diff --git a/Android.mk b/Android.mk
index fd38fd3..357fdff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,18 +1,17 @@
 # Local modifications:
-# * removed com.google.android.backup.api_key. This should be added to
-#      the manifest in the top level directory.
 # * removed com.google.android.geo.API_KEY key. This should be added to
 #      the manifest files in java/com/android/incallui/calllocation/impl/
 #      and /java/com/android/incallui/maps/impl/
+# * b/62417801 modify translation string naming convention:
+#      $ find . -type d | grep 262 | rename 's/(values)\-([a-zA-Z\+\-]+)\-(mcc262-mnc01)/$1-$3-$2/'
+# * b/37077388 temporarily disable proguard with javac
+# * b/62875795 include manually generated GRPC service class:
+#      $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \
+#               --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \
+#               --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto"
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_BUILD_APPS),)
-support_library_root_dir := frameworks/support
-else
-support_library_root_dir := prebuilts/sdk/current/support
-endif
-
 # The base directory for Dialer sources.
 BASE_DIR := java/com/android
 
@@ -20,6 +19,7 @@
 SRC_DIRS := \
 	$(BASE_DIR)/contacts/common \
 	$(BASE_DIR)/dialer \
+	$(BASE_DIR)/dialershared \
 	$(BASE_DIR)/incallui \
 	$(BASE_DIR)/voicemail
 
@@ -39,196 +39,153 @@
 	$(BASE_DIR)/incallui/calllocation/impl/TrafficStatsTags.java \
 	$(BASE_DIR)/incallui/maps/impl/MapsImpl.java \
 	$(BASE_DIR)/incallui/maps/impl/MapsModule.java \
-	$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java
+	$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java \
 
 # Exclude testing only class, not used anywhere here
 EXCLUDE_FILES += \
 	$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java
 
-# All Dialers resources.
-# find . -type d -name "res" | uniq | sort
-RES_DIRS := \
-	assets/product/res \
-	assets/quantum/res \
-	$(BASE_DIR)/contacts/common/res \
-	$(BASE_DIR)/dialer/about/res \
-	$(BASE_DIR)/dialer/app/res \
-	$(BASE_DIR)/dialer/app/voicemail/error/res \
-	$(BASE_DIR)/dialer/blocking/res \
-	$(BASE_DIR)/dialer/callcomposer/camera/camerafocus/res \
-	$(BASE_DIR)/dialer/callcomposer/cameraui/res \
-	$(BASE_DIR)/dialer/callcomposer/res \
-	$(BASE_DIR)/dialer/calldetails/res \
-	$(BASE_DIR)/dialer/calllog/ui/res \
-	$(BASE_DIR)/dialer/calllogutils/res \
-	$(BASE_DIR)/dialer/common/res \
-	$(BASE_DIR)/dialer/contactsfragment/res \
-	$(BASE_DIR)/dialer/dialpadview/res \
-	$(BASE_DIR)/dialer/interactions/res \
-	$(BASE_DIR)/dialer/notification/res \
-	$(BASE_DIR)/dialer/oem/res \
-	$(BASE_DIR)/dialer/phonenumberutil/res \
-	$(BASE_DIR)/dialer/postcall/res \
-	$(BASE_DIR)/dialer/shortcuts/res \
-	$(BASE_DIR)/dialer/speeddial/res \
-	$(BASE_DIR)/dialer/theme/res \
-	$(BASE_DIR)/dialer/util/res \
-	$(BASE_DIR)/dialer/voicemailstatus/res \
-	$(BASE_DIR)/dialer/widget/res \
-	$(BASE_DIR)/incallui/answer/impl/affordance/res \
-	$(BASE_DIR)/incallui/answer/impl/answermethod/res \
-	$(BASE_DIR)/incallui/answer/impl/hint/res \
-	$(BASE_DIR)/incallui/answer/impl/res \
-	$(BASE_DIR)/incallui/audioroute/res \
-	$(BASE_DIR)/incallui/autoresizetext/res \
-	$(BASE_DIR)/incallui/calllocation/impl/res \
-	$(BASE_DIR)/incallui/commontheme/res \
-	$(BASE_DIR)/incallui/contactgrid/res \
-	$(BASE_DIR)/incallui/hold/res \
-	$(BASE_DIR)/incallui/incall/impl/res \
-	$(BASE_DIR)/incallui/res \
-	$(BASE_DIR)/incallui/sessiondata/res \
-	$(BASE_DIR)/incallui/telecomeventui/res \
-	$(BASE_DIR)/incallui/video/impl/res \
-	$(BASE_DIR)/incallui/video/protocol/res \
-	$(BASE_DIR)/incallui/wifi/res \
-	$(BASE_DIR)/voicemail/impl/res \
+# Exclude build variants for now
+EXCLUDE_FILES += \
+	$(BASE_DIR)/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java \
+	$(BASE_DIR)/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java \
+	$(BASE_DIR)/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java \
+	$(BASE_DIR)/dialer/buildtype/test/BuildTypeAccessorImpl.java \
+	$(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \
+	$(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \
+	$(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java \
 
+EXCLUDE_RESOURCE_DIRECTORIES := \
+	java/com/android/incallui/maps/impl/res \
+
+# All Dialers resources.
+RES_DIRS := $(call all-subdir-named-dirs,res,.)
+RES_DIRS := $(filter-out $(EXCLUDE_RESOURCE_DIRECTORIES),$(RES_DIRS))
+
+EXCLUDE_MANIFESTS := \
+	$(BASE_DIR)/dialer/binary/aosp/testing/AndroidManifest.xml \
+	$(BASE_DIR)/dialer/binary/google/AndroidManifest.xml \
+	$(BASE_DIR)/incallui/calllocation/impl/AndroidManifest.xml \
+	$(BASE_DIR)/incallui/maps/impl/AndroidManifest.xml \
 
 # Dialer manifest files to merge.
-# find . -type f -name "AndroidManifest.xml" | uniq | sort
-DIALER_MANIFEST_FILES += \
-	$(BASE_DIR)/contacts/common/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/about/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/app/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/app/manifests/activities/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/app/voicemail/error/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/backup/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/blocking/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/callcomposer/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/callcomposer/camera/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/callcomposer/camera/camerafocus/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/callcomposer/cameraui/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/calldetails/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/calllog/ui/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/calllogutils/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/common/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/contactsfragment/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/dialpadview/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/interactions/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/notification/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/oem/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/phonenumberutil/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/theme/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/util/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/voicemailstatus/AndroidManifest.xml \
-	$(BASE_DIR)/dialer/widget/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/answer/impl/affordance/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/answer/impl/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/answer/impl/answermethod/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/answer/impl/hint/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/audioroute/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/autoresizetext/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/commontheme/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/contactgrid/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/hold/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/telecomeventui/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \
-	$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \
-	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \
-	$(BASE_DIR)/voicemail/permissions.xml \
-
+DIALER_MANIFEST_FILES := $(call all-named-files-under,AndroidManifest.xml,.)
+DIALER_MANIFEST_FILES := $(filter-out $(EXCLUDE_MANIFESTS),$(DIALER_MANIFEST_FILES))
 
 # Merge all manifest files.
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
 	$(addprefix $(LOCAL_PATH)/, $(DIALER_MANIFEST_FILES))
+
 LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS))
-LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS))
+LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
+
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)
 
-LOCAL_RESOURCE_DIR := \
-	$(addprefix $(LOCAL_PATH)/, $(RES_DIRS)) \
-	$(support_library_root_dir)/design/res \
-	$(support_library_root_dir)/transition/res \
-	$(support_library_root_dir)/v7/appcompat/res \
-	$(support_library_root_dir)/v7/cardview/res \
-	$(support_library_root_dir)/v7/recyclerview/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
+
+EXCLUDE_EXTRA_PACKAGES := \
+	com.android.dialer.binary.aosp.testing \
+	com.android.dialer.binary.google \
+	com.android.incallui.calllocation.impl \
+	com.android.incallui.maps.impl \
 
 # We specify each package explicitly to glob resource files.
+# find . -type f -name "AndroidManifest.xml" | uniq | sort | cut -c 8- | rev | cut -c 21- | rev | sed 's/\//./g' | sed 's/$/ \\/'
 LOCAL_AAPT_FLAGS := \
+	com.android.contacts.common \
+	com.android.dialer.about \
+	com.android.dialer.app \
+	com.android.dialer.app.manifests.activities \
+	com.android.dialer.app.voicemail.error \
+	com.android.dialer.backup \
+	com.android.dialer.binary.aosp.testing \
+	com.android.dialer.binary.google \
+	com.android.dialer.blocking \
+	com.android.dialer.callcomposer \
+	com.android.dialer.callcomposer.camera \
+	com.android.dialer.callcomposer.camera.camerafocus \
+	com.android.dialer.callcomposer.cameraui \
+	com.android.dialer.calldetails \
+	com.android.dialer.calllog.database \
+	com.android.dialer.calllog.ui \
+	com.android.dialer.calllogutils \
+	com.android.dialer.common \
+	com.android.dialer.configprovider \
+	com.android.dialer.contactactions \
+	com.android.dialer.contactphoto \
+	com.android.dialer.contactsfragment \
+	com.android.dialer.databasepopulator \
+	com.android.dialer.dialpadview \
+	com.android.dialer.enrichedcall.simulator \
+	com.android.dialer.interactions \
+	com.android.dialer.lettertile \
+	com.android.dialer.location \
+	com.android.dialer.main.impl \
+	com.android.dialer.notification \
+	com.android.dialer.oem \
+	com.android.dialer.phonenumberutil \
+	com.android.dialer.postcall \
+	com.android.dialer.searchfragment.common \
+	com.android.dialer.searchfragment.cp2 \
+	com.android.dialer.searchfragment.list \
+	com.android.dialer.searchfragment.nearbyplaces \
+	com.android.dialer.searchfragment.remote \
+	com.android.dialershared.bubble \
+	com.android.dialer.shortcuts \
+	com.android.dialer.simulator.impl \
+	com.android.dialer.speeddial \
+	com.android.dialer.theme \
+	com.android.dialer.util \
+	com.android.dialer.voicemail.listui \
+	com.android.dialer.voicemailstatus \
+	com.android.dialer.widget \
+	com.android.incallui \
+	com.android.incallui.answer.impl.affordance \
+	com.android.incallui.answer.impl \
+	com.android.incallui.answer.impl.answermethod \
+	com.android.incallui.answer.impl.hint \
+	com.android.incallui.audioroute \
+	com.android.incallui.autoresizetext \
+	com.android.incallui.calllocation.impl \
+	com.android.incallui.callpending \
+	com.android.incallui.commontheme \
+	com.android.incallui.contactgrid \
+	com.android.incallui.disconnectdialog \
+	com.android.incallui.hold \
+	com.android.incallui.incall.impl \
+	com.android.incallui.maps.impl \
+	com.android.incallui.sessiondata \
+	com.android.incallui.spam \
+	com.android.incallui.speakerbuttonlogic \
+	com.android.incallui.telecomeventui \
+	com.android.incallui.video.impl \
+	com.android.incallui.video.protocol \
+	com.android.voicemail \
+	com.android.voicemail.impl \
+	com.android.voicemail.impl.configui \
+
+LOCAL_AAPT_FLAGS := $(filter-out $(EXCLUDE_EXTRA_PACKAGES),$(LOCAL_AAPT_FLAGS))
+LOCAL_AAPT_FLAGS := $(addprefix --extra-packages , $(LOCAL_AAPT_FLAGS))
+LOCAL_AAPT_FLAGS += \
 	--auto-add-overlay \
-	--extra-packages com.android.contacts.common \
-	--extra-packages com.android.dialer.about \
-	--extra-packages com.android.dialer.app \
-	--extra-packages com.android.dialer.app.voicemail.error \
-	--extra-packages com.android.dialer.blocking \
-	--extra-packages com.android.dialer.callcomposer \
-	--extra-packages com.android.dialer.callcomposer \
-	--extra-packages com.android.dialer.callcomposer.camera \
-	--extra-packages com.android.dialer.callcomposer.camera.camerafocus \
-	--extra-packages com.android.dialer.callcomposer.cameraui \
-	--extra-packages com.android.dialer.calldetails \
-	--extra-packages com.android.dialer.calllog.ui \
-	--extra-packages com.android.dialer.calllogutils \
-	--extra-packages com.android.dialer.common \
-	--extra-packages com.android.dialer.contactsfragment \
-	--extra-packages com.android.dialer.dialpadview \
-	--extra-packages com.android.dialer.interactions \
-	--extra-packages com.android.dialer.notification \
-	--extra-packages com.android.dialer.oem \
-	--extra-packages com.android.dialer.phonenumberutil \
-	--extra-packages com.android.dialer.postcall \
-	--extra-packages com.android.dialer.shortcuts \
-	--extra-packages com.android.dialer.speeddial \
-	--extra-packages com.android.dialer.theme \
-	--extra-packages com.android.dialer.util \
-	--extra-packages com.android.dialer.voicemailstatus \
-	--extra-packages com.android.dialer.widget \
-	--extra-packages com.android.incallui \
-	--extra-packages com.android.incallui.answer.impl \
-	--extra-packages com.android.incallui.answer.impl.affordance \
-	--extra-packages com.android.incallui.answer.impl.affordance \
-	--extra-packages com.android.incallui.answer.impl.answermethod \
-	--extra-packages com.android.incallui.answer.impl.hint \
-	--extra-packages com.android.incallui.audioroute \
-	--extra-packages com.android.incallui.autoresizetext \
-	--extra-packages com.android.incallui.calllocation \
-	--extra-packages com.android.incallui.calllocation.impl \
-	--extra-packages com.android.incallui.commontheme \
-	--extra-packages com.android.incallui.contactgrid \
-	--extra-packages com.android.incallui.hold \
-	--extra-packages com.android.incallui.incall.impl \
-	--extra-packages com.android.incallui.maps.impl \
-	--extra-packages com.android.incallui.sessiondata \
-	--extra-packages com.android.incallui.telecomeventui \
-	--extra-packages com.android.incallui.video \
-	--extra-packages com.android.incallui.video.impl \
-	--extra-packages com.android.incallui.wifi \
-	--extra-packages com.android.phone.common \
-	--extra-packages com.android.voicemail \
-	--extra-packages com.android.voicemail.impl \
-	--extra-packages com.android.voicemail.impl.fetch \
-	--extra-packages com.android.voicemail.impl.settings \
-	--extra-packages com.android.voicemail.settings \
-	--extra-packages me.leolin.shortcutbadger
+	--extra-packages me.leolin.shortcutbadger \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	android-common \
+	android-support-dynamic-animation \
 	com.android.vcard \
 	dialer-commons-io-target \
 	dialer-dagger2-target \
 	dialer-disklrucache-target \
 	dialer-gifdecoder-target \
 	dialer-glide-target \
+	dialer-grpc-all-target \
+	dialer-grpc-context-target \
+	dialer-grpc-core-target \
+	dialer-grpc-okhttp-target \
+	dialer-grpc-protobuf-lite-target \
+	dialer-grpc-stub-target \
 	dialer-guava-target \
 	dialer-javax-annotation-api-target \
 	dialer-javax-inject-target \
@@ -238,8 +195,10 @@
 	jsr305 \
 	libphonenumber \
 	volley \
+	libbackup \
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
+	android-support-core-ui \
 	android-support-design \
 	android-support-transition \
 	android-support-v13 \
@@ -249,18 +208,18 @@
 	android-support-v7-recyclerview \
 
 LOCAL_JAVA_LIBRARIES := \
-	org.apache.http.legacy \
 	dialer-auto-value \
+	org.apache.http.legacy \
 
 # Libraries needed by the compiler (JACK) to generate code.
 PROCESSOR_LIBRARIES_TARGET := \
-	dialer-dagger2-compiler \
+	dialer-auto-value \
 	dialer-dagger2 \
+	dialer-dagger2-compiler \
 	dialer-dagger2-producers \
 	dialer-guava \
 	dialer-javax-annotation-api \
 	dialer-javax-inject \
-	dialer-auto-value \
 
 # Resolve the jar paths.
 PROCESSOR_JARS := $(call java-lib-deps, $(PROCESSOR_LIBRARIES_TARGET))
@@ -270,20 +229,24 @@
 LOCAL_JACK_FLAGS += --processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
 LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
 
+
+# Begin Bug: 37077388
+LOCAL_DX_FLAGS := --multi-dex
+LOCAL_JACK_FLAGS := --multi-dex native
+
+LOCAL_PROGUARD_ENABLED := disabled
+ifdef LOCAL_JACK_ENABLED
+
+
 # Proguard includes
-LOCAL_PROGUARD_FLAG_FILES := \
-    java/com/android/dialer/common/proguard.flags \
-    java/com/android/dialer/proguard/proguard_base.flags \
-    java/com/android/dialer/proguard/proguard.flags \
-    java/com/android/dialer/proguard/proguard_release.flags \
-    java/com/android/incallui/answer/impl/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(SRC_DIRS))
 LOCAL_PROGUARD_ENABLED := custom
 
-ifdef LOCAL_JACK_ENABLED
-# Bug: 37077388
 LOCAL_PROGUARD_ENABLED += optimization
 endif
 
+# End Bug: 37077388
+
 LOCAL_SDK_VERSION := system_current
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := Dialer
@@ -304,15 +267,22 @@
 DIALER_MANIFEST_FILES :=
 PROCESSOR_LIBRARIES_TARGET :=
 PROCESSOR_JARS :=
+EXCLUDE_MANIFESTS :=
+EXCLUDE_EXTRA_PACKAGES :=
 
 # Create references to prebuilt libraries.
 include $(CLEAR_VARS)
 
 LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
+    dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \
     dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
@@ -346,7 +316,7 @@
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE := dialer-disklrucache-target
 LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/disklrucache/1.0.0-SNAPSHOT/disklrucache-1.0.0-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/disklrucache/1.0.0-SNAPSHOT/disklrucache-1.0.0-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX) 
 LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -432,3 +402,63 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-core-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-okhttp-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-protobuf-lite-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-stub-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-all-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-grpc-context-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c04f8be..b508401 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   coreApp="true"
   package="com.android.dialer"
-  android:versionCode="130000"
-  android:versionName="10.0">
+  android:versionCode="170000"
+  android:versionName="13.0">
 
   <uses-sdk
     android:minSdkVersion="23"
@@ -55,6 +55,7 @@
   <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.SEND_SMS"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
   <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
   <!-- We use this to disable the status bar buttons of home, back and recent
@@ -102,17 +103,12 @@
   <uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS"/>
 
   <application
-    android:backupAgent='com.android.dialer.backup.DialerBackupAgent'
-    android:fullBackupOnly="true"
-    android:restoreAnyVersion="true"
     android:hardwareAccelerated="true"
     android:icon="@mipmap/ic_launcher_phone"
     android:label="@string/applicationLabel"
     android:name="com.android.dialer.binary.aosp.AospDialerApplication"
     android:supportsRtl="true"
     android:usesCleartextTraffic="false">
-
-
   </application>
 
 </manifest>
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png
new file mode 100644
index 0000000..046372d
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_check_circle_googblue_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_check_circle_googblue_24.png
deleted file mode 100644
index 52ff857..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_check_circle_googblue_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
index ceb1a1e..fd3edbd 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_forward_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_forward_white_24.png
deleted file mode 100644
index a0711d3..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_forward_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
index 86eecdd..dbbb9f6 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png
new file mode 100644
index 0000000..d25d388
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
index b414cf5..caf34c2 100644
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png
new file mode 100644
index 0000000..6fccf5d
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_network_wifi_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_network_wifi_white_24.png
deleted file mode 100644
index 8df91f2..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_network_wifi_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png
new file mode 100644
index 0000000..f2c8942
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png
new file mode 100644
index 0000000..ec67c6e
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png
new file mode 100644
index 0000000..63edb42
--- /dev/null
+++ b/assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_report_white_18.png b/assets/quantum/res/drawable-hdpi/quantum_ic_report_white_18.png
deleted file mode 100644
index f0bb6f5..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_report_white_18.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png
new file mode 100644
index 0000000..ddffcf1
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_check_circle_googblue_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_check_circle_googblue_24.png
deleted file mode 100644
index eff56272..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_check_circle_googblue_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
index af7f828..3f1f3f8 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_forward_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_forward_white_24.png
deleted file mode 100644
index 65f7329..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_forward_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
index d2cbe4c..d85d324 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png
new file mode 100644
index 0000000..df06379
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
index d474bd5..d17a3fa 100644
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png
new file mode 100644
index 0000000..15094d8
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_network_wifi_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_network_wifi_white_24.png
deleted file mode 100644
index 1c3e8b9..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_network_wifi_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png
new file mode 100644
index 0000000..e6f98af
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png
new file mode 100644
index 0000000..f2c8942
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png
new file mode 100644
index 0000000..88fa794
--- /dev/null
+++ b/assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_report_white_18.png b/assets/quantum/res/drawable-mdpi/quantum_ic_report_white_18.png
deleted file mode 100644
index 63ef736..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_report_white_18.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png
new file mode 100644
index 0000000..b494eb3
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_check_circle_googblue_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_check_circle_googblue_24.png
deleted file mode 100644
index e31fcf3..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_check_circle_googblue_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
index b7c7ffd..59c2fae 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_forward_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_forward_white_24.png
deleted file mode 100644
index 7a5df52..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_forward_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
index d65f39d..ce1f670 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png
new file mode 100644
index 0000000..d7a741b
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
index 2642b9e..07ee6bc 100644
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png
new file mode 100644
index 0000000..bb7915f
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_network_wifi_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_network_wifi_white_24.png
deleted file mode 100644
index ca927f3..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_network_wifi_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png
new file mode 100644
index 0000000..a2d78b2
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png
new file mode 100644
index 0000000..9c002da
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png
new file mode 100644
index 0000000..9b9d49f
--- /dev/null
+++ b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_report_white_18.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_report_white_18.png
deleted file mode 100644
index dc0c995..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_report_white_18.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png
new file mode 100644
index 0000000..d5022d0
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_check_circle_googblue_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_check_circle_googblue_24.png
deleted file mode 100644
index a8eb2a4..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_check_circle_googblue_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
index 6b717e0..d5fd569 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_forward_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_forward_white_24.png
deleted file mode 100644
index 7bd5b16..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_forward_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
index aa58792..44f3fdf 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png
new file mode 100644
index 0000000..82db542
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
index f9f1def..0059339 100644
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png
new file mode 100644
index 0000000..7a15a9e
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_network_wifi_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_network_wifi_white_24.png
deleted file mode 100644
index 75469cd..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_network_wifi_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png
new file mode 100644
index 0000000..9c002da
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png
new file mode 100644
index 0000000..5bb683f
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png
new file mode 100644
index 0000000..e0721e6
--- /dev/null
+++ b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_grey600_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_white_18.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_white_18.png
deleted file mode 100644
index 919a872..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_report_white_18.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png
new file mode 100644
index 0000000..8e1fa20
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_check_circle_googblue_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_check_circle_googblue_24.png
deleted file mode 100644
index 7e08f61..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_check_circle_googblue_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
index 3964192..dac4e9c 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_close_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_forward_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_forward_white_24.png
deleted file mode 100644
index 428009c..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_forward_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
index 7f38d09..31000c6 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_grade_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png
new file mode 100644
index 0000000..0f0b2e1
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
index 2ffdb55..f62cee6 100644
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_image_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png
new file mode 100644
index 0000000..22ca19a
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_network_wifi_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_network_wifi_white_24.png
deleted file mode 100644
index eb284e3..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_network_wifi_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png
new file mode 100644
index 0000000..36be1da
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png
new file mode 100644
index 0000000..1257e66
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png
new file mode 100644
index 0000000..29ac881
--- /dev/null
+++ b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_grey600_24.png
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_white_18.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_white_18.png
deleted file mode 100644
index aed7668..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_report_white_18.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
new file mode 100644
index 0000000..2989fda
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml
new file mode 100644
index 0000000..8c44535
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_block_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_end_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_end_vd_theme_24.xml
new file mode 100644
index 0000000..ea9a093
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_call_end_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,9c-1.6,0 -3.15,0.25 -4.6,0.72v3.1c0,0.39 -0.23,0.74 -0.56,0.9 -0.98,0.49 -1.87,1.12 -2.66,1.85 -0.18,0.18 -0.43,0.28 -0.7,0.28 -0.28,0 -0.53,-0.11 -0.71,-0.29L0.29,13.08c-0.18,-0.17 -0.29,-0.42 -0.29,-0.7 0,-0.28 0.11,-0.53 0.29,-0.71C3.34,8.78 7.46,7 12,7s8.66,1.78 11.71,4.67c0.18,0.18 0.29,0.43 0.29,0.71 0,0.28 -0.11,0.53 -0.29,0.71l-2.48,2.48c-0.18,0.18 -0.43,0.29 -0.71,0.29 -0.27,0 -0.52,-0.11 -0.7,-0.28 -0.79,-0.74 -1.69,-1.36 -2.67,-1.85 -0.33,-0.16 -0.56,-0.5 -0.56,-0.9v-3.1C15.15,9.25 13.6,9 12,9z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_vd_theme_24.xml
new file mode 100644
index 0000000..1fbafeb
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_call_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml
new file mode 100644
index 0000000..3f99732
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml
index 4f1fd49..b3493b8 100644
--- a/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_enterprise_vd_theme_24.xml
@@ -6,5 +6,5 @@
         android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M14,16.5h-4L10,15L3,15v4c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-4h-7v1.5zM20,6h-3.5L16.5,4.5L15,3L9,3L7.5,4.55L7.5,6L4,6c-1.1,0 -2,0.9 -2,2v4c0,1.1 0.9,2 2,2h6v-1.5h4L14,14h6c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM15,6L9,6L9,4.5h6L15,6z"/>
-</vector>
\ No newline at end of file
+        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
index c67509c..b6da8a0 100644
--- a/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml
@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM14.5,13.5h2v-3h-2v3z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_history_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_history_vd_theme_24.xml
new file mode 100644
index 0000000..d8567f5
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_history_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml
new file mode 100644
index 0000000..bea0d5c
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_language_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml
new file mode 100644
index 0000000..280fa26
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_message_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
new file mode 100644
index 0000000..1a3a684
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_more_vert_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_person_add_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_person_add_vd_theme_24.xml
new file mode 100644
index 0000000..cf4e563
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_person_add_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml
new file mode 100644
index 0000000..083d636
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml
new file mode 100644
index 0000000..429061a
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_vd_theme_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+</vector>
diff --git a/java/com/android/contacts/common/Bindings.java b/java/com/android/contacts/common/Bindings.java
deleted file mode 100644
index 29cf795..0000000
--- a/java/com/android/contacts/common/Bindings.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common;
-
-import android.content.Context;
-import com.android.contacts.common.bindings.ContactsCommonBindings;
-import com.android.contacts.common.bindings.ContactsCommonBindingsFactory;
-import com.android.contacts.common.bindings.ContactsCommonBindingsStub;
-import java.util.Objects;
-
-/** Accessor for the contacts common bindings. */
-public class Bindings {
-
-  private static ContactsCommonBindings instance;
-
-  private Bindings() {}
-
-  public static ContactsCommonBindings get(Context context) {
-    Objects.requireNonNull(context);
-    if (instance != null) {
-      return instance;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof ContactsCommonBindingsFactory) {
-      instance = ((ContactsCommonBindingsFactory) application).newContactsCommonBindings();
-    }
-
-    if (instance == null) {
-      instance = new ContactsCommonBindingsStub();
-    }
-    return instance;
-  }
-
-  public static void setForTesting(ContactsCommonBindings testInstance) {
-    instance = testInstance;
-  }
-}
diff --git a/java/com/android/contacts/common/ClipboardUtils.java b/java/com/android/contacts/common/ClipboardUtils.java
index 9345b0f..3d76839 100644
--- a/java/com/android/contacts/common/ClipboardUtils.java
+++ b/java/com/android/contacts/common/ClipboardUtils.java
@@ -24,8 +24,6 @@
 
 public class ClipboardUtils {
 
-  private static final String TAG = "ClipboardUtils";
-
   private ClipboardUtils() {}
 
   /**
diff --git a/java/com/android/contacts/common/ContactPhotoManager.java b/java/com/android/contacts/common/ContactPhotoManager.java
deleted file mode 100644
index 169348b..0000000
--- a/java/com/android/contacts/common/ContactPhotoManager.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Copyright (C) 2010 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.contacts.common;
-
-import android.content.ComponentCallbacks2;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.QuickContactBadge;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.util.UriUtils;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.util.PermissionsUtil;
-
-/** Asynchronously loads contact photos and maintains a cache of photos. */
-public abstract class ContactPhotoManager implements ComponentCallbacks2 {
-
-  /** Contact type constants used for default letter images */
-  public static final int TYPE_PERSON = LetterTileDrawable.TYPE_PERSON;
-
-  public static final int TYPE_SPAM = LetterTileDrawable.TYPE_SPAM;
-  public static final int TYPE_BUSINESS = LetterTileDrawable.TYPE_BUSINESS;
-  public static final int TYPE_VOICEMAIL = LetterTileDrawable.TYPE_VOICEMAIL;
-  public static final int TYPE_DEFAULT = LetterTileDrawable.TYPE_DEFAULT;
-  public static final int TYPE_GENERIC_AVATAR = LetterTileDrawable.TYPE_GENERIC_AVATAR;
-  /** Scale and offset default constants used for default letter images */
-  public static final float SCALE_DEFAULT = 1.0f;
-
-  public static final float OFFSET_DEFAULT = 0.0f;
-  public static final boolean IS_CIRCULAR_DEFAULT = false;
-  // TODO: Use LogUtil.isVerboseEnabled for DEBUG branches instead of a lint check.
-  // LINT.DoNotSubmitIf(true)
-  static final boolean DEBUG = false;
-  // LINT.DoNotSubmitIf(true)
-  static final boolean DEBUG_SIZES = false;
-  /** Uri-related constants used for default letter images */
-  private static final String DISPLAY_NAME_PARAM_KEY = "display_name";
-
-  private static final String IDENTIFIER_PARAM_KEY = "identifier";
-  private static final String CONTACT_TYPE_PARAM_KEY = "contact_type";
-  private static final String SCALE_PARAM_KEY = "scale";
-  private static final String OFFSET_PARAM_KEY = "offset";
-  private static final String IS_CIRCULAR_PARAM_KEY = "is_circular";
-  private static final String DEFAULT_IMAGE_URI_SCHEME = "defaultimage";
-  private static final Uri DEFAULT_IMAGE_URI = Uri.parse(DEFAULT_IMAGE_URI_SCHEME + "://");
-  public static final DefaultImageProvider DEFAULT_AVATAR = new LetterTileDefaultImageProvider();
-  private static ContactPhotoManager sInstance;
-
-  /**
-   * Given a {@link DefaultImageRequest}, returns an Uri that can be used to request a letter tile
-   * avatar when passed to the {@link ContactPhotoManager}. The internal implementation of this uri
-   * is not guaranteed to remain the same across application versions, so the actual uri should
-   * never be persisted in long-term storage and reused.
-   *
-   * @param request A {@link DefaultImageRequest} object with the fields configured to return a
-   * @return A Uri that when later passed to the {@link ContactPhotoManager} via {@link
-   *     #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest)}, can be used to
-   *     request a default contact image, drawn as a letter tile using the parameters as configured
-   *     in the provided {@link DefaultImageRequest}
-   */
-  public static Uri getDefaultAvatarUriForContact(DefaultImageRequest request) {
-    final Builder builder = DEFAULT_IMAGE_URI.buildUpon();
-    if (request != null) {
-      if (!TextUtils.isEmpty(request.displayName)) {
-        builder.appendQueryParameter(DISPLAY_NAME_PARAM_KEY, request.displayName);
-      }
-      if (!TextUtils.isEmpty(request.identifier)) {
-        builder.appendQueryParameter(IDENTIFIER_PARAM_KEY, request.identifier);
-      }
-      if (request.contactType != TYPE_DEFAULT) {
-        builder.appendQueryParameter(CONTACT_TYPE_PARAM_KEY, String.valueOf(request.contactType));
-      }
-      if (request.scale != SCALE_DEFAULT) {
-        builder.appendQueryParameter(SCALE_PARAM_KEY, String.valueOf(request.scale));
-      }
-      if (request.offset != OFFSET_DEFAULT) {
-        builder.appendQueryParameter(OFFSET_PARAM_KEY, String.valueOf(request.offset));
-      }
-      if (request.isCircular != IS_CIRCULAR_DEFAULT) {
-        builder.appendQueryParameter(IS_CIRCULAR_PARAM_KEY, String.valueOf(request.isCircular));
-      }
-    }
-    return builder.build();
-  }
-
-  /**
-   * Adds a business contact type encoded fragment to the URL. Used to ensure photo URLS from Nearby
-   * Places can be identified as business photo URLs rather than URLs for personal contact photos.
-   *
-   * @param photoUrl The photo URL to modify.
-   * @return URL with the contact type parameter added and set to TYPE_BUSINESS.
-   */
-  public static String appendBusinessContactType(String photoUrl) {
-    Uri uri = Uri.parse(photoUrl);
-    Builder builder = uri.buildUpon();
-    builder.encodedFragment(String.valueOf(TYPE_BUSINESS));
-    return builder.build().toString();
-  }
-
-  /**
-   * Removes the contact type information stored in the photo URI encoded fragment.
-   *
-   * @param photoUri The photo URI to remove the contact type from.
-   * @return The photo URI with contact type removed.
-   */
-  public static Uri removeContactType(Uri photoUri) {
-    String encodedFragment = photoUri.getEncodedFragment();
-    if (!TextUtils.isEmpty(encodedFragment)) {
-      Builder builder = photoUri.buildUpon();
-      builder.encodedFragment(null);
-      return builder.build();
-    }
-    return photoUri;
-  }
-
-  /**
-   * Inspects a photo URI to determine if the photo URI represents a business.
-   *
-   * @param photoUri The URI to inspect.
-   * @return Whether the URI represents a business photo or not.
-   */
-  public static boolean isBusinessContactUri(Uri photoUri) {
-    if (photoUri == null) {
-      return false;
-    }
-
-    String encodedFragment = photoUri.getEncodedFragment();
-    return !TextUtils.isEmpty(encodedFragment)
-        && encodedFragment.equals(String.valueOf(TYPE_BUSINESS));
-  }
-
-  protected static DefaultImageRequest getDefaultImageRequestFromUri(Uri uri) {
-    final DefaultImageRequest request =
-        new DefaultImageRequest(
-            uri.getQueryParameter(DISPLAY_NAME_PARAM_KEY),
-            uri.getQueryParameter(IDENTIFIER_PARAM_KEY),
-            false);
-    try {
-      String contactType = uri.getQueryParameter(CONTACT_TYPE_PARAM_KEY);
-      if (!TextUtils.isEmpty(contactType)) {
-        request.contactType = Integer.valueOf(contactType);
-      }
-
-      String scale = uri.getQueryParameter(SCALE_PARAM_KEY);
-      if (!TextUtils.isEmpty(scale)) {
-        request.scale = Float.valueOf(scale);
-      }
-
-      String offset = uri.getQueryParameter(OFFSET_PARAM_KEY);
-      if (!TextUtils.isEmpty(offset)) {
-        request.offset = Float.valueOf(offset);
-      }
-
-      String isCircular = uri.getQueryParameter(IS_CIRCULAR_PARAM_KEY);
-      if (!TextUtils.isEmpty(isCircular)) {
-        request.isCircular = Boolean.valueOf(isCircular);
-      }
-    } catch (NumberFormatException e) {
-      LogUtil.w(
-          "ContactPhotoManager.getDefaultImageRequestFromUri",
-          "Invalid DefaultImageRequest image parameters provided, ignoring and using "
-              + "defaults.");
-    }
-
-    return request;
-  }
-
-  public static ContactPhotoManager getInstance(Context context) {
-    if (sInstance == null) {
-      Context applicationContext = context.getApplicationContext();
-      sInstance = createContactPhotoManager(applicationContext);
-      applicationContext.registerComponentCallbacks(sInstance);
-      if (PermissionsUtil.hasContactsReadPermissions(context)) {
-        sInstance.preloadPhotosInBackground();
-      }
-    }
-    return sInstance;
-  }
-
-  public static synchronized ContactPhotoManager createContactPhotoManager(Context context) {
-    return new ContactPhotoManagerImpl(context);
-  }
-
-  @VisibleForTesting
-  public static void injectContactPhotoManagerForTesting(ContactPhotoManager photoManager) {
-    sInstance = photoManager;
-  }
-
-  protected boolean isDefaultImageUri(Uri uri) {
-    return DEFAULT_IMAGE_URI_SCHEME.equals(uri.getScheme());
-  }
-
-  /**
-   * Load thumbnail image into the supplied image view. If the photo is already cached, it is
-   * displayed immediately. Otherwise a request is sent to load the photo from the database.
-   */
-  public abstract void loadThumbnail(
-      ImageView view,
-      long photoId,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest,
-      DefaultImageProvider defaultProvider);
-
-  /**
-   * Calls {@link #loadThumbnail(ImageView, long, boolean, boolean, DefaultImageRequest,
-   * DefaultImageProvider)} using the {@link DefaultImageProvider} {@link #DEFAULT_AVATAR}.
-   */
-  public final void loadThumbnail(
-      ImageView view,
-      long photoId,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest) {
-    loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
-  }
-
-  public final void loadDialerThumbnailOrPhoto(
-      QuickContactBadge badge,
-      Uri contactUri,
-      long photoId,
-      Uri photoUri,
-      String displayName,
-      int contactType) {
-    badge.assignContactUri(contactUri);
-    badge.setOverlay(null);
-
-    String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri);
-    ContactPhotoManager.DefaultImageRequest request =
-        new ContactPhotoManager.DefaultImageRequest(
-            displayName, lookupKey, contactType, true /* isCircular */);
-    if (photoId == 0 && photoUri != null) {
-      loadDirectoryPhoto(badge, photoUri, false /* darkTheme */, true /* isCircular */, request);
-    } else {
-      loadThumbnail(badge, photoId, false /* darkTheme */, true /* isCircular */, request);
-    }
-  }
-
-  /**
-   * Load photo into the supplied image view. If the photo is already cached, it is displayed
-   * immediately. Otherwise a request is sent to load the photo from the location specified by the
-   * URI.
-   *
-   * @param view The target view
-   * @param photoUri The uri of the photo to load
-   * @param requestedExtent Specifies an approximate Max(width, height) of the targetView. This is
-   *     useful if the source image can be a lot bigger that the target, so that the decoding is
-   *     done using efficient sampling. If requestedExtent is specified, no sampling of the image is
-   *     performed
-   * @param darkTheme Whether the background is dark. This is used for default avatars
-   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
-   *     letter tile avatar should be drawn.
-   * @param defaultProvider The provider of default avatars (this is used if photoUri doesn't refer
-   *     to an existing image)
-   */
-  public abstract void loadPhoto(
-      ImageView view,
-      Uri photoUri,
-      int requestedExtent,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest,
-      DefaultImageProvider defaultProvider);
-
-  /**
-   * Calls {@link #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest,
-   * DefaultImageProvider)} with {@link #DEFAULT_AVATAR} and {@code null} display names and lookup
-   * keys.
-   *
-   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
-   *     letter tile avatar should be drawn.
-   */
-  public final void loadPhoto(
-      ImageView view,
-      Uri photoUri,
-      int requestedExtent,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest) {
-    loadPhoto(
-        view,
-        photoUri,
-        requestedExtent,
-        darkTheme,
-        isCircular,
-        defaultImageRequest,
-        DEFAULT_AVATAR);
-  }
-
-  /**
-   * Calls {@link #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest,
-   * DefaultImageProvider)} with {@link #DEFAULT_AVATAR} and with the assumption, that the image is
-   * a thumbnail.
-   *
-   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
-   *     letter tile avatar should be drawn.
-   */
-  public final void loadDirectoryPhoto(
-      ImageView view,
-      Uri photoUri,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest) {
-    loadPhoto(view, photoUri, -1, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
-  }
-
-  /**
-   * Remove photo from the supplied image view. This also cancels current pending load request
-   * inside this photo manager.
-   */
-  public abstract void removePhoto(ImageView view);
-
-  /** Cancels all pending requests to load photos asynchronously. */
-  public abstract void cancelPendingRequests(View fragmentRootView);
-
-  /** Temporarily stops loading photos from the database. */
-  public abstract void pause();
-
-  /** Resumes loading photos from the database. */
-  public abstract void resume();
-
-  /**
-   * Marks all cached photos for reloading. We can continue using cache but should also make sure
-   * the photos haven't changed in the background and notify the views if so.
-   */
-  public abstract void refreshCache();
-
-  /** Initiates a background process that over time will fill up cache with preload photos. */
-  public abstract void preloadPhotosInBackground();
-
-  // ComponentCallbacks2
-  @Override
-  public void onConfigurationChanged(Configuration newConfig) {}
-
-  // ComponentCallbacks2
-  @Override
-  public void onLowMemory() {}
-
-  // ComponentCallbacks2
-  @Override
-  public void onTrimMemory(int level) {}
-
-  /**
-   * Contains fields used to contain contact details and other user-defined settings that might be
-   * used by the ContactPhotoManager to generate a default contact image. This contact image takes
-   * the form of a letter or bitmap drawn on top of a colored tile.
-   */
-  public static class DefaultImageRequest {
-
-    /**
-     * Used to indicate that a drawable that represents a contact without any contact details should
-     * be returned.
-     */
-    public static final DefaultImageRequest EMPTY_DEFAULT_IMAGE_REQUEST = new DefaultImageRequest();
-    /**
-     * Used to indicate that a drawable that represents a business without a business photo should
-     * be returned.
-     */
-    public static final DefaultImageRequest EMPTY_DEFAULT_BUSINESS_IMAGE_REQUEST =
-        new DefaultImageRequest(null, null, TYPE_BUSINESS, false);
-    /**
-     * Used to indicate that a circular drawable that represents a contact without any contact
-     * details should be returned.
-     */
-    public static final DefaultImageRequest EMPTY_CIRCULAR_DEFAULT_IMAGE_REQUEST =
-        new DefaultImageRequest(null, null, true);
-    /**
-     * Used to indicate that a circular drawable that represents a business without a business photo
-     * should be returned.
-     */
-    public static final DefaultImageRequest EMPTY_CIRCULAR_BUSINESS_IMAGE_REQUEST =
-        new DefaultImageRequest(null, null, TYPE_BUSINESS, true);
-    /** The contact's display name. The display name is used to */
-    public String displayName;
-    /**
-     * A unique and deterministic string that can be used to identify this contact. This is usually
-     * the contact's lookup key, but other contact details can be used as well, especially for
-     * non-local or temporary contacts that might not have a lookup key. This is used to determine
-     * the color of the tile.
-     */
-    public String identifier;
-    /**
-     * The type of this contact. This contact type may be used to decide the kind of image to use in
-     * the case where a unique letter cannot be generated from the contact's display name and
-     * identifier. See: {@link #TYPE_PERSON} {@link #TYPE_BUSINESS} {@link #TYPE_PERSON} {@link
-     * #TYPE_DEFAULT}
-     */
-    public int contactType = TYPE_DEFAULT;
-    /**
-     * The amount to scale the letter or bitmap to, as a ratio of its default size (from a range of
-     * 0.0f to 2.0f). The default value is 1.0f.
-     */
-    public float scale = SCALE_DEFAULT;
-    /**
-     * The amount to vertically offset the letter or image to within the tile. The provided offset
-     * must be within the range of -0.5f to 0.5f. If set to -0.5f, the letter will be shifted
-     * upwards by 0.5 times the height of the canvas it is being drawn on, which means it will be
-     * drawn with the center of the letter starting at the top edge of the canvas. If set to 0.5f,
-     * the letter will be shifted downwards by 0.5 times the height of the canvas it is being drawn
-     * on, which means it will be drawn with the center of the letter starting at the bottom edge of
-     * the canvas. The default is 0.0f, which means the letter is drawn in the exact vertical center
-     * of the tile.
-     */
-    public float offset = OFFSET_DEFAULT;
-    /** Whether or not to draw the default image as a circle, instead of as a square/rectangle. */
-    public boolean isCircular = false;
-
-    public DefaultImageRequest() {}
-
-    public DefaultImageRequest(String displayName, String identifier, boolean isCircular) {
-      this(displayName, identifier, TYPE_DEFAULT, SCALE_DEFAULT, OFFSET_DEFAULT, isCircular);
-    }
-
-    public DefaultImageRequest(
-        String displayName, String identifier, int contactType, boolean isCircular) {
-      this(displayName, identifier, contactType, SCALE_DEFAULT, OFFSET_DEFAULT, isCircular);
-    }
-
-    public DefaultImageRequest(
-        String displayName,
-        String identifier,
-        int contactType,
-        float scale,
-        float offset,
-        boolean isCircular) {
-      this.displayName = displayName;
-      this.identifier = identifier;
-      this.contactType = contactType;
-      this.scale = scale;
-      this.offset = offset;
-      this.isCircular = isCircular;
-    }
-  }
-
-  public abstract static class DefaultImageProvider {
-
-    /**
-     * Applies the default avatar to the ImageView. Extent is an indicator for the size (width or
-     * height). If darkTheme is set, the avatar is one that looks better on dark background
-     *
-     * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
-     *     letter tile avatar should be drawn.
-     */
-    public abstract void applyDefaultImage(
-        ImageView view, int extent, boolean darkTheme, DefaultImageRequest defaultImageRequest);
-  }
-
-  /**
-   * A default image provider that applies a letter tile consisting of a colored background and a
-   * letter in the foreground as the default image for a contact. The color of the background and
-   * the type of letter is decided based on the contact's details.
-   */
-  private static class LetterTileDefaultImageProvider extends DefaultImageProvider {
-
-    public static Drawable getDefaultImageForContact(
-        Resources resources, DefaultImageRequest defaultImageRequest) {
-      final LetterTileDrawable drawable = new LetterTileDrawable(resources);
-      final int tileShape =
-          defaultImageRequest.isCircular
-              ? LetterTileDrawable.SHAPE_CIRCLE
-              : LetterTileDrawable.SHAPE_RECTANGLE;
-      if (defaultImageRequest != null) {
-        // If the contact identifier is null or empty, fallback to the
-        // displayName. In that case, use {@code null} for the contact's
-        // display name so that a default bitmap will be used instead of a
-        // letter
-        if (TextUtils.isEmpty(defaultImageRequest.identifier)) {
-          drawable.setCanonicalDialerLetterTileDetails(
-              null, defaultImageRequest.displayName, tileShape, defaultImageRequest.contactType);
-        } else {
-          drawable.setCanonicalDialerLetterTileDetails(
-              defaultImageRequest.displayName,
-              defaultImageRequest.identifier,
-              tileShape,
-              defaultImageRequest.contactType);
-        }
-        drawable.setScale(defaultImageRequest.scale);
-        drawable.setOffset(defaultImageRequest.offset);
-      }
-      return drawable;
-    }
-
-    @Override
-    public void applyDefaultImage(
-        ImageView view, int extent, boolean darkTheme, DefaultImageRequest defaultImageRequest) {
-      final Drawable drawable = getDefaultImageForContact(view.getResources(), defaultImageRequest);
-      view.setImageDrawable(drawable);
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/ContactPhotoManagerImpl.java b/java/com/android/contacts/common/ContactPhotoManagerImpl.java
deleted file mode 100644
index 2e6ff9f..0000000
--- a/java/com/android/contacts/common/ContactPhotoManagerImpl.java
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common;
-
-import android.app.ActivityManager;
-import android.content.ComponentCallbacks2;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.TransitionDrawable;
-import android.media.ThumbnailUtils;
-import android.net.TrafficStats;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Handler.Callback;
-import android.os.HandlerThread;
-import android.os.Message;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Contacts.Photo;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.Directory;
-import android.support.annotation.UiThread;
-import android.support.annotation.WorkerThread;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import android.text.TextUtils;
-import android.util.LruCache;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.TrafficStatsTags;
-import com.android.contacts.common.util.UriUtils;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.util.PermissionsUtil;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
-
-  private static final String LOADER_THREAD_NAME = "ContactPhotoLoader";
-
-  private static final int FADE_TRANSITION_DURATION = 200;
-
-  /**
-   * Type of message sent by the UI thread to itself to indicate that some photos need to be loaded.
-   */
-  private static final int MESSAGE_REQUEST_LOADING = 1;
-
-  /** Type of message sent by the loader thread to indicate that some photos have been loaded. */
-  private static final int MESSAGE_PHOTOS_LOADED = 2;
-
-  private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
-  private static final String[] COLUMNS = new String[] {Photo._ID, Photo.PHOTO};
-
-  /**
-   * Dummy object used to indicate that a bitmap for a given key could not be stored in the cache.
-   */
-  private static final BitmapHolder BITMAP_UNAVAILABLE;
-  /** Cache size for {@link #mBitmapHolderCache} for devices with "large" RAM. */
-  private static final int HOLDER_CACHE_SIZE = 2000000;
-  /** Cache size for {@link #mBitmapCache} for devices with "large" RAM. */
-  private static final int BITMAP_CACHE_SIZE = 36864 * 48; // 1728K
-  /** Height/width of a thumbnail image */
-  private static int mThumbnailSize;
-
-  static {
-    BITMAP_UNAVAILABLE = new BitmapHolder(new byte[0], 0);
-    BITMAP_UNAVAILABLE.bitmapRef = new SoftReference<Bitmap>(null);
-  }
-
-  private final Context mContext;
-  /**
-   * An LRU cache for bitmap holders. The cache contains bytes for photos just as they come from the
-   * database. Each holder has a soft reference to the actual bitmap.
-   */
-  private final LruCache<Object, BitmapHolder> mBitmapHolderCache;
-  /** Cache size threshold at which bitmaps will not be preloaded. */
-  private final int mBitmapHolderCacheRedZoneBytes;
-  /**
-   * Level 2 LRU cache for bitmaps. This is a smaller cache that holds the most recently used
-   * bitmaps to save time on decoding them from bytes (the bytes are stored in {@link
-   * #mBitmapHolderCache}.
-   */
-  private final LruCache<Object, Bitmap> mBitmapCache;
-  /**
-   * A map from ImageView to the corresponding photo ID or uri, encapsulated in a request. The
-   * request may swapped out before the photo loading request is started.
-   */
-  private final ConcurrentHashMap<ImageView, Request> mPendingRequests =
-      new ConcurrentHashMap<ImageView, Request>();
-  /** Handler for messages sent to the UI thread. */
-  private final Handler mMainThreadHandler = new Handler(this);
-  /** For debug: How many times we had to reload cached photo for a stale entry */
-  private final AtomicInteger mStaleCacheOverwrite = new AtomicInteger();
-  /** For debug: How many times we had to reload cached photo for a fresh entry. Should be 0. */
-  private final AtomicInteger mFreshCacheOverwrite = new AtomicInteger();
-  /** {@code true} if ALL entries in {@link #mBitmapHolderCache} are NOT fresh. */
-  private volatile boolean mBitmapHolderCacheAllUnfresh = true;
-  /** Thread responsible for loading photos from the database. Created upon the first request. */
-  private LoaderThread mLoaderThread;
-  /** A gate to make sure we only send one instance of MESSAGE_PHOTOS_NEEDED at a time. */
-  private boolean mLoadingRequested;
-  /** Flag indicating if the image loading is paused. */
-  private boolean mPaused;
-  /** The user agent string to use when loading URI based photos. */
-  private String mUserAgent;
-
-  public ContactPhotoManagerImpl(Context context) {
-    mContext = context;
-
-    final ActivityManager am =
-        ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE));
-
-    final float cacheSizeAdjustment = (am.isLowRamDevice()) ? 0.5f : 1.0f;
-
-    final int bitmapCacheSize = (int) (cacheSizeAdjustment * BITMAP_CACHE_SIZE);
-    mBitmapCache =
-        new LruCache<Object, Bitmap>(bitmapCacheSize) {
-          @Override
-          protected int sizeOf(Object key, Bitmap value) {
-            return value.getByteCount();
-          }
-
-          @Override
-          protected void entryRemoved(
-              boolean evicted, Object key, Bitmap oldValue, Bitmap newValue) {
-            if (DEBUG) {
-              dumpStats();
-            }
-          }
-        };
-    final int holderCacheSize = (int) (cacheSizeAdjustment * HOLDER_CACHE_SIZE);
-    mBitmapHolderCache =
-        new LruCache<Object, BitmapHolder>(holderCacheSize) {
-          @Override
-          protected int sizeOf(Object key, BitmapHolder value) {
-            return value.bytes != null ? value.bytes.length : 0;
-          }
-
-          @Override
-          protected void entryRemoved(
-              boolean evicted, Object key, BitmapHolder oldValue, BitmapHolder newValue) {
-            if (DEBUG) {
-              dumpStats();
-            }
-          }
-        };
-    mBitmapHolderCacheRedZoneBytes = (int) (holderCacheSize * 0.75);
-    LogUtil.i(
-        "ContactPhotoManagerImpl.ContactPhotoManagerImpl", "cache adj: " + cacheSizeAdjustment);
-    if (DEBUG) {
-      LogUtil.d(
-          "ContactPhotoManagerImpl.ContactPhotoManagerImpl",
-          "Cache size: " + btk(mBitmapHolderCache.maxSize()) + " + " + btk(mBitmapCache.maxSize()));
-    }
-
-    mThumbnailSize =
-        context.getResources().getDimensionPixelSize(R.dimen.contact_browser_list_item_photo_size);
-
-    // Get a user agent string to use for URI photo requests.
-    mUserAgent = Bindings.get(context).getUserAgent();
-    if (mUserAgent == null) {
-      mUserAgent = "";
-    }
-  }
-
-  /** Converts bytes to K bytes, rounding up. Used only for debug log. */
-  private static String btk(int bytes) {
-    return ((bytes + 1023) / 1024) + "K";
-  }
-
-  private static final int safeDiv(int dividend, int divisor) {
-    return (divisor == 0) ? 0 : (dividend / divisor);
-  }
-
-  private static boolean isChildView(View parent, View potentialChild) {
-    return potentialChild.getParent() != null
-        && (potentialChild.getParent() == parent
-            || (potentialChild.getParent() instanceof ViewGroup
-                && isChildView(parent, (ViewGroup) potentialChild.getParent())));
-  }
-
-  /**
-   * If necessary, decodes bytes stored in the holder to Bitmap. As long as the bitmap is held
-   * either by {@link #mBitmapCache} or by a soft reference in the holder, it will not be necessary
-   * to decode the bitmap.
-   */
-  private static void inflateBitmap(BitmapHolder holder, int requestedExtent) {
-    final int sampleSize =
-        BitmapUtil.findOptimalSampleSize(holder.originalSmallerExtent, requestedExtent);
-    byte[] bytes = holder.bytes;
-    if (bytes == null || bytes.length == 0) {
-      return;
-    }
-
-    if (sampleSize == holder.decodedSampleSize) {
-      // Check the soft reference.  If will be retained if the bitmap is also
-      // in the LRU cache, so we don't need to check the LRU cache explicitly.
-      if (holder.bitmapRef != null) {
-        holder.bitmap = holder.bitmapRef.get();
-        if (holder.bitmap != null) {
-          return;
-        }
-      }
-    }
-
-    try {
-      Bitmap bitmap = BitmapUtil.decodeBitmapFromBytes(bytes, sampleSize);
-
-      // TODO: As a temporary workaround while framework support is being added to
-      // clip non-square bitmaps into a perfect circle, manually crop the bitmap into
-      // into a square if it will be displayed as a thumbnail so that it can be cropped
-      // into a circle.
-      final int height = bitmap.getHeight();
-      final int width = bitmap.getWidth();
-
-      // The smaller dimension of a scaled bitmap can range from anywhere from 0 to just
-      // below twice the length of a thumbnail image due to the way we calculate the optimal
-      // sample size.
-      if (height != width && Math.min(height, width) <= mThumbnailSize * 2) {
-        final int dimension = Math.min(height, width);
-        bitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension);
-      }
-      // make bitmap mutable and draw size onto it
-      if (DEBUG_SIZES) {
-        Bitmap original = bitmap;
-        bitmap = bitmap.copy(bitmap.getConfig(), true);
-        original.recycle();
-        Canvas canvas = new Canvas(bitmap);
-        Paint paint = new Paint();
-        paint.setTextSize(16);
-        paint.setColor(Color.BLUE);
-        paint.setStyle(Style.FILL);
-        canvas.drawRect(0.0f, 0.0f, 50.0f, 20.0f, paint);
-        paint.setColor(Color.WHITE);
-        paint.setAntiAlias(true);
-        canvas.drawText(bitmap.getWidth() + "/" + sampleSize, 0, 15, paint);
-      }
-
-      holder.decodedSampleSize = sampleSize;
-      holder.bitmap = bitmap;
-      holder.bitmapRef = new SoftReference<Bitmap>(bitmap);
-      if (DEBUG) {
-        LogUtil.d(
-            "ContactPhotoManagerImpl.inflateBitmap",
-            "inflateBitmap "
-                + btk(bytes.length)
-                + " -> "
-                + bitmap.getWidth()
-                + "x"
-                + bitmap.getHeight()
-                + ", "
-                + btk(bitmap.getByteCount()));
-      }
-    } catch (OutOfMemoryError e) {
-      // Do nothing - the photo will appear to be missing
-    }
-  }
-
-  /** Dump cache stats on logcat. */
-  private void dumpStats() {
-    if (!DEBUG) {
-      return;
-    }
-    {
-      int numHolders = 0;
-      int rawBytes = 0;
-      int bitmapBytes = 0;
-      int numBitmaps = 0;
-      for (BitmapHolder h : mBitmapHolderCache.snapshot().values()) {
-        numHolders++;
-        if (h.bytes != null) {
-          rawBytes += h.bytes.length;
-        }
-        Bitmap b = h.bitmapRef != null ? h.bitmapRef.get() : null;
-        if (b != null) {
-          numBitmaps++;
-          bitmapBytes += b.getByteCount();
-        }
-      }
-      LogUtil.d(
-          "ContactPhotoManagerImpl.dumpStats",
-          "L1: "
-              + btk(rawBytes)
-              + " + "
-              + btk(bitmapBytes)
-              + " = "
-              + btk(rawBytes + bitmapBytes)
-              + ", "
-              + numHolders
-              + " holders, "
-              + numBitmaps
-              + " bitmaps, avg: "
-              + btk(safeDiv(rawBytes, numHolders))
-              + ","
-              + btk(safeDiv(bitmapBytes, numBitmaps)));
-      LogUtil.d(
-          "ContactPhotoManagerImpl.dumpStats",
-          "L1 Stats: "
-              + mBitmapHolderCache.toString()
-              + ", overwrite: fresh="
-              + mFreshCacheOverwrite.get()
-              + " stale="
-              + mStaleCacheOverwrite.get());
-    }
-
-    {
-      int numBitmaps = 0;
-      int bitmapBytes = 0;
-      for (Bitmap b : mBitmapCache.snapshot().values()) {
-        numBitmaps++;
-        bitmapBytes += b.getByteCount();
-      }
-      LogUtil.d(
-          "ContactPhotoManagerImpl.dumpStats",
-          "L2: "
-              + btk(bitmapBytes)
-              + ", "
-              + numBitmaps
-              + " bitmaps"
-              + ", avg: "
-              + btk(safeDiv(bitmapBytes, numBitmaps)));
-      // We don't get from L2 cache, so L2 stats is meaningless.
-    }
-  }
-
-  @Override
-  public void onTrimMemory(int level) {
-    if (DEBUG) {
-      LogUtil.d("ContactPhotoManagerImpl.onTrimMemory", "onTrimMemory: " + level);
-    }
-    if (level >= ComponentCallbacks2.TRIM_MEMORY_MODERATE) {
-      // Clear the caches.  Note all pending requests will be removed too.
-      clear();
-    }
-  }
-
-  @Override
-  public void preloadPhotosInBackground() {
-    ensureLoaderThread();
-    mLoaderThread.requestPreloading();
-  }
-
-  @Override
-  public void loadThumbnail(
-      ImageView view,
-      long photoId,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest,
-      DefaultImageProvider defaultProvider) {
-    if (photoId == 0) {
-      // No photo is needed
-      defaultProvider.applyDefaultImage(view, -1, darkTheme, defaultImageRequest);
-      mPendingRequests.remove(view);
-    } else {
-      if (DEBUG) {
-        LogUtil.d("ContactPhotoManagerImpl.loadThumbnail", "loadPhoto request: " + photoId);
-      }
-      loadPhotoByIdOrUri(
-          view, Request.createFromThumbnailId(photoId, darkTheme, isCircular, defaultProvider));
-    }
-  }
-
-  @Override
-  public void loadPhoto(
-      ImageView view,
-      Uri photoUri,
-      int requestedExtent,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageRequest defaultImageRequest,
-      DefaultImageProvider defaultProvider) {
-    if (photoUri == null) {
-      // No photo is needed
-      defaultProvider.applyDefaultImage(view, requestedExtent, darkTheme, defaultImageRequest);
-      mPendingRequests.remove(view);
-    } else {
-      if (DEBUG) {
-        LogUtil.d("ContactPhotoManagerImpl.loadPhoto", "loadPhoto request: " + photoUri);
-      }
-      if (isDefaultImageUri(photoUri)) {
-        createAndApplyDefaultImageForUri(
-            view, photoUri, requestedExtent, darkTheme, isCircular, defaultProvider);
-      } else {
-        loadPhotoByIdOrUri(
-            view,
-            Request.createFromUri(
-                photoUri, requestedExtent, darkTheme, isCircular, defaultProvider));
-      }
-    }
-  }
-
-  private void createAndApplyDefaultImageForUri(
-      ImageView view,
-      Uri uri,
-      int requestedExtent,
-      boolean darkTheme,
-      boolean isCircular,
-      DefaultImageProvider defaultProvider) {
-    DefaultImageRequest request = getDefaultImageRequestFromUri(uri);
-    request.isCircular = isCircular;
-    defaultProvider.applyDefaultImage(view, requestedExtent, darkTheme, request);
-  }
-
-  private void loadPhotoByIdOrUri(ImageView view, Request request) {
-    boolean loaded = loadCachedPhoto(view, request, false);
-    if (loaded) {
-      mPendingRequests.remove(view);
-    } else {
-      mPendingRequests.put(view, request);
-      if (!mPaused) {
-        // Send a request to start loading photos
-        requestLoading();
-      }
-    }
-  }
-
-  @Override
-  public void removePhoto(ImageView view) {
-    view.setImageDrawable(null);
-    mPendingRequests.remove(view);
-  }
-
-  /**
-   * Cancels pending requests to load photos asynchronously for views inside {@param
-   * fragmentRootView}. If {@param fragmentRootView} is null, cancels all requests.
-   */
-  @Override
-  public void cancelPendingRequests(View fragmentRootView) {
-    if (fragmentRootView == null) {
-      mPendingRequests.clear();
-      return;
-    }
-    final Iterator<Entry<ImageView, Request>> iterator = mPendingRequests.entrySet().iterator();
-    while (iterator.hasNext()) {
-      final ImageView imageView = iterator.next().getKey();
-      // If an ImageView is orphaned (currently scrap) or a child of fragmentRootView, then
-      // we can safely remove its request.
-      if (imageView.getParent() == null || isChildView(fragmentRootView, imageView)) {
-        iterator.remove();
-      }
-    }
-  }
-
-  @Override
-  public void refreshCache() {
-    if (mBitmapHolderCacheAllUnfresh) {
-      if (DEBUG) {
-        LogUtil.d("ContactPhotoManagerImpl.refreshCache", "refreshCache -- no fresh entries.");
-      }
-      return;
-    }
-    if (DEBUG) {
-      LogUtil.d("ContactPhotoManagerImpl.refreshCache", "refreshCache");
-    }
-    mBitmapHolderCacheAllUnfresh = true;
-    for (BitmapHolder holder : mBitmapHolderCache.snapshot().values()) {
-      if (holder != BITMAP_UNAVAILABLE) {
-        holder.fresh = false;
-      }
-    }
-  }
-
-  /**
-   * Checks if the photo is present in cache. If so, sets the photo on the view.
-   *
-   * @return false if the photo needs to be (re)loaded from the provider.
-   */
-  @UiThread
-  private boolean loadCachedPhoto(ImageView view, Request request, boolean fadeIn) {
-    BitmapHolder holder = mBitmapHolderCache.get(request.getKey());
-    if (holder == null) {
-      // The bitmap has not been loaded ==> show default avatar
-      request.applyDefaultImage(view, request.mIsCircular);
-      return false;
-    }
-
-    if (holder.bytes == null) {
-      request.applyDefaultImage(view, request.mIsCircular);
-      return holder.fresh;
-    }
-
-    Bitmap cachedBitmap = holder.bitmapRef == null ? null : holder.bitmapRef.get();
-    if (cachedBitmap == null) {
-      request.applyDefaultImage(view, request.mIsCircular);
-      return false;
-    }
-
-    final Drawable previousDrawable = view.getDrawable();
-    if (fadeIn && previousDrawable != null) {
-      final Drawable[] layers = new Drawable[2];
-      // Prevent cascade of TransitionDrawables.
-      if (previousDrawable instanceof TransitionDrawable) {
-        final TransitionDrawable previousTransitionDrawable = (TransitionDrawable) previousDrawable;
-        layers[0] =
-            previousTransitionDrawable.getDrawable(
-                previousTransitionDrawable.getNumberOfLayers() - 1);
-      } else {
-        layers[0] = previousDrawable;
-      }
-      layers[1] = getDrawableForBitmap(mContext.getResources(), cachedBitmap, request);
-      TransitionDrawable drawable = new TransitionDrawable(layers);
-      view.setImageDrawable(drawable);
-      drawable.startTransition(FADE_TRANSITION_DURATION);
-    } else {
-      view.setImageDrawable(getDrawableForBitmap(mContext.getResources(), cachedBitmap, request));
-    }
-
-    // Put the bitmap in the LRU cache. But only do this for images that are small enough
-    // (we require that at least six of those can be cached at the same time)
-    if (cachedBitmap.getByteCount() < mBitmapCache.maxSize() / 6) {
-      mBitmapCache.put(request.getKey(), cachedBitmap);
-    }
-
-    // Soften the reference
-    holder.bitmap = null;
-
-    return holder.fresh;
-  }
-
-  /**
-   * Given a bitmap, returns a drawable that is configured to display the bitmap based on the
-   * specified request.
-   */
-  private Drawable getDrawableForBitmap(Resources resources, Bitmap bitmap, Request request) {
-    if (request.mIsCircular) {
-      final RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(resources, bitmap);
-      drawable.setAntiAlias(true);
-      drawable.setCornerRadius(bitmap.getHeight() / 2);
-      return drawable;
-    } else {
-      return new BitmapDrawable(resources, bitmap);
-    }
-  }
-
-  public void clear() {
-    if (DEBUG) {
-      LogUtil.d("ContactPhotoManagerImpl.clear", "clear");
-    }
-    mPendingRequests.clear();
-    mBitmapHolderCache.evictAll();
-    mBitmapCache.evictAll();
-  }
-
-  @Override
-  public void pause() {
-    mPaused = true;
-  }
-
-  @Override
-  public void resume() {
-    mPaused = false;
-    if (DEBUG) {
-      dumpStats();
-    }
-    if (!mPendingRequests.isEmpty()) {
-      requestLoading();
-    }
-  }
-
-  /**
-   * Sends a message to this thread itself to start loading images. If the current view contains
-   * multiple image views, all of those image views will get a chance to request their respective
-   * photos before any of those requests are executed. This allows us to load images in bulk.
-   */
-  private void requestLoading() {
-    if (!mLoadingRequested) {
-      mLoadingRequested = true;
-      mMainThreadHandler.sendEmptyMessage(MESSAGE_REQUEST_LOADING);
-    }
-  }
-
-  /** Processes requests on the main thread. */
-  @Override
-  public boolean handleMessage(Message msg) {
-    switch (msg.what) {
-      case MESSAGE_REQUEST_LOADING:
-        {
-          mLoadingRequested = false;
-          if (!mPaused) {
-            ensureLoaderThread();
-            mLoaderThread.requestLoading();
-          }
-          return true;
-        }
-
-      case MESSAGE_PHOTOS_LOADED:
-        {
-          if (!mPaused) {
-            processLoadedImages();
-          }
-          if (DEBUG) {
-            dumpStats();
-          }
-          return true;
-        }
-    }
-    return false;
-  }
-
-  public void ensureLoaderThread() {
-    if (mLoaderThread == null) {
-      mLoaderThread = new LoaderThread(mContext.getContentResolver());
-      mLoaderThread.start();
-    }
-  }
-
-  /**
-   * Goes over pending loading requests and displays loaded photos. If some of the photos still
-   * haven't been loaded, sends another request for image loading.
-   */
-  private void processLoadedImages() {
-    final Iterator<Entry<ImageView, Request>> iterator = mPendingRequests.entrySet().iterator();
-    while (iterator.hasNext()) {
-      final Entry<ImageView, Request> entry = iterator.next();
-      // TODO: Temporarily disable contact photo fading in, until issues with
-      // RoundedBitmapDrawables overlapping the default image drawables are resolved.
-      final boolean loaded = loadCachedPhoto(entry.getKey(), entry.getValue(), false);
-      if (loaded) {
-        iterator.remove();
-      }
-    }
-
-    softenCache();
-
-    if (!mPendingRequests.isEmpty()) {
-      requestLoading();
-    }
-  }
-
-  /**
-   * Removes strong references to loaded bitmaps to allow them to be garbage collected if needed.
-   * Some of the bitmaps will still be retained by {@link #mBitmapCache}.
-   */
-  private void softenCache() {
-    for (BitmapHolder holder : mBitmapHolderCache.snapshot().values()) {
-      holder.bitmap = null;
-    }
-  }
-
-  /** Stores the supplied bitmap in cache. */
-  private void cacheBitmap(Object key, byte[] bytes, boolean preloading, int requestedExtent) {
-    if (DEBUG) {
-      BitmapHolder prev = mBitmapHolderCache.get(key);
-      if (prev != null && prev.bytes != null) {
-        LogUtil.d(
-            "ContactPhotoManagerImpl.cacheBitmap",
-            "overwriting cache: key=" + key + (prev.fresh ? " FRESH" : " stale"));
-        if (prev.fresh) {
-          mFreshCacheOverwrite.incrementAndGet();
-        } else {
-          mStaleCacheOverwrite.incrementAndGet();
-        }
-      }
-      LogUtil.d(
-          "ContactPhotoManagerImpl.cacheBitmap",
-          "caching data: key=" + key + ", " + (bytes == null ? "<null>" : btk(bytes.length)));
-    }
-    BitmapHolder holder =
-        new BitmapHolder(bytes, bytes == null ? -1 : BitmapUtil.getSmallerExtentFromBytes(bytes));
-
-    // Unless this image is being preloaded, decode it right away while
-    // we are still on the background thread.
-    if (!preloading) {
-      inflateBitmap(holder, requestedExtent);
-    }
-
-    if (bytes != null) {
-      mBitmapHolderCache.put(key, holder);
-      if (mBitmapHolderCache.get(key) != holder) {
-        LogUtil.w("ContactPhotoManagerImpl.cacheBitmap", "bitmap too big to fit in cache.");
-        mBitmapHolderCache.put(key, BITMAP_UNAVAILABLE);
-      }
-    } else {
-      mBitmapHolderCache.put(key, BITMAP_UNAVAILABLE);
-    }
-
-    mBitmapHolderCacheAllUnfresh = false;
-  }
-
-  /**
-   * Populates an array of photo IDs that need to be loaded. Also decodes bitmaps that we have
-   * already loaded
-   */
-  private void obtainPhotoIdsAndUrisToLoad(
-      Set<Long> photoIds, Set<String> photoIdsAsStrings, Set<Request> uris) {
-    photoIds.clear();
-    photoIdsAsStrings.clear();
-    uris.clear();
-
-    boolean jpegsDecoded = false;
-
-    /*
-     * Since the call is made from the loader thread, the map could be
-     * changing during the iteration. That's not really a problem:
-     * ConcurrentHashMap will allow those changes to happen without throwing
-     * exceptions. Since we may miss some requests in the situation of
-     * concurrent change, we will need to check the map again once loading
-     * is complete.
-     */
-    Iterator<Request> iterator = mPendingRequests.values().iterator();
-    while (iterator.hasNext()) {
-      Request request = iterator.next();
-      final BitmapHolder holder = mBitmapHolderCache.get(request.getKey());
-      if (holder == BITMAP_UNAVAILABLE) {
-        continue;
-      }
-      if (holder != null
-          && holder.bytes != null
-          && holder.fresh
-          && (holder.bitmapRef == null || holder.bitmapRef.get() == null)) {
-        // This was previously loaded but we don't currently have the inflated Bitmap
-        inflateBitmap(holder, request.getRequestedExtent());
-        jpegsDecoded = true;
-      } else {
-        if (holder == null || !holder.fresh) {
-          if (request.isUriRequest()) {
-            uris.add(request);
-          } else {
-            photoIds.add(request.getId());
-            photoIdsAsStrings.add(String.valueOf(request.mId));
-          }
-        }
-      }
-    }
-
-    if (jpegsDecoded) {
-      mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
-    }
-  }
-
-  /** Maintains the state of a particular photo. */
-  private static class BitmapHolder {
-
-    final byte[] bytes;
-    final int originalSmallerExtent;
-
-    volatile boolean fresh;
-    Bitmap bitmap;
-    Reference<Bitmap> bitmapRef;
-    int decodedSampleSize;
-
-    public BitmapHolder(byte[] bytes, int originalSmallerExtent) {
-      this.bytes = bytes;
-      this.fresh = true;
-      this.originalSmallerExtent = originalSmallerExtent;
-    }
-  }
-
-  /**
-   * A holder for either a Uri or an id and a flag whether this was requested for the dark or light
-   * theme
-   */
-  private static final class Request {
-
-    private final long mId;
-    private final Uri mUri;
-    private final boolean mDarkTheme;
-    private final int mRequestedExtent;
-    private final DefaultImageProvider mDefaultProvider;
-    /** Whether or not the contact photo is to be displayed as a circle */
-    private final boolean mIsCircular;
-
-    private Request(
-        long id,
-        Uri uri,
-        int requestedExtent,
-        boolean darkTheme,
-        boolean isCircular,
-        DefaultImageProvider defaultProvider) {
-      mId = id;
-      mUri = uri;
-      mDarkTheme = darkTheme;
-      mIsCircular = isCircular;
-      mRequestedExtent = requestedExtent;
-      mDefaultProvider = defaultProvider;
-    }
-
-    public static Request createFromThumbnailId(
-        long id, boolean darkTheme, boolean isCircular, DefaultImageProvider defaultProvider) {
-      return new Request(id, null /* no URI */, -1, darkTheme, isCircular, defaultProvider);
-    }
-
-    public static Request createFromUri(
-        Uri uri,
-        int requestedExtent,
-        boolean darkTheme,
-        boolean isCircular,
-        DefaultImageProvider defaultProvider) {
-      return new Request(
-          0 /* no ID */, uri, requestedExtent, darkTheme, isCircular, defaultProvider);
-    }
-
-    public boolean isUriRequest() {
-      return mUri != null;
-    }
-
-    public Uri getUri() {
-      return mUri;
-    }
-
-    public long getId() {
-      return mId;
-    }
-
-    public int getRequestedExtent() {
-      return mRequestedExtent;
-    }
-
-    @Override
-    public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + (int) (mId ^ (mId >>> 32));
-      result = prime * result + mRequestedExtent;
-      result = prime * result + ((mUri == null) ? 0 : mUri.hashCode());
-      return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj) {
-        return true;
-      }
-      if (obj == null) {
-        return false;
-      }
-      if (getClass() != obj.getClass()) {
-        return false;
-      }
-      final Request that = (Request) obj;
-      if (mId != that.mId) {
-        return false;
-      }
-      if (mRequestedExtent != that.mRequestedExtent) {
-        return false;
-      }
-      if (!UriUtils.areEqual(mUri, that.mUri)) {
-        return false;
-      }
-      // Don't compare equality of mDarkTheme because it is only used in the default contact
-      // photo case. When the contact does have a photo, the contact photo is the same
-      // regardless of mDarkTheme, so we shouldn't need to put the photo request on the queue
-      // twice.
-      return true;
-    }
-
-    public Object getKey() {
-      return mUri == null ? mId : mUri;
-    }
-
-    /**
-     * Applies the default image to the current view. If the request is URI-based, looks for the
-     * contact type encoded fragment to determine if this is a request for a business photo, in
-     * which case we will load the default business photo.
-     *
-     * @param view The current image view to apply the image to.
-     * @param isCircular Whether the image is circular or not.
-     */
-    public void applyDefaultImage(ImageView view, boolean isCircular) {
-      final DefaultImageRequest request;
-
-      if (isCircular) {
-        request =
-            ContactPhotoManager.isBusinessContactUri(mUri)
-                ? DefaultImageRequest.EMPTY_CIRCULAR_BUSINESS_IMAGE_REQUEST
-                : DefaultImageRequest.EMPTY_CIRCULAR_DEFAULT_IMAGE_REQUEST;
-      } else {
-        request =
-            ContactPhotoManager.isBusinessContactUri(mUri)
-                ? DefaultImageRequest.EMPTY_DEFAULT_BUSINESS_IMAGE_REQUEST
-                : DefaultImageRequest.EMPTY_DEFAULT_IMAGE_REQUEST;
-      }
-      mDefaultProvider.applyDefaultImage(view, mRequestedExtent, mDarkTheme, request);
-    }
-  }
-
-  /** The thread that performs loading of photos from the database. */
-  private class LoaderThread extends HandlerThread implements Callback {
-
-    private static final int BUFFER_SIZE = 1024 * 16;
-    private static final int MESSAGE_PRELOAD_PHOTOS = 0;
-    private static final int MESSAGE_LOAD_PHOTOS = 1;
-
-    /** A pause between preload batches that yields to the UI thread. */
-    private static final int PHOTO_PRELOAD_DELAY = 1000;
-
-    /** Number of photos to preload per batch. */
-    private static final int PRELOAD_BATCH = 25;
-
-    /**
-     * Maximum number of photos to preload. If the cache size is 2Mb and the expected average size
-     * of a photo is 4kb, then this number should be 2Mb/4kb = 500.
-     */
-    private static final int MAX_PHOTOS_TO_PRELOAD = 100;
-
-    private static final int PRELOAD_STATUS_NOT_STARTED = 0;
-    private static final int PRELOAD_STATUS_IN_PROGRESS = 1;
-    private static final int PRELOAD_STATUS_DONE = 2;
-    private final ContentResolver mResolver;
-    private final StringBuilder mStringBuilder = new StringBuilder();
-    private final Set<Long> mPhotoIds = new HashSet<>();
-    private final Set<String> mPhotoIdsAsStrings = new HashSet<>();
-    private final Set<Request> mPhotoUris = new HashSet<>();
-    private final List<Long> mPreloadPhotoIds = new ArrayList<>();
-    private Handler mLoaderThreadHandler;
-    private byte[] mBuffer;
-    private int mPreloadStatus = PRELOAD_STATUS_NOT_STARTED;
-
-    public LoaderThread(ContentResolver resolver) {
-      super(LOADER_THREAD_NAME);
-      mResolver = resolver;
-    }
-
-    public void ensureHandler() {
-      if (mLoaderThreadHandler == null) {
-        mLoaderThreadHandler = new Handler(getLooper(), this);
-      }
-    }
-
-    /**
-     * Kicks off preloading of the next batch of photos on the background thread. Preloading will
-     * happen after a delay: we want to yield to the UI thread as much as possible.
-     *
-     * <p>If preloading is already complete, does nothing.
-     */
-    public void requestPreloading() {
-      if (mPreloadStatus == PRELOAD_STATUS_DONE) {
-        return;
-      }
-
-      ensureHandler();
-      if (mLoaderThreadHandler.hasMessages(MESSAGE_LOAD_PHOTOS)) {
-        return;
-      }
-
-      mLoaderThreadHandler.sendEmptyMessageDelayed(MESSAGE_PRELOAD_PHOTOS, PHOTO_PRELOAD_DELAY);
-    }
-
-    /**
-     * Sends a message to this thread to load requested photos. Cancels a preloading request, if
-     * any: we don't want preloading to impede loading of the photos we need to display now.
-     */
-    public void requestLoading() {
-      ensureHandler();
-      mLoaderThreadHandler.removeMessages(MESSAGE_PRELOAD_PHOTOS);
-      mLoaderThreadHandler.sendEmptyMessage(MESSAGE_LOAD_PHOTOS);
-    }
-
-    /**
-     * Receives the above message, loads photos and then sends a message to the main thread to
-     * process them.
-     */
-    @Override
-    public boolean handleMessage(Message msg) {
-      switch (msg.what) {
-        case MESSAGE_PRELOAD_PHOTOS:
-          preloadPhotosInBackground();
-          break;
-        case MESSAGE_LOAD_PHOTOS:
-          loadPhotosInBackground();
-          break;
-      }
-      return true;
-    }
-
-    /**
-     * The first time it is called, figures out which photos need to be preloaded. Each subsequent
-     * call preloads the next batch of photos and requests another cycle of preloading after a
-     * delay. The whole process ends when we either run out of photos to preload or fill up cache.
-     */
-    @WorkerThread
-    private void preloadPhotosInBackground() {
-      if (!PermissionsUtil.hasPermission(mContext, android.Manifest.permission.READ_CONTACTS)) {
-        return;
-      }
-
-      if (mPreloadStatus == PRELOAD_STATUS_DONE) {
-        return;
-      }
-
-      if (mPreloadStatus == PRELOAD_STATUS_NOT_STARTED) {
-        queryPhotosForPreload();
-        if (mPreloadPhotoIds.isEmpty()) {
-          mPreloadStatus = PRELOAD_STATUS_DONE;
-        } else {
-          mPreloadStatus = PRELOAD_STATUS_IN_PROGRESS;
-        }
-        requestPreloading();
-        return;
-      }
-
-      if (mBitmapHolderCache.size() > mBitmapHolderCacheRedZoneBytes) {
-        mPreloadStatus = PRELOAD_STATUS_DONE;
-        return;
-      }
-
-      mPhotoIds.clear();
-      mPhotoIdsAsStrings.clear();
-
-      int count = 0;
-      int preloadSize = mPreloadPhotoIds.size();
-      while (preloadSize > 0 && mPhotoIds.size() < PRELOAD_BATCH) {
-        preloadSize--;
-        count++;
-        Long photoId = mPreloadPhotoIds.get(preloadSize);
-        mPhotoIds.add(photoId);
-        mPhotoIdsAsStrings.add(photoId.toString());
-        mPreloadPhotoIds.remove(preloadSize);
-      }
-
-      loadThumbnails(true);
-
-      if (preloadSize == 0) {
-        mPreloadStatus = PRELOAD_STATUS_DONE;
-      }
-
-      LogUtil.v(
-          "ContactPhotoManagerImpl.preloadPhotosInBackground",
-          "preloaded " + count + " photos.  cached bytes: " + mBitmapHolderCache.size());
-
-      requestPreloading();
-    }
-
-    @WorkerThread
-    private void queryPhotosForPreload() {
-      Cursor cursor = null;
-      try {
-        Uri uri =
-            Contacts.CONTENT_URI
-                .buildUpon()
-                .appendQueryParameter(
-                    ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
-                .appendQueryParameter(
-                    ContactsContract.LIMIT_PARAM_KEY, String.valueOf(MAX_PHOTOS_TO_PRELOAD))
-                .build();
-        cursor =
-            mResolver.query(
-                uri,
-                new String[] {Contacts.PHOTO_ID},
-                Contacts.PHOTO_ID + " NOT NULL AND " + Contacts.PHOTO_ID + "!=0",
-                null,
-                Contacts.STARRED + " DESC, " + Contacts.LAST_TIME_CONTACTED + " DESC");
-
-        if (cursor != null) {
-          while (cursor.moveToNext()) {
-            // Insert them in reverse order, because we will be taking
-            // them from the end of the list for loading.
-            mPreloadPhotoIds.add(0, cursor.getLong(0));
-          }
-        }
-      } finally {
-        if (cursor != null) {
-          cursor.close();
-        }
-      }
-    }
-
-    @WorkerThread
-    private void loadPhotosInBackground() {
-      if (!PermissionsUtil.hasPermission(mContext, android.Manifest.permission.READ_CONTACTS)) {
-        return;
-      }
-      obtainPhotoIdsAndUrisToLoad(mPhotoIds, mPhotoIdsAsStrings, mPhotoUris);
-      loadThumbnails(false);
-      loadUriBasedPhotos();
-      requestPreloading();
-    }
-
-    /** Loads thumbnail photos with ids */
-    @WorkerThread
-    private void loadThumbnails(boolean preloading) {
-      if (mPhotoIds.isEmpty()) {
-        return;
-      }
-
-      // Remove loaded photos from the preload queue: we don't want
-      // the preloading process to load them again.
-      if (!preloading && mPreloadStatus == PRELOAD_STATUS_IN_PROGRESS) {
-        for (Long id : mPhotoIds) {
-          mPreloadPhotoIds.remove(id);
-        }
-        if (mPreloadPhotoIds.isEmpty()) {
-          mPreloadStatus = PRELOAD_STATUS_DONE;
-        }
-      }
-
-      mStringBuilder.setLength(0);
-      mStringBuilder.append(Photo._ID + " IN(");
-      for (int i = 0; i < mPhotoIds.size(); i++) {
-        if (i != 0) {
-          mStringBuilder.append(',');
-        }
-        mStringBuilder.append('?');
-      }
-      mStringBuilder.append(')');
-
-      Cursor cursor = null;
-      try {
-        if (DEBUG) {
-          LogUtil.d(
-              "ContactPhotoManagerImpl.loadThumbnails",
-              "loading " + TextUtils.join(",", mPhotoIdsAsStrings));
-        }
-        cursor =
-            mResolver.query(
-                Data.CONTENT_URI,
-                COLUMNS,
-                mStringBuilder.toString(),
-                mPhotoIdsAsStrings.toArray(EMPTY_STRING_ARRAY),
-                null);
-
-        if (cursor != null) {
-          while (cursor.moveToNext()) {
-            Long id = cursor.getLong(0);
-            byte[] bytes = cursor.getBlob(1);
-            cacheBitmap(id, bytes, preloading, -1);
-            mPhotoIds.remove(id);
-          }
-        }
-      } finally {
-        if (cursor != null) {
-          cursor.close();
-        }
-      }
-
-      // Remaining photos were not found in the contacts database (but might be in profile).
-      for (Long id : mPhotoIds) {
-        if (ContactsContract.isProfileId(id)) {
-          Cursor profileCursor = null;
-          try {
-            profileCursor =
-                mResolver.query(
-                    ContentUris.withAppendedId(Data.CONTENT_URI, id), COLUMNS, null, null, null);
-            if (profileCursor != null && profileCursor.moveToFirst()) {
-              cacheBitmap(profileCursor.getLong(0), profileCursor.getBlob(1), preloading, -1);
-            } else {
-              // Couldn't load a photo this way either.
-              cacheBitmap(id, null, preloading, -1);
-            }
-          } finally {
-            if (profileCursor != null) {
-              profileCursor.close();
-            }
-          }
-        } else {
-          // Not a profile photo and not found - mark the cache accordingly
-          cacheBitmap(id, null, preloading, -1);
-        }
-      }
-
-      mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
-    }
-
-    /**
-     * Loads photos referenced with Uris. Those can be remote thumbnails (from directory searches),
-     * display photos etc
-     */
-    @WorkerThread
-    private void loadUriBasedPhotos() {
-      for (Request uriRequest : mPhotoUris) {
-        // Keep the original URI and use this to key into the cache.  Failure to do so will
-        // result in an image being continually reloaded into cache if the original URI
-        // has a contact type encodedFragment (eg nearby places business photo URLs).
-        Uri originalUri = uriRequest.getUri();
-
-        // Strip off the "contact type" we added to the URI to ensure it was identifiable as
-        // a business photo -- there is no need to pass this on to the server.
-        Uri uri = ContactPhotoManager.removeContactType(originalUri);
-
-        if (mBuffer == null) {
-          mBuffer = new byte[BUFFER_SIZE];
-        }
-        try {
-          if (DEBUG) {
-            LogUtil.d("ContactPhotoManagerImpl.loadUriBasedPhotos", "loading " + uri);
-          }
-          final String scheme = uri.getScheme();
-          InputStream is = null;
-          if (scheme.equals("http") || scheme.equals("https")) {
-            TrafficStats.setThreadStatsTag(TrafficStatsTags.CONTACT_PHOTO_DOWNLOAD_TAG);
-            final HttpURLConnection connection =
-                (HttpURLConnection) new URL(uri.toString()).openConnection();
-
-            // Include the user agent if it is specified.
-            if (!TextUtils.isEmpty(mUserAgent)) {
-              connection.setRequestProperty("User-Agent", mUserAgent);
-            }
-            try {
-              is = connection.getInputStream();
-            } catch (IOException e) {
-              connection.disconnect();
-              is = null;
-            }
-            TrafficStats.clearThreadStatsTag();
-          } else {
-            is = mResolver.openInputStream(uri);
-          }
-          if (is != null) {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            try {
-              int size;
-              while ((size = is.read(mBuffer)) != -1) {
-                baos.write(mBuffer, 0, size);
-              }
-            } finally {
-              is.close();
-            }
-            cacheBitmap(originalUri, baos.toByteArray(), false, uriRequest.getRequestedExtent());
-            mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
-          } else {
-            LogUtil.v("ContactPhotoManagerImpl.loadUriBasedPhotos", "cannot load photo " + uri);
-            cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
-          }
-        } catch (final Exception | OutOfMemoryError ex) {
-          LogUtil.v("ContactPhotoManagerImpl.loadUriBasedPhotos", "cannot load photo " + uri, ex);
-          cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
-        }
-      }
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/ContactPresenceIconUtil.java b/java/com/android/contacts/common/ContactPresenceIconUtil.java
index eeaf652..bce4b21 100644
--- a/java/com/android/contacts/common/ContactPresenceIconUtil.java
+++ b/java/com/android/contacts/common/ContactPresenceIconUtil.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.provider.ContactsContract.StatusUpdates;
+import android.support.v4.content.ContextCompat;
 
 /** Define the contact present show policy in Contacts */
 public class ContactPresenceIconUtil {
@@ -36,7 +37,7 @@
       case StatusUpdates.AWAY:
       case StatusUpdates.DO_NOT_DISTURB:
       case StatusUpdates.INVISIBLE:
-        return context.getResources().getDrawable(StatusUpdates.getPresenceIconResourceId(status));
+        return ContextCompat.getDrawable(context, StatusUpdates.getPresenceIconResourceId(status));
       case StatusUpdates.OFFLINE:
         // The undefined status is treated as OFFLINE in getPresenceIconResourceId();
       default:
diff --git a/java/com/android/contacts/common/ContactStatusUtil.java b/java/com/android/contacts/common/ContactStatusUtil.java
index 97d84c8..c5347e7 100644
--- a/java/com/android/contacts/common/ContactStatusUtil.java
+++ b/java/com/android/contacts/common/ContactStatusUtil.java
@@ -23,8 +23,6 @@
 /** Provides static function to get default contact status message. */
 public class ContactStatusUtil {
 
-  private static final String TAG = "ContactStatusUtil";
-
   public static String getStatusString(Context context, int presence) {
     Resources resources = context.getResources();
     switch (presence) {
diff --git a/java/com/android/contacts/common/ContactsUtils.java b/java/com/android/contacts/common/ContactsUtils.java
index 60af44b..66ccc90 100644
--- a/java/com/android/contacts/common/ContactsUtils.java
+++ b/java/com/android/contacts/common/ContactsUtils.java
@@ -16,184 +16,17 @@
 
 package com.android.contacts.common;
 
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract.CommonDataKinds.Im;
-import android.provider.ContactsContract.DisplayPhoto;
+import android.provider.ContactsContract.Contacts;
 import android.support.annotation.IntDef;
-import android.text.TextUtils;
-import android.util.Pair;
-import com.android.contacts.common.compat.ContactsCompat;
 import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.ImDataItem;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.List;
 
 public class ContactsUtils {
 
   // Telecomm related schemes are in CallUtil
-  public static final String SCHEME_IMTO = "imto";
-  public static final String SCHEME_MAILTO = "mailto";
-  public static final String SCHEME_SMSTO = "smsto";
   public static final long USER_TYPE_CURRENT = 0;
   public static final long USER_TYPE_WORK = 1;
-  private static final String TAG = "ContactsUtils";
-  private static final int DEFAULT_THUMBNAIL_SIZE = 96;
-  private static int sThumbnailSize = -1;
-
-  /**
-   * This looks up the provider name defined in ProviderNames from the predefined IM protocol id.
-   * This is used for interacting with the IM application.
-   *
-   * @param protocol the protocol ID
-   * @return the provider name the IM app uses for the given protocol, or null if no provider is
-   *     defined for the given protocol
-   * @hide
-   */
-  public static String lookupProviderNameFromId(int protocol) {
-    switch (protocol) {
-      case Im.PROTOCOL_GOOGLE_TALK:
-        return ProviderNames.GTALK;
-      case Im.PROTOCOL_AIM:
-        return ProviderNames.AIM;
-      case Im.PROTOCOL_MSN:
-        return ProviderNames.MSN;
-      case Im.PROTOCOL_YAHOO:
-        return ProviderNames.YAHOO;
-      case Im.PROTOCOL_ICQ:
-        return ProviderNames.ICQ;
-      case Im.PROTOCOL_JABBER:
-        return ProviderNames.JABBER;
-      case Im.PROTOCOL_SKYPE:
-        return ProviderNames.SKYPE;
-      case Im.PROTOCOL_QQ:
-        return ProviderNames.QQ;
-    }
-    return null;
-  }
-
-  /**
-   * Test if the given {@link CharSequence} contains any graphic characters, first checking {@link
-   * TextUtils#isEmpty(CharSequence)} to handle null.
-   */
-  public static boolean isGraphic(CharSequence str) {
-    return !TextUtils.isEmpty(str) && TextUtils.isGraphic(str);
-  }
-
-  /** Returns true if two objects are considered equal. Two null references are equal here. */
-  public static boolean areObjectsEqual(Object a, Object b) {
-    return a == b || (a != null && a.equals(b));
-  }
-
-  /** Returns true if two {@link Intent}s are both null, or have the same action. */
-  public static final boolean areIntentActionEqual(Intent a, Intent b) {
-    if (a == b) {
-      return true;
-    }
-    if (a == null || b == null) {
-      return false;
-    }
-    return TextUtils.equals(a.getAction(), b.getAction());
-  }
-
-  public static boolean areGroupWritableAccountsAvailable(Context context) {
-    final List<AccountWithDataSet> accounts =
-        AccountTypeManager.getInstance(context).getGroupWritableAccounts();
-    return !accounts.isEmpty();
-  }
-
-  /**
-   * Returns the size (width and height) of thumbnail pictures as configured in the provider. This
-   * can safely be called from the UI thread, as the provider can serve this without performing a
-   * database access
-   */
-  public static int getThumbnailSize(Context context) {
-    if (sThumbnailSize == -1) {
-      final Cursor c =
-          context
-              .getContentResolver()
-              .query(
-                  DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
-                  new String[] {DisplayPhoto.THUMBNAIL_MAX_DIM},
-                  null,
-                  null,
-                  null);
-      if (c != null) {
-        try {
-          if (c.moveToFirst()) {
-            sThumbnailSize = c.getInt(0);
-          }
-        } finally {
-          c.close();
-        }
-      }
-    }
-    return sThumbnailSize != -1 ? sThumbnailSize : DEFAULT_THUMBNAIL_SIZE;
-  }
-
-  private static Intent getCustomImIntent(ImDataItem im, int protocol) {
-    String host = im.getCustomProtocol();
-    final String data = im.getData();
-    if (TextUtils.isEmpty(data)) {
-      return null;
-    }
-    if (protocol != Im.PROTOCOL_CUSTOM) {
-      // Try bringing in a well-known host for specific protocols
-      host = ContactsUtils.lookupProviderNameFromId(protocol);
-    }
-    if (TextUtils.isEmpty(host)) {
-      return null;
-    }
-    final String authority = host.toLowerCase();
-    final Uri imUri =
-        new Uri.Builder().scheme(SCHEME_IMTO).authority(authority).appendPath(data).build();
-    final Intent intent = new Intent(Intent.ACTION_SENDTO, imUri);
-    return intent;
-  }
-
-  /**
-   * Returns the proper Intent for an ImDatItem. If available, a secondary intent is stored in the
-   * second Pair slot
-   */
-  public static Pair<Intent, Intent> buildImIntent(Context context, ImDataItem im) {
-    Intent intent = null;
-    Intent secondaryIntent = null;
-    final boolean isEmail = im.isCreatedFromEmail();
-
-    if (!isEmail && !im.isProtocolValid()) {
-      return new Pair<>(null, null);
-    }
-
-    final String data = im.getData();
-    if (TextUtils.isEmpty(data)) {
-      return new Pair<>(null, null);
-    }
-
-    final int protocol = isEmail ? Im.PROTOCOL_GOOGLE_TALK : im.getProtocol();
-
-    if (protocol == Im.PROTOCOL_GOOGLE_TALK) {
-      final int chatCapability = im.getChatCapability();
-      if ((chatCapability & Im.CAPABILITY_HAS_CAMERA) != 0) {
-        intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message"));
-        secondaryIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call"));
-      } else if ((chatCapability & Im.CAPABILITY_HAS_VOICE) != 0) {
-        // Allow Talking and Texting
-        intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message"));
-        secondaryIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call"));
-      } else {
-        intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message"));
-      }
-    } else {
-      // Build an IM Intent
-      intent = getCustomImIntent(im, protocol);
-    }
-    return new Pair<>(intent, secondaryIntent);
-  }
 
   /**
    * Determine UserType from directory id and contact id.
@@ -232,27 +65,13 @@
           : USER_TYPE_CURRENT;
     }
     // Only check contact id if directory id is null
-    if (contactId != null && contactId != 0L && ContactsCompat.isEnterpriseContactId(contactId)) {
+    if (contactId != null && contactId != 0L && Contacts.isEnterpriseContactId(contactId)) {
       return USER_TYPE_WORK;
     } else {
       return USER_TYPE_CURRENT;
     }
   }
 
-  // TODO find a proper place for the canonical version of these
-  public interface ProviderNames {
-
-    String YAHOO = "Yahoo";
-    String GTALK = "GTalk";
-    String MSN = "MSN";
-    String ICQ = "ICQ";
-    String AIM = "AIM";
-    String XMPP = "XMPP";
-    String JABBER = "JABBER";
-    String SKYPE = "SKYPE";
-    String QQ = "QQ";
-  }
-
   /**
    * UserType indicates the user type of the contact. If the contact is from Work User (Work Profile
    * in Android Multi-User System), it's {@link #USER_TYPE_WORK}, otherwise, {@link
diff --git a/java/com/android/contacts/common/GeoUtil.java b/java/com/android/contacts/common/GeoUtil.java
deleted file mode 100644
index 50b0cd9..0000000
--- a/java/com/android/contacts/common/GeoUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2012 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.contacts.common;
-
-import android.app.Application;
-import android.content.Context;
-import com.android.contacts.common.location.CountryDetector;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
-import java.util.Locale;
-
-/** Static methods related to Geo. */
-public class GeoUtil {
-
-  /**
-   * Returns the country code of the country the user is currently in. Before calling this method,
-   * make sure that {@link CountryDetector#initialize(Context)} has already been called in {@link
-   * Application#onCreate()}.
-   *
-   * @return The ISO 3166-1 two letters country code of the country the user is in.
-   */
-  public static String getCurrentCountryIso(Context context) {
-    // The {@link CountryDetector} should never return null so this is safe to return as-is.
-    return CountryDetector.getInstance(context).getCurrentCountryIso();
-  }
-
-  public static String getGeocodedLocationFor(Context context, String phoneNumber) {
-    final PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance();
-    final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
-    try {
-      final Phonenumber.PhoneNumber structuredPhoneNumber =
-          phoneNumberUtil.parse(phoneNumber, getCurrentCountryIso(context));
-      final Locale locale = context.getResources().getConfiguration().locale;
-      return geocoder.getDescriptionForNumber(structuredPhoneNumber, locale);
-    } catch (NumberParseException e) {
-      return null;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/MoreContactUtils.java b/java/com/android/contacts/common/MoreContactUtils.java
index 028f899..26241b3 100644
--- a/java/com/android/contacts/common/MoreContactUtils.java
+++ b/java/com/android/contacts/common/MoreContactUtils.java
@@ -16,7 +16,6 @@
 
 package com.android.contacts.common;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
@@ -24,7 +23,6 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.TextView;
 import com.android.contacts.common.model.account.AccountType;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -194,40 +192,6 @@
   }
 
   /**
-   * Returns a header view based on the R.layout.list_separator, where the containing {@link
-   * android.widget.TextView} is set using the given textResourceId.
-   */
-  public static TextView createHeaderView(Context context, int textResourceId) {
-    final TextView textView = (TextView) View.inflate(context, R.layout.list_separator, null);
-    textView.setText(context.getString(textResourceId));
-    return textView;
-  }
-
-  /**
-   * Set the top padding on the header view dynamically, based on whether the header is in the first
-   * row or not.
-   */
-  public static void setHeaderViewBottomPadding(
-      Context context, TextView textView, boolean isFirstRow) {
-    final int topPadding;
-    if (isFirstRow) {
-      topPadding =
-          (int)
-              context
-                  .getResources()
-                  .getDimension(R.dimen.frequently_contacted_title_top_margin_when_first_row);
-    } else {
-      topPadding =
-          (int) context.getResources().getDimension(R.dimen.frequently_contacted_title_top_margin);
-    }
-    textView.setPaddingRelative(
-        textView.getPaddingStart(),
-        topPadding,
-        textView.getPaddingEnd(),
-        textView.getPaddingBottom());
-  }
-
-  /**
    * Returns the intent to launch for the given invitable account type and contact lookup URI. This
    * will return null if the account type is not invitable (i.e. there is no {@link
    * AccountType#getInviteContactActivityClassName()} or {@link
diff --git a/java/com/android/contacts/common/bindings/ContactsCommonBindings.java b/java/com/android/contacts/common/bindings/ContactsCommonBindings.java
deleted file mode 100644
index 44be53b..0000000
--- a/java/com/android/contacts/common/bindings/ContactsCommonBindings.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common.bindings;
-
-import android.support.annotation.Nullable;
-
-/** Allows the container application to customize the contacts common library. */
-public interface ContactsCommonBindings {
-
-  /** Builds a user agent string for the current application. */
-  @Nullable
-  String getUserAgent();
-}
diff --git a/java/com/android/contacts/common/bindings/ContactsCommonBindingsFactory.java b/java/com/android/contacts/common/bindings/ContactsCommonBindingsFactory.java
deleted file mode 100644
index 8958ad9..0000000
--- a/java/com/android/contacts/common/bindings/ContactsCommonBindingsFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common.bindings;
-
-/**
- * This interface should be implementated by the Application subclass. It allows the contacts common
- * module to get references to the ContactsCommonBindings.
- */
-public interface ContactsCommonBindingsFactory {
-
-  ContactsCommonBindings newContactsCommonBindings();
-}
diff --git a/java/com/android/contacts/common/bindings/ContactsCommonBindingsStub.java b/java/com/android/contacts/common/bindings/ContactsCommonBindingsStub.java
deleted file mode 100644
index f2e21b1..0000000
--- a/java/com/android/contacts/common/bindings/ContactsCommonBindingsStub.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common.bindings;
-
-import android.support.annotation.Nullable;
-
-/** Default implementation for contacts common bindings. */
-public class ContactsCommonBindingsStub implements ContactsCommonBindings {
-
-  @Override
-  @Nullable
-  public String getUserAgent() {
-    return null;
-  }
-}
diff --git a/java/com/android/contacts/common/compat/ContactsCompat.java b/java/com/android/contacts/common/compat/ContactsCompat.java
index 39d0b55..e0c9b7e 100644
--- a/java/com/android/contacts/common/compat/ContactsCompat.java
+++ b/java/com/android/contacts/common/compat/ContactsCompat.java
@@ -21,7 +21,6 @@
 import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
-import com.android.dialer.compat.CompatUtils;
 
 /** Compatibility class for {@link ContactsContract.Contacts} */
 public class ContactsCompat {
@@ -29,8 +28,6 @@
   // TODO: Use N APIs
   private static final Uri ENTERPRISE_CONTENT_FILTER_URI =
       Uri.withAppendedPath(Contacts.CONTENT_URI, "filter_enterprise");
-  // Copied from ContactsContract.Contacts#ENTERPRISE_CONTACT_ID_BASE, which is hidden.
-  private static final long ENTERPRISE_CONTACT_ID_BASE = 1000000000;
 
   /** Not instantiable. */
   private ContactsCompat() {}
@@ -41,17 +38,4 @@
     }
     return Contacts.CONTENT_FILTER_URI;
   }
-
-  /**
-   * Return {@code true} if a contact ID is from the contacts provider on the enterprise profile.
-   */
-  public static boolean isEnterpriseContactId(long contactId) {
-    if (CompatUtils.isLollipopCompatible()) {
-      return Contacts.isEnterpriseContactId(contactId);
-    } else {
-      // copied from ContactsContract.Contacts.isEnterpriseContactId
-      return (contactId >= ENTERPRISE_CONTACT_ID_BASE)
-          && (contactId < ContactsContract.Profile.MIN_ID);
-    }
-  }
 }
diff --git a/java/com/android/contacts/common/compat/PhoneAccountCompat.java b/java/com/android/contacts/common/compat/PhoneAccountCompat.java
index 6a24ec0..aa22c68 100644
--- a/java/com/android/contacts/common/compat/PhoneAccountCompat.java
+++ b/java/com/android/contacts/common/compat/PhoneAccountCompat.java
@@ -20,33 +20,10 @@
 import android.graphics.drawable.Icon;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccount;
-import android.util.Log;
-import com.android.dialer.compat.CompatUtils;
 
 /** Compatiblity class for {@link android.telecom.PhoneAccount} */
 public class PhoneAccountCompat {
 
-  private static final String TAG = PhoneAccountCompat.class.getSimpleName();
-
-  /**
-   * Gets the {@link Icon} associated with the given {@link PhoneAccount}
-   *
-   * @param phoneAccount the PhoneAccount from which to retrieve the Icon
-   * @return the Icon, or null
-   */
-  @Nullable
-  public static Icon getIcon(@Nullable PhoneAccount phoneAccount) {
-    if (phoneAccount == null) {
-      return null;
-    }
-
-    if (CompatUtils.isMarshmallowCompatible()) {
-      return phoneAccount.getIcon();
-    }
-
-    return null;
-  }
-
   /**
    * Builds and returns an icon {@code Drawable} to represent this {@code PhoneAccount} in a user
    * interface.
@@ -61,44 +38,16 @@
     if (phoneAccount == null || context == null) {
       return null;
     }
-
-    if (CompatUtils.isMarshmallowCompatible()) {
-      return createIconDrawableMarshmallow(phoneAccount, context);
-    }
-
-    if (CompatUtils.isLollipopMr1Compatible()) {
-      return createIconDrawableLollipopMr1(phoneAccount, context);
-    }
-    return null;
+    return createIconDrawableMarshmallow(phoneAccount, context);
   }
 
   @Nullable
   private static Drawable createIconDrawableMarshmallow(
       PhoneAccount phoneAccount, Context context) {
-    Icon accountIcon = getIcon(phoneAccount);
+    Icon accountIcon = phoneAccount.getIcon();
     if (accountIcon == null) {
       return null;
     }
     return accountIcon.loadDrawable(context);
   }
-
-  @Nullable
-  private static Drawable createIconDrawableLollipopMr1(
-      PhoneAccount phoneAccount, Context context) {
-    try {
-      return (Drawable)
-          PhoneAccount.class
-              .getMethod("createIconDrawable", Context.class)
-              .invoke(phoneAccount, context);
-    } catch (ReflectiveOperationException e) {
-      return null;
-    } catch (Throwable t) {
-      Log.e(
-          TAG,
-          "Unexpected exception when attempting to call "
-              + "android.telecom.PhoneAccount#createIconDrawable",
-          t);
-      return null;
-    }
-  }
 }
diff --git a/java/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java b/java/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
index 960b340..a6cfe07 100644
--- a/java/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
+++ b/java/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
@@ -17,13 +17,7 @@
 package com.android.contacts.common.compat;
 
 import android.telephony.PhoneNumberUtils;
-import android.text.Spannable;
-import android.text.TextUtils;
 import android.text.style.TtsSpan;
-import com.android.dialer.compat.CompatUtils;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 
 /**
  * This class contains static utility methods extracted from PhoneNumberUtils, and the methods were
@@ -37,138 +31,16 @@
   /** Not instantiable. */
   private PhoneNumberUtilsCompat() {}
 
-  public static String normalizeNumber(String phoneNumber) {
-    if (CompatUtils.isLollipopCompatible()) {
-      return PhoneNumberUtils.normalizeNumber(phoneNumber);
-    } else {
-      return normalizeNumberInternal(phoneNumber);
-    }
-  }
-
-  /** Implementation copied from {@link PhoneNumberUtils#normalizeNumber} */
-  private static String normalizeNumberInternal(String phoneNumber) {
-    if (TextUtils.isEmpty(phoneNumber)) {
-      return "";
-    }
-    StringBuilder sb = new StringBuilder();
-    int len = phoneNumber.length();
-    for (int i = 0; i < len; i++) {
-      char c = phoneNumber.charAt(i);
-      // Character.digit() supports ASCII and Unicode digits (fullwidth, Arabic-Indic, etc.)
-      int digit = Character.digit(c, 10);
-      if (digit != -1) {
-        sb.append(digit);
-      } else if (sb.length() == 0 && c == '+') {
-        sb.append(c);
-      } else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-        return normalizeNumber(PhoneNumberUtils.convertKeypadLettersToDigits(phoneNumber));
-      }
-    }
-    return sb.toString();
-  }
-
   public static String formatNumber(
       String phoneNumber, String phoneNumberE164, String defaultCountryIso) {
-    if (CompatUtils.isLollipopCompatible()) {
       return PhoneNumberUtils.formatNumber(phoneNumber, phoneNumberE164, defaultCountryIso);
-    } else {
-      // This method was deprecated in API level 21, so it's only used on pre-L SDKs.
-      return PhoneNumberUtils.formatNumber(phoneNumber);
-    }
   }
 
   public static CharSequence createTtsSpannable(CharSequence phoneNumber) {
-    if (CompatUtils.isMarshmallowCompatible()) {
-      return PhoneNumberUtils.createTtsSpannable(phoneNumber);
-    } else {
-      return createTtsSpannableInternal(phoneNumber);
-    }
+    return PhoneNumberUtils.createTtsSpannable(phoneNumber);
   }
 
   public static TtsSpan createTtsSpan(String phoneNumber) {
-    if (CompatUtils.isMarshmallowCompatible()) {
-      return PhoneNumberUtils.createTtsSpan(phoneNumber);
-    } else if (CompatUtils.isLollipopCompatible()) {
-      return createTtsSpanLollipop(phoneNumber);
-    } else {
-      return null;
-    }
-  }
-
-  /** Copied from {@link PhoneNumberUtils#createTtsSpannable} */
-  private static CharSequence createTtsSpannableInternal(CharSequence phoneNumber) {
-    if (phoneNumber == null) {
-      return null;
-    }
-    Spannable spannable = Spannable.Factory.getInstance().newSpannable(phoneNumber);
-    addTtsSpanInternal(spannable, 0, spannable.length());
-    return spannable;
-  }
-
-  /** Compat method for addTtsSpan, see {@link PhoneNumberUtils#addTtsSpan} */
-  public static void addTtsSpan(Spannable s, int start, int endExclusive) {
-    if (CompatUtils.isMarshmallowCompatible()) {
-      PhoneNumberUtils.addTtsSpan(s, start, endExclusive);
-    } else {
-      addTtsSpanInternal(s, start, endExclusive);
-    }
-  }
-
-  /** Copied from {@link PhoneNumberUtils#addTtsSpan} */
-  private static void addTtsSpanInternal(Spannable s, int start, int endExclusive) {
-    s.setSpan(
-        createTtsSpan(s.subSequence(start, endExclusive).toString()),
-        start,
-        endExclusive,
-        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-  }
-
-  /** Copied from {@link PhoneNumberUtils#createTtsSpan} */
-  private static TtsSpan createTtsSpanLollipop(String phoneNumberString) {
-    if (phoneNumberString == null) {
-      return null;
-    }
-
-    // Parse the phone number
-    final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
-    PhoneNumber phoneNumber = null;
-    try {
-      // Don't supply a defaultRegion so this fails for non-international numbers because
-      // we don't want to TalkBalk to read a country code (e.g. +1) if it is not already
-      // present
-      phoneNumber = phoneNumberUtil.parse(phoneNumberString, /* defaultRegion */ null);
-    } catch (NumberParseException ignored) {
-    }
-
-    // Build a telephone tts span
-    final TtsSpan.TelephoneBuilder builder = new TtsSpan.TelephoneBuilder();
-    if (phoneNumber == null) {
-      // Strip separators otherwise TalkBack will be silent
-      // (this behavior was observed with TalkBalk 4.0.2 from their alpha channel)
-      builder.setNumberParts(splitAtNonNumerics(phoneNumberString));
-    } else {
-      if (phoneNumber.hasCountryCode()) {
-        builder.setCountryCode(Integer.toString(phoneNumber.getCountryCode()));
-      }
-      builder.setNumberParts(Long.toString(phoneNumber.getNationalNumber()));
-    }
-    return builder.build();
-  }
-
-  /**
-   * Split a phone number using spaces, ignoring anything that is not a digit
-   *
-   * @param number A {@code CharSequence} before splitting, e.g., "+20(123)-456#"
-   * @return A {@code String} after splitting, e.g., "20 123 456".
-   */
-  private static String splitAtNonNumerics(CharSequence number) {
-    StringBuilder sb = new StringBuilder(number.length());
-    for (int i = 0; i < number.length(); i++) {
-      sb.append(PhoneNumberUtils.isISODigit(number.charAt(i)) ? number.charAt(i) : " ");
-    }
-    // It is very important to remove extra spaces. At time of writing, any leading or trailing
-    // spaces, or any sequence of more than one space, will confuse TalkBack and cause the TTS
-    // span to be non-functional!
-    return sb.toString().replaceAll(" +", " ").trim();
+    return PhoneNumberUtils.createTtsSpan(phoneNumber);
   }
 }
diff --git a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java b/java/com/android/contacts/common/compat/TelephonyManagerCompat.java
deleted file mode 100644
index 7e4803c..0000000
--- a/java/com/android/contacts/common/compat/TelephonyManagerCompat.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2015 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.contacts.common.compat;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.support.annotation.Nullable;
-import android.support.v4.os.BuildCompat;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.TelephonyManager;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
-import java.lang.reflect.InvocationTargetException;
-
-public class TelephonyManagerCompat {
-
-  // TODO: Use public API for these constants when available
-  public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE =
-      "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE";
-  public static final String EVENT_HANDOVER_TO_WIFI_FAILED =
-      "android.telephony.event.EVENT_HANDOVER_TO_WIFI_FAILED";
-  public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";
-  public static final String EVENT_CALL_REMOTELY_UNHELD =
-      "android.telecom.event.CALL_REMOTELY_UNHELD";
-
-  public static final String EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC =
-      "android.telephony.event.EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC";
-
-  public static final String TELEPHONY_MANAGER_CLASS = "android.telephony.TelephonyManager";
-
-  private static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";
-
-  /**
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @return true if the current device is "voice capable".
-   *     <p>"Voice capable" means that this device supports circuit-switched (i.e. voice) phone
-   *     calls over the telephony network, and is allowed to display the in-call UI while a cellular
-   *     voice call is active. This will be false on "data only" devices which can't make voice
-   *     calls and don't support any in-call UI.
-   *     <p>Note: the meaning of this flag is subtly different from the
-   *     PackageManager.FEATURE_TELEPHONY system feature, which is available on any device with a
-   *     telephony radio, even if the device is data-only.
-   */
-  public static boolean isVoiceCapable(@Nullable TelephonyManager telephonyManager) {
-    if (telephonyManager == null) {
-      return false;
-    }
-    if (CompatUtils.isLollipopMr1Compatible()
-        || CompatUtils.isMethodAvailable(TELEPHONY_MANAGER_CLASS, "isVoiceCapable")) {
-      // isVoiceCapable was unhidden in L-MR1
-      return telephonyManager.isVoiceCapable();
-    }
-    final int phoneType = telephonyManager.getPhoneType();
-    return phoneType == TelephonyManager.PHONE_TYPE_CDMA
-        || phoneType == TelephonyManager.PHONE_TYPE_GSM;
-  }
-
-  /**
-   * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM
-   * functionality) Returns 2 for Dual standby mode.(Dual SIM functionality)
-   *
-   * <p>Returns 1 if the method or telephonyManager is not available.
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   */
-  public static int getPhoneCount(@Nullable TelephonyManager telephonyManager) {
-    if (telephonyManager == null) {
-      return 1;
-    }
-    if (CompatUtils.isMarshmallowCompatible()
-        || CompatUtils.isMethodAvailable(TELEPHONY_MANAGER_CLASS, "getPhoneCount")) {
-      return telephonyManager.getPhoneCount();
-    }
-    return 1;
-  }
-
-  /**
-   * Returns the unique device ID of a subscription, for example, the IMEI for GSM and the MEID for
-   * CDMA phones. Return null if device ID is not available.
-   *
-   * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @param slotId of which deviceID is returned
-   */
-  public static String getDeviceId(@Nullable TelephonyManager telephonyManager, int slotId) {
-    if (telephonyManager == null) {
-      return null;
-    }
-    if (CompatUtils.isMarshmallowCompatible()
-        || CompatUtils.isMethodAvailable(TELEPHONY_MANAGER_CLASS, "getDeviceId", Integer.class)) {
-      return telephonyManager.getDeviceId(slotId);
-    }
-    return null;
-  }
-
-  /**
-   * Whether the phone supports TTY mode.
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @return {@code true} if the device supports TTY mode, and {@code false} otherwise.
-   */
-  public static boolean isTtyModeSupported(@Nullable TelephonyManager telephonyManager) {
-    if (telephonyManager == null) {
-      return false;
-    }
-    if (CompatUtils.isMarshmallowCompatible()
-        || CompatUtils.isMethodAvailable(TELEPHONY_MANAGER_CLASS, "isTtyModeSupported")) {
-      return telephonyManager.isTtyModeSupported();
-    }
-    return false;
-  }
-
-  /**
-   * Whether the phone supports hearing aid compatibility.
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @return {@code true} if the device supports hearing aid compatibility, and {@code false}
-   *     otherwise.
-   */
-  public static boolean isHearingAidCompatibilitySupported(
-      @Nullable TelephonyManager telephonyManager) {
-    if (telephonyManager == null) {
-      return false;
-    }
-    if (CompatUtils.isMarshmallowCompatible()
-        || CompatUtils.isMethodAvailable(
-            TELEPHONY_MANAGER_CLASS, "isHearingAidCompatibilitySupported")) {
-      return telephonyManager.isHearingAidCompatibilitySupported();
-    }
-    return false;
-  }
-
-  /**
-   * Returns the URI for the per-account voicemail ringtone set in Phone settings.
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @param accountHandle The handle for the {@link android.telecom.PhoneAccount} for which to
-   *     retrieve the voicemail ringtone.
-   * @return The URI for the ringtone to play when receiving a voicemail from a specific
-   *     PhoneAccount.
-   */
-  @Nullable
-  public static Uri getVoicemailRingtoneUri(
-      TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return null;
-    }
-    return telephonyManager.getVoicemailRingtoneUri(accountHandle);
-  }
-
-  /**
-   * Returns whether vibration is set for voicemail notification in Phone settings.
-   *
-   * @param telephonyManager The telephony manager instance to use for method calls.
-   * @param accountHandle The handle for the {@link android.telecom.PhoneAccount} for which to
-   *     retrieve the voicemail vibration setting.
-   * @return {@code true} if the vibration is set for this PhoneAccount, {@code false} otherwise.
-   */
-  public static boolean isVoicemailVibrationEnabled(
-      TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
-    return VERSION.SDK_INT < VERSION_CODES.N
-        || telephonyManager.isVoicemailVibrationEnabled(accountHandle);
-  }
-
-  /**
-   * This method uses a new system API to enable or disable visual voicemail. TODO: restrict
-   * to N MR1, not needed in future SDK.
-   */
-  public static void setVisualVoicemailEnabled(
-      TelephonyManager telephonyManager, PhoneAccountHandle handle, boolean enabled) {
-    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
-      Assert.fail("setVisualVoicemailEnabled called on pre-NMR1");
-    }
-    try {
-      TelephonyManager.class
-          .getMethod("setVisualVoicemailEnabled", PhoneAccountHandle.class, boolean.class)
-          .invoke(telephonyManager, handle, enabled);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      LogUtil.e("TelephonyManagerCompat.setVisualVoicemailEnabled", "failed", e);
-    }
-  }
-
-  /**
-   * This method uses a new system API to check if visual voicemail is enabled TODO: restrict
-   * to N MR1, not needed in future SDK.
-   */
-  public static boolean isVisualVoicemailEnabled(
-      TelephonyManager telephonyManager, PhoneAccountHandle handle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
-      Assert.fail("isVisualVoicemailEnabled called on pre-NMR1");
-    }
-    try {
-      return (boolean)
-          TelephonyManager.class
-              .getMethod("isVisualVoicemailEnabled", PhoneAccountHandle.class)
-              .invoke(telephonyManager, handle);
-    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-      LogUtil.e("TelephonyManagerCompat.setVisualVoicemailEnabled", "failed", e);
-    }
-    return false;
-  }
-
-  /**
-   * Handles secret codes to launch arbitrary activities.
-   *
-   * @param context the context to use
-   * @param secretCode the secret code without the "*#*#" prefix and "#*#*" suffix
-   */
-  public static void handleSecretCode(Context context, String secretCode) {
-    // Must use system service on O+ to avoid using broadcasts, which are not allowed on O+.
-    if (BuildCompat.isAtLeastO()) {
-      context.getSystemService(TelephonyManager.class).sendDialerSpecialCode(secretCode);
-    } else {
-      // System service call is not supported pre-O, so must use a broadcast for N-.
-      Intent intent =
-          new Intent(SECRET_CODE_ACTION, Uri.parse("android_secret_code://" + secretCode));
-      context.sendBroadcast(intent);
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
index 5687f6f..172fb11 100644
--- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
+++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
@@ -15,273 +15,30 @@
  */
 package com.android.contacts.common.compat.telecom;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import com.android.dialer.compat.CompatUtils;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Field;
 
 /** Compatibility class for {@link android.telecom.TelecomManager}. */
 public class TelecomManagerCompat {
 
-  public static final String TELECOM_MANAGER_CLASS = "android.telecom.TelecomManager";
-
-  // TODO: remove once this is available in android.telecom.Call
+  // TODO(mdooley): remove once this is available in android.telecom.Call
   // b/33779976
   public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS =
       "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";
 
-  /**
-   * Places a new outgoing call to the provided address using the system telecom service with the
-   * specified intent.
-   *
-   * @param activity {@link Activity} used to start another activity for the given intent
-   * @param telecomManager the {@link TelecomManager} used to place a call, if possible
-   * @param intent the intent for the call
-   */
-  public static void placeCall(
-      @Nullable Activity activity,
-      @Nullable TelecomManager telecomManager,
-      @Nullable Intent intent) {
-    if (activity == null || telecomManager == null || intent == null) {
-      return;
-    }
-    if (CompatUtils.isMarshmallowCompatible()) {
-      telecomManager.placeCall(intent.getData(), intent.getExtras());
-      return;
-    }
-    activity.startActivityForResult(intent, 0);
-  }
+  // Constants from http://cs/android/frameworks/base/telecomm/java/android/telecom/Call.java.
+  public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";
+  public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =
+      "android.telecom.extra.HANDOVER_PHONE_ACCOUNT_HANDLE";
+  public static final String EXTRA_HANDOVER_VIDEO_STATE =
+      "android.telecom.extra.HANDOVER_VIDEO_STATE";
 
-  /**
-   * Get the URI for running an adn query.
-   *
-   * @param telecomManager the {@link TelecomManager} used for method calls, if possible.
-   * @param accountHandle The handle for the account to derive an adn query URI for or {@code null}
-   *     to return a URI which will use the default account.
-   * @return The URI (with the content:// scheme) specific to the specified {@link PhoneAccount} for
-   *     the the content retrieve.
-   */
-  public static Uri getAdnUriForPhoneAccount(
-      @Nullable TelecomManager telecomManager, PhoneAccountHandle accountHandle) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(
-                TELECOM_MANAGER_CLASS, "getAdnUriForPhoneAccount", PhoneAccountHandle.class))) {
-      return telecomManager.getAdnUriForPhoneAccount(accountHandle);
-    }
-    return Uri.parse("content://icc/adn");
-  }
-
-  /**
-   * Returns a list of {@link PhoneAccountHandle}s which can be used to make and receive phone
-   * calls. The returned list includes only those accounts which have been explicitly enabled by the
-   * user.
-   *
-   * @param telecomManager the {@link TelecomManager} used for method calls, if possible.
-   * @return A list of PhoneAccountHandle objects.
-   */
-  public static List<PhoneAccountHandle> getCallCapablePhoneAccounts(
-      @Nullable TelecomManager telecomManager) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(
-                TELECOM_MANAGER_CLASS, "getCallCapablePhoneAccounts"))) {
-      return telecomManager.getCallCapablePhoneAccounts();
-    }
-    return new ArrayList<>();
-  }
-
-  /**
-   * Used to determine the currently selected default dialer package.
-   *
-   * @param telecomManager the {@link TelecomManager} used for method calls, if possible.
-   * @return package name for the default dialer package or null if no package has been selected as
-   *     the default dialer.
-   */
-  @Nullable
-  public static String getDefaultDialerPackage(@Nullable TelecomManager telecomManager) {
-    if (telecomManager != null && CompatUtils.isDefaultDialerCompatible()) {
-      return telecomManager.getDefaultDialerPackage();
-    }
-    return null;
-  }
-
-  /**
-   * Return the {@link PhoneAccount} which will be used to place outgoing calls to addresses with
-   * the specified {@code uriScheme}. This PhoneAccount will always be a member of the list which is
-   * returned from invoking {@link TelecomManager#getCallCapablePhoneAccounts()}. The specific
-   * account returned depends on the following priorities:
-   *
-   * <p>1. If the user-selected default PhoneAccount supports the specified scheme, it will be
-   * returned. 2. If there exists only one PhoneAccount that supports the specified scheme, it will
-   * be returned.
-   *
-   * <p>If no PhoneAccount fits the criteria above, this method will return {@code null}.
-   *
-   * @param telecomManager the {@link TelecomManager} used for method calls, if possible.
-   * @param uriScheme The URI scheme.
-   * @return The {@link PhoneAccountHandle} corresponding to the account to be used.
-   */
-  @Nullable
-  public static PhoneAccountHandle getDefaultOutgoingPhoneAccount(
-      @Nullable TelecomManager telecomManager, @Nullable String uriScheme) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(
-                TELECOM_MANAGER_CLASS, "getDefaultOutgoingPhoneAccount", String.class))) {
-      return telecomManager.getDefaultOutgoingPhoneAccount(uriScheme);
-    }
-    return null;
-  }
-
-  /**
-   * Return the line 1 phone number for given phone account.
-   *
-   * @param telecomManager the {@link TelecomManager} to use in the event that {@link
-   *     TelecomManager#getLine1Number(PhoneAccountHandle)} is available
-   * @param telephonyManager the {@link TelephonyManager} to use if TelecomManager#getLine1Number is
-   *     unavailable
-   * @param phoneAccountHandle the phoneAccountHandle upon which to check the line one number
-   * @return the line one number
-   */
-  @Nullable
-  public static String getLine1Number(
-      @Nullable TelecomManager telecomManager,
-      @Nullable TelephonyManager telephonyManager,
-      @Nullable PhoneAccountHandle phoneAccountHandle) {
-    if (telecomManager != null && CompatUtils.isMarshmallowCompatible()) {
-      return telecomManager.getLine1Number(phoneAccountHandle);
-    }
-    if (telephonyManager != null) {
-      return telephonyManager.getLine1Number();
-    }
-    return null;
-  }
-
-  /**
-   * Return whether a given phone number is the configured voicemail number for a particular phone
-   * account.
-   *
-   * @param telecomManager the {@link TelecomManager} to use for checking the number.
-   * @param accountHandle The handle for the account to check the voicemail number against
-   * @param number The number to look up.
-   */
-  public static boolean isVoiceMailNumber(
-      @Nullable TelecomManager telecomManager,
-      @Nullable PhoneAccountHandle accountHandle,
-      @Nullable String number) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(
-                TELECOM_MANAGER_CLASS,
-                "isVoiceMailNumber",
-                PhoneAccountHandle.class,
-                String.class))) {
-      return telecomManager.isVoiceMailNumber(accountHandle, number);
-    }
-    return PhoneNumberUtils.isVoiceMailNumber(number);
-  }
-
-  /**
-   * Return the {@link PhoneAccount} for a specified {@link PhoneAccountHandle}. Object includes
-   * resources which can be used in a user interface.
-   *
-   * @param telecomManager the {@link TelecomManager} used for method calls, if possible.
-   * @param account The {@link PhoneAccountHandle}.
-   * @return The {@link PhoneAccount} object or null if it doesn't exist.
-   */
-  @Nullable
-  public static PhoneAccount getPhoneAccount(
-      @Nullable TelecomManager telecomManager, @Nullable PhoneAccountHandle accountHandle) {
-    if (telecomManager != null
-        && (CompatUtils.isMethodAvailable(
-            TELECOM_MANAGER_CLASS, "getPhoneAccount", PhoneAccountHandle.class))) {
-      return telecomManager.getPhoneAccount(accountHandle);
-    }
-    return null;
-  }
-
-  /**
-   * Return the voicemail number for a given phone account.
-   *
-   * @param telecomManager The {@link TelecomManager} object to use for retrieving the voicemail
-   *     number if accountHandle is specified.
-   * @param telephonyManager The {@link TelephonyManager} object to use for retrieving the voicemail
-   *     number if accountHandle is null.
-   * @param accountHandle The handle for the phone account.
-   * @return The voicemail number for the phone account, and {@code null} if one has not been
-   *     configured.
-   */
-  @Nullable
-  public static String getVoiceMailNumber(
-      @Nullable TelecomManager telecomManager,
-      @Nullable TelephonyManager telephonyManager,
-      @Nullable PhoneAccountHandle accountHandle) {
-    if (telecomManager != null
-        && (CompatUtils.isMethodAvailable(
-            TELECOM_MANAGER_CLASS, "getVoiceMailNumber", PhoneAccountHandle.class))) {
-      return telecomManager.getVoiceMailNumber(accountHandle);
-    } else if (telephonyManager != null) {
-      return telephonyManager.getVoiceMailNumber();
-    }
-    return null;
-  }
-
-  /**
-   * Processes the specified dial string as an MMI code. MMI codes are any sequence of characters
-   * entered into the dialpad that contain a "*" or "#". Some of these sequences launch special
-   * behavior through handled by Telephony.
-   *
-   * @param telecomManager The {@link TelecomManager} object to use for handling MMI.
-   * @param dialString The digits to dial.
-   * @return {@code true} if the digits were processed as an MMI code, {@code false} otherwise.
-   */
-  public static boolean handleMmi(
-      @Nullable TelecomManager telecomManager,
-      @Nullable String dialString,
-      @Nullable PhoneAccountHandle accountHandle) {
-    if (telecomManager == null || TextUtils.isEmpty(dialString)) {
-      return false;
-    }
-    if (CompatUtils.isMarshmallowCompatible()) {
-      return telecomManager.handleMmi(dialString, accountHandle);
-    }
-
-    Object handleMmiResult =
-        CompatUtils.invokeMethod(
-            telecomManager,
-            "handleMmi",
-            new Class<?>[] {PhoneAccountHandle.class, String.class},
-            new Object[] {accountHandle, dialString});
-    if (handleMmiResult != null) {
-      return (boolean) handleMmiResult;
-    }
-
-    return telecomManager.handleMmi(dialString);
-  }
-
-  /**
-   * Silences the ringer if a ringing call exists. Noop if {@link TelecomManager#silenceRinger()} is
-   * unavailable.
-   *
-   * @param telecomManager the TelecomManager to use to silence the ringer.
-   */
-  public static void silenceRinger(@Nullable TelecomManager telecomManager) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(TELECOM_MANAGER_CLASS, "silenceRinger"))) {
-      telecomManager.silenceRinger();
-    }
-  }
+  // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect
+  // reason if it wants us to prompt the user that the video call is not available.
+  // TODO(wangqi): Reference it to constant in android.telecom.DisconnectCause.
+  public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";
 
   /**
    * Returns the current SIM call manager. Apps must be prepared for this method to return null,
@@ -292,11 +49,25 @@
    */
   @Nullable
   public static PhoneAccountHandle getSimCallManager(TelecomManager telecomManager) {
-    if (telecomManager != null
-        && (CompatUtils.isMarshmallowCompatible()
-            || CompatUtils.isMethodAvailable(TELECOM_MANAGER_CLASS, "getSimCallManager"))) {
+    if (telecomManager != null) {
       return telecomManager.getSimCallManager();
     }
     return null;
   }
+
+  /**
+   * Handovers are supported from Android O-DR onward. Since there is no API bump from O to O-DR, we
+   * need to use reflection to check the existence of TelecomManager.EXTRA_IS_HANDOVER in
+   * http://cs/android/frameworks/base/telecomm/java/android/telecom/TelecomManager.java.
+   */
+  public static boolean supportsHandover() {
+    //
+    try {
+      Field field = TelecomManager.class.getDeclaredField("EXTRA_IS_HANDOVER");
+      return "android.telecom.extra.IS_HANDOVER".equals(field.get(null /* obj (static field) */));
+    } catch (Exception e) {
+      // Do nothing
+    }
+    return false;
+  }
 }
diff --git a/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java b/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
index d5e6135..5d10720 100644
--- a/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
+++ b/java/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
@@ -20,6 +20,9 @@
 import android.content.ContentResolver;
 import android.database.Cursor;
 import android.net.Uri;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * An {@AsyncQueryHandler} that will never return a null cursor.
@@ -27,6 +30,8 @@
  * <p>Instead, will return a {@link Cursor} with 0 records.
  */
 public abstract class NoNullCursorAsyncQueryHandler extends AsyncQueryHandler {
+  private static final AtomicInteger pendingQueryCount = new AtomicInteger();
+  @Nullable private static PendingQueryCountChangedListener pendingQueryCountChangedListener;
 
   public NoNullCursorAsyncQueryHandler(ContentResolver cr) {
     super(cr);
@@ -41,6 +46,11 @@
       String selection,
       String[] selectionArgs,
       String orderBy) {
+    pendingQueryCount.getAndIncrement();
+    if (pendingQueryCountChangedListener != null) {
+      pendingQueryCountChangedListener.onPendingQueryCountChanged();
+    }
+
     final CookieWithProjection projectionCookie = new CookieWithProjection(cookie, projection);
     super.startQuery(token, projectionCookie, uri, projection, selection, selectionArgs, orderBy);
   }
@@ -55,10 +65,31 @@
       cursor = new EmptyCursor(projectionCookie.projection);
     }
     onNotNullableQueryComplete(token, projectionCookie.originalCookie, cursor);
+
+    pendingQueryCount.getAndDecrement();
+    if (pendingQueryCountChangedListener != null) {
+      pendingQueryCountChangedListener.onPendingQueryCountChanged();
+    }
   }
 
   protected abstract void onNotNullableQueryComplete(int token, Object cookie, Cursor cursor);
 
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void setPendingQueryCountChangedListener(
+      @Nullable PendingQueryCountChangedListener listener) {
+    pendingQueryCountChangedListener = listener;
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static int getPendingQueryCount() {
+    return pendingQueryCount.get();
+  }
+
+  /** Callback to listen for changes in the number of queries that have not completed. */
+  public interface PendingQueryCountChangedListener {
+    void onPendingQueryCountChanged();
+  }
+
   /** Class to add projection to an existing cookie. */
   private static class CookieWithProjection {
 
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
index 0e79371..5c2ae2f 100644
--- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
@@ -43,13 +43,13 @@
 import android.widget.ListView;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.R;
-import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.util.ViewUtil;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -154,11 +154,7 @@
                   .setCallSubject(subject)
                   .build();
 
-          TelecomManagerCompat.placeCall(
-              CallSubjectDialog.this,
-              (TelecomManager) getSystemService(Context.TELECOM_SERVICE),
-              intent);
-
+          getSystemService(TelecomManager.class).placeCall(intent.getData(), intent.getExtras());
           mSubjectHistory.add(subject);
           saveSubjectHistory(mSubjectHistory);
           finish();
@@ -202,7 +198,7 @@
         number /* number */,
         null /* displayNumber */,
         null /* numberLabel */,
-        ContactPhotoManager.TYPE_DEFAULT,
+        LetterTileDrawable.TYPE_DEFAULT,
         null /* phoneAccountHandle */);
   }
 
@@ -356,7 +352,7 @@
     mNumber = arguments.getString(ARG_NUMBER);
     mDisplayNumber = arguments.getString(ARG_DISPLAY_NUMBER);
     mNumberLabel = arguments.getString(ARG_NUMBER_LABEL);
-    mContactType = arguments.getInt(ARG_CONTACT_TYPE, ContactPhotoManager.TYPE_DEFAULT);
+    mContactType = arguments.getInt(ARG_CONTACT_TYPE, LetterTileDrawable.TYPE_DEFAULT);
     mPhoneAccountHandle = arguments.getParcelable(ARG_PHONE_ACCOUNT_HANDLE);
   }
 
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
index 2607ad1..6c932daf 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
@@ -15,14 +15,24 @@
 package com.android.contacts.common.extensions;
 
 import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.android.contacts.common.list.DirectoryPartition;
 import java.util.List;
 
 /** An interface for adding extended phone directories. */
 public interface PhoneDirectoryExtender {
+
   /**
    * Return a list of extended directories to add. May return null if no directories are to be
    * added.
    */
   List<DirectoryPartition> getExtendedDirectories(Context context);
+
+  /** returns true if the nearby places directory is enabled. */
+  boolean isEnabled(Context context);
+
+  /** Returns the content uri for nearby places. */
+  @Nullable
+  Uri getContentUri();
 }
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
index 84649f1..7978831 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderAccessor.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
 
 /** Accessor for the phone directory extender singleton. */
@@ -25,6 +26,11 @@
 
   private PhoneDirectoryExtenderAccessor() {}
 
+  @VisibleForTesting
+  public static void setForTesting(PhoneDirectoryExtender extender) {
+    instance = extender;
+  }
+
   @NonNull
   public static PhoneDirectoryExtender get(@NonNull Context context) {
     Assert.isNotNull(context);
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
index 95f9715..4c3d3d1 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
@@ -15,6 +15,8 @@
 package com.android.contacts.common.extensions;
 
 import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.Nullable;
 import com.android.contacts.common.list.DirectoryPartition;
 import java.util.Collections;
 import java.util.List;
@@ -26,4 +28,15 @@
   public List<DirectoryPartition> getExtendedDirectories(Context context) {
     return Collections.emptyList();
   }
+
+  @Override
+  public boolean isEnabled(Context context) {
+    return false;
+  }
+
+  @Nullable
+  @Override
+  public Uri getContentUri() {
+    return null;
+  }
 }
diff --git a/java/com/android/contacts/common/format/FormatUtils.java b/java/com/android/contacts/common/format/FormatUtils.java
deleted file mode 100644
index 727c15b..0000000
--- a/java/com/android/contacts/common/format/FormatUtils.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2011 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.contacts.common.format;
-
-import android.database.CharArrayBuffer;
-import android.graphics.Typeface;
-import android.support.annotation.VisibleForTesting;
-import android.text.SpannableString;
-import android.text.style.StyleSpan;
-import java.util.Arrays;
-
-/** Assorted utility methods related to text formatting in Contacts. */
-public class FormatUtils {
-
-  /**
-   * Finds the earliest point in buffer1 at which the first part of buffer2 matches. For example,
-   * overlapPoint("abcd", "cdef") == 2.
-   */
-  public static int overlapPoint(CharArrayBuffer buffer1, CharArrayBuffer buffer2) {
-    if (buffer1 == null || buffer2 == null) {
-      return -1;
-    }
-    return overlapPoint(
-        Arrays.copyOfRange(buffer1.data, 0, buffer1.sizeCopied),
-        Arrays.copyOfRange(buffer2.data, 0, buffer2.sizeCopied));
-  }
-
-  /**
-   * Finds the earliest point in string1 at which the first part of string2 matches. For example,
-   * overlapPoint("abcd", "cdef") == 2.
-   */
-  @VisibleForTesting
-  public static int overlapPoint(String string1, String string2) {
-    if (string1 == null || string2 == null) {
-      return -1;
-    }
-    return overlapPoint(string1.toCharArray(), string2.toCharArray());
-  }
-
-  /**
-   * Finds the earliest point in array1 at which the first part of array2 matches. For example,
-   * overlapPoint("abcd", "cdef") == 2.
-   */
-  public static int overlapPoint(char[] array1, char[] array2) {
-    if (array1 == null || array2 == null) {
-      return -1;
-    }
-    int count1 = array1.length;
-    int count2 = array2.length;
-
-    // Ignore matching tails of the two arrays.
-    while (count1 > 0 && count2 > 0 && array1[count1 - 1] == array2[count2 - 1]) {
-      count1--;
-      count2--;
-    }
-
-    int size = count2;
-    for (int i = 0; i < count1; i++) {
-      if (i + size > count1) {
-        size = count1 - i;
-      }
-      int j;
-      for (j = 0; j < size; j++) {
-        if (array1[i + j] != array2[j]) {
-          break;
-        }
-      }
-      if (j == size) {
-        return i;
-      }
-    }
-
-    return -1;
-  }
-
-  /**
-   * Applies the given style to a range of the input CharSequence.
-   *
-   * @param style The style to apply (see the style constants in {@link Typeface}).
-   * @param input The CharSequence to style.
-   * @param start Starting index of the range to style (will be clamped to be a minimum of 0).
-   * @param end Ending index of the range to style (will be clamped to a maximum of the input
-   *     length).
-   * @param flags Bitmask for configuring behavior of the span. See {@link android.text.Spanned}.
-   * @return The styled CharSequence.
-   */
-  public static CharSequence applyStyleToSpan(
-      int style, CharSequence input, int start, int end, int flags) {
-    // Enforce bounds of the char sequence.
-    start = Math.max(0, start);
-    end = Math.min(input.length(), end);
-    SpannableString text = new SpannableString(input);
-    text.setSpan(new StyleSpan(style), start, end, flags);
-    return text;
-  }
-
-  @VisibleForTesting
-  public static void copyToCharArrayBuffer(String text, CharArrayBuffer buffer) {
-    if (text != null) {
-      char[] data = buffer.data;
-      if (data == null || data.length < text.length()) {
-        buffer.data = text.toCharArray();
-      } else {
-        text.getChars(0, text.length(), data, 0);
-      }
-      buffer.sizeCopied = text.length();
-    } else {
-      buffer.sizeCopied = 0;
-    }
-  }
-
-  /** Returns a String that represents the content of the given {@link CharArrayBuffer}. */
-  @VisibleForTesting
-  public static String charArrayBufferToString(CharArrayBuffer buffer) {
-    return new String(buffer.data, 0, buffer.sizeCopied);
-  }
-
-  /**
-   * Finds the index of the first word that starts with the given prefix.
-   *
-   * <p>If not found, returns -1.
-   *
-   * @param text the text in which to search for the prefix
-   * @param prefix the text to find, in upper case letters
-   */
-  public static int indexOfWordPrefix(CharSequence text, String prefix) {
-    if (prefix == null || text == null) {
-      return -1;
-    }
-
-    int textLength = text.length();
-    int prefixLength = prefix.length();
-
-    if (prefixLength == 0 || textLength < prefixLength) {
-      return -1;
-    }
-
-    int i = 0;
-    while (i < textLength) {
-      // Skip non-word characters
-      while (i < textLength && !Character.isLetterOrDigit(text.charAt(i))) {
-        i++;
-      }
-
-      if (i + prefixLength > textLength) {
-        return -1;
-      }
-
-      // Compare the prefixes
-      int j;
-      for (j = 0; j < prefixLength; j++) {
-        if (Character.toUpperCase(text.charAt(i + j)) != prefix.charAt(j)) {
-          break;
-        }
-      }
-      if (j == prefixLength) {
-        return i;
-      }
-
-      // Skip this word
-      while (i < textLength && Character.isLetterOrDigit(text.charAt(i))) {
-        i++;
-      }
-    }
-
-    return -1;
-  }
-}
diff --git a/java/com/android/contacts/common/format/TextHighlighter.java b/java/com/android/contacts/common/format/TextHighlighter.java
index 30c03fd..f397f04 100644
--- a/java/com/android/contacts/common/format/TextHighlighter.java
+++ b/java/com/android/contacts/common/format/TextHighlighter.java
@@ -24,8 +24,6 @@
 /** Highlights the text in a text field. */
 public class TextHighlighter {
 
-  private static final boolean DEBUG = false;
-  private final String TAG = TextHighlighter.class.getSimpleName();
   private int mTextStyle;
 
   private CharacterStyle mTextStyleSpan;
@@ -81,7 +79,7 @@
     }
     final String trimmedPrefix = prefix.substring(prefixStart);
 
-    int index = FormatUtils.indexOfWordPrefix(text, trimmedPrefix);
+    int index = indexOfWordPrefix(text, trimmedPrefix);
     if (index != -1) {
       final SpannableString result = new SpannableString(text);
       result.setSpan(mTextStyleSpan, index, index + trimmedPrefix.length(), 0 /* flags */);
@@ -90,4 +88,55 @@
       return text;
     }
   }
+
+  /**
+   * Finds the index of the first word that starts with the given prefix.
+   *
+   * <p>If not found, returns -1.
+   *
+   * @param text the text in which to search for the prefix
+   * @param prefix the text to find, in upper case letters
+   */
+  public static int indexOfWordPrefix(CharSequence text, String prefix) {
+    if (prefix == null || text == null) {
+      return -1;
+    }
+
+    int textLength = text.length();
+    int prefixLength = prefix.length();
+
+    if (prefixLength == 0 || textLength < prefixLength) {
+      return -1;
+    }
+
+    int i = 0;
+    while (i < textLength) {
+      // Skip non-word characters
+      while (i < textLength && !Character.isLetterOrDigit(text.charAt(i))) {
+        i++;
+      }
+
+      if (i + prefixLength > textLength) {
+        return -1;
+      }
+
+      // Compare the prefixes
+      int j;
+      for (j = 0; j < prefixLength; j++) {
+        if (Character.toUpperCase(text.charAt(i + j)) != prefix.charAt(j)) {
+          break;
+        }
+      }
+      if (j == prefixLength) {
+        return i;
+      }
+
+      // Skip this word
+      while (i < textLength && Character.isLetterOrDigit(text.charAt(i))) {
+        i++;
+      }
+    }
+
+    return -1;
+  }
 }
diff --git a/java/com/android/contacts/common/format/testing/SpannedTestUtils.java b/java/com/android/contacts/common/format/testing/SpannedTestUtils.java
deleted file mode 100644
index 293d9d5..0000000
--- a/java/com/android/contacts/common/format/testing/SpannedTestUtils.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2011 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.contacts.common.format.testing;
-
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.Html;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.StyleSpan;
-import android.widget.TextView;
-import junit.framework.Assert;
-
-/** Utility class to check the value of spanned text in text views. */
-@SmallTest
-public class SpannedTestUtils {
-
-  /**
-   * Checks that the text contained in the text view matches the given HTML text.
-   *
-   * @param expectedHtmlText the expected text to be in the text view
-   * @param textView the text view from which to get the text
-   */
-  public static void checkHtmlText(String expectedHtmlText, TextView textView) {
-    String actualHtmlText = Html.toHtml((Spanned) textView.getText());
-    if (TextUtils.isEmpty(expectedHtmlText)) {
-      // If the text is empty, it does not add the <p></p> bits to it.
-      Assert.assertEquals("", actualHtmlText);
-    } else {
-      Assert.assertEquals("<p dir=ltr>" + expectedHtmlText + "</p>\n", actualHtmlText);
-    }
-  }
-
-  /**
-   * Assert span exists in the correct location.
-   *
-   * @param seq The spannable string to check.
-   * @param start The starting index.
-   * @param end The ending index.
-   */
-  public static void assertPrefixSpan(CharSequence seq, int start, int end) {
-    Assert.assertTrue(seq instanceof Spanned);
-    Spanned spannable = (Spanned) seq;
-
-    if (start > 0) {
-      Assert.assertEquals(0, getNumForegroundColorSpansBetween(spannable, 0, start - 1));
-    }
-    Assert.assertEquals(1, getNumForegroundColorSpansBetween(spannable, start, end));
-    Assert.assertEquals(
-        0, getNumForegroundColorSpansBetween(spannable, end + 1, spannable.length() - 1));
-  }
-
-  private static int getNumForegroundColorSpansBetween(Spanned value, int start, int end) {
-    return value.getSpans(start, end, StyleSpan.class).length;
-  }
-
-  /**
-   * Asserts that the given character sequence is not a Spanned object and text is correct.
-   *
-   * @param seq The sequence to check.
-   * @param expected The expected text.
-   */
-  public static void assertNotSpanned(CharSequence seq, String expected) {
-    Assert.assertFalse(seq instanceof Spanned);
-    Assert.assertEquals(expected, seq);
-  }
-
-  public static int getNextTransition(SpannableString seq, int start) {
-    return seq.nextSpanTransition(start, seq.length(), StyleSpan.class);
-  }
-}
diff --git a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java b/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java
deleted file mode 100644
index 88522c4..0000000
--- a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright (C) 2013 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.contacts.common.lettertiles;
-
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Outline;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import com.android.contacts.common.R;
-import com.android.dialer.common.Assert;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * A drawable that encapsulates all the functionality needed to display a letter tile to represent a
- * contact image.
- */
-public class LetterTileDrawable extends Drawable {
-
-  /**
-   * ContactType indicates the avatar type of the contact. For a person or for the default when no
-   * name is provided, it is {@link #TYPE_DEFAULT}, otherwise, for a business it is {@link
-   * #TYPE_BUSINESS}, and voicemail contacts should use {@link #TYPE_VOICEMAIL}.
-   */
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({TYPE_PERSON, TYPE_BUSINESS, TYPE_VOICEMAIL, TYPE_GENERIC_AVATAR, TYPE_SPAM})
-  public @interface ContactType {}
-
-  /** Contact type constants */
-  public static final int TYPE_PERSON = 1;
-  public static final int TYPE_BUSINESS = 2;
-  public static final int TYPE_VOICEMAIL = 3;
-  /**
-   * A generic avatar that features the default icon, default color, and no letter. Useful for
-   * situations where a contact is anonymous.
-   */
-  public static final int TYPE_GENERIC_AVATAR = 4;
-  public static final int TYPE_SPAM = 5;
-  public static final int TYPE_CONFERENCE = 6;
-  @ContactType public static final int TYPE_DEFAULT = TYPE_PERSON;
-
-  /**
-   * Shape indicates the letter tile shape. It can be either a {@link #SHAPE_CIRCLE}, otherwise, it
-   * is a {@link #SHAPE_RECTANGLE}.
-   */
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({SHAPE_CIRCLE, SHAPE_RECTANGLE})
-  public @interface Shape {}
-
-  /** Shape constants */
-  public static final int SHAPE_CIRCLE = 1;
-
-  public static final int SHAPE_RECTANGLE = 2;
-
-  /** 54% opacity */
-  private static final int ALPHA = 138;
-  /** 100% opacity */
-  private static final int SPAM_ALPHA = 255;
-  /** Default icon scale for vector drawable. */
-  private static final float VECTOR_ICON_SCALE = 0.7f;
-
-  /** Reusable components to avoid new allocations */
-  private static final Paint sPaint = new Paint();
-
-  private static final Rect sRect = new Rect();
-  private static final char[] sFirstChar = new char[1];
-  /** Letter tile */
-  private static TypedArray sColors;
-
-  private static int sSpamColor;
-  private static int sDefaultColor;
-  private static int sTileFontColor;
-  private static float sLetterToTileRatio;
-  private static Drawable sDefaultPersonAvatar;
-  private static Drawable sDefaultBusinessAvatar;
-  private static Drawable sDefaultVoicemailAvatar;
-  private static Drawable sDefaultSpamAvatar;
-  private static Drawable sDefaultConferenceAvatar;
-
-  private final Paint mPaint;
-  @ContactType private int mContactType = TYPE_DEFAULT;
-  private float mScale = 1.0f;
-  private float mOffset = 0.0f;
-  private boolean mIsCircle = false;
-
-  private int mColor;
-  private Character mLetter = null;
-
-  private String mDisplayName;
-
-  public LetterTileDrawable(final Resources res) {
-    if (sColors == null) {
-      sColors = res.obtainTypedArray(R.array.letter_tile_colors);
-      sSpamColor = res.getColor(R.color.spam_contact_background);
-      sDefaultColor = res.getColor(R.color.letter_tile_default_color);
-      sTileFontColor = res.getColor(R.color.letter_tile_font_color);
-      sLetterToTileRatio = res.getFraction(R.dimen.letter_to_tile_ratio, 1, 1);
-      sDefaultPersonAvatar =
-          res.getDrawable(R.drawable.product_logo_avatar_anonymous_white_color_120, null);
-      sDefaultBusinessAvatar = res.getDrawable(R.drawable.quantum_ic_business_vd_theme_24, null);
-      sDefaultVoicemailAvatar = res.getDrawable(R.drawable.quantum_ic_voicemail_vd_theme_24, null);
-      sDefaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null);
-      sDefaultConferenceAvatar = res.getDrawable(R.drawable.quantum_ic_group_vd_theme_24, null);
-      sPaint.setTypeface(
-          Typeface.create(res.getString(R.string.letter_tile_letter_font_family), Typeface.NORMAL));
-      sPaint.setTextAlign(Align.CENTER);
-      sPaint.setAntiAlias(true);
-    }
-    mPaint = new Paint();
-    mPaint.setFilterBitmap(true);
-    mPaint.setDither(true);
-    mColor = sDefaultColor;
-  }
-
-  private Rect getScaledBounds(float scale, float offset) {
-    // The drawable should be drawn in the middle of the canvas without changing its width to
-    // height ratio.
-    final Rect destRect = copyBounds();
-    // Crop the destination bounds into a square, scaled and offset as appropriate
-    final int halfLength = (int) (scale * Math.min(destRect.width(), destRect.height()) / 2);
-
-    destRect.set(
-        destRect.centerX() - halfLength,
-        (int) (destRect.centerY() - halfLength + offset * destRect.height()),
-        destRect.centerX() + halfLength,
-        (int) (destRect.centerY() + halfLength + offset * destRect.height()));
-    return destRect;
-  }
-
-  private Drawable getDrawableForContactType(int contactType) {
-    switch (contactType) {
-      case TYPE_BUSINESS:
-        mScale = VECTOR_ICON_SCALE;
-        return sDefaultBusinessAvatar;
-      case TYPE_VOICEMAIL:
-        mScale = VECTOR_ICON_SCALE;
-        return sDefaultVoicemailAvatar;
-      case TYPE_SPAM:
-        mScale = VECTOR_ICON_SCALE;
-        return sDefaultSpamAvatar;
-      case TYPE_CONFERENCE:
-        mScale = VECTOR_ICON_SCALE;
-        return sDefaultConferenceAvatar;
-      case TYPE_PERSON:
-      case TYPE_GENERIC_AVATAR:
-      default:
-        return sDefaultPersonAvatar;
-    }
-  }
-
-  private static boolean isEnglishLetter(final char c) {
-    return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
-  }
-
-  @Override
-  public void draw(final Canvas canvas) {
-    final Rect bounds = getBounds();
-    if (!isVisible() || bounds.isEmpty()) {
-      return;
-    }
-    // Draw letter tile.
-    drawLetterTile(canvas);
-  }
-
-  public Bitmap getBitmap(int width, int height) {
-    Bitmap bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
-    this.setBounds(0, 0, width, height);
-    Canvas canvas = new Canvas(bitmap);
-    this.draw(canvas);
-    return bitmap;
-  }
-
-  private void drawLetterTile(final Canvas canvas) {
-    // Draw background color.
-    sPaint.setColor(mColor);
-    sPaint.setAlpha(mPaint.getAlpha());
-
-    final Rect bounds = getBounds();
-    final int minDimension = Math.min(bounds.width(), bounds.height());
-
-    if (mIsCircle) {
-      canvas.drawCircle(bounds.centerX(), bounds.centerY(), minDimension / 2, sPaint);
-    } else {
-      canvas.drawRect(bounds, sPaint);
-    }
-
-    // Draw letter/digit only if the first character is an english letter or there's a override
-    if (mLetter != null) {
-      // Draw letter or digit.
-      sFirstChar[0] = mLetter;
-
-      // Scale text by canvas bounds and user selected scaling factor
-      sPaint.setTextSize(mScale * sLetterToTileRatio * minDimension);
-      sPaint.getTextBounds(sFirstChar, 0, 1, sRect);
-      sPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
-      sPaint.setColor(sTileFontColor);
-      sPaint.setAlpha(ALPHA);
-
-      // Draw the letter in the canvas, vertically shifted up or down by the user-defined
-      // offset
-      canvas.drawText(
-          sFirstChar,
-          0,
-          1,
-          bounds.centerX(),
-          bounds.centerY() + mOffset * bounds.height() - sRect.exactCenterY(),
-          sPaint);
-    } else {
-      // Draw the default image if there is no letter/digit to be drawn
-      Drawable drawable = getDrawableForContactType(mContactType);
-      drawable.setBounds(getScaledBounds(mScale, mOffset));
-      drawable.setAlpha(drawable == sDefaultSpamAvatar ? SPAM_ALPHA : ALPHA);
-      drawable.draw(canvas);
-    }
-  }
-
-  public int getColor() {
-    return mColor;
-  }
-
-  public LetterTileDrawable setColor(int color) {
-    mColor = color;
-    return this;
-  }
-
-  /** Returns a deterministic color based on the provided contact identifier string. */
-  private int pickColor(final String identifier) {
-    if (mContactType == TYPE_SPAM) {
-      return sSpamColor;
-    }
-
-    if (mContactType == TYPE_VOICEMAIL
-        || mContactType == TYPE_BUSINESS
-        || TextUtils.isEmpty(identifier)) {
-      return sDefaultColor;
-    }
-
-    // String.hashCode() implementation is not supposed to change across java versions, so
-    // this should guarantee the same email address always maps to the same color.
-    // The email should already have been normalized by the ContactRequest.
-    final int color = Math.abs(identifier.hashCode()) % sColors.length();
-    return sColors.getColor(color, sDefaultColor);
-  }
-
-  @Override
-  public void setAlpha(final int alpha) {
-    mPaint.setAlpha(alpha);
-  }
-
-  @Override
-  public void setColorFilter(final ColorFilter cf) {
-    mPaint.setColorFilter(cf);
-  }
-
-  @Override
-  public int getOpacity() {
-    return android.graphics.PixelFormat.OPAQUE;
-  }
-
-  @Override
-  public void getOutline(Outline outline) {
-    if (mIsCircle) {
-      outline.setOval(getBounds());
-    } else {
-      outline.setRect(getBounds());
-    }
-
-    outline.setAlpha(1);
-  }
-
-  /**
-   * Scale the drawn letter tile to a ratio of its default size
-   *
-   * @param scale The ratio the letter tile should be scaled to as a percentage of its default size,
-   *     from a scale of 0 to 2.0f. The default is 1.0f.
-   */
-  public LetterTileDrawable setScale(float scale) {
-    mScale = scale;
-    return this;
-  }
-
-  /**
-   * Assigns the vertical offset of the position of the letter tile to the ContactDrawable
-   *
-   * @param offset The provided offset must be within the range of -0.5f to 0.5f. If set to -0.5f,
-   *     the letter will be shifted upwards by 0.5 times the height of the canvas it is being drawn
-   *     on, which means it will be drawn with the center of the letter starting at the top edge of
-   *     the canvas. If set to 0.5f, the letter will be shifted downwards by 0.5 times the height of
-   *     the canvas it is being drawn on, which means it will be drawn with the center of the letter
-   *     starting at the bottom edge of the canvas. The default is 0.0f.
-   */
-  public LetterTileDrawable setOffset(float offset) {
-    Assert.checkArgument(offset >= -0.5f && offset <= 0.5f);
-    mOffset = offset;
-    return this;
-  }
-
-  public LetterTileDrawable setLetter(Character letter) {
-    mLetter = letter;
-    return this;
-  }
-
-  public Character getLetter() {
-    return this.mLetter;
-  }
-
-  private LetterTileDrawable setLetterAndColorFromContactDetails(
-      final String displayName, final String identifier) {
-    if (!TextUtils.isEmpty(displayName) && isEnglishLetter(displayName.charAt(0))) {
-      mLetter = Character.toUpperCase(displayName.charAt(0));
-    } else {
-      mLetter = null;
-    }
-    mColor = pickColor(identifier);
-    return this;
-  }
-
-  public LetterTileDrawable setContactType(@ContactType int contactType) {
-    mContactType = contactType;
-    return this;
-  }
-
-  @ContactType
-  public int getContactType() {
-    return this.mContactType;
-  }
-
-  public LetterTileDrawable setIsCircular(boolean isCircle) {
-    mIsCircle = isCircle;
-    return this;
-  }
-
-  public boolean tileIsCircular() {
-    return this.mIsCircle;
-  }
-
-  /**
-   * Creates a canonical letter tile for use across dialer fragments.
-   *
-   * @param displayName The display name to produce the letter in the tile. Null values or numbers
-   *     yield no letter.
-   * @param identifierForTileColor The string used to produce the tile color.
-   * @param shape The shape of the tile.
-   * @param contactType The type of contact, e.g. TYPE_VOICEMAIL.
-   * @return this
-   */
-  public LetterTileDrawable setCanonicalDialerLetterTileDetails(
-      @Nullable final String displayName,
-      @Nullable final String identifierForTileColor,
-      @Shape final int shape,
-      final int contactType) {
-
-    this.setIsCircular(shape == SHAPE_CIRCLE);
-
-    /**
-     * We return quickly under the following conditions: 1. We are asked to draw a default tile, and
-     * no coloring information is provided, meaning no further initialization is necessary OR 2.
-     * We've already invoked this method before, set mDisplayName, and found that it has not
-     * changed. This is useful during events like hangup, when we lose the call state for special
-     * types of contacts, like voicemail. We keep track of the special case until we encounter a new
-     * display name.
-     */
-    if (contactType == TYPE_DEFAULT
-        && ((displayName == null && identifierForTileColor == null)
-            || (displayName != null && displayName.equals(mDisplayName)))) {
-      return this;
-    }
-
-    this.mDisplayName = displayName;
-    setContactType(contactType);
-
-    // Special contact types receive default color and no letter tile, but special iconography.
-    if (contactType != TYPE_PERSON) {
-      this.setLetterAndColorFromContactDetails(null, null);
-    } else {
-      if (identifierForTileColor != null) {
-        this.setLetterAndColorFromContactDetails(displayName, identifierForTileColor);
-      } else {
-        this.setLetterAndColorFromContactDetails(displayName, displayName);
-      }
-    }
-    return this;
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
index 18bbae3..117825d 100644
--- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
@@ -26,20 +26,23 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.QuickContactBadge;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.R;
 import com.android.contacts.common.compat.DirectoryCompat;
 import com.android.contacts.common.util.SearchUtil;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 import java.util.HashSet;
 
 /**
@@ -53,7 +56,6 @@
    */
   public static final boolean LOCAL_INVISIBLE_DIRECTORY_ENABLED = false;
 
-  private static final String TAG = "ContactEntryListAdapter";
   private int mDisplayOrder;
   private int mSortOrder;
 
@@ -80,6 +82,8 @@
   private ContactListFilter mFilter;
   private boolean mDarkTheme = false;
 
+  public static final int SUGGESTIONS_LOADER_ID = 0;
+
   /** Resource used to provide header-text for default filter. */
   private CharSequence mDefaultFilterHeaderText;
 
@@ -128,9 +132,22 @@
   }
 
   protected void addPartitions() {
+    if (ConfigProviderBindings.get(getContext()).getBoolean("p13n_ranker_should_enable", false)) {
+      addPartition(createSuggestionsDirectoryPartition());
+    }
     addPartition(createDefaultDirectoryPartition());
   }
 
+  protected DirectoryPartition createSuggestionsDirectoryPartition() {
+    DirectoryPartition partition = new DirectoryPartition(true, true);
+    partition.setDirectoryId(SUGGESTIONS_LOADER_ID);
+    partition.setDirectoryType(getContext().getString(R.string.contact_suggestions));
+    partition.setPriorityDirectory(true);
+    partition.setPhotoSupported(true);
+    partition.setLabel(getContext().getString(R.string.local_suggestions_search_label));
+    return partition;
+  }
+
   protected DirectoryPartition createDefaultDirectoryPartition() {
     DirectoryPartition partition = new DirectoryPartition(true, true);
     partition.setDirectoryId(Directory.DEFAULT);
@@ -243,6 +260,11 @@
     } else {
       mUpperCaseQueryString = SearchUtil.cleanStartAndEndOfSearchQuery(queryString.toUpperCase());
     }
+
+    // Enable default partition header if in search mode (including zero-suggest).
+    if (mQueryString != null) {
+      setDefaultPartitionHeader(true);
+    }
   }
 
   public String getUpperCaseQueryString() {
@@ -354,9 +376,9 @@
     if (cursor.getCount() == 0) {
       // Directory table must have at least local directory, without which this adapter will
       // enter very weird state.
-      Log.e(
-          TAG,
-          "Directory search loader returned an empty cursor, which implies we have "
+      LogUtil.i(
+          "ContactEntryListAdapter.changeDirectories",
+          "directory search loader returned an empty cursor, which implies we have "
               + "no directory entries.",
           new RuntimeException());
       return;
@@ -529,22 +551,27 @@
     return false;
   }
 
-  /** Changes visibility parameters for the default directory partition. */
-  public void configureDefaultPartition(boolean showIfEmpty, boolean hasHeader) {
+  /** Configures visibility parameters for the directory partitions. */
+  public void configurePartitionsVisibility(boolean isInSearchMode) {
+    for (int i = 0; i < getPartitionCount(); i++) {
+      setShowIfEmpty(i, false);
+      setHasHeader(i, isInSearchMode);
+    }
+  }
+
+  // Sets header for the default partition.
+  private void setDefaultPartitionHeader(boolean setHeader) {
+    // Iterate in reverse here to ensure the first DEFAULT directory has header.
+    // Both "Suggestions" and "All Contacts" directories have DEFAULT id.
     int defaultPartitionIndex = -1;
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
+    for (int i = getPartitionCount() - 1; i >= 0; i--) {
       Partition partition = getPartition(i);
       if (partition instanceof DirectoryPartition
           && ((DirectoryPartition) partition).getDirectoryId() == Directory.DEFAULT) {
         defaultPartitionIndex = i;
-        break;
       }
     }
-    if (defaultPartitionIndex != -1) {
-      setShowIfEmpty(defaultPartitionIndex, showIfEmpty);
-      setHasHeader(defaultPartitionIndex, hasHeader);
-    }
+    setHasHeader(defaultPartitionIndex, setHeader);
   }
 
   @Override
@@ -678,6 +705,9 @@
       // mimetype here is reasonable.
       quickContact.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
     }
+    Logger.get(mContext)
+        .logQuickContactOnTouch(
+            quickContact, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_SEARCH, true);
 
     if (photoId != 0 || photoUriColumn == -1) {
       getPhotoLoader().loadThumbnail(quickContact, photoId, mDarkTheme, mCircularPhotos, null);
diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java
index 278175c..94551a8 100644
--- a/java/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/java/com/android/contacts/common/list/ContactEntryListFragment.java
@@ -43,10 +43,11 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import com.android.common.widget.CompositeCursorAdapter.Partition;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactListViewUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.performancereport.PerformanceReport;
 import java.lang.ref.WeakReference;
 import java.util.Locale;
 
@@ -440,6 +441,11 @@
       return;
     }
 
+    // Return for non-"Suggestions" if on the zero-suggest screen.
+    if (TextUtils.isEmpty(mQueryString) && partitionIndex > 0) {
+      return;
+    }
+
     mAdapter.changeCursor(partitionIndex, data);
     setProfileHeader();
 
@@ -555,7 +561,6 @@
   protected void setSearchMode(boolean flag) {
     if (mSearchMode != flag) {
       mSearchMode = flag;
-      setSectionHeaderDisplayEnabled(!mSearchMode);
 
       if (!flag) {
         mDirectoryListStatus = STATUS_NOT_LOADED;
@@ -572,7 +577,7 @@
           // should be cleaned up on exiting the search mode.
           mAdapter.removeDirectoriesAfterDefault();
         }
-        mAdapter.configureDefaultPartition(false, flag);
+        mAdapter.configurePartitionsVisibility(flag);
       }
 
       if (mListView != null) {
@@ -676,22 +681,16 @@
 
     boolean searchMode = isSearchMode();
     mAdapter.setSearchMode(searchMode);
-    mAdapter.configureDefaultPartition(false, searchMode);
+    mAdapter.configurePartitionsVisibility(searchMode);
     mAdapter.setPhotoLoader(mPhotoManager);
     mListView.setAdapter(mAdapter);
-
-    if (!isSearchMode()) {
-      mListView.setFocusableInTouchMode(true);
-      mListView.requestFocus();
-    }
-
     return mView;
   }
 
   protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
     mView = inflateView(inflater, container);
 
-    mListView = (ListView) mView.findViewById(android.R.id.list);
+    mListView = mView.findViewById(android.R.id.list);
     if (mListView == null) {
       throw new RuntimeException(
           "Your content must have a ListView whose id attribute is " + "'android.R.id.list'");
@@ -770,6 +769,7 @@
 
   @Override
   public void onScrollStateChanged(AbsListView view, int scrollState) {
+    PerformanceReport.recordScrollStateChange(scrollState);
     if (scrollState == OnScrollListener.SCROLL_STATE_FLING) {
       mPhotoManager.pause();
     } else if (isPhotoLoaderEnabled()) {
diff --git a/java/com/android/contacts/common/list/ContactListAdapter.java b/java/com/android/contacts/common/list/ContactListAdapter.java
index 6cd3118..721609d 100644
--- a/java/com/android/contacts/common/list/ContactListAdapter.java
+++ b/java/com/android/contacts/common/list/ContactListAdapter.java
@@ -23,9 +23,9 @@
 import android.provider.ContactsContract.Directory;
 import android.provider.ContactsContract.SearchSnippets;
 import android.view.ViewGroup;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.R;
 import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
 
 /**
  * A cursor adapter for the {@link ContactsContract.Contacts#CONTENT_TYPE} content type. Also
diff --git a/java/com/android/contacts/common/list/ContactListFilterController.java b/java/com/android/contacts/common/list/ContactListFilterController.java
index d2168f3..c5c078c 100644
--- a/java/com/android/contacts/common/list/ContactListFilterController.java
+++ b/java/com/android/contacts/common/list/ContactListFilterController.java
@@ -75,13 +75,13 @@
  */
 class ContactListFilterControllerImpl extends ContactListFilterController {
 
-  private final Context mContext;
+  private final Context mAppContext;
   private final List<ContactListFilterListener> mListeners =
       new ArrayList<ContactListFilterListener>();
   private ContactListFilter mFilter;
 
   public ContactListFilterControllerImpl(Context context) {
-    mContext = context;
+    mAppContext = context.getApplicationContext();
     mFilter = ContactListFilter.restoreDefaultPreferences(getSharedPreferences());
     checkFilterValidity(true /* notify listeners */);
   }
@@ -102,7 +102,7 @@
   }
 
   private SharedPreferences getSharedPreferences() {
-    return PreferenceManager.getDefaultSharedPreferences(mContext);
+    return PreferenceManager.getDefaultSharedPreferences(mAppContext);
   }
 
   @Override
@@ -162,7 +162,7 @@
 
   /** @return true if the Account for the current filter exists. */
   private boolean filterAccountExists() {
-    final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(mContext);
+    final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(mAppContext);
     final AccountWithDataSet filterAccount =
         new AccountWithDataSet(mFilter.accountName, mFilter.accountType, mFilter.dataSet);
     return accountTypeManager.contains(filterAccount, false);
diff --git a/java/com/android/contacts/common/list/ContactListItemView.java b/java/com/android/contacts/common/list/ContactListItemView.java
index 7a31947..c605f4e 100644
--- a/java/com/android/contacts/common/list/ContactListItemView.java
+++ b/java/com/android/contacts/common/list/ContactListItemView.java
@@ -30,8 +30,8 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.SearchSnippets;
 import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -55,7 +55,7 @@
 import com.android.contacts.common.list.PhoneNumberListAdapter.Listener;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.contacts.common.util.SearchUtil;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.util.ViewUtil;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -81,13 +81,15 @@
 
   /** IntDef for indices of ViewPager tabs. */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({NONE, VIDEO, CALL_AND_SHARE})
+  @IntDef({NONE, VIDEO, LIGHTBRINGER, CALL_AND_SHARE})
   public @interface CallToAction {}
 
   public static final int NONE = 0;
   public static final int VIDEO = 1;
-  public static final int CALL_AND_SHARE = 2;
+  public static final int LIGHTBRINGER = 2;
+  public static final int CALL_AND_SHARE = 3;
 
+  private final PhotoPosition mPhotoPosition = getDefaultPhotoPosition();
   private static final Pattern SPLIT_PATTERN =
       Pattern.compile("([\\w-\\.]+)@((?:[\\w]+\\.)+)([a-zA-Z]{2,4})|[\\w]+");
   static final char SNIPPET_START_MATCH = '[';
@@ -106,7 +108,7 @@
   private int mNameTextViewTextSize;
   private int mHeaderWidth;
   private Drawable mActivatedBackgroundDrawable;
-  private int mCallToActionSize = 32;
+  private int mCallToActionSize = 48;
   private int mCallToActionMargin = 16;
   // Set in onLayout. Represent left and right position of the View on the screen.
   private int mLeftOffset;
@@ -122,10 +124,7 @@
   private String mHighlightedPrefix;
   /** Indicates whether the view should leave room for the "video call" icon. */
   private boolean mSupportVideoCall;
-  /** Indicates whether the view should leave room for the "call and share" icon. */
-  private boolean mSupportCallAndShare;
 
-  private PhotoPosition mPhotoPosition = getDefaultPhotoPosition(false /* normal/non opposite */);
   // Header layout data
   private TextView mHeaderTextView;
   private boolean mIsSectionHeaderEnabled;
@@ -139,7 +138,7 @@
   private TextView mSnippetView;
   private TextView mStatusView;
   private ImageView mPresenceIcon;
-  private ImageView mCallToAction;
+  @NonNull private final ImageView mCallToActionView;
   private ImageView mWorkProfileIcon;
   private ColorStateList mSecondaryTextColor;
   private int mDefaultPhotoViewSize = 0;
@@ -181,23 +180,14 @@
   private Rect mBoundsWithoutHeader = new Rect();
   private CharSequence mUnknownNameText;
 
-  public ContactListItemView(Context context) {
-    super(context);
+  private String mPhoneNumber;
+  private int mPosition = -1;
+  private @CallToAction int mCallToAction = NONE;
 
-    mTextHighlighter = new TextHighlighter(Typeface.BOLD);
-    mNameHighlightSequence = new ArrayList<>();
-    mNumberHighlightSequence = new ArrayList<>();
-  }
-
-  public ContactListItemView(
-      Context context,
-      AttributeSet attrs,
-      boolean supportVideoCallIcon,
-      boolean supportCallAndShare) {
+  public ContactListItemView(Context context, AttributeSet attrs, boolean supportVideoCallIcon) {
     this(context, attrs);
 
     mSupportVideoCall = supportVideoCallIcon;
-    mSupportCallAndShare = supportCallAndShare;
   }
 
   public ContactListItemView(Context context, AttributeSet attrs) {
@@ -284,19 +274,20 @@
     mNameHighlightSequence = new ArrayList<>();
     mNumberHighlightSequence = new ArrayList<>();
 
+    mCallToActionView = new ImageView(getContext());
+    mCallToActionView.setId(R.id.call_to_action);
+    mCallToActionView.setLayoutParams(new LayoutParams(mCallToActionSize, mCallToActionSize));
+    mCallToActionView.setScaleType(ScaleType.CENTER);
+    mCallToActionView.setImageTintList(
+        ContextCompat.getColorStateList(getContext(), R.color.search_video_call_icon_tint));
+    addView(mCallToActionView);
+
     setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
   }
 
-  public static PhotoPosition getDefaultPhotoPosition(boolean opposite) {
-    final Locale locale = Locale.getDefault();
-    final int layoutDirection = TextUtils.getLayoutDirectionFromLocale(locale);
-    switch (layoutDirection) {
-      case View.LAYOUT_DIRECTION_RTL:
-        return (opposite ? PhotoPosition.LEFT : PhotoPosition.RIGHT);
-      case View.LAYOUT_DIRECTION_LTR:
-      default:
-        return (opposite ? PhotoPosition.RIGHT : PhotoPosition.LEFT);
-    }
+  public static PhotoPosition getDefaultPhotoPosition() {
+    int layoutDirection = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault());
+    return layoutDirection == View.LAYOUT_DIRECTION_RTL ? PhotoPosition.RIGHT : PhotoPosition.LEFT;
   }
 
   /**
@@ -333,35 +324,48 @@
    * @param position The position in the adapter of the call to action.
    */
   public void setCallToAction(@CallToAction int action, Listener listener, int position) {
-    int drawable;
+    mCallToAction = action;
+    mPosition = position;
+
+    Drawable drawable;
     int description;
     OnClickListener onClickListener;
-    if (action == CALL_AND_SHARE && mSupportCallAndShare) {
-      drawable = R.drawable.ic_call_and_share;
-      description = R.string.description_search_video_call;
+    if (action == CALL_AND_SHARE) {
+      drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_phone_attach);
+      drawable.setAutoMirrored(true);
+      description = R.string.description_search_call_and_share;
       onClickListener = v -> listener.onCallAndShareIconClicked(position);
     } else if (action == VIDEO && mSupportVideoCall) {
-      drawable = R.drawable.ic_search_video_call;
-      description = R.string.description_search_call_and_share;
+      drawable =
+          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
+      drawable.setAutoMirrored(true);
+      description = R.string.description_search_video_call;
       onClickListener = v -> listener.onVideoCallIconClicked(position);
+    } else if (action == LIGHTBRINGER) {
+      CallIntentBuilder.increaseLightbringerCallButtonAppearInSearchCount();
+      drawable =
+          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
+      drawable.setAutoMirrored(true);
+      description = R.string.description_search_video_call;
+      onClickListener = v -> listener.onLightbringerIconClicked(position);
     } else {
-      if (mCallToAction != null) {
-        mCallToAction.setVisibility(View.GONE);
-        mCallToAction.setOnClickListener(null);
-      }
+      mCallToActionView.setVisibility(View.GONE);
+      mCallToActionView.setOnClickListener(null);
       return;
     }
 
-    if (mCallToAction == null) {
-      mCallToAction = new ImageView(getContext());
-      mCallToAction.setLayoutParams(new LayoutParams(mCallToActionSize, mCallToActionSize));
-      mCallToAction.setScaleType(ScaleType.CENTER);
-      addView(mCallToAction);
-    }
-    mCallToAction.setContentDescription(getContext().getString(description));
-    mCallToAction.setOnClickListener(onClickListener);
-    mCallToAction.setImageResource(drawable);
-    mCallToAction.setVisibility(View.VISIBLE);
+    mCallToActionView.setContentDescription(getContext().getString(description));
+    mCallToActionView.setOnClickListener(onClickListener);
+    mCallToActionView.setImageDrawable(drawable);
+    mCallToActionView.setVisibility(View.VISIBLE);
+  }
+
+  public @CallToAction int getCallToAction() {
+    return mCallToAction;
+  }
+
+  public int getPosition() {
+    return mPosition;
   }
 
   /**
@@ -376,18 +380,6 @@
     mSupportVideoCall = supportVideoCall;
   }
 
-  /**
-   * Sets whether the view supports a call and share icon. This is independent of whether the view
-   * is actually showing an icon. Support for the icon ensures that the layout leaves space for it,
-   * should it be shown.
-   *
-   * @param supportCallAndShare {@code true} if the call and share icon is supported, {@code false}
-   *     otherwise.
-   */
-  public void setSupportCallAndShareIcon(boolean supportCallAndShare) {
-    mSupportCallAndShare = supportCallAndShare;
-  }
-
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     // We will match parent's width and wrap content vertically, but make sure
@@ -423,9 +415,7 @@
       effectiveWidth -= mHeaderWidth + mGapBetweenImageAndText;
     }
 
-    if (mSupportVideoCall || mSupportCallAndShare) {
-      effectiveWidth -= (mCallToActionSize + mCallToActionMargin);
-    }
+    effectiveWidth -= (mCallToActionSize + mCallToActionMargin);
 
     // Go over all visible text views and measure actual width of each of them.
     // Also calculate their heights to get the total height for this entire view.
@@ -496,11 +486,9 @@
       mStatusTextViewHeight = mPresenceIcon.getMeasuredHeight();
     }
 
-    if ((mSupportVideoCall || mSupportCallAndShare) && isVisible(mCallToAction)) {
-      mCallToAction.measure(
-          MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY));
-    }
+    mCallToActionView.measure(
+        MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY));
 
     if (isVisible(mWorkProfileIcon)) {
       mWorkProfileIcon.measure(
@@ -629,34 +617,30 @@
       leftBound += mTextIndent;
     }
 
-    if (mSupportVideoCall || mSupportCallAndShare) {
-      // Place the call to action at the end of the list (e.g. take into account RTL mode).
-      if (isVisible(mCallToAction)) {
-        // Center the icon vertically
-        final int callToActionTop = topBound + (height - topBound - mCallToActionSize) / 2;
+    // Place the call to action at the end of the list (e.g. take into account RTL mode).
+    // Center the icon vertically
+    final int callToActionTop = topBound + (height - topBound - mCallToActionSize) / 2;
 
-        if (!isLayoutRtl) {
-          // When photo is on left, icon is placed on the right edge.
-          mCallToAction.layout(
-              rightBound - mCallToActionSize,
-              callToActionTop,
-              rightBound,
-              callToActionTop + mCallToActionSize);
-        } else {
-          // When photo is on right, icon is placed on the left edge.
-          mCallToAction.layout(
-              leftBound,
-              callToActionTop,
-              leftBound + mCallToActionSize,
-              callToActionTop + mCallToActionSize);
-        }
-      }
+    if (!isLayoutRtl) {
+      // When photo is on left, icon is placed on the right edge.
+      mCallToActionView.layout(
+          rightBound - mCallToActionSize,
+          callToActionTop,
+          rightBound,
+          callToActionTop + mCallToActionSize);
+    } else {
+      // When photo is on right, icon is placed on the left edge.
+      mCallToActionView.layout(
+          leftBound,
+          callToActionTop,
+          leftBound + mCallToActionSize,
+          callToActionTop + mCallToActionSize);
+    }
 
-      if (mPhotoPosition == PhotoPosition.LEFT) {
-        rightBound -= (mCallToActionSize + mCallToActionMargin);
-      } else {
-        leftBound += mCallToActionSize + mCallToActionMargin;
-      }
+    if (mPhotoPosition == PhotoPosition.LEFT) {
+      rightBound -= (mCallToActionSize + mCallToActionMargin);
+    } else {
+      leftBound += mCallToActionSize + mCallToActionMargin;
     }
 
     // Center text vertically, then apply the top offset.
@@ -901,9 +885,7 @@
     }
     if (mQuickContact == null) {
       mQuickContact = new QuickContactBadge(getContext());
-      if (CompatUtils.isLollipopCompatible()) {
-        mQuickContact.setOverlay(null);
-      }
+      mQuickContact.setOverlay(null);
       mQuickContact.setLayoutParams(getDefaultPhotoLayoutParams());
       if (mNameTextView != null) {
         mQuickContact.setContentDescription(
@@ -1008,9 +990,7 @@
       mNameTextView.setGravity(Gravity.CENTER_VERTICAL);
       mNameTextView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
       mNameTextView.setId(R.id.cliv_name_textview);
-      if (CompatUtils.isLollipopCompatible()) {
-        mNameTextView.setElegantTextHeight(false);
-      }
+      mNameTextView.setElegantTextHeight(false);
       addView(mNameTextView);
     }
     return mNameTextView;
@@ -1056,6 +1036,7 @@
    * exists.
    */
   public void setPhoneNumber(String text) {
+    mPhoneNumber = text;
     if (text == null) {
       if (mDataView != null) {
         mDataView.setVisibility(View.GONE);
@@ -1086,6 +1067,10 @@
     }
   }
 
+  public String getPhoneNumber() {
+    return mPhoneNumber;
+  }
+
   private void setMarqueeText(TextView textView, CharSequence text) {
     if (getTextEllipsis() == TruncateAt.MARQUEE) {
       // To show MARQUEE correctly (with END effect during non-active state), we need
@@ -1109,9 +1094,7 @@
       mDataView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
       mDataView.setActivated(isActivated());
       mDataView.setId(R.id.cliv_data_view);
-      if (CompatUtils.isLollipopCompatible()) {
-        mDataView.setElegantTextHeight(false);
-      }
+      mDataView.setElegantTextHeight(false);
       addView(mDataView);
     }
     return mDataView;
@@ -1469,28 +1452,17 @@
     forceLayout();
   }
 
-  public void setPhotoPosition(PhotoPosition photoPosition) {
-    mPhotoPosition = photoPosition;
-  }
-
   /**
    * Set drawable resources directly for the drawable resource of the photo view.
    *
-   * @param drawableId Id of drawable resource.
+   * @param drawable A drawable resource.
    */
-  public void setDrawableResource(int drawableId) {
+  public void setDrawable(Drawable drawable) {
     ImageView photo = getPhotoView();
     photo.setScaleType(ImageView.ScaleType.CENTER);
-    final Drawable drawable = ContextCompat.getDrawable(getContext(), drawableId);
-    final int iconColor = ContextCompat.getColor(getContext(), R.color.search_shortcut_icon_color);
-    if (CompatUtils.isLollipopCompatible()) {
-      photo.setImageDrawable(drawable);
-      photo.setImageTintList(ColorStateList.valueOf(iconColor));
-    } else {
-      final Drawable drawableWrapper = DrawableCompat.wrap(drawable).mutate();
-      DrawableCompat.setTint(drawableWrapper, iconColor);
-      photo.setImageDrawable(drawableWrapper);
-    }
+    int iconColor = ContextCompat.getColor(getContext(), R.color.search_shortcut_icon_color);
+    photo.setImageDrawable(drawable);
+    photo.setImageTintList(ColorStateList.valueOf(iconColor));
   }
 
   @Override
diff --git a/java/com/android/contacts/common/list/ContactTileView.java b/java/com/android/contacts/common/list/ContactTileView.java
index 9273b05..cfd52f3 100644
--- a/java/com/android/contacts/common/list/ContactTileView.java
+++ b/java/com/android/contacts/common/list/ContactTileView.java
@@ -19,15 +19,17 @@
 import android.graphics.Rect;
 import android.net.Uri;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.R;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallSpecificAppData;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
 
 /** A ContactTile displays a contact's picture and name */
 public abstract class ContactTileView extends FrameLayout {
@@ -60,8 +62,15 @@
         if (mListener == null) {
           return;
         }
+        CallSpecificAppData callSpecificAppData =
+            CallSpecificAppData.newBuilder()
+                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)
+                .setAllowAssistedDialing(true)
+                .build();
         mListener.onContactSelected(
-            getLookupUri(), MoreContactUtils.getTargetRectFromView(ContactTileView.this));
+            getLookupUri(),
+            MoreContactUtils.getTargetRectFromView(ContactTileView.this),
+            callSpecificAppData);
       }
     };
   }
@@ -97,7 +106,7 @@
 
         }
       } else {
-        Log.w(TAG, "contactPhotoManager not set");
+        LogUtil.w(TAG, "contactPhotoManager not set");
       }
     } else {
       setVisibility(View.INVISIBLE);
@@ -163,9 +172,10 @@
   public interface Listener {
 
     /** Notification that the contact was selected; no specific action is dictated. */
-    void onContactSelected(Uri contactLookupUri, Rect viewRect);
+    void onContactSelected(
+        Uri contactLookupUri, Rect viewRect, CallSpecificAppData callSpecificAppData);
 
     /** Notification that the specified number is to be called. */
-    void onCallNumberDirectly(String phoneNumber);
+    void onCallNumberDirectly(String phoneNumber, CallSpecificAppData callSpecificAppData);
   }
 }
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 9a490d7..71d9dad 100644
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -27,11 +27,10 @@
 import android.provider.ContactsContract.CommonDataKinds.SipAddress;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Directory;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.R;
 import com.android.contacts.common.compat.CallableCompat;
@@ -41,13 +40,16 @@
 import com.android.contacts.common.list.ContactListItemView.CallToAction;
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.Constants;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.location.GeoUtil;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.CallUtil;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,16 +70,14 @@
   // A list of extended directories to add to the directories from the database
   private final List<DirectoryPartition> mExtendedDirectories;
   private final CharSequence mUnknownNameText;
-  private final boolean mCallAndShareEnabled;
+  protected final boolean mIsImsVideoEnabled;
+
   // Extended directories will have ID's that are higher than any of the id's from the database,
   // so that we can identify them and set them up properly. If no extended directories
   // exist, this will be Long.MAX_VALUE
   private long mFirstExtendedDirectoryId = Long.MAX_VALUE;
-  private ContactListItemView.PhotoPosition mPhotoPosition;
   private boolean mUseCallableUri;
   private Listener mListener;
-  private boolean mIsVideoEnabled;
-  private boolean mIsPresenceEnabled;
 
   public PhoneNumberListAdapter(Context context) {
     super(context);
@@ -88,11 +88,9 @@
         PhoneDirectoryExtenderAccessor.get(mContext).getExtendedDirectories(mContext);
 
     int videoCapabilities = CallUtil.getVideoCallingAvailability(context);
-    mIsVideoEnabled = (videoCapabilities & CallUtil.VIDEO_CALLING_ENABLED) != 0;
-    mIsPresenceEnabled = (videoCapabilities & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
-
-    // TODO
-    mCallAndShareEnabled = true;
+    mIsImsVideoEnabled =
+        CallUtil.isVideoEnabled(context)
+            && (videoCapabilities & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
   }
 
   @Override
@@ -249,10 +247,10 @@
     return item != null ? item.getString(PhoneQuery.LOOKUP_KEY) : null;
   }
 
-  public CallComposerContact getCallComposerContact(int position) {
+  public DialerContact getDialerContact(int position) {
     Cursor cursor = (Cursor) getItem(position);
     if (cursor == null) {
-      LogUtil.e("PhoneNumberListAdapter.getCallComposerContact", "cursor was null.");
+      LogUtil.e("PhoneNumberListAdapter.getDialerContact", "cursor was null.");
       return null;
     }
 
@@ -263,11 +261,11 @@
         Contacts.getLookupUri(
             cursor.getLong(PhoneQuery.CONTACT_ID), cursor.getString(PhoneQuery.LOOKUP_KEY));
 
-    CallComposerContact.Builder contact = CallComposerContact.newBuilder();
+    DialerContact.Builder contact = DialerContact.newBuilder();
     contact
         .setNumber(number)
         .setPhotoId(cursor.getLong(PhoneQuery.PHOTO_ID))
-        .setContactType(ContactPhotoManager.TYPE_DEFAULT)
+        .setContactType(LetterTileDrawable.TYPE_DEFAULT)
         .setNameOrNumber(displayName)
         .setNumberLabel(
             Phone.getTypeLabel(
@@ -297,7 +295,6 @@
     ContactListItemView view = super.newView(context, partition, cursor, position, parent);
     view.setUnknownNameText(mUnknownNameText);
     view.setQuickContactEnabled(isQuickContactEnabled());
-    view.setPhotoPosition(mPhotoPosition);
     return view;
   }
 
@@ -355,19 +352,14 @@
     }
 
     final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);
-
-    // If the first partition does not have a header, then all subsequent partitions'
-    // getPositionForPartition returns an index off by 1.
-    int partitionOffset = 0;
-    if (partition > 0 && !getPartition(0).getHasHeader()) {
-      partitionOffset = 1;
-    }
-    position += getPositionForPartition(partition) + partitionOffset;
+    // All sections have headers, so scroll position is off by 1.
+    position += getPositionForPartition(partition) + 1;
 
     bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position);
   }
 
-  protected void bindPhoneNumber(
+  @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+  public void bindPhoneNumber(
       ContactListItemView view, Cursor cursor, boolean displayNumber, int position) {
     CharSequence label = null;
     if (displayNumber && !cursor.isNull(PhoneQuery.PHONE_TYPE)) {
@@ -389,7 +381,7 @@
         text = phoneLabel;
       } else {
         final String phoneNumber = cursor.getString(PhoneQuery.PHONE_NUMBER);
-        text = GeoUtil.getGeocodedLocationFor(mContext, phoneNumber);
+        text = PhoneNumberHelper.getGeoDescription(mContext, phoneNumber);
       }
     }
     view.setPhoneNumber(text);
@@ -401,16 +393,21 @@
       int carrierPresence = cursor.getInt(PhoneQuery.CARRIER_PRESENCE);
       boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
 
-      boolean isVideoIconShown = mIsVideoEnabled && (!mIsPresenceEnabled || isPresent);
-      if (isVideoIconShown) {
+      boolean showViewIcon = mIsImsVideoEnabled && isPresent;
+      if (showViewIcon) {
         action = ContactListItemView.VIDEO;
       }
     }
 
-    if (isCallAndShareEnabled() && action == ContactListItemView.NONE && number != null) {
+    if (action == ContactListItemView.NONE
+        && LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) {
+      action = ContactListItemView.LIGHTBRINGER;
+    }
+
+    if (action == ContactListItemView.NONE) {
       EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
       EnrichedCallCapabilities capabilities = manager.getCapabilities(number);
-      if (capabilities != null && capabilities.supportsCallComposer()) {
+      if (capabilities != null && capabilities.isCallComposerCapable()) {
         action = ContactListItemView.CALL_AND_SHARE;
       } else if (capabilities == null
           && getQueryString() != null
@@ -481,14 +478,6 @@
     }
   }
 
-  public ContactListItemView.PhotoPosition getPhotoPosition() {
-    return mPhotoPosition;
-  }
-
-  public void setPhotoPosition(ContactListItemView.PhotoPosition photoPosition) {
-    mPhotoPosition = photoPosition;
-  }
-
   public void setUseCallableUri(boolean useCallableUri) {
     mUseCallableUri = useCallableUri;
   }
@@ -570,14 +559,12 @@
     mListener = listener;
   }
 
-  public boolean isCallAndShareEnabled() {
-    return mCallAndShareEnabled;
-  }
-
   public interface Listener {
 
     void onVideoCallIconClicked(int position);
 
+    void onLightbringerIconClicked(int position);
+
     void onCallAndShareIconClicked(int position);
   }
 
@@ -642,18 +629,14 @@
     static {
       final List<String> projectionList =
           new ArrayList<>(Arrays.asList(PROJECTION_PRIMARY_INTERNAL));
-      if (CompatUtils.isMarshmallowCompatible()) {
-        projectionList.add(Phone.CARRIER_PRESENCE); // 9
-      }
+      projectionList.add(Phone.CARRIER_PRESENCE); // 9
       PROJECTION_PRIMARY = projectionList.toArray(new String[projectionList.size()]);
     }
 
     static {
       final List<String> projectionList =
           new ArrayList<>(Arrays.asList(PROJECTION_ALTERNATIVE_INTERNAL));
-      if (CompatUtils.isMarshmallowCompatible()) {
-        projectionList.add(Phone.CARRIER_PRESENCE); // 9
-      }
+      projectionList.add(Phone.CARRIER_PRESENCE); // 9
       PROJECTION_ALTERNATIVE = projectionList.toArray(new String[projectionList.size()]);
     }
   }
diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
index 8f25f82..d704e54 100644
--- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
@@ -29,16 +29,20 @@
 import android.view.View;
 import android.view.ViewGroup;
 import com.android.contacts.common.R;
+import com.android.contacts.common.list.PhoneNumberListAdapter.Listener;
 import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallInitiationType.Type;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.protos.ProtoParsers;
 import java.util.Set;
 import org.json.JSONException;
@@ -61,9 +65,6 @@
 
   private boolean mUseCallableUri;
 
-  private ContactListItemView.PhotoPosition mPhotoPosition =
-      ContactListItemView.getDefaultPhotoPosition(false /* normal/non opposite */);
-
   private final Set<OnLoadFinishedListener> mLoadFinishedListeners = new ArraySet<>();
 
   private CursorReranker mCursorReranker;
@@ -71,7 +72,7 @@
   public PhoneNumberPickerFragment() {
     setQuickContactEnabled(false);
     setPhotoLoaderEnabled(true);
-    setSectionHeaderDisplayEnabled(true);
+    setSectionHeaderDisplayEnabled(false);
     setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);
 
     // Show nothing instead of letting caller Activity show something.
@@ -85,17 +86,33 @@
    */
   @Override
   public void onVideoCallIconClicked(int position) {
+    Logger.get(getContext()).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_SEARCH);
     callNumber(position, true /* isVideoCall */);
   }
 
   @Override
+  public void onLightbringerIconClicked(int position) {
+    PerformanceReport.stopRecording();
+    String phoneNumber = getPhoneNumber(position);
+    Intent intent =
+        LightbringerComponent.get(getContext())
+            .getLightbringer()
+            .getIntent(getContext(), phoneNumber);
+    // DialtactsActivity.ACTIVITY_REQUEST_CODE_LIGHTBRINGER
+    // Cannot reference because of cyclic dependencies
+    Logger.get(getContext())
+        .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH);
+    int dialactsActivityRequestCode = 3;
+    getActivity().startActivityForResult(intent, dialactsActivityRequestCode);
+  }
+
+  @Override
   public void onCallAndShareIconClicked(int position) {
     // Required because of cyclic dependencies of everything depending on contacts/common.
     String componentName = "com.android.dialer.callcomposer.CallComposerActivity";
     Intent intent = new Intent();
     intent.setComponent(new ComponentName(getContext(), componentName));
-    CallComposerContact contact =
-        ((PhoneNumberListAdapter) getAdapter()).getCallComposerContact(position);
+    DialerContact contact = ((PhoneNumberListAdapter) getAdapter()).getDialerContact(position);
     ProtoParsers.put(intent, "CALL_COMPOSER_CONTACT", contact);
     startActivity(intent);
   }
@@ -218,6 +235,7 @@
       cacheContactInfo(position);
       CallSpecificAppData callSpecificAppData =
           CallSpecificAppData.newBuilder()
+              .setAllowAssistedDialing(true)
               .setCallInitiationType(getCallInitiationType(true /* isRemoteDirectory */))
               .setPositionOfSelectedSearchResult(position)
               .setCharactersInSearchString(getQueryString() == null ? 0 : getQueryString().length())
@@ -261,13 +279,13 @@
   @MainThread
   public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
     Assert.isMainThread();
-    // TODO: define and verify behavior for "Nearby places", corp directories,
+    // TODO(strongarm): define and verify behavior for "Nearby places", corp directories,
     // and dividers listed in UI between these categories
     if (mCursorReranker != null
         && data != null
         && !data.isClosed()
         && data.getCount() > 0
-        && loader.getId() != -1) { // skip invalid directory ID of -1
+        && loader.getId() == 0) { // only re-rank if a suggestions loader with id of 0.
       data = mCursorReranker.rerankCursor(data);
     }
     super.onLoadFinished(loader, data);
@@ -320,7 +338,27 @@
   @Override
   public void onCapabilitiesUpdated() {
     if (getAdapter() != null) {
-      getAdapter().notifyDataSetChanged();
+      EnrichedCallManager manager =
+          EnrichedCallComponent.get(getContext()).getEnrichedCallManager();
+      Listener listener = ((PhoneNumberListAdapter) getAdapter()).getListener();
+
+      for (int i = 0; i < getListView().getChildCount(); i++) {
+        if (!(getListView().getChildAt(i) instanceof ContactListItemView)) {
+          continue;
+        }
+
+        // Since call and share is the lowest priority call to action, if any others are set,
+        // do not reset the call to action. Also do not set the call and share call to action if
+        // the number doesn't support call composer.
+        ContactListItemView view = (ContactListItemView) getListView().getChildAt(i);
+        if (view.getCallToAction() != ContactListItemView.NONE
+            || view.getPhoneNumber() == null
+            || manager.getCapabilities(view.getPhoneNumber()) == null
+            || !manager.getCapabilities(view.getPhoneNumber()).isCallComposerCapable()) {
+          continue;
+        }
+        view.setCallToAction(ContactListItemView.CALL_AND_SHARE, listener, view.getPosition());
+      }
     }
   }
 
@@ -360,12 +398,6 @@
     if (!isSearchMode() && mFilter != null) {
       adapter.setFilter(mFilter);
     }
-
-    setPhotoPosition(adapter);
-  }
-
-  protected void setPhotoPosition(ContactEntryListAdapter adapter) {
-    ((PhoneNumberListAdapter) adapter).setPhotoPosition(mPhotoPosition);
   }
 
   @Override
@@ -389,15 +421,6 @@
     updateFilterHeaderView();
   }
 
-  public void setPhotoPosition(ContactListItemView.PhotoPosition photoPosition) {
-    mPhotoPosition = photoPosition;
-
-    final PhoneNumberListAdapter adapter = (PhoneNumberListAdapter) getAdapter();
-    if (adapter != null) {
-      adapter.setPhotoPosition(photoPosition);
-    }
-  }
-
   /**
    * @param isRemoteDirectory {@code true} if the call was initiated using a contact/phone number
    *     not in the local contacts database
diff --git a/java/com/android/contacts/common/list/ViewPagerTabs.java b/java/com/android/contacts/common/list/ViewPagerTabs.java
index 34f623e..1e6cf13 100644
--- a/java/com/android/contacts/common/list/ViewPagerTabs.java
+++ b/java/com/android/contacts/common/list/ViewPagerTabs.java
@@ -33,7 +33,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.android.contacts.common.R;
-import com.android.dialer.compat.CompatUtils;
 
 /**
  * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
@@ -43,7 +42,13 @@
  */
 public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnPageChangeListener {
 
-  private static final ViewOutlineProvider VIEW_BOUNDS_OUTLINE_PROVIDER;
+  private static final ViewOutlineProvider VIEW_BOUNDS_OUTLINE_PROVIDER =
+      new ViewOutlineProvider() {
+        @Override
+        public void getOutline(View view, Outline outline) {
+          outline.setRect(0, 0, view.getWidth(), view.getHeight());
+        }
+      };
   private static final int TAB_SIDE_PADDING_IN_DPS = 10;
   // TODO: This should use <declare-styleable> in the future
   private static final int[] ATTRS =
@@ -54,20 +59,6 @@
         android.R.attr.textAllCaps
       };
 
-  static {
-    if (CompatUtils.isLollipopCompatible()) {
-      VIEW_BOUNDS_OUTLINE_PROVIDER =
-          new ViewOutlineProvider() {
-            @Override
-            public void getOutline(View view, Outline outline) {
-              outline.setRect(0, 0, view.getWidth(), view.getHeight());
-            }
-          };
-    } else {
-      VIEW_BOUNDS_OUTLINE_PROVIDER = null;
-    }
-  }
-
   /**
    * Linearlayout that will contain the TextViews serving as tabs. This is the only child of the
    * parent HorizontalScrollView.
@@ -111,10 +102,8 @@
         new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
     a.recycle();
 
-    if (CompatUtils.isLollipopCompatible()) {
-      // enable shadow casting from view bounds
-      setOutlineProvider(VIEW_BOUNDS_OUTLINE_PROVIDER);
-    }
+    // enable shadow casting from view bounds
+    setOutlineProvider(VIEW_BOUNDS_OUTLINE_PROVIDER);
   }
 
   public void setViewPager(ViewPager viewPager) {
diff --git a/java/com/android/contacts/common/location/CountryDetector.java b/java/com/android/contacts/common/location/CountryDetector.java
deleted file mode 100644
index 7d9e42b..0000000
--- a/java/com/android/contacts/common/location/CountryDetector.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common.location;
-
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.location.Geocoder;
-import android.location.Location;
-import android.location.LocationManager;
-import android.preference.PreferenceManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import com.android.dialer.util.PermissionsUtil;
-import java.util.Locale;
-
-/**
- * This class is used to detect the country where the user is. It is a simplified version of the
- * country detector service in the framework. The sources of country location are queried in the
- * following order of reliability:
- *
- * <ul>
- * <li>Mobile network
- * <li>Location manager
- * <li>SIM's country
- * <li>User's default locale
- * </ul>
- *
- * As far as possible this class tries to replicate the behavior of the system's country detector
- * service: 1) Order in priority of sources of country location 2) Mobile network information
- * provided by CDMA phones is ignored 3) Location information is updated every 12 hours (instead of
- * 24 hours in the system) 4) Location updates only uses the {@link
- * LocationManager#PASSIVE_PROVIDER} to avoid active use of the GPS 5) If a location is successfully
- * obtained and geocoded, we never fall back to use of the SIM's country (for the system, the
- * fallback never happens without a reboot) 6) Location is not used if the device does not implement
- * a {@link android.location.Geocoder}
- */
-public class CountryDetector {
-
-  public static final String KEY_PREFERENCE_TIME_UPDATED = "preference_time_updated";
-  public static final String KEY_PREFERENCE_CURRENT_COUNTRY = "preference_current_country";
-  private static final String TAG = "CountryDetector";
-  // Wait 12 hours between updates
-  private static final long TIME_BETWEEN_UPDATES_MS = 1000L * 60 * 60 * 12;
-  // Minimum distance before an update is triggered, in meters. We don't need this to be too
-  // exact because all we care about is what country the user is in.
-  private static final long DISTANCE_BETWEEN_UPDATES_METERS = 5000;
-  private static CountryDetector sInstance;
-  private final TelephonyManager mTelephonyManager;
-  private final LocationManager mLocationManager;
-  private final LocaleProvider mLocaleProvider;
-  // Used as a default country code when all the sources of country data have failed in the
-  // exceedingly rare event that the device does not have a default locale set for some reason.
-  private static final String DEFAULT_COUNTRY_ISO = "US";
-  private final Context mContext;
-
-  private CountryDetector(Context context) {
-    this(
-        context,
-        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE),
-        (LocationManager) context.getSystemService(Context.LOCATION_SERVICE),
-        new LocaleProvider());
-  }
-
-  private CountryDetector(
-      Context context,
-      TelephonyManager telephonyManager,
-      LocationManager locationManager,
-      LocaleProvider localeProvider) {
-    mTelephonyManager = telephonyManager;
-    mLocationManager = locationManager;
-    mLocaleProvider = localeProvider;
-    mContext = context;
-
-    registerForLocationUpdates(context, mLocationManager);
-  }
-
-  public static void registerForLocationUpdates(Context context, LocationManager locationManager) {
-    if (!PermissionsUtil.hasLocationPermissions(context)) {
-      Log.w(TAG, "No location permissions, not registering for location updates.");
-      return;
-    }
-
-    if (!Geocoder.isPresent()) {
-      // Certain devices do not have an implementation of a geocoder - in that case there is
-      // no point trying to get location updates because we cannot retrieve the country based
-      // on the location anyway.
-      return;
-    }
-    final Intent activeIntent = new Intent(context, LocationChangedReceiver.class);
-    final PendingIntent pendingIntent =
-        PendingIntent.getBroadcast(context, 0, activeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-    locationManager.requestLocationUpdates(
-        LocationManager.PASSIVE_PROVIDER,
-        TIME_BETWEEN_UPDATES_MS,
-        DISTANCE_BETWEEN_UPDATES_METERS,
-        pendingIntent);
-  }
-
-  /**
-   * Returns the instance of the country detector. {@link #initialize(Context)} must have been
-   * called previously.
-   *
-   * @return the initialized country detector.
-   */
-  public static synchronized CountryDetector getInstance(Context context) {
-    if (sInstance == null) {
-      sInstance = new CountryDetector(context.getApplicationContext());
-    }
-    return sInstance;
-  }
-
-  /** Factory method for {@link CountryDetector} that allows the caller to provide mock objects. */
-  public CountryDetector getInstanceForTest(
-      Context context,
-      TelephonyManager telephonyManager,
-      LocationManager locationManager,
-      LocaleProvider localeProvider,
-      Geocoder geocoder) {
-    return new CountryDetector(context, telephonyManager, locationManager, localeProvider);
-  }
-
-  public String getCurrentCountryIso() {
-    String result = null;
-    if (isNetworkCountryCodeAvailable()) {
-      result = getNetworkBasedCountryIso();
-    }
-    if (TextUtils.isEmpty(result)) {
-      result = getLocationBasedCountryIso();
-    }
-    if (TextUtils.isEmpty(result)) {
-      result = getSimBasedCountryIso();
-    }
-    if (TextUtils.isEmpty(result)) {
-      result = getLocaleBasedCountryIso();
-    }
-    if (TextUtils.isEmpty(result)) {
-      result = DEFAULT_COUNTRY_ISO;
-    }
-    return result.toUpperCase(Locale.US);
-  }
-
-  /** @return the country code of the current telephony network the user is connected to. */
-  private String getNetworkBasedCountryIso() {
-    return mTelephonyManager.getNetworkCountryIso();
-  }
-
-  /** @return the geocoded country code detected by the {@link LocationManager}. */
-  private String getLocationBasedCountryIso() {
-    if (!Geocoder.isPresent() || !PermissionsUtil.hasLocationPermissions(mContext)) {
-      return null;
-    }
-    final SharedPreferences sharedPreferences =
-        PreferenceManager.getDefaultSharedPreferences(mContext);
-    return sharedPreferences.getString(KEY_PREFERENCE_CURRENT_COUNTRY, null);
-  }
-
-  /** @return the country code of the SIM card currently inserted in the device. */
-  private String getSimBasedCountryIso() {
-    return mTelephonyManager.getSimCountryIso();
-  }
-
-  /** @return the country code of the user's currently selected locale. */
-  private String getLocaleBasedCountryIso() {
-    Locale defaultLocale = mLocaleProvider.getDefaultLocale();
-    if (defaultLocale != null) {
-      return defaultLocale.getCountry();
-    }
-    return null;
-  }
-
-  private boolean isNetworkCountryCodeAvailable() {
-    // On CDMA TelephonyManager.getNetworkCountryIso() just returns the SIM's country code.
-    // In this case, we want to ignore the value returned and fallback to location instead.
-    return mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM;
-  }
-
-  /**
-   * Class that can be used to return the user's default locale. This is in its own class so that it
-   * can be mocked out.
-   */
-  public static class LocaleProvider {
-
-    public Locale getDefaultLocale() {
-      return Locale.getDefault();
-    }
-  }
-
-  public static class LocationChangedReceiver extends BroadcastReceiver {
-
-    @Override
-    public void onReceive(final Context context, Intent intent) {
-      if (!intent.hasExtra(LocationManager.KEY_LOCATION_CHANGED)) {
-        return;
-      }
-
-      final Location location =
-          (Location) intent.getExtras().get(LocationManager.KEY_LOCATION_CHANGED);
-
-      UpdateCountryService.updateCountry(context, location);
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/location/UpdateCountryService.java b/java/com/android/contacts/common/location/UpdateCountryService.java
deleted file mode 100644
index f23e09e..0000000
--- a/java/com/android/contacts/common/location/UpdateCountryService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2016 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.contacts.common.location;
-
-import android.app.IntentService;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.location.Address;
-import android.location.Geocoder;
-import android.location.Location;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Service used to perform asynchronous geocoding from within a broadcast receiver. Given a {@link
- * Location}, convert it into a country code, and save it in shared preferences.
- */
-public class UpdateCountryService extends IntentService {
-
-  private static final String TAG = UpdateCountryService.class.getSimpleName();
-
-  private static final String ACTION_UPDATE_COUNTRY = "saveCountry";
-
-  private static final String KEY_INTENT_LOCATION = "location";
-
-  public UpdateCountryService() {
-    super(TAG);
-  }
-
-  public static void updateCountry(Context context, Location location) {
-    final Intent serviceIntent = new Intent(context, UpdateCountryService.class);
-    serviceIntent.setAction(ACTION_UPDATE_COUNTRY);
-    serviceIntent.putExtra(UpdateCountryService.KEY_INTENT_LOCATION, location);
-    context.startService(serviceIntent);
-  }
-
-  @Override
-  protected void onHandleIntent(Intent intent) {
-    if (intent == null) {
-      Log.d(TAG, "onHandleIntent: could not handle null intent");
-      return;
-    }
-    if (ACTION_UPDATE_COUNTRY.equals(intent.getAction())) {
-      final Location location = intent.getParcelableExtra(KEY_INTENT_LOCATION);
-      final String country = getCountryFromLocation(getApplicationContext(), location);
-
-      if (country == null) {
-        return;
-      }
-
-      final SharedPreferences prefs =
-          PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-
-      final Editor editor = prefs.edit();
-      editor.putLong(CountryDetector.KEY_PREFERENCE_TIME_UPDATED, System.currentTimeMillis());
-      editor.putString(CountryDetector.KEY_PREFERENCE_CURRENT_COUNTRY, country);
-      editor.commit();
-    }
-  }
-
-  /**
-   * Given a {@link Location}, return a country code.
-   *
-   * @return the ISO 3166-1 two letter country code
-   */
-  private String getCountryFromLocation(Context context, Location location) {
-    final Geocoder geocoder = new Geocoder(context);
-    String country = null;
-    try {
-      double latitude = location.getLatitude();
-      // Latitude has to be between 90 and -90 (latitude of north and south poles wrt equator)
-      if (latitude <= 90 && latitude >= -90) {
-        final List<Address> addresses =
-            geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
-        if (addresses != null && addresses.size() > 0) {
-          country = addresses.get(0).getCountryCode();
-        }
-      } else {
-        Log.w(TAG, "Invalid latitude");
-      }
-    } catch (IOException e) {
-      Log.w(TAG, "Exception occurred when getting geocoded country from location");
-    }
-    return country;
-  }
-}
diff --git a/java/com/android/contacts/common/model/ContactLoader.java b/java/com/android/contacts/common/model/ContactLoader.java
index 55464b1..d2c7577 100644
--- a/java/com/android/contacts/common/model/ContactLoader.java
+++ b/java/com/android/contacts/common/model/ContactLoader.java
@@ -44,10 +44,10 @@
 import com.android.contacts.common.model.dataitem.PhotoDataItem;
 import com.android.contacts.common.util.Constants;
 import com.android.contacts.common.util.ContactLoaderUtils;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.UriUtils;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -522,6 +522,7 @@
     cursorColumnToContentValues(cursor, cv, ContactQuery.TIMES_USED);
     cursorColumnToContentValues(cursor, cv, ContactQuery.LAST_TIME_USED);
     cursorColumnToContentValues(cursor, cv, ContactQuery.CARRIER_PRESENCE);
+
     return cv;
   }
 
@@ -730,6 +731,7 @@
         intent.setClassName(servicePackageName, serviceName);
         intent.setAction(Intent.ACTION_VIEW);
         intent.setDataAndType(uri, RawContacts.CONTENT_ITEM_TYPE);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         try {
           context.startService(intent);
         } catch (Exception e) {
diff --git a/java/com/android/contacts/common/model/account/AccountType.java b/java/com/android/contacts/common/model/account/AccountType.java
index 1ae485a..ed0d421 100644
--- a/java/com/android/contacts/common/model/account/AccountType.java
+++ b/java/com/android/contacts/common/model/account/AccountType.java
@@ -25,6 +25,7 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.ContextCompat;
 import android.util.ArrayMap;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -113,7 +114,7 @@
       final PackageManager pm = context.getPackageManager();
       return pm.getDrawable(syncAdapterPackageName, iconRes, null);
     } else if (titleRes != -1) {
-      return context.getResources().getDrawable(iconRes);
+      return ContextCompat.getDrawable(context, iconRes);
     } else {
       return null;
     }
diff --git a/java/com/android/contacts/common/model/account/BaseAccountType.java b/java/com/android/contacts/common/model/account/BaseAccountType.java
index 8e9ba73..ccdad36 100644
--- a/java/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/java/com/android/contacts/common/model/account/BaseAccountType.java
@@ -307,7 +307,7 @@
     DataKind kind =
         addKind(
             new DataKind(Phone.CONTENT_ITEM_TYPE, R.string.phoneLabelsGroup, Weight.PHONE, true));
-    kind.iconAltRes = R.drawable.quantum_ic_message_white_24;
+    kind.iconAltRes = R.drawable.quantum_ic_message_vd_theme_24;
     kind.iconAltDescriptionRes = R.string.sms;
     kind.actionHeader = new PhoneActionInflater();
     kind.actionAltHeader = new PhoneActionAltInflater();
@@ -1228,7 +1228,7 @@
               new PhoneActionInflater(),
               new SimpleInflater(Phone.NUMBER));
 
-      kind.iconAltRes = R.drawable.quantum_ic_message_white_24;
+      kind.iconAltRes = R.drawable.quantum_ic_message_vd_theme_24;
       kind.iconAltDescriptionRes = R.string.sms;
       kind.actionAltHeader = new PhoneActionAltInflater();
 
diff --git a/java/com/android/contacts/common/preference/ContactsPreferences.java b/java/com/android/contacts/common/preference/ContactsPreferences.java
index 7f0d99a..399700e 100644
--- a/java/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/java/com/android/contacts/common/preference/ContactsPreferences.java
@@ -27,6 +27,7 @@
 import android.text.TextUtils;
 import com.android.contacts.common.R;
 import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.dialer.strictmode.DialerStrictMode;
 
 /** Manages user preferences for contacts. */
 public class ContactsPreferences implements OnSharedPreferenceChangeListener {
@@ -69,7 +70,10 @@
   public ContactsPreferences(Context context) {
     mContext = context;
     mHandler = new Handler();
-    mPreferences = mContext.getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);
+    mPreferences =
+        mContext
+            .getApplicationContext()
+            .getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);
     mDefaultAccountKey =
         mContext.getResources().getString(R.string.contact_editor_default_account_key);
     mDefaultAccountSavedKey =
@@ -77,11 +81,11 @@
     maybeMigrateSystemSettings();
   }
 
-  public boolean isSortOrderUserChangeable() {
+  private boolean isSortOrderUserChangeable() {
     return mContext.getResources().getBoolean(R.bool.config_sort_order_user_changeable);
   }
 
-  public int getDefaultSortOrder() {
+  private int getDefaultSortOrder() {
     if (mContext.getResources().getBoolean(R.bool.config_default_sort_order_primary)) {
       return SORT_ORDER_PRIMARY;
     } else {
@@ -103,14 +107,14 @@
     mSortOrder = sortOrder;
     final Editor editor = mPreferences.edit();
     editor.putInt(SORT_ORDER_KEY, sortOrder);
-    editor.commit();
+    DialerStrictMode.bypass(editor::commit);
   }
 
-  public boolean isDisplayOrderUserChangeable() {
+  private boolean isDisplayOrderUserChangeable() {
     return mContext.getResources().getBoolean(R.bool.config_display_order_user_changeable);
   }
 
-  public int getDefaultDisplayOrder() {
+  private int getDefaultDisplayOrder() {
     if (mContext.getResources().getBoolean(R.bool.config_default_display_order_primary)) {
       return DISPLAY_ORDER_PRIMARY;
     } else {
@@ -132,14 +136,14 @@
     mDisplayOrder = displayOrder;
     final Editor editor = mPreferences.edit();
     editor.putInt(DISPLAY_ORDER_KEY, displayOrder);
-    editor.commit();
+    DialerStrictMode.bypass(editor::commit);
   }
 
-  public boolean isDefaultAccountUserChangeable() {
+  private boolean isDefaultAccountUserChangeable() {
     return mContext.getResources().getBoolean(R.bool.config_default_account_user_changeable);
   }
 
-  public String getDefaultAccount() {
+  private String getDefaultAccount() {
     if (!isDefaultAccountUserChangeable()) {
       return mDefaultAccount;
     }
@@ -153,7 +157,7 @@
     return mDefaultAccount;
   }
 
-  public void setDefaultAccount(AccountWithDataSet accountWithDataSet) {
+  private void setDefaultAccount(AccountWithDataSet accountWithDataSet) {
     mDefaultAccount = accountWithDataSet == null ? null : accountWithDataSet.name;
     final Editor editor = mPreferences.edit();
     if (TextUtils.isEmpty(mDefaultAccount)) {
@@ -162,7 +166,7 @@
       editor.putString(mDefaultAccountKey, accountWithDataSet.stringify());
     }
     editor.putBoolean(mDefaultAccountSavedKey, true);
-    editor.commit();
+    DialerStrictMode.bypass(editor::commit);
   }
 
   public void registerChangeListener(ChangeListener listener) {
@@ -252,7 +256,7 @@
 
     if (!mPreferences.contains(mDefaultAccountKey)) {
       final SharedPreferences previousPrefs =
-          PreferenceManager.getDefaultSharedPreferences(mContext);
+          PreferenceManager.getDefaultSharedPreferences(mContext.getApplicationContext());
       final String defaultAccount = previousPrefs.getString(mDefaultAccountKey, null);
       if (!TextUtils.isEmpty(defaultAccount)) {
         final AccountWithDataSet accountWithDataSet =
diff --git a/java/com/android/contacts/common/res/color/popup_menu_color.xml b/java/com/android/contacts/common/res/color/popup_menu_color.xml
deleted file mode 100644
index c52bd5b..0000000
--- a/java/com/android/contacts/common/res/color/popup_menu_color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:alpha="0.5" android:color="#ff000000" android:state_enabled="false"/>
-  <item android:color="#ff000000"/>
-</selector>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_ab_search.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_ab_search.png
deleted file mode 100644
index d86b219..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_ab_search.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_arrow_back_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_arrow_back_24dp.png
deleted file mode 100644
index ddbb2c4..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_arrow_back_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_business_white_120dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_business_white_120dp.png
deleted file mode 100644
index d5942dc..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_business_white_120dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_call_24dp.png
deleted file mode 100644
index 4dc5065..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_close_dk.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_close_dk.png
deleted file mode 100644
index 9695529..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_close_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_create_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_create_24dp.png
deleted file mode 100644
index 540ab4d..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_create_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_group_white_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_group_white_24dp.png
deleted file mode 100644
index 017e4bb..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_group_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_history_white_drawable_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_history_white_drawable_24dp.png
deleted file mode 100644
index 703d30b..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_history_white_drawable_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_info_outline_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_info_outline_24dp.png
deleted file mode 100644
index c7b1113..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_info_outline_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_back.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_back.png
deleted file mode 100644
index deb3a6d..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_back.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_dk.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_dk.png
deleted file mode 100644
index 06bd18f..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_lt.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_lt.png
deleted file mode 100644
index d829d11..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_group_lt.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_overflow_lt.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_overflow_lt.png
deleted file mode 100644
index 1ba1295..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_overflow_lt.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_dk.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_dk.png
deleted file mode 100644
index 5ff3ac5..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_lt.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_lt.png
deleted file mode 100644
index b4ebfc7..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_person_lt.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_remove_field_holo_light.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_remove_field_holo_light.png
deleted file mode 100644
index 03fd2fb..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_remove_field_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_dk.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_dk.png
deleted file mode 100644
index e8cb0f5..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_holo_light.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_holo_light.png
deleted file mode 100644
index 4513796..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_lt.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_lt.png
deleted file mode 100644
index 1c9bb81..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_menu_star_lt.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_person_24dp.png
deleted file mode 100644
index 56708b0..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_person_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_rx_videocam.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_rx_videocam.png
deleted file mode 100644
index ccdda67..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_rx_videocam.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_tx_videocam.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_tx_videocam.png
deleted file mode 100644
index 603ddc8..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_tx_videocam.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_videocam.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_videocam.png
deleted file mode 100644
index 97905c9..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_videocam.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_voicemail_avatar.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_voicemail_avatar.png
deleted file mode 100644
index 2121878..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_voicemail_avatar.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 4ea7afa..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_background_holo.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_background_holo.9.png
deleted file mode 100644
index cddf9be..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_longpressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_longpressed_holo_light.9.png
deleted file mode 100644
index e9afcc9..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_longpressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_pressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 2054530..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index a0f1756..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/list_title_holo.9.png b/java/com/android/contacts/common/res/drawable-hdpi/list_title_holo.9.png
deleted file mode 100644
index ae93717..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_focused_holo.9.png
deleted file mode 100644
index 4139942..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 569d28f..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_title_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_title_holo.9.png
deleted file mode 100644
index 5ec4c96..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-hdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_focused_holo.9.png
deleted file mode 100644
index 4139942..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 065ff62..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_title_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_title_holo.9.png
deleted file mode 100644
index 013d5e7..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-mdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 947f03c..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 6d09d72..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png
deleted file mode 100644
index 63c7456..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_focused_holo.9.png
deleted file mode 100644
index 4139942..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index af58554..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_title_holo.9.png b/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_title_holo.9.png
deleted file mode 100644
index cb801ac..0000000
--- a/java/com/android/contacts/common/res/drawable-ldrtl-xhdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 3bf8e03..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-mdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/list_longpressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-mdpi/list_longpressed_holo_light.9.png
deleted file mode 100644
index 3226ab7..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/list_longpressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/list_pressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-mdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 061904c..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 1d9371d..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-sw600dp-hdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-sw600dp-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 046b24a..0000000
--- a/java/com/android/contacts/common/res/drawable-sw600dp-hdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-sw600dp-mdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-sw600dp-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 1ff3373..0000000
--- a/java/com/android/contacts/common/res/drawable-sw600dp-mdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-sw600dp-xhdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-sw600dp-xhdpi/list_activated_holo.9.png
deleted file mode 100644
index 2eb7c7e..0000000
--- a/java/com/android/contacts/common/res/drawable-sw600dp-xhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-xhdpi/list_activated_holo.9.png
deleted file mode 100644
index eda10e6..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-xhdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/list_longpressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-xhdpi/list_longpressed_holo_light.9.png
deleted file mode 100644
index 5532e88..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/list_longpressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/list_pressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-xhdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index f4af926..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/list_section_divider_holo_custom.9.png b/java/com/android/contacts/common/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 8fb0636..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/list_activated_holo.9.png b/java/com/android/contacts/common/res/drawable-xxhdpi/list_activated_holo.9.png
deleted file mode 100644
index 52c00dd..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/list_focused_holo.9.png b/java/com/android/contacts/common/res/drawable-xxhdpi/list_focused_holo.9.png
deleted file mode 100644
index 3e4ca68..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/list_longpressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-xxhdpi/list_longpressed_holo_light.9.png
deleted file mode 100644
index 230d649..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/list_longpressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/list_pressed_holo_light.9.png b/java/com/android/contacts/common/res/drawable-xxhdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 1352a17..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable/ic_back_arrow.xml b/java/com/android/contacts/common/res/drawable/ic_back_arrow.xml
deleted file mode 100644
index ecf704e..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_back_arrow.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/quantum_ic_arrow_back_white_24"
-    android:tint="@color/actionbar_icon_color"/>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/ic_call_and_share.xml b/java/com/android/contacts/common/res/drawable/ic_call_and_share.xml
deleted file mode 100644
index be0cdd3..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_call_and_share.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/ic_phone_attach"
-    android:tint="@color/search_video_call_icon_tint"
-    android:background="?attr/selectableItemBackgroundBorderless"/>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/ic_more_vert.xml b/java/com/android/contacts/common/res/drawable/ic_more_vert.xml
deleted file mode 100644
index fcc3d9e..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_more_vert.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24.0"
-  android:viewportWidth="24.0"
-  android:width="24dp">
-  <path
-    android:fillColor="#FF000000"
-    android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
-</vector>
diff --git a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml b/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
deleted file mode 100644
index c2538cf..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_person_add_tinted_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:autoMirrored="true"
-  android:src="@drawable/quantum_ic_person_add_white_24"
-  android:tint="@color/actionbar_icon_color"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml b/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
deleted file mode 100644
index 476212d..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_search_add_contact.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:autoMirrored="true"
-  android:src="@drawable/quantum_ic_person_add_white_24"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_search_video_call.xml b/java/com/android/contacts/common/res/drawable/ic_search_video_call.xml
deleted file mode 100644
index 0fe0367..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_search_video_call.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:autoMirrored="true"
-  android:src="@drawable/quantum_ic_videocam_white_24"
-  android:tint="@color/search_video_call_icon_tint"
-  android:background="?attr/selectableItemBackgroundBorderless"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_work_profile.xml b/java/com/android/contacts/common/res/drawable/ic_work_profile.xml
index fc21100..4452885 100644
--- a/java/com/android/contacts/common/res/drawable/ic_work_profile.xml
+++ b/java/com/android/contacts/common/res/drawable/ic_work_profile.xml
@@ -1,16 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="16dp"
-  android:viewportHeight="48"
-  android:viewportWidth="48"
-  android:width="16dp">
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="16.0"
+        android:viewportHeight="16.0">
 
 
-  <path
-    android:fillColor="#757575"
-    android:pathData="M28 33h-8v-3H6v8c0 2.2 1.8 4 4 4h28c2.2 0 4-1.8
-4-4v-8H28v3zm12-21h-7V9l-3-3H18l-3 3.1V12H8c-2.2 0-4 1.8-4 4v8c0 2.2 1.8 4 4
-4h12v-3h8v3h12c2.2 0 4-1.8 4-4v-8c0-2.2-1.8-4-4-4zm-10 0H18V9h12v3z"/>
-  <path
-    android:pathData="M0 0h48v48H0z"/>
+    <path
+        android:pathData="M13.33,4h-2.67V2.67c0,-0.74 -0.59,-1.33 -1.33,-1.33H6.67c-0.74,0 -1.33,0.59 -1.33,1.33V4H2.67C1.93,4 1.34,4.59 1.34,5.33l-0.01,7.33c0,0.74 0.59,1.33 1.33,1.33h10.67c0.74,0 1.33,-0.59 1.33,-1.33V5.33C14.67,4.59 14.07,4 13.33,4zM8,10c-0.73,0 -1.33,-0.6 -1.33,-1.33S7.27,7.33 8,7.33s1.33,0.6 1.33,1.33S8.73,10 8,10zM9.33,4H6.67V2.67h2.67V4z"
+        android:fillColor="#757575"/>
 </vector>
diff --git a/java/com/android/contacts/common/res/drawable/list_selector_background_transition_holo_light.xml b/java/com/android/contacts/common/res/drawable/list_selector_background_transition_holo_light.xml
deleted file mode 100644
index 35fff99..0000000
--- a/java/com/android/contacts/common/res/drawable/list_selector_background_transition_holo_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/list_pressed_holo_light"/>
-  <item android:drawable="@drawable/list_longpressed_holo_light"/>
-</transition>
diff --git a/java/com/android/contacts/common/res/layout/account_selector_list_item.xml b/java/com/android/contacts/common/res/layout/account_selector_list_item.xml
deleted file mode 100644
index 587626e..0000000
--- a/java/com/android/contacts/common/res/layout/account_selector_list_item.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="?android:attr/listPreferredItemHeight"
-  android:orientation="horizontal">
-  <ImageView
-    android:id="@android:id/icon"
-    android:layout_width="@dimen/detail_network_icon_size"
-    android:layout_height="@dimen/detail_network_icon_size"
-    android:layout_margin="16dip"
-    android:layout_gravity="center_vertical"/>
-
-  <LinearLayout
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginLeft="8dp"
-    android:layout_gravity="center_vertical"
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@android:id/text1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="8dip"
-      android:layout_marginRight="8dip"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <TextView
-      android:id="@android:id/text2"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="8dip"
-      android:layout_marginRight="8dip"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:textAppearance="?android:attr/textAppearanceSmall"
-      android:textColor="?android:attr/textColorSecondary"/>
-  </LinearLayout>
-</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/account_selector_list_item_condensed.xml b/java/com/android/contacts/common/res/layout/account_selector_list_item_condensed.xml
deleted file mode 100644
index 3382116..0000000
--- a/java/com/android/contacts/common/res/layout/account_selector_list_item_condensed.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="?android:attr/listPreferredItemHeight"
-  android:orientation="horizontal">
-  <ImageView
-    android:id="@android:id/icon"
-    android:layout_width="@dimen/detail_network_icon_size"
-    android:layout_height="@dimen/detail_network_icon_size"
-    android:layout_margin="24dip"
-    android:layout_gravity="center_vertical"/>
-
-  <LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_gravity="center_vertical"
-    android:orientation="vertical">
-
-    <TextView
-      android:id="@android:id/text1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="8dip"
-      android:layout_marginRight="8dip"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <TextView
-      android:id="@android:id/text2"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="8dip"
-      android:layout_marginRight="8dip"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:textAppearance="?android:attr/textAppearanceSmall"
-      android:textColor="?android:attr/textColorSecondary"/>
-  </LinearLayout>
-</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/call_subject_history.xml b/java/com/android/contacts/common/res/layout/call_subject_history.xml
deleted file mode 100644
index 733f1d8..0000000
--- a/java/com/android/contacts/common/res/layout/call_subject_history.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/background"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@android:color/transparent">
-
-  <ListView
-    android:id="@+id/subject_list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:background="@color/call_subject_history_background"
-    android:divider="@null"
-    android:elevation="8dp"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml
index a33b2ac..df8e8d2 100644
--- a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml
+++ b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml
@@ -129,7 +129,7 @@
           android:layout_height="25dp"
           android:layout_alignParentStart="true"
           android:layout_centerVertical="true"
-          android:src="@drawable/quantum_ic_history_white_24"
+          android:src="@drawable/quantum_ic_history_vd_theme_24"
           android:tint="@color/call_subject_history_icon"/>
 
         <TextView
diff --git a/java/com/android/contacts/common/res/layout/list_separator.xml b/java/com/android/contacts/common/res/layout/list_separator.xml
deleted file mode 100644
index ab60605..0000000
--- a/java/com/android/contacts/common/res/layout/list_separator.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-<TextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/title"
-  android:textStyle="bold"
-  android:paddingTop="16dip"
-  android:paddingBottom="15dip"
-  android:paddingStart="16dip"
-  android:paddingEnd="16dip"
-  android:paddingLeft="16dip"
-  android:paddingRight="16dip"
-  android:textColor="@color/frequently_contacted_title_color"
-  android:textSize="@dimen/frequently_contacted_title_text_size"/>
diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
index fa16083..7192eb0 100644
--- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
+++ b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
@@ -29,7 +29,7 @@
     android:layout_margin="@dimen/search_box_navigation_icon_margin"
     android:background="?attr/selectableItemBackgroundBorderless"
     android:contentDescription="@string/action_menu_back_from_search"
-    android:src="@drawable/ic_back_arrow"
+    android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
     android:tint="@color/contactscommon_actionbar_background_color"/>
 
   <EditText
@@ -56,7 +56,7 @@
     android:background="?attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:contentDescription="@string/description_clear_search"
-    android:src="@drawable/quantum_ic_close_white_24"
+    android:src="@drawable/quantum_ic_close_vd_theme_24"
     android:tint="@color/searchbox_icon_tint"/>
 
 </LinearLayout>
diff --git a/java/com/android/contacts/common/res/values-af/strings.xml b/java/com/android/contacts/common/res/values-af/strings.xml
index 52e612d..5d81218 100644
--- a/java/com/android/contacts/common/res/values-af/strings.xml
+++ b/java/com/android/contacts/common/res/values-af/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teks gekopieer"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopieer na knipbord"</string>
     <string name="call_custom" msgid="3041673234638990874">"Bel <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Bel huis"</string>
     <string name="call_mobile" msgid="967589404494150813">"Bel selfoon"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Bel werkroeper"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Bel <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Bel MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Bel)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS huis"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS selfoon"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS werkroeper"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Boodskap)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vee gereeld-gekontaktes uit?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Jy gaan die gereeld gekontak-lys in die Kontakte- en Foon-program uitvee en e-posprogramme dwing om jou adresvoorkeure van nuuts af te leer."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Vee tans gereeld-gekontaktes uit..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Weg"</string>
     <string name="status_busy" msgid="5990832098713248503">"Besig"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Topvoorgestel"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ander"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Gids"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Werkgids"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakte"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Voorstelle"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ek"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Soek tans…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Meer as <xliff:g id="COUNT">%d</xliff:g> gevind."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Geen kontakte nie"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> gevind</item>
-      <item quantity="one">1 gevind</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Vinnige kontak vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Geen naam nie)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Gereeld gebel"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Gereeld gekontak"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Bekyk kontak"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakte met foonnommers"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Werkprofielkontakte"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-pos <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-pos"</string>
     <string name="postal_street" msgid="6918171741240802474">"Straat"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Posbus"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Buurt"</string>
     <string name="postal_city" msgid="8674569121430005628">"Stad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Staat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poskode"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Klets met ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Klets met Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Klets"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"vee uit"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Vou naamvelde uit of in"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Vou fonetiese naamvelde uit of in"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakte"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Klaar"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Kanselleer"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakte in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakte in gepasmaakte aansig"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Enkel kontak"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Stoor ingevoerde kontakte in:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Voer van SIM-kaart af in"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Voer in vanaf SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Voer in vanaf SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Voer in vanaf .vcf-lêer"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Kanselleer invoer van <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Kanselleer uitvoer van <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Kon nie vCard invoer/uitvoer kanselleer nie"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Onbekende fout."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Kon nie \"<xliff:g id="FILE_NAME">%s</xliff:g>\" oopmaak nie: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Kon nie die uitvoerder aktiveer nie: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Daar is geen uitvoerbare kontak nie."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Jy het \'n vereiste toestemming gedeaktiveer."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"\'n Fout het voorgekom tydens uitvoer: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Vereiste lêernaam is te lank (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/U-fout"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nie genoeg geheue nie. Die lêer is dalk te groot."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Kon nie vCard ontleed nie weens onverwagte rede."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Die formaat word nie ondersteun nie."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Kon nie meta-inligting van gegewe vCard-lêer(s) versamel nie."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Een of meer lêers kon nie ingevoer word nie (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Klaar met uitvoer van <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Het kontakte klaar uitgevoer."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontakte is klaar uitgevoer; klik die kennisgewing om kontakte te deel."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tik om kontakte te deel."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Uitvoer van <xliff:g id="FILENAME">%s</xliff:g> is gekanselleer."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Voer kontakdata uit"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontakdata word tans uitgevoer."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Kon nie databasis-inligting kry nie"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Daar is geen kontakte om uit te voer nie. As jy kontakte op jou toestel het, sal sommige dataverskaffers dalk nie toelaat dat die toestel se kontakte uitgevoer word nie."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Die vCard-opsteller het nie behoorlik begin nie."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Kon nie uitvoer nie"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Die kontakdata is nie uitgevoer nie.\nRede: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Voer tans <xliff:g id="NAME">%s</xliff:g> in"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Kon nie vCard-data lees nie"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lees van vCard-data gekanselleer"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Klaar met invoer van vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Invoer van <xliff:g id="FILENAME">%s</xliff:g> gekanselleer"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> sal binnekort ingevoer word."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Die lêer sal binnekort ingevoer word."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard invoerversoek is verwerp. Probeer asseblief later weer."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> sal binnekort uitgevoer word."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Die lêer sal binnekort uitgevoer word."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakte sal binnekort uitgevoer word."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard uitvoerversoek is verwerp. Probeer asseblief later weer."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontak"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Kas tans vCard(s) na die plaaslike tydelike berging. Die werklike invoer sal binnekort begin."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Kon nie vCard invoer nie."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontak ontvang via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Voer kontakte uit?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Kas tans"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Voer <xliff:g id="TOTAL_NUMBER">%s</xliff:g><xliff:g id="CURRENT_NUMBER">%s</xliff:g> tans in: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Voer uit na .vcf-lêer"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sorteer volgens"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Voornaam"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Van"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Naamformaat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Voornaam eerste"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Van eerste"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Verstekrekening vir nuwe kontakte"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinkroniseer kontakmetadata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Meer oor Kontakte"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Instellings"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Deel sigbare kontakte"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Kon nie sigbare kontakte deel nie."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Deel gunstelingkontakte"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Deel alle kontakte"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kon nie kontakte deel nie."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Voer kontakte in/uit"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Voer kontakte in"</string>
-    <string name="share_error" msgid="5642622973966851784">"Hierdie kontak kan nie gedeel word nie."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Daar is geen kontakte om te deel nie."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Soek"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Vind kontakte"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Gunstelinge"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Geen kontakte nie."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Geen sigbare kontakte nie."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Geen gunstelinge nie"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Geen kontakte in <xliff:g id="NAME">%s</xliff:g> nie"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Vee dikwels-gebruiktes uit"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Kies SIM-kaart"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Bestuur rekeninge"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Voer in/uit"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"hou op soek"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Vee soektog uit"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opsies vir wys van kontakte"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Rekening"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Gebruik dit altyd vir oproepe"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Bel met"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Tik \'n nota om saam met oproep te stuur …"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"STUUR EN BEL"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-oortjie"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-oortjie <xliff:g id="COUNT_3">%2$d</xliff:g> ongelese items. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-oortjie <xliff:g id="COUNT_1">%2$d</xliff:g> ongelese item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Bouweergawe"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Oopbronlisensies"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Lisensiebesonderhede van oopbronsagteware"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privaatheidsbeleid"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Diensbepalings"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Oopbronlisensies"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Kon nie die URL oopmaak nie."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video-oproep"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Deel en bel"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-am/strings.xml b/java/com/android/contacts/common/res/values-am/strings.xml
index 0283fbb..71399fa 100644
--- a/java/com/android/contacts/common/res/values-am/strings.xml
+++ b/java/com/android/contacts/common/res/values-am/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"ፅሁፍ ገልብጧል"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ወደ ቅንጥብ ሰሌዳ ገልብጥ"</string>
     <string name="call_custom" msgid="3041673234638990874">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ይደውሉ"</string>
     <string name="call_home" msgid="125893483593803791">"ለቤት ይደውሉ"</string>
     <string name="call_mobile" msgid="967589404494150813">"ለተንቀሳቃሽ ስልክ ይደውሉ"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ለየሥራ ጥሪ ምልክት ማድረጊያ ይደውሉ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ይደውሉ"</string>
     <string name="call_mms" msgid="4958811711741872901">"ለኤም ኤም ኤስ ይደውሉ"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ጥሪ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ጽሑፍ ይላኩ"</string>
     <string name="sms_home" msgid="3527719551060295243">"ለቤት ጽሑፍ ይላኩ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ለተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ለሥራ ምልክት ማድረጊያ ጽሑፍ ይላኩ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ጽሑፍ ይላኩ"</string>
     <string name="sms_mms" msgid="5187888900503248542">"ለኤም ኤም ኤስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (መልዕክት)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"በተደጋጋሚ የተገኙ ይጽዱ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"በእውቂያዎች እና በስልክ መተግበሪያዎች ውስጥ በተደጋጋሚ ያገኟቸውን ዝርዝር አጽድተው የኢሜይል መተግበሪያዎች ምርጫዎችዎን ከባዶ ተነስተው እንዲያውቁ ያስገድዱዋቸዋል።"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"በተደጋጋሚ የተገኙትን በማጽዳት ላይ…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ወጣ ብሏል"</string>
     <string name="status_busy" msgid="5990832098713248503">"ተይዟል"</string>
     <string name="contactsList" msgid="8806067891419291513">"እውቅያዎች"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"በብዛት የተጠቆሙ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ሌላ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ማውጫ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"የሥራ ስልክ ማውጫ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ሁሉም እውቅያዎች"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ጥቆማዎች"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"እኔ"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"በመፈለግ ላይ…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"ከ<xliff:g id="COUNT">%d</xliff:g> በላይ ተገኝተዋል።"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"እውቅያዎች የሉም"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ተገኝቷል</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ተገኝተዋል</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"ለ<xliff:g id="NAME">%1$s</xliff:g> ፈጣን ዕውቂያ"</string>
     <string name="missing_name" msgid="978606963362745020">"(ስም የለም)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"በተደጋጋሚ የተደወለለት/ላት"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"በተደጋጋሚ የተገኙ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"ዕውቂያ ተመልከት"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"የስልክ ቁጥር ያላቸው ሁሉም ዕውቂያዎች"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"የሥራ መገለጫ ዕውቂያዎች"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ኢሜይል ይላኩ"</string>
     <string name="email" msgid="2807318537887091606">"ኢሜይል"</string>
     <string name="postal_street" msgid="6918171741240802474">"መንገድ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"የፖስታ ሣጥን ቁጥር"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ሰፈር"</string>
     <string name="postal_city" msgid="8674569121430005628">"ከተማ"</string>
     <string name="postal_region" msgid="1730369286225469192">"ግዛት"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ዚፕ ኮድ"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQን በመጠቀም ይወያዩ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabberን በመጠቀም 271448"</string>
     <string name="chat" msgid="1020428260359370236">"ውይይት"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ሰርዝ"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"የስም መስኮችን ይዘርጉ ወይም ይሰብስቡ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"የድምፀ ልሳን ስም መስኮችን ይዘርጉ ወይም ይሰብስቡ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ሁሉም ዕውቂያዎች"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ተከናውኗል"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ይቅር"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"በ<xliff:g id="NAME">%s</xliff:g> ውስጥ ያሉ ዕውቂያዎች"</string>
     <string name="listCustomView" msgid="5306282632413086731">"እውቂያዎች በብጁ እይታ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ነጠላ እውቂያ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"እንዲመጡ የተደረጉ እውቂያዎችን አስቀምጥ ወደ፦"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"ከሲም ካርድ ያስመጡ"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"ከSIM አስመጣ <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"ከSIM አስመጣ <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"ከ .vcf ፋይል አስመጣ"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውስጥ ማስመጣት ይቅር?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውጭ መላክ ይቅር?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard ማስመጣት/ወደ ውጪ ይቅር ማለት አልተቻለም"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"ያልታወቀ ስህተት።"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"«<xliff:g id="FILE_NAME">%s</xliff:g>»ን መክፈት አልተቻለም፦ <xliff:g id="EXACT_REASON">%s</xliff:g>።"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ይህንን ላኪ መጀመር አልተቻለም፦ «<xliff:g id="EXACT_REASON">%s</xliff:g>»"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ምንም ወደ ውጭ መላክ የሚችል ዕውቂያ የለም።"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"አንድ የሚያስፈልግ ፍቃድ አሰናክለዋል።"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ወደ ውጪ በሚላክበት ጊዜ ስህተት ተከስቷል፦ <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"የተጠየቀው ፋይል ስም በጣም ረጅም ነው  («<xliff:g id="FILENAME">%s</xliff:g>»)።"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"የግብዓት/ውጽዓት ስህተት"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"በቂ ማህደረ ትውስታ የለም። ፋይሉ በጣም ትልቅ ሊሆን ይችላል።"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ባልተጠበቀ ምክንያት vCard መተንተን አልተቻለም።"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ቅርፀቱ አይደገፍም።"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"የተሰጠው(ጡት) vCard ፋይል(ሎች) ዲበ ውሂብ መረጃ መሰብሰብ አልተቻለም።"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"አንድ ወይም ከዚያ በላይ ፋይሎች ማስመጣት አልተቻለም (%s)።"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>ን ወደ ውጪ መላክ ተጠናቅቋል።"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"እውቂያዎችን ወደ ውጪ መላክ ተጠናቅቋል።"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"እውቂያዎችን ወደ ውጭ መላክ ተጠናቅቋል፣ እውቂያዎችን ለማጋራት ማሳወቂያውን ጠቅ ያድርጉ።"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"እውቂያዎችን ለማጋራት መታ ያድርጉ።"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>ን ወደ ውጪ መላክ ተሰርዟል።"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"የዕውቂያ ውሂብ ወደ ውጪ በመላክ ላይ"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"የእውቂያ ውሂብ ወደ ውጭ በመላክ ላይ።"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ውሂብ ጎታ መረጃን ማግኘት አልተቻለም።"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ወደ ውጭ ሊላኩ የሚችሉ እውቂያዎች የሉም። በመሳሪያዎ ላይ እውቂያዎች ካሉዎ፣ የተወሰኑ ውሂብ አቅራቢዎች እውቂያዎችዎ ከመሳሪያው ወደ ውጪ እንዲላኩ ላይፈቅዱ ይችላሉ።"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"የvCard  አቀናባሪው በትክክል አልጀመረም።"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ወደ ውጭ መላክ አልተቻለም"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"የዕውቅያ ውሂቡ ወደ ውጭ አልተላከም።\nምክንያት፦«<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>ን በማስመጣት ላይ"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"የvCard ውሂቡን ማንበብ አልተቻለም"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"የvCard ውሂብ ማንበብ ተሰርዟል"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"የ<xliff:g id="FILENAME">%s</xliff:g> vCard  ማስመጣት ተጠናቅቋል"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"የ<xliff:g id="FILENAME">%s</xliff:g> ማስመጣት ተሰርዟል"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ከትንሽ ጊዜ በኋላ ይመጣል።"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ፋይሉ ከትንሽ ጊዜ በኋላ ይመጣል።"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"የvCard ማስመጣት ጥያቄ ተቀባይነት አላገኘም። ትንሽ ቆይተው ይሞክሩ።"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ከትንሽ ጊዜ በኋላ ወደ ውጪ ይላካል።"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ፋይሉ ትንሽ ቆይቶ ወደ ውጪ ይላካል።"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"እውቂያዎች በቅርቡ ወደ ውጭ ይላካሉ።"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"የvCard ወደ ውጪ መላክ ጥያቄ ተቀባይነት አላገኘም። ትንሽ ቆይተው ይሞከሩ።"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"እውቂያ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(s) ወደ ጊዜያዊ ማከማቻ በመሸጎጥ ላይ ነው። ትክክለኛው ማስመጣቱ በቅርቡ ይጀምራል።"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCardን ማስመጣት አልተቻለም።"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"በNFC የደረሱ ዕውቂያዎች"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"እውቅያዎች ይላኩ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"በመሸጎጥ ላይ"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>ን በማስመጣት ላይ፦ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"ወደ የ .vcf ፋይል ላክ"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ደርድር በ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"የመጀመሪያ ስም"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"የመጨረሻ ስም"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"የስም ቅርጸት"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"የመጀመሪያ ስም መጀመሪያ"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"የመጨረሻ ስም መጀመሪያ"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"ለአዲስ እውቂያዎች ነባሪ መለያ"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"የእውቂያ ዲበ ውሂብን አሥምር"</string>
-    <string name="setting_about" msgid="5253319937596745755">"ስለዕውቂያዎች"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ቅንብሮች"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"የሚታዩ እውቂያዎችን አጋራ"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"የሚታዩ እውቂያዎችን ማጋራት አልተሳካም።"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ተወዳጅ እውቂያዎችን አጋራ"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ሁሉንም እውቂያዎች አጋራ"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"እውቂያዎችን ማጋራት አልተሳካም።"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"ዕውቂያዎች ያስመጡ/ይላኩ"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"እውቅያዎችን ከውጭ አስመጣ"</string>
-    <string name="share_error" msgid="5642622973966851784">"ይህ ዕውቂያ ሊጋራ አይችልም።"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ምንም የሚጋሩ እውቂያዎች የሉም።"</string>
-    <string name="menu_search" msgid="1241802591112035764">"ፈልግ"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"ዕውቂያዎችን ያግኙ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ተወዳጆች"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ምንም ዕውቂያዎች የሉም።"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ምንም የሚታዩ ዕውቂያዎች የሉም።"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ምንም ተወዳጆች የሉም"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"በ<xliff:g id="NAME">%s</xliff:g> ውስጥ ምንም ዕውቂያዎች የሉም"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ተደጋጋሚዎችን አጽዳ"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"ሲም ካርድ ይምረጡ"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"መለያዎች አቀናብር"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ያስመጡ/ወደ ውጪ ይላኩ"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"በ<xliff:g id="SOURCE">%1$s</xliff:g> በኩል"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> በ<xliff:g id="SOURCE">%2$s</xliff:g> በኩል"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"መፈለግ አቁም"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ፍለጋን አጽዳ"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"የእውቂያ ማሳያ አማራጮች"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"መለያ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ይደውሉ ከዚህ ጋር"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ከጥሪ ጋር ለመላክ የማስታወሻ ጽሑፍ ይተይቡ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ላክ እና ደውል"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g><xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"የ<xliff:g id="TITLE">%1$s</xliff:g> ትር።"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> የ<xliff:g id="TITLE_2">%1$s</xliff:g> ትር። <xliff:g id="COUNT_3">%2$d</xliff:g> ያልተነበቡ ንጥሎች። </item>
       <item quantity="other"> የ<xliff:g id="TITLE_2">%1$s</xliff:g> ትር። <xliff:g id="COUNT_3">%2$d</xliff:g> ያልተነበቡ ንጥሎች። </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"የግንብ ሥሪት"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"የክፍት ምንጭ ፍቃዶች"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ለነፃ ምንጭ ሶፍትዌሮች የፈቃድ ዝርዝሮች"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"የግላዊነት መመሪያ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"የአገልግሎት ውል"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"የክፍት ምንጭ ፈቃዶች"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"ዩ አር ኤሉን ለመክፈት አልተሳካም።"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"የቪዲዮ ጥሪ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"ያጋሩ እና ይደውሉ"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ar/strings.xml b/java/com/android/contacts/common/res/values-ar/strings.xml
index a3862fe..fba65e3 100644
--- a/java/com/android/contacts/common/res/values-ar/strings.xml
+++ b/java/com/android/contacts/common/res/values-ar/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"تم نسخ النص"</string>
-    <string name="copy_text" msgid="5890820280087874642">"نسخ إلى الحافظة"</string>
     <string name="call_custom" msgid="3041673234638990874">"الاتصال بـ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"الاتصال بهاتف منزلي"</string>
     <string name="call_mobile" msgid="967589404494150813">"الاتصال بالجوال"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"الاتصال بجهاز نداء العمل"</string>
     <string name="call_assistant" msgid="4177478845473789294">"الاتصال بـ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"اتصال بهاتف رسائل الوسائط المتعددة"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (اتصال)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"إرسال رسالة نصية إلى <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"إرسال رسالة نصية إلى هاتف منزلي"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"إرسال رسالة نصية إلى جوال"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"إرسال رسالة نصية إلى جهاز نداء العمل"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"إرسال رسالة نصية إلى <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"إرسال رسالة نصية إلى هاتف رسائل الوسائط المتعددة"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (رسالة)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"محو قائمة من يتم الاتصال بهم كثيرًا؟"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ستمحو قائمة من يتم الاتصال بهم كثيرًا في تطبيقي جهات الاتصال والهاتف، وستفرض على تطبيقات البريد الإلكتروني التعرف على تفضيلات توجيه الرسائل من البداية."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"جارٍ محو قائمة المُتصل بهم كثيرًا…"</string>
@@ -70,26 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"بالخارج"</string>
     <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
     <string name="contactsList" msgid="8806067891419291513">"جهات الاتصال"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"أهم المقترحات"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"غير ذلك"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"الدليل"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"دليل العمل"</string>
     <string name="local_search_label" msgid="907622822323119235">"جميع جهات الاتصال"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"الاقتراحات"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"أنا"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"جارِ البحث…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"تم العثور على أكثر من <xliff:g id="COUNT">%d</xliff:g> من جهات الاتصال."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"ليست هناك جهات اتصال"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="zero"><xliff:g id="COUNT">%d</xliff:g> - لا توجد أية جهة اتصال</item>
-      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> جهتا اتصال موجودتان</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> جهات اتصال موجودة</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> جهة اتصال موجودة</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> من جهات الاتصال موجودة</item>
-      <item quantity="one">توجد جهة اتصال واحدة</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"اتصال سريع لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(بلا اسم)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"الأكثر اتصالاً"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"يتم الاتصال بها بشكل متكرر"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"عرض جهة الاتصال"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"جميع جهات الاتصال التي لها أرقام هواتف"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"جهات الاتصال للملف الشخصي للعمل"</string>
@@ -129,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"البريد الإلكتروني <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"إرسال رسالة إلكترونية"</string>
     <string name="postal_street" msgid="6918171741240802474">"الشارع"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"صندوق البريد"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"منطقة مجاورة"</string>
     <string name="postal_city" msgid="8674569121430005628">"المدينة"</string>
     <string name="postal_region" msgid="1730369286225469192">"الولاية"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"الرمز البريدي"</string>
@@ -148,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"‏الدردشة باستخدام ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"‏الدردشة باستخدام Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"دردشة"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"حذف"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"توسيع أو تصغير حقول الاسم"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"توسيع أو تصغير حقول الاسم الصوتي"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"كل جهات الاتصال"</string>
-    <string name="menu_done" msgid="1817505539263889535">"تم"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"إلغاء"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"جهات الاتصال في <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"جهات الاتصال في عرض مخصص"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"جهة اتصال واحدة"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"حفظ جهات الاتصال المستوردة إلى:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"‏استيراد من شريحة SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"‏استيراد من شريحة SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"‏استيراد من شريحة SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"‏الاستيراد من ملف vcf."</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"هل تريد إلغاء استيراد <xliff:g id="FILENAME">%s</xliff:g>؟"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"هل تريد إلغاء تصدير <xliff:g id="FILENAME">%s</xliff:g>؟"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"‏تعذر إلغاء استيراد/تصدير vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"خطأ غير معروف."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"تعذر فتح \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"تعذر بدء المُصدر: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ليست هناك جهة اتصال قابلة للتصدير."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"لقد عطلت إذنًا مطلوبًا."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"حدث خطأ أثناء التصدير: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"اسم الملف المطلوب أطول مما يجب (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"‏خطأ I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"الذاكرة غير كافية. ربما يكون الملف أكبر مما يجب."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"‏تعذر تحليل vCard لسبب غير متوقع."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"التنسيق غير معتمد."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"‏تعذر جمع معلومات وصفية حول ملفات vCard المحددة."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"‏تعذر استيراد ملف أو أكثر (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"تم الانتهاء من تصدير <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"تم الانتهاء من تصدير جهات الاتصال."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"تم الانتهاء من تصدير جهات الاتصال، انقر على الإشعار لمشاركة جهات الاتصال."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"انقر لمشاركة جهات الاتصال."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"تم إلغاء تصدير <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"تصدير بيانات جهة الاتصال"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"يجري تصدير بيانات جهات الاتصال."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"تعذر الحصول على معلومات قاعدة البيانات."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ليست هناك أية جهات اتصال قابلة للتصدير. إذا كانت لديك جهات اتصال على جهازك، فإن بعض موفري البيانات لا يسمحون بتصدير جهات الاتصال من الجهاز."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"‏لم يبدأ مؤلف vCard بشكل صحيح."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"تعذر التصدير"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"لم يتم تصدير بيانات جهة الاتصال.\nالسبب: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"جارٍ استيراد <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"‏تعذرت قراءة بيانات vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"‏تم إلغاء قراءة بيانات vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"‏تم الانتهاء من استيراد ملف vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"تم إلغاء استيراد <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"سيتم استيراد <xliff:g id="FILENAME">%s</xliff:g> بعد قليل."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"سيتم استيراد الملف بعد قليل."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"‏تم رفض طلب استيراد vCard. أعد المحاولة لاحقًا."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"سيتم تصدير <xliff:g id="FILENAME">%s</xliff:g> بعد قليل."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"سيتم تصدير الملف بعد قليل."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"سيتم تصدير جهات الاتصال قريبًا."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"‏تم رفض طلب تصدير vCard. أعد المحاولة لاحقًا."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"جهة اتصال"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"‏يجري تخزين ملفات vCard مؤقتًا على وحدة تخزين مؤقتة محلية. سيبدأ الاستيراد الفعلي قريبًا."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"‏تعذر استيراد vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"‏استلام ج اتص.NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"تصدير جهات الاتصال؟"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"تخزين مؤقت"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"جارٍ استيراد <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"‏تصدير إلى ملف vcf."</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ترتيب بحسب"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"الاسم الأول"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"اسم العائلة"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"تنسيق الاسم"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"الاسم الأول أولاً"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"اسم العائلة أوّلًا"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"الحساب الافتراضي لجهات الاتصال الجديدة"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"مزامنة البيانات الوصفية لجهات الاتصال"</string>
-    <string name="setting_about" msgid="5253319937596745755">"حول جهات الاتصال"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"الإعدادات"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"مشاركة جهات الاتصال المرئية"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"أخفقت مشاركة جهات الاتصال المرئية."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"مشاركة جهات الاتصال المفضلة"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"مشاركة جميع جهات الاتصال"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"أخفقت مشاركة جهات الاتصال."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"استيراد/تصدير جهات اتصال"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"استيراد جهات الاتصال"</string>
-    <string name="share_error" msgid="5642622973966851784">"لا يمكن مشاركة جهة الاتصال هذه."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ليست هناك جهات اتصال لمشاركتها."</string>
-    <string name="menu_search" msgid="1241802591112035764">"بحث"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"البحث عن جهات اتصال"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"المفضلة"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ليست هناك جهات اتصال."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ليست هناك جهات اتصال مرئية."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ليست هناك مفضلة"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"ليست هناك جهات اتصال في <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"محو قائمة من يتصل بهم كثيرًا"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"‏تحديد شريحة SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"إدارة الحسابات"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"استيراد/تصدير"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"عبر <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> عبر <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"إيقاف البحث"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"محو البحث"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"خيارات عرض جهات الاتصال"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"الحساب"</string>
     <string name="set_default_account" msgid="7966099951006467572">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"الاتصال باستخدام"</string>
@@ -252,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"اكتب ملاحظة لإرسالها مع المكالمة ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"إرسال واتصال"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"علامة تبويب <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="zero"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامة تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
@@ -262,13 +161,6 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامة تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> علامة تبويب. عنصر واحد (<xliff:g id="COUNT_1">%2$d</xliff:g>) غير مقروء. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"نسخة الإصدار"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"تراخيص البرامج مفتوحة المصدر"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"تفاصيل الترخيص للبرامج مفتوحة المصدر"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"سياسة الخصوصية"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"بنود الخدمة"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"تراخيص البرامج مفتوحة المصدر"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"‏فشل فتح عنوان URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"مكالمة فيديو"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"المشاركة والاتصال"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-az/strings.xml b/java/com/android/contacts/common/res/values-az/strings.xml
index 9433771..ed0c6a4 100644
--- a/java/com/android/contacts/common/res/values-az/strings.xml
+++ b/java/com/android/contacts/common/res/values-az/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Mətn kopyalandı"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Panoya kopyalayın"</string>
     <string name="call_custom" msgid="3041673234638990874">"Zəng <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ev zəngi"</string>
     <string name="call_mobile" msgid="967589404494150813">"Mobil zəng"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"İş peycerinə zəng"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Zəng <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS zəngi"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Zəng)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Mətn <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Ev mətni"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Mobil mətn"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"İş peyceri nömrəsinə mesaj"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Mətn <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS nömrəsinə mesaj"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesaj)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Tez-tez ünsiyyət qurulanlar silinsin?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Əlaqələr və Telefon proqramlarında tez-tez əlaqə saxlanılanların siyahısını siləcəksiniz və fraqmentdən ünvanlama seçimlərinizi öyrənmək üçün e-poçt proqramlarını məcbur edəcəksiniz."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Tez-tez ünsiyyət qurulanlar silinir..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Kənar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Məşğul"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Ən yaxşı Təkliflər"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Digər"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Kataloq"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"İş kataloqu"</string>
     <string name="local_search_label" msgid="907622822323119235">"Bütün kontaktlar"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Təkliflər"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mən"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Axtarılır..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ədəddən çox tapılıb."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Kontakt yoxdur"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> tapıldı</item>
-      <item quantity="one">1 tapıldı</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> üçün tez kontakt"</string>
     <string name="missing_name" msgid="978606963362745020">"(ad yoxdur)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Tez-tez zəng edilən"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Tez-tez əlaqə saxlanılan"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontakta baxın"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Telefon nömrələri olan bütün kontaktlar"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"İş profili kontaktları"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-poçt <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-poçt"</string>
     <string name="postal_street" msgid="6918171741240802474">"Küçə"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO Box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Qonşuluq"</string>
     <string name="postal_city" msgid="8674569121430005628">"Şəhər"</string>
     <string name="postal_region" msgid="1730369286225469192">"Dövlət"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poçt indeksi"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ üzərindən çat"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber üzərindən çat"</string>
     <string name="chat" msgid="1020428260359370236">"Çat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"sil"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ad sahələrini genişləndirin və yığcamlaşdırın"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Fonetik ad sahələrini genişləndirin və ya yığcamlaşdırın"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Bütün kontaktlar"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Tamam"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Ləğv et"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> adındakı kontaktlar"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Fərdi baxışdan kontakt"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Tək kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"İmport olunan kontaktları yadda saxlayın:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM kartdan import edin"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM-dən import edin: <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM-dən import edin: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf fayldan import edin"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> importu ləğv olunsun?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> eksportu ləğv edilsin?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Vizit kart importunu/eksportunu ləğv etmək mümkün olmadı"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Naməlum xəta."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" açmaq olmadı: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Eksportçunu başlatmaq olmadı: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Eksport edilə bilən heç bir kontakt yoxdur"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Tələb olunan icazəni deaktiv etmisiniz."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Eksport zamanı xəta baş verdi: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Tələb olunan fayl adı çox uzundur (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O xəta"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Yetərli qədər yaddaş yoxdur. Fayl çox böyük ola bilər.."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Gözlənilməyən səbəbə görə vizit kart təhlil edilə bilmədi."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format dəstəklənmir."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Verilmiş vizit kartların meta məlumatları toplana bilmədi."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Bir və daha çox fayl İmport edilə bilməz (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> eksportu bitdi"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontaktların eksportu tamamlandı."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktların eksportu tamamlandı, kontaktları paylaşmaq üçün bildirişə tıklayın."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Kontaktları paylaşmaq üçün toxunun."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> eksportu ləğv edildi"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontakt datası eksport olunur"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontakt datası eksport olunur."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Verilənlər bazası məlumatları əldə oluna bilmədi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Eksport edilə bilən kontakt yoxdur. Əgər cihazınızda kontakt varsa, bəzi data provayderləri kontaktların cihazdan eksport olunmasına icazə verməyə bilər."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Vizit kart tərtibçisi düzgün başlamadı."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksport edilə bilmədi"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontakt datası eksport edilmədi.\nSəbəb: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> import edilir"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Vizit kart datası oxuna bilmədi"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Vizit kart datasının oxunması ləğv edildi"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vizit kart İmportu qurtardı"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> importu ləğv edildi"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> tezliklə import olunacaq."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Bu fayl tezliklə import ediləcək."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Vizit kart import sorğusu rədd edildi. Yenidən cəhd edin."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> tezliklə eksport ediləcək."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fayl az sonra eksport ediləcək."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktlar tezliklə eksport ediləcək."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Vizit kart eksport sorğusu rədd edildi. Daha sonra cəhd edin."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Vizit kart yerli müvəqqəti yaddaşa keşlənir. Hazırkı import tezliklə başlayacaq."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Vizit kart import edilə bilmədi."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt NFC üzərindən alınıb"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Kontaktlar eksport olunsun?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Keşləndirilir"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"İmport edilir: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf fayldan eksport edin"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Bunlardan biri üzrə sırala"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ad"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Soyad"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ad formatı"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ad ilk yazılsın"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Soyad ilk yazılsın"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Yeni kontaktlar üçün defolt hesab"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinxronizasiya kontakt metadatası"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Kontaktlar Haqqında"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ayarlar"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Görünən kontaktları paylaşın"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Görünən kontaktları paylaşmaq olmadı"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Sevdiyiniz kontaktları paylaşın"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Bütün kontaktları paylaşın"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontaktları paylaşmaq uğursuz oldu."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontaktları import/eksport edin"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Kontaktları import edin"</string>
-    <string name="share_error" msgid="5642622973966851784">"Bu kontakt paylaşıla bilməz."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Bölüşmək üçün kontakt yoxdur."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Axtarış"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Kontaktlar tapın"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Seçilmişlər"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Kontakt yoxdur."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Görünən kontakt yoxdur."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Favoritlər yoxdur."</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> daxilində kontakt yoxdur"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Müntəzəmləri təmizləyin"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM kart seçin"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Hesabları idarə edin"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"İmport/eksport"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> vasitəsilə"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> vasitəsilə <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"axtarışı dayandırın"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Axtarışı təmizləyin"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontakt göstərilmə seçimləri"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Hesab"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Həmişə bu zənglər üçün istifadə edin"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Çağrı üçün SIM:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Zəng ilə göndərmək üçün qeyd yazın..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"GÖNDƏRİN VƏ ZƏNG EDİN"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tabel."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tabel. <xliff:g id="COUNT_3">%2$d</xliff:g> oxunmamış element. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tabel. <xliff:g id="COUNT_1">%2$d</xliff:g> oxunmamış element. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Quruluş versiyası"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Açıq mənbə lisenziyaları"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Açıq mənbə proqramı üçün lisenziya detalları"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Məxfilik siyasəti"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Xidmət şərtləri"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Açıq mənbə lisenziyaları"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Linki açmaq alınmadı."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video zəng"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Paylaşın və zəng edin"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
index fc99567..ffc0425 100644
--- a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst je kopiran"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiraj u priv. memoriju"</string>
     <string name="call_custom" msgid="3041673234638990874">"Pozovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Pozovi kućni telefon"</string>
     <string name="call_mobile" msgid="967589404494150813">"Pozovi mobilni telefon"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Pozovi poslovni pejdžer"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Pozovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Pozovi broj za MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (pozovi)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Pošalji SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Pošalji SMS na kućni telefon"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Pošalji SMS na mobilni telefon"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji SMS na poslovni pejdžer"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Pošalji SMS na <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Pošalji SMS na broj za MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (pošalji SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Brišete često kontaktirane?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Obrisaćete listu često kontaktiranih u aplikacijama Kontakti i Telefon, pa će imejl aplikacije morati ponovo da prikupe informacije o adresiranju."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih..."</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan/na"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzet/a"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najpopularniji predlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorijum"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktorijum za Work"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Pretražuje se…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nema kontakata"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Pronađen je <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="few">Pronađena su <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">Pronađeno je <xliff:g id="COUNT">%d</xliff:g></item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Brzi kontakt za korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nema imena)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Često pozivani"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Često kontaktirani"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti sa brojevima telefona"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakti sa profila za Work"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Pošalji imejl na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Pošalji imejl"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Poštanski fah"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Kraj"</string>
     <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Država"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
@@ -145,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Započni ćaskanje preko ICQ-a"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Započni ćaskanje preko Jabber-a"</string>
     <string name="chat" msgid="1020428260359370236">"Ćaskanje"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"izbriši"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Proširivanje ili skupljanje polja za nazive"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Proširi ili skupi polja za fonetsko ime"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gotovo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Otkaži"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti u grupi <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Pojedinačni kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Sačuvajte uvezene kontakte na:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Uvezi sa SIM kartice"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Uvoz sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Uvoz sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Uvezi iz .vcf datoteke"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Želite li da otkažete uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Želite li da otkažete izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Nije moguće otkazati vCard uvoz/izvoz"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nepoznata greška."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nismo uspeli da otvorimo datoteku „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nije moguće pokrenuti program za izvoz: „<xliff:g id="EXACT_REASON">%s</xliff:g>“"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nema kontakata za izvoz."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Onemogućili ste obaveznu dozvolu."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Došlo je do greške pri izvozu: „<xliff:g id="EXACT_REASON">%s</xliff:g>“"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Zahtevani naziv datoteke je predugačak („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"U/I greška"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nema dovoljno memorije. Datoteka je možda prevelika."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Iz neočekivanog razloga nije moguće raščlaniti vCard datoteku."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format nije podržan."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nije moguće prikupiti metapodatke navedenih vCard datoteka."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nije moguć uvoz jedne ili više datoteka (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je završen."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Izvoz kontakata je završen."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Izvoz kontakata je završen. Kliknite na obaveštenje da biste ih delili."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Dodirnite da biste delili kontakte."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je otkazan."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Izvoz podataka o kontaktima je u toku"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Podaci o kontaktima se izvoze."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Preuzimanje informacija iz baze podataka nije moguće."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nema kontakata za izvoz. Ako imate kontakte na uređaju, neki dobavljači podataka možda ne dozvoljavaju izvoz kontakata sa uređaja."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Program za izradu vCard datoteka se nije ispravno pokrenuo."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Izvoz nije moguć"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Podaci o kontaktima nizu izvezeni.\nRazlog: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Uvoz kontakta <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Čitanje vCard podataka nije moguće"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Čitanje vCard podataka je otkazano"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Uvoz vCard datoteke <xliff:g id="FILENAME">%s</xliff:g> je završen"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je otkazan"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> će uskoro biti uvezena."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Datoteka će uskoro biti uvezena."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Zahtev za uvoz vCard datoteke je odbijen. Probajte ponovo kasnije."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> će uskoro biti izvezena."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Datoteka će uskoro biti izvezena."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakti će uskoro biti izvezeni."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Zahtev za izvoz vCard datoteke je odbijen. Probajte ponovo kasnije."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Keširanje vCard datoteka u lokalnu privremenu memoriju. Uvoz će uskoro započeti."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Uvoz vCard datoteke nije moguć."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt preko NFC-a"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Želite li da izvezete kontakte?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Keširanje"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Uvozimo <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Izvezi u .vcf datoteku"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortiraj prema"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Imenu"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezimenu"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imena i prezimena"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prvo ime"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prvo prezime"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Podrazumevani nalog za nove kontakte"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinhronizujte metapodatke kontakata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"O Kontaktima"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Podešavanja"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Deli vidljive kontakte"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nije uspelo deljenje vidljivih kontakata."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Deli omiljene kontakte"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Deli sve kontakte"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Deljenje kontakata nije uspelo."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Uvoz/izvoz kontakata"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Uvezi kontakte"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ovaj kontakt ne može da se deli."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nema kontakata za deljenje."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Pretraži"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Pronađite kontakte"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Omiljeno"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nema kontakata."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nema vidljivih kontakata."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nema omiljenih"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nema kontakata u grupi <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Obriši često kontaktirane"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Izaberite SIM karticu"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Upravljaj nalozima"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Uvezi/izvezi"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"preko <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> preko <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavljanje pretraživanja"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Brisanje pretrage"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcije prikazivanja kontakata"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Nalog"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Uvek koristi ovo za pozive"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Pozovi pomoću"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Unesite belešku koju ćete poslati uz poziv..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I POZOVI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
       <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
       <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Verzija"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licence otvorenog koda"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalji licence za softver otvorenog koda"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Politika privatnosti"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Uslovi korišćenja usluge"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licence otvorenog koda"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Otvaranje URL-a nije uspelo."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video poziv"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Deli i pozovi"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-be/strings.xml b/java/com/android/contacts/common/res/values-be/strings.xml
index a9652a1..2fab8a3 100644
--- a/java/com/android/contacts/common/res/values-be/strings.xml
+++ b/java/com/android/contacts/common/res/values-be/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Тэкст скапіяваны"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Скапіраваць у буфер абмену"</string>
     <string name="call_custom" msgid="3041673234638990874">"Выклікаць <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Патэлефанаваць на хатні нумар"</string>
     <string name="call_mobile" msgid="967589404494150813">"Патэлефанаваць на нумар мабільнага тэлефона"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Патэлефанаваць на працоўны пэйджар"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Выклікаць <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Выклікаць MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Выклік)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Напiсаць тэкставае паведамленне <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Напiсаць тэкставае паведамленне на хатні тэлефон"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Напiсаць тэкставае паведамленне на мабільны нумар тэлефона"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Напiсаць тэкставае паведамленне на працоўны пэйджар"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Напiсаць тэкставае паведамленне <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Тэкставае паведамленне MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Паведамленне)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Выдалiць частыя кантакты?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Вы выдалiце найчасцей ужываныя кантакты ў праграмах Кантакты i Тэлефон i прымусiце праграмы па працы з электроннай поштай вывучыць вашы налады адрасацыi з нуля."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Выдаленне частых кантактаў..."</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Адсутнічае"</string>
     <string name="status_busy" msgid="5990832098713248503">"Заняты"</string>
     <string name="contactsList" msgid="8806067891419291513">"Кантакты"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Лепшыя прапановы"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Іншае"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Дырэкторыя"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Працоўны каталог"</string>
     <string name="local_search_label" msgid="907622822323119235">"Усе кантакты"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Прапановы"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Пошук..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Знойдзена вынікаў: больш за <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Няма кантактаў"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Знойдзены <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="few">Знойдзена <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="many">Знойдзена <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">Знойдзена <xliff:g id="COUNT">%d</xliff:g></item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Хуткі кантакт для карыстальніка \"<xliff:g id="NAME">%1$s</xliff:g>\""</string>
     <string name="missing_name" msgid="978606963362745020">"(Без назвы)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Часта выкліканыя"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Часта выкарыстаныя кантакты"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Прагледзець кантакт"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Усе кантакты з нумарамі тэлефонаў"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Кантакты працоўнага профілю"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Адправiць лiст на адрас: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Электронная пошта"</string>
     <string name="postal_street" msgid="6918171741240802474">"Вуліца"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Паштовая скрыня"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Наваколле"</string>
     <string name="postal_city" msgid="8674569121430005628">"Горад"</string>
     <string name="postal_region" msgid="1730369286225469192">"Шт"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Паштовы індэкс"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Чат праз ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Чат у Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Гутарка"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"выдаліць"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Разгарнуць ці згарнуць назвы палёў"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Разгарнуць ці згарнуць палі вымаўлення імён"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Усе кантакты"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Гатова"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Адмяніць"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Кантакты карыстальнiка <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Кантакты ў карыстальнiцкiм выглядзе"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Адзіночны кантакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Захаваць імпартаваныя кантакты ў:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Імпарт з SIM-карты"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Імпарт з SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Імпарт з SIM-карты SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Імпартаваць з файла .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Адмянiць iмпарт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Адмянiць экспарт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Немагчыма адмяніць імпарт/экспарт vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Невядомая памылка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Немагчыма адкрыць файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Не атрымалася запусцiць экспарцёр: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Няма кантактаў для экспарту."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Вы адключылі дазвол, які патрабуецца."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Памылка экспарту: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Патрабаванае імя файла (\"<xliff:g id="FILENAME">%s</xliff:g>\") занадта доўгае."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Памылка ўводу/вываду"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Недастаткова памяці (магчыма, занадта вялікі файл)"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Па нечаканай прычыне немагчыма разабраць файл vCard."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Фармат не падтрымліваецца."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Немагчыма сабраць мета-інфармацыю з гэтых файлаў vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Адзін або некалькі файлаў не могуць быць імпартаваныя (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Экспарт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" завершаны."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Экспартаванне кантактаў завершана."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Экспартаванне кантактаў завершана, націсніце на апавяшчэнне, каб абагуліць кантакты."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Дакраніцеся, каб абагуліць кантакты."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Экспарт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" адменены."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Экспарт дадзеных кантакта"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Даныя кантакта экспартуюцца."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Немагчыма атрымаць інфармацыю з базы дадзеных."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Няма кантактаў, якія можна экспартаваць. Калі ў вас ёсць кантакты на прыладзе, некаторыя пастаўшчыкі даных могуць не дазваляць экспарт кантактаў з прылады."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Памылка запуску складальнiка файлаў vCard."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Не атрымалася экспартаваць"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Памылка экспарта кантактных дадзеных. \nПрычына: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Імпарт дадзеных карыстальнiка: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Немагчыма прачытаць дадзеныя vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Адменена чытанне дадзеных з vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Заканчэнне імпартавання vCard \"<xliff:g id="FILENAME">%s</xliff:g>\""</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Імпарт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" адменены"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Файл \"<xliff:g id="FILENAME">%s</xliff:g>\" будзе імпартаваны ў бліжэйшы час."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файл будзе імпартаваны ў бліжэйшы час."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Запыт экспарту vCard адхілены. Паспрабуйце пазней."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Файл \"<xliff:g id="FILENAME">%s</xliff:g>\" будзе экспартаваны ў бліжэйшы час."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Файл хутка будзе экспартаваны."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Кантакты хутка будуць экспартаваны."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Запыт экспарту vCard адхілены. Паспрабуйце пазней."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"кантакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Кэшуе файлы vCard у лакальнае часовае сховішча. Фактычны імпарт пачнецца ў бліжэйшы час."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Немагчыма імпартаваць vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Кантакт атрыманы праз NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Экспартаваць кантакты?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кэшаванне"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Імпарт <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Экспартаваць у файл .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сартаваць па"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Імені"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Прозвішчы"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Фармат імя"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Спачатку імя"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Спачатку прозвішча"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Стандартны ўліковы запіс для новых кантактаў"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Сінхранізаваць метаданыя пра кантакты"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Аб Кантактах"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Налады"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Адкрыць бачныя кантакты"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Спроба абагуліць бачныя кантакты няўдалая."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Абагуліць улюбёныя кантакты"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Абагуліць усе кантакты"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Не атрымалася абагуліць кантакты."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Імпарт/экспарт кантактаў"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Імпартаваць кантакты"</string>
-    <string name="share_error" msgid="5642622973966851784">"Немагчыма падзялiцца гэтым кантактам."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Няма кантактаў, якія можна абагуліць."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Пошук"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Знайсці кантакты"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Любімыя"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Кантактаў няма."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Няма бачных кантактаў."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Няма абраных"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Няма кантакта \"<xliff:g id="NAME">%s</xliff:g>\" у групе"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Выдалiць частыя кантакты"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Выбраць SIM-карту"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Кіраваць уліковымі запісамі"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Імпарт/экспарт"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"праз <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> праз <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"спыніць пошук"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Ачысціць пошук"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Параметры адлюстравання кантактаў"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Уліковы запіс"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Заўсёды выкарыст. гэта для выклікаў"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Выклікаць праз"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Увесці нататку для адпраўкі з выклікам…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"АДПРАВІЦЬ І ВЫКЛІКАЦЬ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Укладка <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытаны элемент. </item>
@@ -258,13 +159,6 @@
       <item quantity="many">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытаных элементаў. </item>
       <item quantity="other">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытанага элемента. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Версія зборкі"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Ліцэнзіі ПЗ з адкрытым зыходным кодам"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Звесткі аб ліцэнзіі на праграмнае забеспячэнне з адкрытым зыходным кодам"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Палітыка прыватнасці"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Умовы абслугоўвання"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Ліцэнзіі ПЗ з адкрытым зыходным кодам"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Не ўдалося адкрыць URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Відэавыклік"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Абагуліць і выклікаць"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bg/strings.xml b/java/com/android/contacts/common/res/values-bg/strings.xml
index 0b57eb6..2a1f2a6 100644
--- a/java/com/android/contacts/common/res/values-bg/strings.xml
+++ b/java/com/android/contacts/common/res/values-bg/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текстът бе копиран"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Копиране в буфера"</string>
     <string name="call_custom" msgid="3041673234638990874">"Обаждане на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Обаждане на домашен"</string>
     <string name="call_mobile" msgid="967589404494150813">"Обаждане на мобилен"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Обаждане на служебен пейджър"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Обаждане на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Обаждане на MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (обаждане)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Изпращане на SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Изпращaне на SMS на домашен"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Изпращане на SMS на мобилен"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Изпращане на SMS на служебен пейджър"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Изпращане на SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Изпращане на SMS на MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (изпращане на съобщение)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Да се изчистят ли често търсените?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Ще изчистите списъка с често търсените в приложенията Контакти и Телефон и ще принудите приложенията за имейл да научат предпочитанията ви за адресите, започвайки отначало."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Често търсените се изчистват…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Отсъства"</string>
     <string name="status_busy" msgid="5990832098713248503">"Зает/а"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Водещи предложения"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Други"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директория"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Служебен указател"</string>
     <string name="local_search_label" msgid="907622822323119235">"Всички контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предложения"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Аз"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Търси се…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Намерени са повече от <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Няма контакти"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Намерени са <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Намерен е 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Бърз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Няма име)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Чести обаждания"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Често търсени"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Преглед на контакта"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Всички контакти с телефонни номера"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти в служебния потребителски профил"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Изпращане на имейл до <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Изпращане на имейл"</string>
     <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Пощенска кутия"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Квартал"</string>
     <string name="postal_city" msgid="8674569121430005628">"Град"</string>
     <string name="postal_region" msgid="1730369286225469192">"Щат"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Пощенски код"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Чат по ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Чат по Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"изтриване"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Разгъване или свиване на полетата с името"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Разгъване или свиване на полетата за фонетични имена"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Всички контакти"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Готово"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Отказ"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти във: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Контакти в персонал. изглед"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Един контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Запазване на импортираните контакти във:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Импортиране от SIM карта"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Импортиране от SIM картата „<xliff:g id="SIM_NAME">^1</xliff:g>“ – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Импортиране от SIM картата „<xliff:g id="SIM_NAME">%1$s</xliff:g>“"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Импортиране от .vcf файл"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Да се анулира ли импортирането на „<xliff:g id="FILENAME">%s</xliff:g>“?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Да се анулира ли експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Импорт./експорт. не можа да се анулира"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Неизвестна грешка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"„<xliff:g id="FILE_NAME">%s</xliff:g>“ не можа да се отвори: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Експортирането не можа да започне: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Няма контакт, позволяващ експортиране."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Деактивирахте задължително разрешение."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"При експортирането възникна грешка: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Поисканото име на файла е твърде дълго („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O грешка"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Няма достатъчно памет. Файлът може да е твърде голям."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vCard не можа да се анализира по неочаквана причина."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Форматът не се поддържа."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Метаинформацията от даден/и vCard файл/ове не можа да бъде събрана."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Един или повече файла не можаха да бъдат импортирани (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“ завърши."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Експортирането на контактите завърши."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Експортирането на контактите завърши. Кликнете върху известието, за да ги споделите."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Докоснете, за да споделите контактите."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“ е анулирано."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Експортиране на данни за контакти"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Данните за контактите се експортират."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Информацията за базата от данни не можа да бъде получена."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Няма контакти, позволяващи експортиране. Ако на устройството си имате контакти, е възможно някои доставчици на данни да не позволяват експортирането им извън него."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Създателят на vCard не се стартира правилно."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Не се експортираха"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Данните за контакта не бяха експортирани.\nПричина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> се импортира"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Данните от vCard не бяха прочетени"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Четенето на данни от vCard е анулирано"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Импортирането на vCard файла „<xliff:g id="FILENAME">%s</xliff:g>“ завърши"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Импортирането на „<xliff:g id="FILENAME">%s</xliff:g>“ е анулирано"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"„<xliff:g id="FILENAME">%s</xliff:g>“ ще се импортира скоро."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файлът ще се импортира скоро."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Заявката за импортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"„<xliff:g id="FILENAME">%s</xliff:g>“ ще се експортира скоро."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Файлът ще се експортира скоро."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Контактите ще бъдат експортирани скоро."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Заявката за експортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard се кешира/т във временно локално хранилище. Самото импортиране ще започне скоро."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard не можа да се импортира."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Контакти от КБП"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Да се експортират ли контактите?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кешира се"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Импортира се <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Експортиране като .vcf файл"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортиране по"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Собствено име"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Фамилно име"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат на името"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Първо собственото име"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Първо фамилното име"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Стандартен профил за новите контакти"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронизиране на метаданните за контактите"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Всичко за Контакти"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Настройки"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Споделяне на видимите контакти"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Споделянето на видимите контакти не бе успешно."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Споделяне на любимите контакти"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Споделяне на всички контакти"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Споделянето на контактите не бе успешно."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Импортиране/eкспортиране на контакти"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Импортиране на контактите"</string>
-    <string name="share_error" msgid="5642622973966851784">"Този контакт не може да бъде споделен."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Няма контакти за споделяне."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Търсене"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Намиране на контакти"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Любими"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Няма контакти."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Няма видими контакти."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Няма любими"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Няма контакти във: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Изчистване на често търсените"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Избиране на SIM карта"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Управление на профилите"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Импортиране/Експортиране"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"чрез <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> чрез <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"спиране на търсенето"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Изчистване на търсенето"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Опции за показване на контактите"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Профил"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Винаги да се използва за обаждания"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Обаждане чрез"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Напишете придружаваща бележка, която ще се изпрати при извършване на обаждането..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ИЗПРАЩАНЕ И ОБАЖДАНЕ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Раздел „<xliff:g id="TITLE">%1$s</xliff:g>“."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Раздел „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочетени елемента. </item>
       <item quantity="one">Раздел „<xliff:g id="TITLE_0">%1$s</xliff:g>“. <xliff:g id="COUNT_1">%2$d</xliff:g> непрочетен елемент. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Версия"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Лицензи за отворен код"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Подробности за лиценза на софтуера с отворен код"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Декларация за поверителност"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Общи условия"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Лицензи за отворен код"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Отварянето на URL адреса не бе успешно."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видеообаждане"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Споделяне и обаждане"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bn/strings.xml b/java/com/android/contacts/common/res/values-bn/strings.xml
index 8e783d1..49d6f5b 100644
--- a/java/com/android/contacts/common/res/values-bn/strings.xml
+++ b/java/com/android/contacts/common/res/values-bn/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"পাঠ্য অনুলিপি হয়েছে"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ক্লিপবোর্ডে কপি করুন"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> এ কল করুন"</string>
     <string name="call_home" msgid="125893483593803791">"বাড়ির নম্বরে কল করুন"</string>
     <string name="call_mobile" msgid="967589404494150813">"মোবাইল নম্বরে কল করুন"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"অফিসের পেজার নম্বরে কল করুন"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> এ কল করুন"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS নম্বরে কল করুন"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (কল)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_home" msgid="3527719551060295243">"ঘরের ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"মোবাইল নম্বরে পাঠ্য বার্তা পাঠান"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"কর্মক্ষেত্রের পেজারে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (বার্তা)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ঘন ঘন যোগাযোগ করা হয়েছে এমন পরিচিতিগুলিকে সাফ করবেন?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"পরিচিতি এবং ফোন অ্যাপ্লিকেশানগুলি থেকে আপনি ঘন ঘন যোগাযোগ করা পরিচিতির তালিকা সাফ করবেন, এবং ইমেল অ্যাপ্লিকেশানগুলিকে আবার শুরু থেকে আপনার ঠিকানা অভিরুচি জানতে বাধ্য করবেন৷"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ঘন ঘন যোগাযোগ করা পরিচিতিগুলিকে সাফ করা হচ্ছে…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"অন্যত্র"</string>
     <string name="status_busy" msgid="5990832098713248503">"ব্যস্ত"</string>
     <string name="contactsList" msgid="8806067891419291513">"পরিচিতিগুলি"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"শীর্ষস্থানীয় প্রস্তাবনা"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"অন্যান্য"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ডিরেক্টরি"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"কাজের সংগ্রহ"</string>
     <string name="local_search_label" msgid="907622822323119235">"সকল পরিচিতি"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"প্রস্তাবনাগুলি"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"আমি"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"অনুসন্ধান করছে..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>টির থেকে বেশি খুঁজে পাওয়া গিয়েছে৷"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"কোনো পরিচিতি নেই"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি খুঁজে পাওয়া গেছে</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি খুঁজে পাওয়া গেছে</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> এর জন্য দ্রুত পরিচিতি"</string>
     <string name="missing_name" msgid="978606963362745020">"(কোনও নাম নেই)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"ঘন ঘন কল করা হয়েছে"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ঘন ঘন যোগাযোগ করা হয়েছে"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"পরিচিতি দেখুন"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ফোন নম্বর সহ সমস্ত পরিচিতি"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"কর্মস্থলের প্রোফাইলের পরিচিতিগুলি"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> এ ইমেল করুন"</string>
     <string name="email" msgid="2807318537887091606">"ইমেল করুন"</string>
     <string name="postal_street" msgid="6918171741240802474">"রাস্তা"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"পোস্ট বক্স"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"নিকটবর্তী অঞ্চল"</string>
     <string name="postal_city" msgid="8674569121430005628">"শহর"</string>
     <string name="postal_region" msgid="1730369286225469192">"রাজ্য"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"পিন কোড"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ ব্যবহার করে চ্যাট করুন"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber ব্যবহার করে চ্যাট করুন"</string>
     <string name="chat" msgid="1020428260359370236">"চ্যাট করুন"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"মুছুন"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"নামের ক্ষেত্রটিকে প্রসারিত বা সঙ্কুচিত করুন"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ফোনেটিক নামের ক্ষেত্রটিকে প্রসারিত বা সঙ্কুচিত করুন"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"সকল পরিচিতি"</string>
-    <string name="menu_done" msgid="1817505539263889535">"সম্পন্ন হয়েছে"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"বাতিল করুন"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> এ পরিচিতিগুলি"</string>
     <string name="listCustomView" msgid="5306282632413086731">"কাস্টম দৃশ্যে পরিচিতিগুলি"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"একক পরিচিতি"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"আমদানি করা পরিচিতিগুলি এতে সংরক্ষণ করুন:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"সিম কার্ড থেকে আমদানি করুন"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> সিম থেকে আমদানি করুন - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> সিম থেকে আমদানি করুন"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ফাইল থেকে আমদানি করুন"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> এর আমদানি বাতিল করবেন?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> এর রপ্তানি বাতিল করবেন?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard এর আমদানি/রপ্তানি বাতিল করা যায়নি"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"অজানা ত্রুটি৷"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" খোলা গেল না: <xliff:g id="EXACT_REASON">%s</xliff:g>৷"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"রপ্তানিকারক শুরু করা যায়নি: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"৷"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"রপ্তানিযোগ্য কোনো পরিচিতি নেই৷"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"আপনি একটি প্রয়োজনীয় অনুমতি অক্ষম করেছেন৷"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"রপ্তানির সময় একটি ত্রুটি ঘটেছে: \" <xliff:g id="EXACT_REASON">%s</xliff:g> \"৷"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"প্রয়োজনীয় ফাইলের নামটি  (\"<xliff:g id="FILENAME">%s</xliff:g>\") অত্যন্ত দীর্ঘ৷"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O ত্রুটি"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"যথেষ্ট মেমরি নেই৷ ফাইলটি খুব বড় হতে পারে৷"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"একটি অপ্রত্যাশিত কারণে vCard পার্জ করা যায়নি৷"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"এই ফর্ম্যাটটি সমর্থিত নয়৷"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"প্রদত্ত vCard ফাইলের(গুলির) মেটা তথ্য সংগ্রহ করা যায়নি৷"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"একটি বা একাধিক (%s) ফাইল আমদানি করা যাবে না৷"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> রপ্তানি করা সম্পন্ন হয়েছে৷"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"পরিচিতি রপ্তানি করা সম্পন্ন হয়েছে৷"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"পরিচিতিগুলি রপ্তানি করা হয়েছে, পরিচিতিগুলিকে শেয়ার করতে বিজ্ঞপ্তিটিতে ক্লিক করুন৷"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"পরিচিতিগুলিকে শেয়ার করতে আলতো চাপ দিন৷"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> রপ্তানি করা বাতিল হয়েছে৷"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"পরিচিতির তথ্য রপ্তানি করা হচ্ছে"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"পরিচিতির ডেটা রপ্তানি করা হচ্ছে৷"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ডেটাবেসের তথ্য পাওয়া যায়নি৷"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"এখানে রপ্তানিযোগ্য কোনো পরিচিতি নেই৷ আপনার ডিভাইসে পরিচিতি থাকলে, কিছু ডেটা সরবরাহকারী আপনার ডিভাইস থেকে সেই পরিচিতিগুলিকে রপ্তানি করার অনুমতি নাও করতে পারে৷"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard কম্পোজার সঠিকভাবে শুরু করা হয়নি৷"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"রপ্তানি করা যায়নি"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"পরিচিতির তথ্য রপ্তানি করা যায়নি৷\nকারণ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> আমদানি করা হচ্ছে"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard ডেটা পড়া যায়নি"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard ডেটা পড়া বাতিল করা হয়েছে"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> আমদানি করা সমাপ্ত হয়েছে"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> আমদানি করা বাতিল করা হয়েছে"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> শীঘ্রই আমদানি করা হবে৷"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ফাইলটি শীঘ্রই আমদানি করা হবে৷"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard আমদানি করার অনুরোধ প্রত্যাখ্যাত হয়েছে৷ পরে আবার চেষ্টা করুন৷"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> শীঘ্রই রপ্তানি করা হবে৷"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ফাইলটি শীঘ্রই রপ্তানি করা হবে৷"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"পরিচিতিগুলি শীঘ্রই রপ্তানি করা হবে৷"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard রপ্তানি করার অনুরোধ প্রত্যাখ্যাত হয়েছে৷ পরে আবার চেষ্টা করুন৷"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"পরিচিতি"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"স্থানীয় অস্থায়ী সংগ্রহস্থলে vCard(গুলি)কে ক্যাশ করা হচ্ছে৷ প্রকৃত আমদানি শীঘ্রই শুরু হবে৷"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard আমদানি করতে পারা যায় নি৷"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC এর মাধ্যমে পরিচিতি প্রাপ্ত হয়েছে"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"পরিচিতিগুলি রপ্তানি করবেন?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ক্যাশ করা হচ্ছে"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"আমদানি করা হচ্ছে, <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ফাইলে রপ্তানি করুন"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"এই অনুসারে বাছুন"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"প্রথম নাম"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"পদবি"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"নামের বিন্যাস"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"প্রথমে প্রথম নামটি"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"প্রথমে উপাধি"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"নতুন পরিচিতিগুলির জন্য ডিফল্ট অ্যাকাউন্ট"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"পরিচিতির মেটাডাটা সিঙ্ক করুন"</string>
-    <string name="setting_about" msgid="5253319937596745755">"পরিচিতি সম্পর্কিত"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"সেটিংস"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"দৃশ্যমান পরিচিতিগুলিকে শেয়ার করুন"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"দৃশ্যমান পরিচিতিগুলি শেয়ার করতে ব্যর্থ হয়েছে৷"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"পছন্দসই পরিচিতিগুলি শেয়ার করুন"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"সকল পরিচিতি শেয়ার করুন"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"পরিচিতিগুলিকে শেয়ার করতে ব্যর্থ হয়েছে৷"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"পরিচিতিগুলি আমদানি/রপ্তানি করুন"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"পরিচিতিগুলি আমদানি করুন"</string>
-    <string name="share_error" msgid="5642622973966851784">"এই পরিচিতিটিকে শেয়ার করা যাবে না৷"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"শেয়ার করার জন্য কোনো পরিচিতি নেই৷"</string>
-    <string name="menu_search" msgid="1241802591112035764">"অনুসন্ধান"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"পরিচিতিগুলি খুঁজুন"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"পছন্দগুলি"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"কোনো পরিচিতি নেই৷"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"কোনো দৃশ্যমান পরিচিতি নেই৷"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"কোনো পছন্দসই নেই"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> এ কোনো পরিচিতি নেই"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"পুনরাবৃত্তি সাফ করুন"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"সিম কার্ড নির্বাচন করুন"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"অ্যাকাউন্টগুলি পরিচালনা করুন"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"আমদানি/রপ্তানি"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> এর মাধ্যমে"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> এর মাধ্যমে <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"অনুসন্ধান বন্ধ করুন"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"অনুসন্ধান সাফ করুন"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"পরিচিতি প্রদর্শনের বিকল্পগুলি"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"অ্যাকাউন্ট"</string>
     <string name="set_default_account" msgid="7966099951006467572">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"এর মাধ্যমে কল করুন"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"কলের সাথে পাঠানোর জন্য একটি নোট লিখুন ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"পাঠান এবং কল করুন"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ট্যাব৷"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ট্যাব৷ <xliff:g id="COUNT_3">%2$d</xliff:g>টি অপঠিত আইটেম৷ </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ট্যাব৷ <xliff:g id="COUNT_3">%2$d</xliff:g>টি অপঠিত আইটেম৷ </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"বিল্ডের সংস্করণ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"মুক্ত উৎস লাইসেন্সগুলি"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ওপেন সোর্স সফ্টওয়্যারের লাইসেন্স বিবরণ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"গোপনীয়তা নীতি"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"পরিষেবার শর্তাবলী"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"মুক্ত উৎস লাইসেন্সগুলি"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url খুলতে ব্যর্থ হয়েছে৷"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ভিডিও কল"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"শেয়ার এবং কল করুন"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bs/strings.xml b/java/com/android/contacts/common/res/values-bs/strings.xml
index 278f6a8..b0d1deb 100644
--- a/java/com/android/contacts/common/res/values-bs/strings.xml
+++ b/java/com/android/contacts/common/res/values-bs/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst je kopiran"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiraj u međumemoriju"</string>
     <string name="call_custom" msgid="3041673234638990874">"Pozovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Pozovi kuću"</string>
     <string name="call_mobile" msgid="967589404494150813">"Pozovi mobitel"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Pozovi poslovni pejdžer"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Pozovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Pozovi MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Poziv)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Pošalji tekstualnu poruku na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Pošalji tekstualnu poruku na kućni broj"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Pošalji tekstualnu poruku na mobilni"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji tekstualnu poruku na poslovni pejdžer"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Pošalji tekstualnu poruku <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Pošalji tekstualnu poruku na MMS broj"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Poruka)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Obrisati često kontaktirane osobe?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Obrisat ćete listu često kontaktiranih osoba u aplikaciji Kontakti i Aplikaciji za telefon, pa će aplikacije za e-poštu morati ispočetka učiti vaše postavke adresa."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih osoba…"</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzeto"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ostalo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni imenik"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Pretraživanje…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nema kontakata"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> kontakt pronađen</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> kontakta pronađena</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> kontakata pronađeno</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Brzi kontakt za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Bez imena)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Često pozivane osobe"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Često kontaktirane osobe"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti s brojevima telefona"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakti radnog profila"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-pošta <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-pošta"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Poštanski pretinac"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Naselje"</string>
     <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Država"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
@@ -136,112 +122,28 @@
     <string name="map_work" msgid="5723471185992684400">"Prikaži poslovnu adresu"</string>
     <string name="map_other" msgid="2253764780863500516">"Prikaži adresu"</string>
     <string name="map_custom" msgid="5581743097882436157">"Prikaži adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Ćaskanje putem aplikacije AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Ćaskanje putem aplikacije Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Ćaskanje putem aplikacije Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Ćaskanje putem aplikacije Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Ćaskanje putem aplikacije QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Ćaskanje putem aplikacije Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Ćaskanje putem aplikacije ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Ćaskanje putem aplikacije Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Ćaskanje"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"izbriši"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Proširi ili skupi polja za imena"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Proširi ili skupi polja za fonetska imena"</string>
+    <string name="chat_aim" msgid="2954364435497941659">"Chat putem aplikacije AIM"</string>
+    <string name="chat_msn" msgid="3130135239071228678">"Chat putem aplikacije Windows Live"</string>
+    <string name="chat_yahoo" msgid="3233552142326865347">"Chat putem aplikacije Yahoo"</string>
+    <string name="chat_skype" msgid="6486703981390592425">"Chat putem aplikacije Skype"</string>
+    <string name="chat_qq" msgid="786924280665740019">"Chat putem aplikacije QQ"</string>
+    <string name="chat_gtalk" msgid="7914674177243078035">"Chat putem aplikacije Google Talk"</string>
+    <string name="chat_icq" msgid="3292934726414765801">"Chat putem aplikacije ICQ"</string>
+    <string name="chat_jabber" msgid="6701542313597880204">"Chat putem aplikacije Jabber"</string>
+    <string name="chat" msgid="1020428260359370236">"Chat"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gotovo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Otkaži"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti na računu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Jedan kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Sačuvaj uvezene kontakte na karticu:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Uvezi sa SIM kartice"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Uvezi iz .vcf fajla"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Otkazati uvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Otkazati izvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Nemoguće otkazati uvoz/izvoz vCard fajla"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nepoznata greška."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nije moguće otvoriti \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nije moguće pokrenuti program za izvoz: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nema sadržaja za izvoz."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Onemogućili ste potrebnu dozvolu."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Došlo je do greške prilikom izvoza: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Zahtijevano ime fajla je predugo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O greška"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nema dovoljno memorije. Možda je fajl prevelik."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Nije moguće raščlaniti vCard fajl iz neočekivanog razloga."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format nije podržan."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nije moguće otvoriti metapodatke vCard fajl(ov)a."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nije moguće uvesti jedan ili više fajlova (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Izvoz fajla <xliff:g id="FILENAME">%s</xliff:g> je završen."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Izvoz kontakata je završen."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Izvoz kontakata je završen. Kliknite obavještenje da podijelite kontakte."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Dodirnite da podijelite kontakte."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Izvoz fajla <xliff:g id="FILENAME">%s</xliff:g> je otkazan."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Izvoz podataka kontakta u toku"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Podaci kontakta se izvoze."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nije moguće preuzeti informacije iz baze podataka."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nema kontakata koji se mogu izvoziti. Ako imate kontakte na uređaju, neki dobavljači podataka možda ne dozvoljavaju izvoz kontakata s tableta."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Program za izradu kartica vCard nije pravilno pokrenut."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Izvoz nije uspio"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Podaci kontakta nisu izvezeni.\nRazlog: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Uvozi se kontakt <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Čitanje podataka vCard nije uspjelo"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Čitanje vCard podataka je otkazano"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Završen uvoz vCard fajla <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Uvoz fajla <xliff:g id="FILENAME">%s</xliff:g> je otkazan"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Fajl <xliff:g id="FILENAME">%s</xliff:g> će uskoro biti uvezen."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fajl će uskoro biti uvezen."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Zahtjev za uvoz vCard fajla je odbijen. Pokušajte ponovo kasnije."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Fajl <xliff:g id="FILENAME">%s</xliff:g> će će uskoro biti izvezen."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fajl će uskoro biti izvezen."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakti će uskoro biti izvezeni."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Zahtjev za izvoz vCard fajla je odbijen. Pokušajte ponovo kasnije."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Spremanje vCard fajlova u lokalnu privremenu pohranu. Uvoz će započeti uskoro."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Uvoz vCard kartice nije uspio."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt preko NFC-a"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Izvesti kontakte?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Spremanje u privremenu pohranu u toku"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Uvozi se <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Izvezi u .vcf fajl"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Poredaj po"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezime"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imena"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ime prvo"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prezime prvo"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Zadani račun za nove kontakte"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinhroniziraj metapodatke kontakata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"O Kontaktima"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Postavke"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Podijeli vidljive kontakte"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Dijeljenje vidljivih kontakata nije uspjelo."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Dijeli omiljene kontakte"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Dijeli sve kontakte"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Dijeljenje kontakata nije uspjelo."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Uvoz/izvoz kontakata"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Uvezi kontakte"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ovaj kontakt se ne može podijeliti."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nema kontakata za dijeljenje."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Traži"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Pronađi kontakte"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoriti"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nema kontakata."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nema vidljivih kontakata."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nema favorita"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nema kontakata u <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Obriši često kontaktirane"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Odaberite SIM karticu"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Upravljaj računima"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Uvoz/izvoz"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"putem <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> putem <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavi pretraživanje"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Obriši pretragu"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcije prikaza kontakata"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Uvijek koristi ovu karticu za pozive"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Poziv putem"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Upišite bilješku koja će se poslati uz poziv ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I POZOVI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
       <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
       <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Međuverzija aplikacije"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licence otvorenog koda"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalji o licenci za Open source softver"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Pravila o privatnosti"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Uslovi pružanja usluge"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licence otvorenog koda"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Otvaranje URL-a nije uspjelo."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videopoziv"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Podijeli i pozovi"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ca/strings.xml b/java/com/android/contacts/common/res/values-ca/strings.xml
index ad31a01..f34bd1f 100644
--- a/java/com/android/contacts/common/res/values-ca/strings.xml
+++ b/java/com/android/contacts/common/res/values-ca/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text copiat"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copia al porta-retalls"</string>
     <string name="call_custom" msgid="3041673234638990874">"Truca al <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Truca a casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Truca al mòbil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Truca al cercapersones de la feina"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Truca al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Truca al número MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (truca-li)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Envia SMS al <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Envia un SMS a casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Envia un SMS al mòbil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Envia un SMS al cercapersones de la feina"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Envia un SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Envia un MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (envia-li un missatge)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vols esborrar els contactes freqüents?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"S\'esborrarà la llista de contactes més freqüents a les aplicacions Contactes i Telèfon i es forçarà les aplicacions de correu electrònic a obtenir informació nova sobre les teves preferències pel que fa a adreces."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"S\'estan esborrant contactes freq..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupat"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactes"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suggeriments principals"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altres"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directori de la feina"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tots els contactes"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggeriments"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jo"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"S\'està cercant…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Se n\'han trobat més de <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No hi ha cap contacte"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactes trobats</item>
-      <item quantity="one">1 contacte trobat</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contacte ràpid per a <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sense nom)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Usuaris a qui es truca sovint"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactes freqüents"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualitza el contacte"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Tots els contactes que tenen números de telèfon"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactes del perfil professional"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Envia un correu electrònic a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Correu electrònic"</string>
     <string name="postal_street" msgid="6918171741240802474">"Carrer"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Apartat postal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Barri"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ciutat"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Codi postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Xateja amb ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Xateja amb Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Xat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"suprimeix"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Desplega o replega els camps de nom"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Desplega o replega els camps de nom fonètic"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tots els contactes"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Fet"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancel·la"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactes a <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contactes en visualització personalitzada"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Un sol contacte"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Desa els contactes importats a:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importa de la targeta SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importa des de la targeta SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importa des de la targeta SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importa d\'un fitxer .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vols cancel·lar la importació de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vols cancel·lar l\'exportació de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"No es pot cancel·lar la imp./exp. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"S\'ha produït un error desconegut."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"<xliff:g id="FILE_NAME">%s</xliff:g> no s\'ha pogut obrir: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"No s\'ha pogut iniciar l\'exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"No hi ha cap contacte que es pugui exportar."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Has desactivat un permís obligatori."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"S\'ha produït un error durant l\'exportació: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"El nom de fitxer obligatori és massa llarg (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Error d\'E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"No hi ha prou memòria. És possible que el fitxer sigui massa gran."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"No s\'ha pogut analitzar la vCard a causa d\'un motiu inesperat."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"No s\'admet aquest format."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"No s\'ha pogut recopilar metainformació dels fitxers de la vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"No s\'ha pogut importar un dels fitxers com a mínim (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportació de <xliff:g id="FILENAME">%s</xliff:g> finalitzada."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"S\'han acabat d\'exportar els contactes."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"S\'han acabat d\'exportar els contactes; fes clic a la notificació per compartir-los."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toca per compartir els contactes."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"S\'ha cancel·lat l\'exportació de: <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"S\'estan exportant les dades de contacte"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"S\'estan exportant les dades de contacte."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"No s\'ha pogut obtenir informació de la base de dades."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"No hi ha cap contacte que es pugui exportar. Si en tens algun al dispositiu, és possible que hi hagi proveïdors de dades que no permetin que els contactes s\'exportin des d\'aquest dispositiu."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"No s\'ha iniciat correctament el creador de vCard."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Error en exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"No s\'han exportat les dades de contacte.\nMotiu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"S\'està important <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"No s\'han pogut llegir les dades de vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lectura de dades de vCard cancel·lada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importació de vCard <xliff:g id="FILENAME">%s</xliff:g> finalitzada"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"S\'ha cancel·lat la importació de: <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> s\'importarà d\'aquí a poc."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"D\'aquí a poc s\'importarà el fitxer."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"S\'ha rebutjat la sol·licitud per importar la vCard. Torna-ho a provar més tard."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> s\'exportarà en breu."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"El fitxer s\'exportarà en breu."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Aviat s\'exportaran els contactes."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"S\'ha rebutjat la sol·licitud per exportar la vCard. Torna-ho a provar més tard."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contacte"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"S\'estan desant les vCard a l\'emmagatzematge temporal local. La importació real començarà aviat."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"No s\'ha pogut importar la vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contac. reb. NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Vols exportar els contactes?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Desament a la memòria cau"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"S\'estan important <xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exporta a un fitxer .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordena per"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nom"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Cognoms"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format del nom"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primer el nom"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primer els cognoms"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Compte predeterminat per als contactes nous"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronitza les metadades dels contactes"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Sobre Contactes"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Configuració"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Comparteix contactes visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Error en compartir els contactes visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Comparteix els contactes preferits"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Comparteix tots els contactes"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"No s\'han pogut compartir els contactes."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importa/exporta contactes"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importa contactes"</string>
-    <string name="share_error" msgid="5642622973966851784">"No es pot compartir aquest contacte."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"No hi ha cap contacte per compartir."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Cerca"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Cerca contactes"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Preferits"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No hi ha cap contacte."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No hi ha cap contacte visible."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Sense preferits"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"No hi ha cap contacte a <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Esborra contactes freqüents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Selecció d\'una targeta SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gestiona els comptes"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importa/exporta"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"mitjançant <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> mitjançant <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"Atura la cerca."</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Esborra la cerca"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcions de visualització de contactes"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Utilitza sempre per a les trucades"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Truca mitjançant"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escriu una nota per enviar-la juntament amb la trucada..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIA I TRUCA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Pestanya <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Pestanya <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> elements no llegits </item>
       <item quantity="one">Pestanya <xliff:g id="TITLE_0">%1$s</xliff:g>: <xliff:g id="COUNT_1">%2$d</xliff:g> element no llegit </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versió de la compilació"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Llicències de codi obert"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalls de la llicència del programari lliure"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de privadesa"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Condicions del servei"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Llicències de programari lliure"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"No s\'ha pogut obrir l\'URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videotrucada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Comparteix i truca"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-cs/strings.xml b/java/com/android/contacts/common/res/values-cs/strings.xml
index ab54be9..dcad846 100644
--- a/java/com/android/contacts/common/res/values-cs/strings.xml
+++ b/java/com/android/contacts/common/res/values-cs/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text zkopírován"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Zkopírovat do schránky"</string>
     <string name="call_custom" msgid="3041673234638990874">"Volat číslo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Volat domů"</string>
     <string name="call_mobile" msgid="967589404494150813">"Volat mobil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Volat na pracovní pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Volat kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Volat MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Zavolat)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Poslat SMS na číslo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Poslat SMS domů"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Poslat SMS na mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Poslat SMS na pracovní pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Poslat SMS na kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Poslat SMS na číslo MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Poslat zprávu)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vymazat často kontaktované osoby?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vymažete seznam často kontaktovaných osob v aplikacích Kontakty a Telefon a e-mailové aplikace budou muset nastavení adresátů vytvořit znovu."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Mazání často kontaktovaných osob..."</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Pryč"</string>
     <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Hlavní návrhy"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Ostatní"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Adresář"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovní adresář"</string>
     <string name="local_search_label" msgid="907622822323119235">"Všechny kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Já"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Vyhledávání..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Nalezeno více kontaktů než <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Žádné kontakty"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="few">Nalezeny <xliff:g id="COUNT">%d</xliff:g> kontakty</item>
-      <item quantity="many">Nalezeno <xliff:g id="COUNT">%d</xliff:g> kontaktu</item>
-      <item quantity="other">Nalezeno <xliff:g id="COUNT">%d</xliff:g> kontaktů</item>
-      <item quantity="one">Nalezen 1 kontakt</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Rychlý kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Žádné jméno)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Často volané"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Často používané"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Zobrazit kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Kontakty s telefonními čísly"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty z pracovního profilu"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-mail <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulice"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Číslo poštovní schránky"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Čtvrť"</string>
     <string name="postal_city" msgid="8674569121430005628">"Město"</string>
     <string name="postal_region" msgid="1730369286225469192">"Stát"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"PSČ"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatovat pomocí ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatovat pomocí Jabberu"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"smazat"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Rozbalit nebo sbalit pole jména"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Rozbalí nebo sbalí pole s fonetickým přepisem jména"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Všechny kontakty"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Hotovo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Zrušit"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty v účtu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakty ve vlastním zobrazení"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Jeden kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Účet k uložení importovaných kontaktů:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importovat ze SIM karty"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importovat ze SIM karty <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importovat ze SIM karty <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importovat ze souboru VCF"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Zrušit import souboru <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Zrušit export souboru <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Import/export vizitky vCard nelze zrušit"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Neznámá chyba."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Soubor <xliff:g id="FILE_NAME">%s</xliff:g> nelze otevřít: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nelze spustit nástroj pro export: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Žádný kontakt nelze exportovat."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Zakázali jste požadované oprávnění."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Při exportu došlo k chybě: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Požadovaný název souboru (<xliff:g id="FILENAME">%s</xliff:g>) je příliš dlouhý."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Chyba I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Není k dispozici dostatek paměti. Soubor může být příliš velký."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Analýza souboru vCard se z neočekávaných důvodů nezdařila."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formát není podporován."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Informace o metadatech daných souborů vCard se nepodařilo shromáždit."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Jeden nebo více souborů se nepodařilo importovat (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Export souboru <xliff:g id="FILENAME">%s</xliff:g> byl dokončen."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Exportování kontaktů bylo dokončeno."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Export kontaktů byl dokončen. Klepnutím na oznámení je můžete sdílet."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Klepnutím můžete sdílet kontakty."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Export souboru <xliff:g id="FILENAME">%s</xliff:g> byl zrušen."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Export dat kontaktů"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Probíhá export dat kontaktů."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nepodařilo se získat informace o databázi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Není možné exportovat žádné kontakty. Pokud v zařízení opravdu máte uložené kontakty, je možné, že některý poskytovatel datových služeb zakázal jejich export mimo zařízení."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Editor souboru vCard nebyl správně spuštěn."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Export se nezdařil"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Data kontaktů nebyla exportována.\nDůvod: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Probíhá import: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nepodařilo se přečíst údaje vizitky vCard."</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Čtení dat souboru vCard bylo zrušeno"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Import souboru vCard (<xliff:g id="FILENAME">%s</xliff:g>) byl dokončen"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Import souboru <xliff:g id="FILENAME">%s</xliff:g> byl zrušen."</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Soubor <xliff:g id="FILENAME">%s</xliff:g> bude za okamžik importován."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Soubor bude zakrátko importován."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Požadavek na import souborů vCard byl zamítnut. Zkuste to prosím později."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Soubor <xliff:g id="FILENAME">%s</xliff:g> bude za okamžik exportován."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Soubor bude brzy exportován."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakty budou brzy exportovány."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Požadavek na export souborů vCard byl zamítnut. Zkuste to prosím později."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Načítání souboru vCard do mezipaměti místního dočasného úložiště. Vlastní import bude zahájen v krátké době."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Soubor vCard se nepodařilo importovat."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt přijatý prostřednictvím komunikace NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportovat kontakty?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Ukládání do mezipaměti"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Probíhá import: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportovat do souboru VCF"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Seřadit podle"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Jméno"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Příjmení"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formát jména"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nejprve jméno"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nejprve příjmení"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Výchozí účet pro nové kontakty"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synchronizovat metadata kontaktů"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Informace o kontaktech"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Nastavení"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Sdílet viditelné kontakty"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Sdílení viditelných kontaktů se nezdařilo."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Sdílet oblíbené kontakty"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Sdílet všechny kontakty"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontakty se nepodařilo sdílet."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importovat nebo exportovat kontakty"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importovat kontakty"</string>
-    <string name="share_error" msgid="5642622973966851784">"Tento kontakt nelze sdílet."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nejsou dostupné žádné kontakty ke sdílení."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Hledat"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Najít kontakty"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Oblíbené"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Žádné kontakty."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Žádné kontakty nejsou viditelné."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Žádné oblíbené položky"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Žádné kontakty v položce <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Vymazat často kontaktované"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Vybrat SIM kartu"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Správa účtů"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importovat/Exportovat"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"prostřednictvím zdroje <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> prostřednictvím zdroje <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zastavit vyhledávání"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Vymazat vyhledávání"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Možnosti zobrazení kontaktů"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Účet"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Vždy používat pro hovory"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Volat pomocí"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Zadejte poznámku, která se odešle pomocí volání…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ODESLAT A ZAVOLAT"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepřečtené položky. </item>
@@ -258,13 +159,6 @@
       <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepřečtených položek. </item>
       <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> nepřečtená položka. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Verze sestavení"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licence open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Podrobnosti o licenci pro software s otevřeným zdrojovým kódem"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Zásady ochrany soukromí"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Smluvní podmínky"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licence open source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Adresu URL se nepodařilo otevřít."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videohovor"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Sdílet a zavolat"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-da/strings.xml b/java/com/android/contacts/common/res/values-da/strings.xml
index 965d04a..fdc7219 100644
--- a/java/com/android/contacts/common/res/values-da/strings.xml
+++ b/java/com/android/contacts/common/res/values-da/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Kopieret tekst"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopier til udklipsholder"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ring til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ring til mobil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ring til personsøger på arbejdet"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ring til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ring til mms"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring op)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Send sms til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Send sms til hjem"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Send sms til mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Send sms til personsøger på arbejdet"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Send sms til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Send sms til mms"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send besked)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du rydde de ofte kontaktede?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i appene Kontaktpersoner og Opkald. Du vil samtidig tvinge e-mailapps til at lære dine adressepræferencer fra bunden."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Ofte kontaktede personer ryddes…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ikke til stede"</string>
     <string name="status_busy" msgid="5990832098713248503">"Optaget"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populære forslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Andre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Indeks"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Indeks for arbejde"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mig"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Søger..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Der er fundet mere end <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ingen kontaktpersoner"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> blev fundet</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> blev fundet</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Hurtig kontakt til <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Intet navn)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Ofte ringet til"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Ofte kontaktet"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontaktperson"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontaktpersoner med telefonnumre"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktpersoner for arbejdsprofil"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Send e-mail til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Send e-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gade"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postboks"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Nabolag"</string>
     <string name="postal_city" msgid="8674569121430005628">"By"</string>
     <string name="postal_region" msgid="1730369286225469192">"Stat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat ved hjælp af ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat ved hjælp af Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"slet"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Udvid eller skjul navnefelter"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Udvid eller skjul felter til fonetiske navne"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontaktpersoner"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Afslut"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Annuller"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktpersoner i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Enkelt kontaktperson"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Gem importerede kontaktpersoner på:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importér fra SIM-kort"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importér fra SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importér fra SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importér fra .vcf-fil"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vil du annullere importen af <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vil du annullere eksporten af <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Import/eksport af vCard kunne ikke annulleres"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Ukendt fejl."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" kan ikke åbnes: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Eksportfunktionen kunne ikke startes: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Der er ingen kontaktpersoner, der kan eksporteres."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Du har deaktiveret en påkrævet tilladelse."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Der opstod en fejl under eksporten: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Det krævede filnavn er for langt (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O-fejl"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ikke nok hukommelse. Filen kan være for stor."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vCard kunne ikke parses af uventede årsager."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatet understøttes ikke."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Metaoplysninger om de angivne vCard-filer kunne ikke hentes."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"En eller flere filer kunne ikke importeres (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> er eksporteret."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontaktpersoner blev eksporteret."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktpersonerne blev eksporteret. Klik på underretningen for at dele kontaktpersonerne."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tryk for at dele kontaktpersoner."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Eksport af <xliff:g id="FILENAME">%s</xliff:g> er annulleret."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Eksporterer kontaktdata"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktoplysningerne eksporteres."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Databaseoplysningerne kunne ikke hentes."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Der er ingen kontaktpersoner, der kan eksporteres. Hvis du har kontaktpersoner på din enhed, tillader nogle dataudbydere muligvis ikke, at kontaktpersonerne eksporteres fra enheden."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Oprettelsen af vCard startede ikke korrekt."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksport ikke mulig"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktdataene blev ikke eksporteret.\nÅrsag: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importerer <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Dataene på dette vCard kunne ikke læses"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Læsning af vCard-data blev annulleret"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Import af vCard afsluttet <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Import af <xliff:g id="FILENAME">%s</xliff:g> blev annulleret"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> importeres om et øjeblik."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Filen importeres inden længe."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Anmodningen om import af vCard blev afvist. Prøv igen senere."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> eksporteres om et øjeblik."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Filen eksporteres om et øjeblik."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktpersonerne eksporteres om lidt."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Anmodningen om eksport af vCard blev afvist. Prøv igen senere."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontaktperson"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Cachelagrer vCard-fil(er) til lokalt midlertidigt lager. Den egentlige import starter snart."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard kunne ikke importeres."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Eksportér kontaktpersoner?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Cachelagrer"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importerer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportér til .vcf-fil"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér efter"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Efternavn"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavn først"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Efternavn først"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standardkonto til nye kontaktpersoner"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synkroniser metadata for kontaktpersoner"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Om Kontaktpersoner"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Indstillinger"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Del synlige kontaktpersoner"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Det lykkedes ikke at dele synlige kontaktpersoner."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Del foretrukne kontaktpersoner"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Del alle kontaktpersoner"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontaktpersonerne kunne ikke deles."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importér/eksportér kontaktpersoner"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importer kontaktpersoner"</string>
-    <string name="share_error" msgid="5642622973966851784">"Denne kontaktperson kan ikke deles."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Der er ingen kontaktpersoner, der kan deles."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Søg"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Find kontaktpersoner"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Foretrukne"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Der er ingen kontaktpersoner."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ingen synlige kontaktpersoner."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Der er ingen favoritter"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ingen kontaktpersoner i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Ryd hyppige"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Vælg SIM-kort"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Administrer konti"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importér/eksportér"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop søgning"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Ryd søgning"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Indstillinger for visning af kontaktpersoner"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Brug altid ved opkald"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Indtast en note, som skal sendes ved opkald..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Fanen <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Fanen <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ulæst element. </item>
       <item quantity="other"> Fanen <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ulæste elementer. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build-version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open source-licenser"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licensoplysninger til open source-software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privatlivspolitik"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Servicevilkår"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open source-licenser"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Webadressen kunne ikke åbnes."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videoopkald"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-de/strings.xml b/java/com/android/contacts/common/res/values-de/strings.xml
index 60c5e68..65d4c55 100644
--- a/java/com/android/contacts/common/res/values-de/strings.xml
+++ b/java/com/android/contacts/common/res/values-de/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text kopiert"</string>
-    <string name="copy_text" msgid="5890820280087874642">"In Zwischenablage kopieren"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> anrufen"</string>
     <string name="call_home" msgid="125893483593803791">"Private Nummer anrufen"</string>
     <string name="call_mobile" msgid="967589404494150813">"Mobilfunknummer anrufen"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Pager (geschäftlich) anrufen"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> anrufen"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS anrufen"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Anruf)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS an <xliff:g id="CUSTOM">%s</xliff:g> senden"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS an private Nummer senden"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS an Mobilfunknummer senden"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS an Pager (geschäftlich) senden"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS an <xliff:g id="ASSISTANT">%s</xliff:g> senden"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS an MMS senden"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Nachricht)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Liste \"Häufig kontaktiert\" löschen?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du löschst die Liste \"Häufig kontaktiert\" in den Apps \"Kontakte\" und \"Telefon\" und bewirkst so ein Zurücksetzen deiner Adresseinstellungen für E-Mail-Apps."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"\"Häufig kontaktiert\" wird gelöscht…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Abwesend"</string>
     <string name="status_busy" msgid="5990832098713248503">"Beschäftigt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top-Vorschläge"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Andere"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Verzeichnis"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Verzeichnis geschäftlicher Kontakte"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle Kontakte"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Vorschläge"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ich"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Suche läuft..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Mehr als <xliff:g id="COUNT">%d</xliff:g> Kontakte gefunden"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Keine Kontakte"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> gefunden</item>
-      <item quantity="one">1 gefunden</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Schnellkontakt für <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Kein Name)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Häufig angerufen"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Häufig kontaktiert"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontakt ansehen"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle Kontakte mit Telefonnummern"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Arbeitsprofilkontakte"</string>
@@ -125,14 +114,12 @@
     <string name="email_custom" msgid="7246580894327511013">"E-Mail an <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-Mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Straße"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postfach"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Stadtteil"</string>
     <string name="postal_city" msgid="8674569121430005628">"Stadt"</string>
     <string name="postal_region" msgid="1730369286225469192">"Bundesland"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postleitzahl"</string>
     <string name="postal_country" msgid="232670707458768148">"Land"</string>
     <string name="map_home" msgid="4181131107392126938">"Privatadresse ansehen"</string>
-    <string name="map_work" msgid="5723471185992684400">"Geschäftsadresse ansehen"</string>
+    <string name="map_work" msgid="5723471185992684400">"Arbeitsadresse ansehen"</string>
     <string name="map_other" msgid="2253764780863500516">"Adresse ansehen"</string>
     <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g>-Adresse ansehen"</string>
     <string name="chat_aim" msgid="2954364435497941659">"Über AIM chatten"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Über ICQ chatten"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Über Jabber chatten"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"löschen"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Namensfelder minimieren oder maximieren"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Felder für phonetische Namen maximieren oder minimieren"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle Kontakte"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Fertig"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Abbrechen"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakte in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakte in benutzerdef. Ansicht"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Einzelner Kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Importierte Kontakte speichern unter:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Von SIM-Karte importieren"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Von SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> importieren"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Von SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> importieren"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Aus VCF-Datei importieren"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Import von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Export von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard-Import/-Export nicht abgebrochen"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Unbekannter Fehler"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" konnte nicht geöffnet werden. Grund: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Exportprogramm konnte nicht gestartet werden. Grund: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Es ist kein exportierbarer Kontakt vorhanden."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Du hast eine erforderliche Berechtigung deaktiviert."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Beim Export ist ein Fehler aufgetreten: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Erforderlicher Dateiname ist zu lang (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"E/A-Fehler"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nicht genügend Speicherplatz. Die Datei ist möglicherweise zu groß."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Die vCard konnte aus einem unerwarteten Grund nicht geparst werden."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Das Format wird nicht unterstützt."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Abrufen der Metadaten aus angegebenen vCards nicht möglich"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Eine oder mehrere Dateien können nicht importiert werden (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgeschlossen"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontakte wurden exportiert"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Das Exportieren der Kontakte ist abgeschlossen. Klicke auf die Benachrichtigung, um die Kontakte freizugeben."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Zum Teilen der Kontakte tippen."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontaktdaten werden exportiert..."</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Die Kontaktdaten werden gerade exportiert."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Datenbankinformationen konnten nicht abgerufen werden."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Es sind keine exportierbaren Kontakte vorhanden. Falls sich Kontakte auf deinem Gerät befinden, ist das Exportieren der Kontakte eventuell durch den Datenanbieter gesperrt."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Das Programm zum Erstellen der vCard wurde nicht richtig gestartet."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Export nicht möglich"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Die Kontaktdaten wurden nicht exportiert.\nGrund: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> wird importiert..."</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Lesen der vCard-Daten nicht möglich"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lesen von vCard-Daten abgebrochen"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Import der vCard <xliff:g id="FILENAME">%s</xliff:g> abgeschlossen"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Import von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> wird in Kürze importiert."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Die Datei wird in Kürze importiert."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Die vCard-Importanfrage wurde abgelehnt. Bitte versuche es später erneut."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> wird in Kürze exportiert."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Die Datei wird in Kürze exportiert."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Die Kontakte werden in Kürze exportiert."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuche es später erneut."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"Kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Caching der vCard(s) in lokalen temporären Speicher wird durchgeführt. Der eigentliche Import beginnt gleich."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Importieren der vCard nicht möglich"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt per NFC erhalten"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Kontakte exportieren?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Caching läuft..."</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Import von <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"In VCF-Datei exportieren"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortieren nach"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vorname"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nachname"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Namensformat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Vorname zuerst"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nachname zuerst"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standardkonto für neue Kontakte"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Kontakt-Metadaten synchronisieren"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Über \"Kontakte\""</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Einstellungen"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Sichtbare Kontakte teilen"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Die sichtbaren Kontakte konnten nicht geteilt werden."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Lieblingskontakte teilen"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Alle Kontakte teilen"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontakte konnten nicht geteilt werden."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontakte importieren/exportieren"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Kontakte importieren"</string>
-    <string name="share_error" msgid="5642622973966851784">"Dieser Kontakt kann nicht geteilt werden."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Keine Kontakte zum Teilen vorhanden."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Suchen"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Kontakte suchen"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoriten"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Keine Kontakte."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Keine sichtbaren Kontakte"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Keine Favoriten"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Keine Kontakte in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"\"Häufig kontaktiert\" löschen"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM-Karte auswählen"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Konten verwalten"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importieren/Exportieren"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"über <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> über <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"Suche beenden"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Suche zurücksetzen"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Anzeigeoptionen für Kontakte"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Anrufen mit"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Notiz eingeben, die beim Anrufen gesendet wird..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SENDEN UND ANRUFEN"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tab \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Tab \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> ungelesene Elemente. </item>
       <item quantity="one">Tab \"<xliff:g id="TITLE_0">%1$s</xliff:g>\". <xliff:g id="COUNT_1">%2$d</xliff:g> ungelesenes Element. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build-Version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open-Source-Lizenzen"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Lizenzdetails für Open-Source-Software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Datenschutzerklärung"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Nutzungsbedingungen"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open-Source-Lizenzen"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Die URL konnte nicht geöffnet werden."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videoanruf"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Teilen und anrufen"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-el/strings.xml b/java/com/android/contacts/common/res/values-el/strings.xml
index 9af3bc5..655bb3a 100644
--- a/java/com/android/contacts/common/res/values-el/strings.xml
+++ b/java/com/android/contacts/common/res/values-el/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Το κείμενο αντιγράφηκε"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Αντιγραφή στο πρόχειρο"</string>
     <string name="call_custom" msgid="3041673234638990874">"Κλήση <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Κλήση οικίας"</string>
     <string name="call_mobile" msgid="967589404494150813">"Κλήση κινητής συσκευής"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Κλήση βομβητή εργασίας"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Κλήση <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Κλήση MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Κλήση)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Αποστολή μηνύματος κειμένου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Αποστολή μηνύματος κειμένου προς οικία"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Αποστολή μηνύματος κειμένου προς κινητή συσκευή"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Αποστολή μηνύματος κειμένου προς βομβητή εργασίας"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Αποστολή μηνύματος προς <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Αποστολή μηνύματος κειμένου ως MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Μήνυμα)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Διαγραφή ατόμων με συχνή επικοινωνία;"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Θα διαγράψετε τη λίστα συχνών επαφών στις εφαρμογές Επαφές και Τηλέφωνο και θα επιβάλλετε στις εφαρμογές ηλεκτρονικού ταχυδρομείου να μάθουν τις προτιμήσεις διευθύνσεών σας από την αρχή,"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Διαγρ. ατόμων με συχνή επικοινωνία…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Μη διαθέσιμος"</string>
     <string name="status_busy" msgid="5990832098713248503">"Απασχολημένος"</string>
     <string name="contactsList" msgid="8806067891419291513">"Επαφές"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Κορυφαίες προτάσεις"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Άλλο"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Κατάλογος"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Κατάλογος εργασίας"</string>
     <string name="local_search_label" msgid="907622822323119235">"Όλες οι επαφές"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Προτάσεις"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Εγώ"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Αναζήτηση..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Βρέθηκαν περισσότερα από <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Δεν υπάρχουν επαφές"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Βρέθηκαν <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Βρέθηκε 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Γρήγορη επαφή για <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Χωρίς όνομα)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Συχνές κλήσεις"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Συχνή επικοινωνία"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Προβολή επαφής"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Όλες οι επαφές με αριθμούς τηλεφώνου"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Επαφές προφίλ εργασίας"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
     <string name="postal_street" msgid="6918171741240802474">"Οδός"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Ταχυδρομική θυρίδα"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Γειτονιά"</string>
     <string name="postal_city" msgid="8674569121430005628">"Πόλη"</string>
     <string name="postal_region" msgid="1730369286225469192">"Πολιτεία"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Ταχυδρομικός κώδικας"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Συζήτηση μέσω ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Συζήτηση μέσω Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Συζήτηση"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"διαγραφή"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ανάπτυξη ή σύμπτυξη πεδίων ονομάτων"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Ανάπτυξη ή σύμπτυξη πεδίων φωνητικού ονόματος"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Όλες οι επαφές"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Τέλος"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Ακύρωση"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Επαφές στο <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Επαφές σε προσ/νη προβολή"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Μία επαφή"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Αποθήκευση επαφών που εισήχθησαν σε:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Εισαγωγή από κάρτα SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Εισαγωγή από κάρτα SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Εισαγωγή από κάρτα SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Εισαγωγή από αρχείο .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Ακύρωση της εισαγωγής του αρχείου <xliff:g id="FILENAME">%s</xliff:g>;"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Ακύρωση της εξαγωγής του αρχείου <xliff:g id="FILENAME">%s</xliff:g>;"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Αδύνατη ακύρωση εισαγωγής/εξαγωγής vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Άγνωστο σφάλμα."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Δεν ήταν δυνατό το άνοιγμα του αρχείου \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Δεν ήταν δυνατή η έναρξη του προγράμματος εξαγωγής: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Δεν υπάρχει επαφή με δυνατότητα εξαγωγής."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Απενεργοποιήσατε μια απαιτούμενη άδεια."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Προέκυψε κάποιο σφάλμα κατά την εξαγωγή: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Το απαιτούμενο όνομα αρχείου είναι πάρα πολύ μεγάλο (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Σφάλμα I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Δεν υπάρχει αρκετή μνήμη. Το αρχείο ενδέχεται να είναι πάρα πολύ μεγάλο."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Δεν ήταν δυνατή η ανάλυση της κάρτας vCard λόγω μη αναμενόμενης αιτίας."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Η μορφή δεν υποστηρίζεται."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Δεν ήταν δυνατή η συλλογή πληροφοριών μεταδεδομένων των καρτών vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Δεν ήταν δυνατή η εισαγωγή ενός ή περισσότερων αρχείων (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> ολοκληρώθηκε."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Ολοκλήρωση εξαγωγής επαφών."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Ολοκληρώθηκε η εξαγωγή των επαφών. Κάντε κλικ στην ειδοποίηση για να μοιραστείτε επαφές."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Πατήστε για να μοιραστείτε επαφές."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> ακυρώθηκε."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Εξαγωγή δεδομένων επαφών"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Γίνεται εξαγωγή των δεδομένων επαφών."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Δεν ήταν δυνατή η λήψη πληροφοριών βάσης δεδομένων."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στη συσκευή σας, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέψουν την εξαγωγή επαφών από τη συσκευή."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Η έναρξη της vCard δεν ήταν σωστή."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Αδυναμία εξαγωγής"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Δεν έγινε εξαγωγή των δεδομένων επαφής.\nΑιτία: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Εισαγωγή <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Αδύνατη η ανάγνωση δεδομένων vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Ακύρωση ανάγνωσης δεδομένων vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Η εισαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> vCard έχει ολοκληρωθεί"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Η εισαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> έχει ακυρωθεί"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Η εισαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> θα γίνει σύντομα."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Η εισαγωγή του αρχείου θα γίνει σύντομα."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Το αίτημα εισαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> θα γίνει σύντομα."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Η εξαγωγή του αρχείου θα γίνει σύντομα."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Σε λίγο θα ξεκινήσει η εξαγωγή επαφών."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Το αίτημα εξαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"επαφή"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Αλλαγή vCard σε τοπικό χώρο προσωρινής αποθήκευσης. Η εισαγωγή θα ξεκινήσει σύντομα."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Δεν ήταν δυνατή η εισαγωγή κάρτας vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Λήψη επαφής μέσω ΕΚΠ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Εξαγωγή επαφών;"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Προσωρινή αποθήκευση"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Εισαγωγή <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Εξαγωγή σε αρχείο .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ταξινόμηση κατά"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Όνομα"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Επώνυμο"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Μορφή ονόματος"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Πρώτα το όνομα"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Πρώτα το επώνυμο"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Προεπιλεγμένος λογαριασμός για νέες επαφές"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Συγχρονισμός μεταδεδομένων επαφής"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Σχετικά με τις Επαφές"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ρυθμίσεις"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Κοινοποίηση ορατών επαφών"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Η κοινοποίηση των ορατών επαφών απέτυχε."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Κοινοποίηση αγαπημένων επαφών"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Κοινή χρήση όλων των επαφών"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Αποτυχία κοινής χρήσης επαφών."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Εισαγωγή/Εξαγωγή επαφών"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Εισαγωγή επαφών"</string>
-    <string name="share_error" msgid="5642622973966851784">"Δεν είναι δυνατή η κοινή χρήση αυτής της επαφής."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Δεν υπάρχουν επαφές για κοινοποίηση."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Αναζήτηση"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Εύρεση επαφών"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Αγαπ."</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Δεν υπάρχουν επαφές."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Δεν υπάρχουν ορατές επαφές."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Δεν υπάρχουν αγαπημένα"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Δεν υπάρχουν επαφές στο <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Διαγραφή ατόμ. με συχνή επικ."</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Επιλογή κάρτας SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Διαχείριση λογαριασμών"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Εισαγωγή/Εξαγωγή"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"μέσω <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> μέσω <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"τέλος αναζήτησης"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Διαγραφή αναζητήσεων"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Επιλογές εμφάνισης επαφών"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Λογαριασμός"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Χρήση πάντα για κλήσεις"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Κλήση με"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Πληκτρολογήστε μια σημείωση για αποστολή με την κλήση…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ΑΠΟΣΤΟΛΗ ΚΑΙ ΚΛΗΣΗ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Καρτέλα <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Καρτέλα <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> μη αναγνωσμένα στοιχεία. </item>
       <item quantity="one"> Καρτέλα <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> μη αναγνωσμένο στοιχείο. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Έκδοση build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Άδειες λογισμικού ανοικτού κώδικα"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Λεπτομέρειες άδειας λογισμικού ανοιχτού κώδικα"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Πολιτική απορρήτου"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Όροι Παροχής Υπηρεσιών"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Άδειες λογισμικού ανοικτού κώδικα"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Αποτυχία ανοίγματος url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Βιντεοκλήση"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Κοινοποίηση και κλήση"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rAU/strings.xml b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
index 996c6ee..b6b2a29 100644
--- a/java/com/android/contacts/common/res/values-en-rAU/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copy to clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Call home"</string>
     <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No contacts"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> found</item>
-      <item quantity="one">1 found</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Frequently called"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Neighbourhood"</string>
     <string name="postal_city" msgid="8674569121430005628">"City"</string>
     <string name="postal_region" msgid="1730369286225469192">"County"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"delete"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expand or collapse name fields"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expand or collapse phonetic name fields"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Done"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancel"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Save imported contacts to:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Import from SIM card"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Import from SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Import from SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Import from .vcf file"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancel import of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Couldn\'t cancel vCard import/export"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Unknown error."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"There is no exportable contact."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"You have disabled a required permission."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"An error occurred during export: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Required filename is too long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O error"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Not enough memory. The file may be too large."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Couldn\'t parse vCard for an unexpected reason."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"The format isn\'t supported."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Couldn\'t collect meta information of given vCard file(s)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"One or more files couldn\'t be imported (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Finished exporting contacts. Please click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tap to share contacts."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Contact data is being exported."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"There are no exportable contacts. If you do have contacts on your device, some data providers may not allow the contacts to be exported from the device."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"The vCard composer didn\'t start properly."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Couldn\'t export"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importing <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Couldn\'t read vCard data"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Reading vCard data cancelled"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Finished importing vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importing <xliff:g id="FILENAME">%s</xliff:g> cancelled"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> will be imported shortly."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"The file will be imported shortly."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard import request was rejected. Try again later."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Contacts will be exported shortly."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard export request was rejected. Try again later."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Couldn\'t import vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact received over NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Export contacts?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Caching"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Export to .vcf file"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sync contact metadata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Settings"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Share visible contacts"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Import/Export contacts"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Import contacts"</string>
-    <string name="share_error" msgid="5642622973966851784">"This contact cannot be shared."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"There are no contacts to share."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Search"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Find contacts"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favourites"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No contacts."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No visible contacts."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"No favourites"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import/export"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Contact display options"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open-source licences"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licence details for open-source software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privacy Policy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Terms of Service"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Failed to open the URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rGB/strings.xml b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
index 996c6ee..b6b2a29 100644
--- a/java/com/android/contacts/common/res/values-en-rGB/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copy to clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Call home"</string>
     <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No contacts"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> found</item>
-      <item quantity="one">1 found</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Frequently called"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Neighbourhood"</string>
     <string name="postal_city" msgid="8674569121430005628">"City"</string>
     <string name="postal_region" msgid="1730369286225469192">"County"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"delete"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expand or collapse name fields"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expand or collapse phonetic name fields"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Done"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancel"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Save imported contacts to:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Import from SIM card"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Import from SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Import from SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Import from .vcf file"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancel import of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Couldn\'t cancel vCard import/export"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Unknown error."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"There is no exportable contact."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"You have disabled a required permission."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"An error occurred during export: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Required filename is too long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O error"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Not enough memory. The file may be too large."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Couldn\'t parse vCard for an unexpected reason."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"The format isn\'t supported."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Couldn\'t collect meta information of given vCard file(s)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"One or more files couldn\'t be imported (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Finished exporting contacts. Please click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tap to share contacts."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Contact data is being exported."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"There are no exportable contacts. If you do have contacts on your device, some data providers may not allow the contacts to be exported from the device."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"The vCard composer didn\'t start properly."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Couldn\'t export"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importing <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Couldn\'t read vCard data"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Reading vCard data cancelled"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Finished importing vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importing <xliff:g id="FILENAME">%s</xliff:g> cancelled"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> will be imported shortly."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"The file will be imported shortly."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard import request was rejected. Try again later."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Contacts will be exported shortly."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard export request was rejected. Try again later."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Couldn\'t import vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact received over NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Export contacts?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Caching"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Export to .vcf file"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sync contact metadata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Settings"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Share visible contacts"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Import/Export contacts"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Import contacts"</string>
-    <string name="share_error" msgid="5642622973966851784">"This contact cannot be shared."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"There are no contacts to share."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Search"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Find contacts"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favourites"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No contacts."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No visible contacts."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"No favourites"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import/export"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Contact display options"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open-source licences"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licence details for open-source software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privacy Policy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Terms of Service"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Failed to open the URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rIN/strings.xml b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
index 996c6ee..b6b2a29 100644
--- a/java/com/android/contacts/common/res/values-en-rIN/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copy to clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Call home"</string>
     <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Away"</string>
     <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
     <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Searching…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No contacts"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> found</item>
-      <item quantity="one">1 found</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Frequently called"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Neighbourhood"</string>
     <string name="postal_city" msgid="8674569121430005628">"City"</string>
     <string name="postal_region" msgid="1730369286225469192">"County"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"delete"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expand or collapse name fields"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expand or collapse phonetic name fields"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Done"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancel"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Save imported contacts to:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Import from SIM card"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Import from SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Import from SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Import from .vcf file"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancel import of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Couldn\'t cancel vCard import/export"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Unknown error."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"There is no exportable contact."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"You have disabled a required permission."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"An error occurred during export: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Required filename is too long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O error"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Not enough memory. The file may be too large."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Couldn\'t parse vCard for an unexpected reason."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"The format isn\'t supported."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Couldn\'t collect meta information of given vCard file(s)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"One or more files couldn\'t be imported (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Finished exporting contacts. Please click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tap to share contacts."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Contact data is being exported."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"There are no exportable contacts. If you do have contacts on your device, some data providers may not allow the contacts to be exported from the device."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"The vCard composer didn\'t start properly."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Couldn\'t export"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importing <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Couldn\'t read vCard data"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Reading vCard data cancelled"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Finished importing vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importing <xliff:g id="FILENAME">%s</xliff:g> cancelled"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> will be imported shortly."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"The file will be imported shortly."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard import request was rejected. Try again later."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Contacts will be exported shortly."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard export request was rejected. Try again later."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Couldn\'t import vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact received over NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Export contacts?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Caching"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Export to .vcf file"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sync contact metadata"</string>
-    <string name="setting_about" msgid="5253319937596745755">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Settings"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Share visible contacts"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Import/Export contacts"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Import contacts"</string>
-    <string name="share_error" msgid="5642622973966851784">"This contact cannot be shared."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"There are no contacts to share."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Search"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Find contacts"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favourites"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No contacts."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No visible contacts."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"No favourites"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import/export"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Contact display options"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open-source licences"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licence details for open-source software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privacy Policy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Terms of Service"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Failed to open the URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-es-rUS/strings.xml b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
index acb563c..9474514 100644
--- a/java/com/android/contacts/common/res/values-es-rUS/strings.xml
+++ b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar en el portapapeles"</string>
     <string name="call_custom" msgid="3041673234638990874">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Llamar a casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Llamar al móvil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Llamar al localizador del trabajo"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Llamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Llamar a MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Llamar)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar SMS a casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS al móvil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS al localizador del trabajo"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Enviar mensaje)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"¿Borrar contactos frecuentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Borrarás la lista de personas con las que te pones en contacto frecuentemente de las aplicaciones Contactos y Teléfono. Además, tus aplicaciones de correo deberán establecer tus preferencias nuevamente."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactos frecuentes…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principales lugares sugeridos"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Otros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio del trabajo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Más de <xliff:g id="COUNT">%d</xliff:g> encontrados"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No hay contactos"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Se encontraron <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Se encontró 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sin nombre)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Llamados con frecuencia"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactados con frecuencia"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos los contactos con número de teléfono"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos del perfil de trabajo"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar correo a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar correo a"</string>
     <string name="postal_street" msgid="6918171741240802474">"Calle"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Apartado postal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Barrio"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ciudad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat mediante ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat mediante Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"eliminar"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expandir o contraer campos de nombre"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expandir o contraer campos de nombre fonético"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos los contactos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Finalizado"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contactos en vista personalizada"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Guardar los contactos que se importaron en:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar desde tarjeta SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar desde SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar desde SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar desde archivo .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"¿Deseas cancelar la importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"¿Deseas cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"No se canceló impor./expor. de vCard."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Error desconocido"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"No se pudo abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"No se pudo iniciar el exportador (\"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"No hay contactos para exportar."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Inhabilitaste un permiso necesario."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Se produjo un error durante la exportación (\"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"El nombre de archivo obligatorio es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Error de E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Memoria insuficiente (es probable que el archivo sea muy grande)."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"No se pudo analizar el archivo vCard debido a un error inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"El formato no se admite."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"No se pudieron recopilar los metadatos de los archivos vCard proporcionados."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"No se pudieron importar uno o más archivos (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportación de <xliff:g id="FILENAME">%s</xliff:g> finalizada"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Finalizó la exportación de contactos"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Se completó la exportación de los contactos. Haz clic en la notificación para compartirlos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Presiona para compartir contactos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Se canceló la exportación de <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportando datos de contacto"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Se están exportando los datos de contacto."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"No se pudo obtener la información de la base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"No hay contactos exportables. Si tienes contactos en el dispositivo, es posible que algunos proveedores de datos no permitan la exportación de contactos desde el dispositivo."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"El compositor de la vCard no se inició correctamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"No se pudo exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"No se exportaron los datos del contacto.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importando <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"No se pudieron leer los datos de vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Se canceló la lectura de datos de vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Finalizó la importación de vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Se canceló la importación de <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> se importará en breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"El archivo se importará en breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Se rechazó la solicitud de importación de vCard. Vuelve a intentarlo más tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"El archivo se exportará en breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Los contactos se exportarán en breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Se rechazó la solicitud de exportación de vCard. Vuelve a intentarlo más tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contactar"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Almacenando vCard(s) en caché local temporal. La importación comenzará pronto."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"No se pudo importar el archivo de vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Se recibió el contacto por NFC."</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"¿Exportar contactos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Almacenando en caché"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar a archivo .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apellido"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato del nombre"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nombre primero"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apellido primero"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Cuenta predeterminada para los contactos nuevos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadatos de contactos"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Acerca de los Contactos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Configuración"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Compartir contactos visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Se produjo un error al compartir los contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Compartir todos los contactos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"No se pudieron compartir los contactos."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contactos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contactos"</string>
-    <string name="share_error" msgid="5642622973966851784">"No es posible compartir este contacto."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"No hay contactos para compartir."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Buscar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Buscar contactos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No hay contactos."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No hay contactos visibles."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"No hay favoritos"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"No hay contactos en <xliff:g id="NAME">%s</xliff:g>."</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar contactos frecuentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Seleccionar tarjeta SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Administrar tus cuentas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"a través de <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"detener la búsqueda"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Borrar la búsqueda"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opciones de visualización de contactos"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Cuenta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Usar siempre para llamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Llamar con"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escribe una nota para enviar con la llamada…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR Y LLAMAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Pestaña <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Pestaña <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos no leídos. </item>
       <item quantity="one"> Pestaña <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento no leído. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versión de la compilación"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licencias de código abierto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalles de la licencia de software de código abierto"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de privacidad"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Condiciones del servicio"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licencias de código abierto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"No se pudo abrir la url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videollamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartir y llamar"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-es/strings.xml b/java/com/android/contacts/common/res/values-es/strings.xml
index def7a44..ec5dc5f 100644
--- a/java/com/android/contacts/common/res/values-es/strings.xml
+++ b/java/com/android/contacts/common/res/values-es/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar en el portapapeles"</string>
     <string name="call_custom" msgid="3041673234638990874">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Llamar a casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Llamar al móvil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Llamar al busca del trabajo"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Llamar al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Llamar a MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Llamar)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar SMS a casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS al móvil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS al busca del trabajo"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Enviar SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"¿Borrar contactos frecuentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vas a borrar la lista de contactos frecuentes de las aplicaciones Contactos y Teléfono y obligarás a las aplicaciones de correo electrónico a que memoricen tus preferencias de nuevo."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactos frecuentes…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Sugerencias principales"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Otro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de trabajo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Se han encontrado más de <xliff:g id="COUNT">%d</xliff:g> contactos."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"No hay contactos."</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> encontrados</item>
-      <item quantity="one">1 encontrado</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contacto rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sin nombre)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Más llamados"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactos frecuentes"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos los contactos con número"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos del perfil de trabajo"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar correo a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar correo"</string>
     <string name="postal_street" msgid="6918171741240802474">"Calle"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Apartado postal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Vecindario"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ciudad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatear con ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatear con Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"eliminar"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ampliar o contraer campos de nombre"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Mostrar u ocultar campos de nombre fonéticos"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos los contactos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Listo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contactos en vista personalizada"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Guardar contactos importados en:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar contactos de la tarjeta SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar de SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar de SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar de archivo .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"¿Quieres cancelar la importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"¿Quieres cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Error al cancelar la importación/exportación de vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Error desconocido"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"No se ha podido abrir el archivo \"<xliff:g id="FILE_NAME">%s</xliff:g>\" (<xliff:g id="EXACT_REASON">%s</xliff:g>)."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"No se ha podido iniciar el exportador (\"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"No hay contactos que exportar."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Has inhabilitado un permiso necesario."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Se ha producido un error durante la exportación (\"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"El nombre de archivo obligatorio es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Error de E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"No hay suficiente espacio de memoria (el archivo puede ser demasiado grande)."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"No se ha podido analizar el archivo vCard debido a un error inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formato no admitido"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"No se han podido recuperar los metadatos de los archivos vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"No se ha podido importar uno o más archivos (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportación de <xliff:g id="FILENAME">%s</xliff:g> finalizada"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Los contactos se han exportado."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Los contactos se han exportado; haz clic en la notificación para compartirlos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toca para compartir contactos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Se ha cancelado la exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportando datos de contacto..."</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Se están exportando los datos de los contactos."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"No se ha podido obtener información de la base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"No hay contactos que exportar. Si tienes contactos en el dispositivo, es posible que el proveedor de datos no permita que se exporten los contactos del dispositivo."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"El redactor de vCard no se ha iniciado correctamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Error al exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"No se han exportado los datos de contacto(\nmotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")."</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importando <xliff:g id="NAME">%s</xliff:g>..."</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Error al leer los datos de vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lectura de datos de vCard cancelada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importación de <xliff:g id="FILENAME">%s</xliff:g> de vCard finalizada"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Se ha cancelado la importación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> se importará en breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"El archivo se importará en breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Se ha rechazado la solicitud de importación de vCard. Inténtalo de nuevo más tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"El archivo se exportará en breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Los contactos se van a exportar en breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Se ha rechazado la solicitud de exportación de vCard. Inténtalo de nuevo más tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contacto"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Se están almacenando los archivos vCard en la caché. La importación empezará pronto."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Error al importar el archivo vCard"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contacto recibido por NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"¿Exportar contactos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Almacenando en caché..."</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar a archivo .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apellido"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato del nombre"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nombre primero"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apellido primero"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Cuenta predeterminada para nuevos contactos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadatos de contactos"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Información sobre Contactos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ajustes"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Compartir contactos visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"No ha sido posible compartir los contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Compartir todos los contactos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Error al compartir contactos"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contactos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contactos"</string>
-    <string name="share_error" msgid="5642622973966851784">"Este contacto no se puede compartir."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"No hay contactos que compartir."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Buscar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Buscar contactos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"No hay contactos."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"No hay contactos visibles."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"No hay favoritos"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ningún contacto en <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar frecuentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Seleccionar tarjeta SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Administrar cuentas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"a través de <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"dejar de buscar"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Borrar la búsqueda"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opciones para mostrar contactos"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Cuenta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Usar siempre esta para llamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Llamar con"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escribe una nota para enviarla con la llamada..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR Y LLAMAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Pestaña <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Pestaña <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos no leídos. </item>
       <item quantity="one"> Pestaña <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento no leído. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versión de la compilación"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licencias de código abierto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalles de las licencias de software libre"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de Privacidad"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Condiciones de Servicio"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licencias de código abierto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"No se ha podido abrir la URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videollamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartir y llamar"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-et/strings.xml b/java/com/android/contacts/common/res/values-et/strings.xml
index c80d542..74c2d1a 100644
--- a/java/com/android/contacts/common/res/values-et/strings.xml
+++ b/java/com/android/contacts/common/res/values-et/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst on kopeeritud"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopeeri lõikelauale"</string>
     <string name="call_custom" msgid="3041673234638990874">"Helista numbrile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Helista kodutelefoninumbrile"</string>
     <string name="call_mobile" msgid="967589404494150813">"Helista mobiilinumbrile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Helista tööpiiparinumbrile"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Helista numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Helista MMS-i numbrile"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (helistamine)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Saada sõnum numbrile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Saada sõnum kodutelefoninumbrile"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Saada sõnum mobiilinumbrile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Saada sõnum tööpiiparinumbrile"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Saada sõnum numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Saada sõnum MMS-i numbrile"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sõnum)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Kas kustutada sagedased kontaktid?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kustutate rakendustes Kontaktid ja Telefon sagedaste kontaktide loendi, mistõttu meilirakendused peavad teie adresseerimiseelistused uuesti omandama."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Saged. kontaktide kustutamine ..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Eemal"</string>
     <string name="status_busy" msgid="5990832098713248503">"Hõivatud"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktid"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populaarsed soovitused"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Kataloog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Töökontaktide kataloog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kõik kontaktid"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Soovitused"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Otsimine ..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Leitud rohkem kui <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Kontaktid puuduvad"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Leiti <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Leiti 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Kiirkontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nimi puudub)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Sageli valitud üksus"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Sageli valitud kontaktisikud"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Kuva kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Kõik telefoninumbritega kontaktid"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Tööprofiili kontaktid"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Saada meilisõnum aadressile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Meilimine"</string>
     <string name="postal_street" msgid="6918171741240802474">"Tänav"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postkast"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Naabruskond"</string>
     <string name="postal_city" msgid="8674569121430005628">"Linn"</string>
     <string name="postal_region" msgid="1730369286225469192">"Osariik"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Sihtnumber"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Vestlus ICQ-d kasutades"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Vestlus Jabberit kasutades"</string>
     <string name="chat" msgid="1020428260359370236">"Vestlus"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"kustutamine"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Nimeväljade laiendamine või ahendamine"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Foneetiliste nimede väljade laiendamine või ahendamine"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Kõik kontaktid"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Valmis"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Tühista"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Konto <xliff:g id="NAME">%s</xliff:g> kontaktid"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontaktid kohandatud vaates"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Üks kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Salvestage imporditud kontaktid kontole:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Impordi SIM-kaardilt"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importimine SIM-kaardilt <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importimine SIM-kaardilt <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importimine VCF-failist"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Kas tühistada faili <xliff:g id="FILENAME">%s</xliff:g> importimine?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Kas tühistada faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCardi impordi/ekspordi tühist. ebaõnn."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Tundmatu viga."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Faili „<xliff:g id="FILE_NAME">%s</xliff:g>” ei saa avada: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Eksportijat ei saa käivitada: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Eksporditavad kontaktid puuduvad."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Olete nõutud loa keelanud."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Viga eksportimisel: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Kohustuslik failinimi on liiga pikk („<xliff:g id="FILENAME">%s</xliff:g>”)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O viga"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Pole piisavalt mälu. Fail võib olla liiga suur."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Ootamatul põhjusel vCardi sõelumine ebaõnnestus."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Vormingut ei toetata."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"vCardi faili(de) metaandmete kogumine ebaõnnestus."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Vähemalt ühe faili importimine ebaõnnestus (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine on lõpetatud."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontaktide eksportimine on lõpetatud."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktide eksportimine lõpetati. Kontaktide jagamiseks klõpsake märguandel."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Puudutage kontaktide jagamiseks."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine tühistati."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontaktandmete eksportimine"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktandmed eksporditakse."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Andmebaasiteabe hankimine ebaõnnestus."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Eksporditavaid kontakte pole. Kui teil siiski on seadmes kontakte, ei pruugi mõned andmesidepakkujad kontaktide eksportimist seadmest lubada."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCardi helilooja ei käivitunud korralikult."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksport ebaõnnestus"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktandmeid ei eksporditud.\nPõhjus: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importimine: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCardi andmete lugemine ebaõnnestus"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCardi andmete lugemine tühistati"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCardi faili <xliff:g id="FILENAME">%s</xliff:g> importimine lõpetatud"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Faili <xliff:g id="FILENAME">%s</xliff:g> importimine tühistati"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Fail <xliff:g id="FILENAME">%s</xliff:g> imporditakse peagi."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fail imporditakse peagi."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCardi importimistaotlus lükati tagasi. Proovige hiljem uuesti."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Fail <xliff:g id="FILENAME">%s</xliff:g> eksporditakse peagi."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fail eksporditakse peagi."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktid eksporditakse peagi."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCardi eksportimistaotlus lükati tagasi. Proovige hiljem uuesti."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCardi(de) vahemälustamine kohalikku ajutisse mäluruumi. Tegelik importimine algab peagi."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCardi importimine ebaõnnestus."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt saadud NFC kaudu"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Eksportida kontakt?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Vahemällu salvestamine"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importimine: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> – <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportimine VCF-faili"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortimisalus"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Eesnimi"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Perekonnanimi"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Nimevorming"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Eesnimi enne"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Perekonnanimi enne"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Vaikekonto uute kontaktide jaoks"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sünkrooni kontakti metaandmed"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Teave rakenduse Kontaktid kohta"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Seaded"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Jaga nähtavaid kontakte"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nähtavate kontaktide jagamine ebaõnnestus."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Jaga lemmikkontakte"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Jaga kõiki kontakte"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontaktide jagamine ebaõnnestus."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontaktide import/eksport"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Impordi kontaktid"</string>
-    <string name="share_error" msgid="5642622973966851784">"Seda kontakti ei saa jagada."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Jagamiseks ei ole ühtki kontakti."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Otsing"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Otsige kontakte"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Lemmikud"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Kontaktid puuduvad."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nähtavaid kontakte pole."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Lemmikuid pole"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Grupis <xliff:g id="NAME">%s</xliff:g> pole kontakte"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Sagedaste kustutamine"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM-kaardi valimine"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Kontode haldamine"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Impordi/ekspordi"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"allika <xliff:g id="SOURCE">%1$s</xliff:g> kaudu"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> allika <xliff:g id="SOURCE">%2$s</xliff:g> kaudu"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"otsimise peatamine"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Otsingu kustutamine"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontaktide kuvavalikud"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Kasuta helistamiseks alati seda"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Helistamine kontoga"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Sisestage märkus, mis koos kõnega saata ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SAADA JA HELISTA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Vahekaart <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Vahekaart <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> lugemata üksust. </item>
       <item quantity="one"> Vahekaart <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> lugemata üksus. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Järguversioon"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Avatud lähtekoodi litsentsid"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Avatud lähtekoodiga tarkvara litsentsi üksikasjad"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privaatsuseeskirjad"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Teenusetingimused"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Avatud lähtekoodi litsentsid"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URL-i avamine ebaõnnestus."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videokõne"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Jagamine ja helistamine"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-eu/strings.xml b/java/com/android/contacts/common/res/values-eu/strings.xml
index 868d668..631aaff 100644
--- a/java/com/android/contacts/common/res/values-eu/strings.xml
+++ b/java/com/android/contacts/common/res/values-eu/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Testua kopiatu da"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiatu arbelean"</string>
     <string name="call_custom" msgid="3041673234638990874">"Deitu <xliff:g id="CUSTOM">%s</xliff:g> zenbakira"</string>
     <string name="call_home" msgid="125893483593803791">"Deitu etxera"</string>
     <string name="call_mobile" msgid="967589404494150813">"Deitu mugikorrera"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Deitu laneko bilagailura"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Deitu <xliff:g id="ASSISTANT">%s</xliff:g> zenbakira"</string>
     <string name="call_mms" msgid="4958811711741872901">"Deitu MMS zenbakira"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (deitu)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Bidali testu-mezua honi: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Bidali testu-mezua etxera"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Bidali testu-mezua mugikorrera"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Bidali testu-mezua laneko bilagailura"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Bidali testu-mezua honi: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Bidali testu-mezua MMS zenbakira"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bidali SMS mezua)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sarri erabilitako kontaktuak garbitu?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kontaktuak eta Telefonoa aplikazioetako sarri erabilitako kontaktuen zerrenda garbituko duzu; beraz, posta elektronikoaren aplikazioek helbideen hobespenak hutsetik ikasi beharko dituzte."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Sarri erabilitako kontaktuak garbitzen…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Kanpoan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Okupatuta"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktuak"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Iradokizun garrantzitsuenak"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Beste bat"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorioa"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Laneko kontaktuak"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kontaktu guztiak"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iradokizunak"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ni"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Bilatzen…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> baino gehiago aurkitu dira."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ez dago kontakturik"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aurkitu dira</item>
-      <item quantity="one">1 aurkitu da</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Honen kontaktu bizkorra: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Izenik ez)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Sarri deitutakoak"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Sarri kontaktatutakoak"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ikusi kontaktua"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Telefono-zenbakiak dituzten kontaktu guztiak"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Laneko profileko kontaktuak"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Bidali mezu elektronikoa <xliff:g id="CUSTOM">%s</xliff:g> helbidera"</string>
     <string name="email" msgid="2807318537887091606">"Bidali mezu elektronikoa"</string>
     <string name="postal_street" msgid="6918171741240802474">"Kalea"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Posta-kutxa"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Auzoa"</string>
     <string name="postal_city" msgid="8674569121430005628">"Hiria"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estatua"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Posta-kodea"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Txateatu ICQ bidez"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Txateatu Jabber bidez"</string>
     <string name="chat" msgid="1020428260359370236">"Txateatu"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ezabatu"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Zabaldu edo tolestu izenen eremuak"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Zabaldu edo tolestu izen fonetikoen eremuak"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Kontaktu guztiak"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Eginda"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Utzi"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontu honetako kontaktuak: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Ikuspegi pertsonalizatuko kontaktuak"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Kontaktu bakarra"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Gorde inportatutako kontaktuak hemen:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Inportatu SIM txarteletik"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Inportatu SIM honetatik: <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Inportatu SIM honetatik: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Inportatu .vcf fitxategitik"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren inportazioa utzi?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren esportazioa utzi?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Ezin da vCard inportazioa/esportazioa utzi"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Errore ezezaguna."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Ezin izan da ireki \"<xliff:g id="FILE_NAME">%s</xliff:g>\". Arrazoia: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Ezin izan da esportatzailea hasi. Arrazoia: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Ez dago esporta daitekeen kontakturik."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Desgaitu egin duzu beharrezko baimena."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Errore bat gertatu da esportatu bitartean. Arrazoia: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Beharrezko fitxategi-izena luzeegia (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Sarrera- edo irteera-errorea"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ez dago nahikoa memoria. Baliteke fitxategia handiegia izatea."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Ezin izan da vCard analizatu ustekabeko arrazoiren batengatik."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatua ez da bateragarria."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Ezin izan da emandako vCard txartelaren fitxategien meta-informazioa bildu."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Ezin izan da fitxategi bat edo gehiago inportatu (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Amaitu da <xliff:g id="FILENAME">%s</xliff:g> esportatzen."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Esportatu dira kontaktuak."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Esportatu dira kontaktuak. Haiek partekatzeko, sakatu jakinarazpena."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Sakatu kontaktuak partekatzeko."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> fitxategia esportatzeari utzi zaio."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontaktatzeko datuak esportatzen"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktuen datuak esportatzen ari gara."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Ezin izan da datu-baseko informazioa lortu."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Ez dago esporta daitekeen kontakturik. Gailuan kontaktuak badituzu, baliteke datu-hornitzaile batzuek kontaktuak gailutik esportatzen ez uztea."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard txartelen idazlea ez da behar bezala hasi."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Ezin da esportatu"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Ez dira kontaktuaren datuak esportatu.\nArrazoia: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> inportatzen"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Ezin izan dira vCard datuak irakurri"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard datuen irakurketa utzi da"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vCard fitxategia inportatzen bukatu da"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren inportazioa utzi da"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> fitxategia laster inportatuko da."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fitxategia laster inportatuko da."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard fitxategia inportatzeko eskaera ukatu da. Saiatu geroago."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> fitxategia laster esportatuko da."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Laster esportatuko da fitxategia."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Laster esportatuko dira kontaktuak."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard fitxategia esportatzeko eskaera ukatu da. Saiatu berriro geroago."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontaktua"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard-ak aldi baterako biltegi lokalaren cachean gordetzen ari dira. Inportazioa bera laster hasiko da."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Ezin izan da vCard fitxategia inportatu."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC bidez jasotako kontaktua"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Kontaktuak esportatu?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Cachean gordetzen"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> inportatzen: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Esportatu .vcf fitxategira"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenatzeko irizpidea"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Izena"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Abizena"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Izenaren formatua"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Izena lehenengo"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Abizena lehenengo"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Kontaktu berriak gordetzeko kontu lehenetsia"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinkronizatu kontaktuen metadatuak"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Kontaktuak zerbitzuari buruz"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ezarpenak"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Partekatu ikusgai dauden kontaktuak"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Ezin izan dira partekatu ikusgai dauden kontaktuak."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Partekatu gogoko kontaktuak"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Partekatu kontaktu guztiak"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Ezin izan dira partekatu kontaktuak."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Inportatu/Esportatu kontaktuak"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Inportatu kontaktuak"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ezin da kontaktua partekatu."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Ez dago parteka daitekeen kontakturik."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Bilatu"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Bilatu kontaktuak"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Gogokoak"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ez dago kontakturik."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ez dago ikusgai dagoen kontakturik."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ez dago gogokorik"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ez dago kontakturik hemen: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Garbitu sarri erabilitakoak"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Hautatu SIM txartela"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Kudeatu kontuak"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Inportatu/Esportatu"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> bidez"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="SOURCE">%2$s</xliff:g> bidez"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"gelditu bilaketa"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Garbitu bilaketa"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontaktuak bistaratzeko aukerak"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Kontua"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Erabili beti hau deietarako"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Deitu kontu honekin:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Idatzi deiarekin batera bidali beharreko oharra…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"BIDALI ETA DEITU"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> fitxa."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> fitxa. Irakurri gabeko <xliff:g id="COUNT_3">%2$d</xliff:g> elementu. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> fitxa. Irakurri gabeko <xliff:g id="COUNT_1">%2$d</xliff:g> elementu. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Konpilazioaren bertsioa"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Kode irekiko lizentziak"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Kode irekiko softwarerako lizentziaren xehetasunak"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Pribatutasun-gidalerroak"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Zerbitzu-baldintzak"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Kode irekiko lizentziak"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Ezin izan da ireki URLa."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Bideo-deia"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Partekatu eta deitu"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fa/strings.xml b/java/com/android/contacts/common/res/values-fa/strings.xml
index dda1064..b3dd170 100644
--- a/java/com/android/contacts/common/res/values-fa/strings.xml
+++ b/java/com/android/contacts/common/res/values-fa/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"متن کپی شده"</string>
-    <string name="copy_text" msgid="5890820280087874642">"کپی در بریده‌دان"</string>
     <string name="call_custom" msgid="3041673234638990874">"تماس با <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"تماس با منزل"</string>
     <string name="call_mobile" msgid="967589404494150813">"تماس با تلفن همراه"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"تماس با پی‌جوی محل کار"</string>
     <string name="call_assistant" msgid="4177478845473789294">"تماس با <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"تماس با فراپیام"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (تماس)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"ارسال پیامک به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"ارسال پیامک به تلفن منزل"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ارسال پیامک به تلفن همراه"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ارسال پیامک به پی‌جوی محل کار"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"ارسال پیامک به <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"ارسال پیامک به خدمات پیام چندرسانه‌ای"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیام)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"مکرراً تماس‌گرفته‌ها پاک شود؟"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های رایانامه مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"درحال پاک کردن مکرراً تماس‌گرفته…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"غایب"</string>
     <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
     <string name="contactsList" msgid="8806067891419291513">"مخاطبین"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"پیشنهادهای برتر"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"سایر موارد"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"فهرست"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"فهرست کار"</string>
     <string name="local_search_label" msgid="907622822323119235">"همه مخاطبین"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"پیشنهادها"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"من"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"در حال جستجو…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"بیش از <xliff:g id="COUNT">%d</xliff:g> مورد یافت شد."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"مخاطبی موجود نیست"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> مورد پیدا شد</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> مورد پیدا شد</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"تماس سریع برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(بدون نام)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"بیشتر تماس‌ گرفته شده"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"مکرراً تماس‌گرفته"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"مشاهده مخاطب"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"همه مخاطبین دارای شماره تلفن"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"مخاطبین نمایه کاری"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"رایانامه به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"رایانامه"</string>
     <string name="postal_street" msgid="6918171741240802474">"خیابان"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"صندوق پستی"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"محله"</string>
     <string name="postal_city" msgid="8674569121430005628">"شهر"</string>
     <string name="postal_region" msgid="1730369286225469192">"ایالت"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"کد پستی"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"‏گپ با استفاده از ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"‏گپ با استفاده از Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"گپ"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"حذف"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"بزرگ یا کوچک کردن قسمت‌های نام"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"بزرگ یا کوچک کردن فیلدهای نام آوایی"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"همه مخاطبین"</string>
-    <string name="menu_done" msgid="1817505539263889535">"تمام"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"لغو"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"مخاطبین در <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"مخاطبین در نمای سفارشی"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"مخاطب تکی"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ذخیره مخاطب‌های وارد شده در:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"وارد کردن از سیم کارت"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"وارد کردن از سیم‌کارت <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"وارد کردن از سیم کارت <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"‏وارد کردن از فایل ‎.vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"وارد کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"صادر کردن به <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"وارد/صادرکردن کارت ویزیت لغو نمی‌شود"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"خطای ناشناس."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" باز نشد: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"صادر کننده راه‌اندازی نشد: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"هیچ مخاطب قابل صدوری موجود نیست."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"یک مجوز الزامی را غیرفعال کرده‌اید."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"خطایی در هنگام صادر کردن روی داد: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"نام فایل خیلی طولانی است (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"خطای ورودی/خروجی"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"حافظه کافی نیست. ممکن است فایل بسیار بزرگ باشد."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"تفسیر کارت ویزیت به دلیل پیش‌بینی نشده‌ای ممکن نیست."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"قالب پشتیبانی نمی‌شود."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"نمی‌توان اطلاعات متای فایل(های) کارت ویزیت داده شده را جمع‌آوری کرد."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"‏نمی‌توان یک یا چند فایل را وارد کرد (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> پایان یافت."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"صادرکردن مخاطبین تمام شد."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"مخاطبین صادر شدند؛ برای اشتراک‌گذاری مخاطبین، روی اعلان کلیک کنید."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"برای اشتراک‌گذاری مخاطبین ضربه بزنید."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شد."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"صدور اطلاعات مخاطب"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"داده‌های مخاطب در حال صادر شدن است."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"نمی‌توان اطلاعات پایگاه داده را دریافت کرد."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"هیچ مخاطب قابل صدوری وجود ندارد. اگر در دستگاهتان مخاطبینی دارید، بعضی از ارائه‌دهندگان داده ممکن است اجازه ندهند مخاطبین را از دستگاه صادر کنید."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"سازنده فایل کارت ویزیت به درستی اجرا نشد."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"صادر نمی‌شود"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"‏داده‎های مخاطب صادر نشد.\nعلت: «<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"وارد کردن <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"خواندن داده‌های کارت ویزیت ممکن نیست"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"خواندن داده کارت ویزیت لغو شد"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"وارد کردن کارت ویزیت <xliff:g id="FILENAME">%s</xliff:g> پایان یافت"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"واردکردن <xliff:g id="FILENAME">%s</xliff:g> لغو شد"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> به زودی وارد می‌شود."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"فایل پس از مدت کوتاهی وارد می‌شود."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"درخواست وارد کردن کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> به زودی صادر می‌شود."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"فایل به‌زودی منقضی می‌شود."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"مخاطبین به‌زودی صادر می‌شوند."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"درخواست صدور کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"مخاطب"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"در حال ذخیره کارت‌(های) ویزیت در حافظه موقت محلی است. وارد کردن واقعی به زودی آغاز خواهد شد."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"وارد کردن کارت ویزیت انجام نشد."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"‏دریافت مخاطب باNFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"مخاطبین صادر شوند؟"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"در حال ذخیره در حافظهٔ پنهان"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"وارد کردن <xliff:g id="CURRENT_NUMBER">%s</xliff:g><xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"‏صادر کردن به فایل ‎.vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"مرتب‌سازی براساس"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"نام"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"نام خانوادگی"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"قالب نام"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ابتدا نام"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ابتدا نام خانوادگی"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"حساب پیش‌فرض برای مخاطبین جدید"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"همگام‌سازی فراداده مخاطب"</string>
-    <string name="setting_about" msgid="5253319937596745755">"درباره مخاطبین"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"تنظیمات"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"اشتراک‌گذاری مخاطبین قابل مشاهده"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"مخاطبین قابل مشاهده به اشتراک گذاشته نشدند."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"اشتراک‌گذاری مخاطبین موردعلاقه"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"اشتراک‌گذاری همه مخاطبین"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"مخاطبین به اشتراک گذاشته نشدند."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"وارد کردن/صادر کردن مخاطبین"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"وارد کردن مخاطبین"</string>
-    <string name="share_error" msgid="5642622973966851784">"این مخاطب قابل اشتراک‌گذاری نیست."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"مخاطبی برای اشتراک‌گذاری وجود ندارد."</string>
-    <string name="menu_search" msgid="1241802591112035764">"جستجو"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"پیدا کردن مخاطبین"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"موارد دلخواه"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"مخاطبی موجود نیست."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"مخاطب قابل مشاهده‌ای موجود نیست."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"مورد دلخواهی ندارید"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"هیچ مخاطبی در <xliff:g id="NAME">%s</xliff:g> موجود نیست"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"پاک کردن مکرراً تماس‌گرفته"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"انتخاب سیم‌کارت"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"مدیریت حساب‌ها"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"وارد کردن/صادر کردن"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"از طریق <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> از طریق <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"توقف جستجو"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"پاک کردن جستجو"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"گزینه‌های نمایش تماس"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"حساب"</string>
     <string name="set_default_account" msgid="7966099951006467572">"همیشه این سیم برای تماس‌ استفاده شود"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"تماس با"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"یادداشتی بنویسید که همراه تماس ارسال شود…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ارسال و تماس"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / ‏<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"برگه «<xliff:g id="TITLE">%1$s</xliff:g>»."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> برگه «<xliff:g id="TITLE_2">%1$s</xliff:g>». <xliff:g id="COUNT_3">%2$d</xliff:g> مورد خوانده‌نشده. </item>
       <item quantity="other"> برگه «<xliff:g id="TITLE_2">%1$s</xliff:g>». <xliff:g id="COUNT_3">%2$d</xliff:g> مورد خوانده‌نشده. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"نسخه ساخت"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"مجوزهای منبع آزاد"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"جزئیات مجوز برای نرم‌افزار منبع آزاد"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"خط‌مشی رازداری"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"شرایط خدمات"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"مجوزهای منبع آزاد"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"نشانی وب باز نشد."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"تماس ویدیویی"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"اشتراک‌گذاری و تماس"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fi/strings.xml b/java/com/android/contacts/common/res/values-fi/strings.xml
index b8065b2..6a2a8bf 100644
--- a/java/com/android/contacts/common/res/values-fi/strings.xml
+++ b/java/com/android/contacts/common/res/values-fi/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teksti kopioitu"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopioi leikepöydälle"</string>
     <string name="call_custom" msgid="3041673234638990874">"Soita: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Soita kotinumeroon"</string>
     <string name="call_mobile" msgid="967589404494150813">"Soita matkapuhelimeen"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Soita hakulaitteeseen (työ)"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Soita: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Soita MMS-numeroon"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (soita)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Lähetä tekstiviesti: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Lähetä tekstiviesti kotinumeroon"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Lähetä tekstiviesti matkapuhelimeen"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Lähetä tekstiviesti hakulaitteeseen (työ)"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Lähetä tekstiviesti: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Lähetä tekstiviesti MMS-numeroon"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (lähetä viesti)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Tyhjennetäänkö usein käytetyt?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Toiminto tyhjentää Yhteystiedot- ja Puhelin-sovellusten usein käytettyjen kontaktien luettelon. Lisäksi sähköpostisovellukset pakotetaan opettelemaan osoiteasetuksesi uudestaan."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Tyhjennetään usein käytetyt..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Poissa"</string>
     <string name="status_busy" msgid="5990832098713248503">"Varattu"</string>
     <string name="contactsList" msgid="8806067891419291513">"Yhteystiedot"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Kiinnostavimmat ehdotukset"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Osoitekirja"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Työhakemisto"</string>
     <string name="local_search_label" msgid="907622822323119235">"Kaikki yhteystiedot"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ehdotukset"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Minä"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Haetaan…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Löytyi yli <xliff:g id="COUNT">%d</xliff:g> yhteystietoa."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ei kontakteja"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> löytyi</item>
-      <item quantity="one">1 löytyi</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Pikayhteys henkilöön <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Ei nimeä)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Soitettu usein"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Usein käytetyt"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Näytä yhteystieto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Kaikki kontaktit, joilla on puhelinnumero"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Työprofiilin yhteystiedot"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Lähetä sähköpostia osoitteeseen <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Lähetä sähköpostia"</string>
     <string name="postal_street" msgid="6918171741240802474">"Katu"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postilokero"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Kaupunginosa"</string>
     <string name="postal_city" msgid="8674569121430005628">"Kaupunki"</string>
     <string name="postal_region" msgid="1730369286225469192">"Osavaltio/alue"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postinumero"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Keskustele ICQ:n avulla"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Keskustele Jabberin avulla"</string>
     <string name="chat" msgid="1020428260359370236">"Keskustelu"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"poista"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Laajenna tai tiivistä nimikentät"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Laajenna tai tiivistä foneettiset nimikentät"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Yhteystiedot"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Valmis"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Peruuta"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Yhteystiedot tilissä <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Muokatun näkymän yhteystiedot"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Yksi yhteystieto"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Tallenna tuodut yhteystiedot kohteeseen"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Tuo SIM-kortilta"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Tuo SIM-kortilta <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Tuo SIM-kortilta <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Tuo .vcf-tiedostosta"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Peruutetaanko kohteen <xliff:g id="FILENAME">%s</xliff:g> tuonti?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Peruutetaanko kohteen <xliff:g id="FILENAME">%s</xliff:g> vienti?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCardin tuonnin/viennin peruutus epäonn."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Tuntematon virhe."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Tiedostoa <xliff:g id="FILE_NAME">%s</xliff:g> ei voi avata: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Vientiohjelman käynnistys epäonnistui: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Ei vietäviä yhteystietoja."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Olet poistanut käytöstä tarvittavan käyttöoikeuden."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Virhe viennin aikana: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Tarvittava tiedostonimi on liian pitkä (<xliff:g id="FILENAME">%s</xliff:g>)"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O-virhe"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Muisti ei riitä. Tiedosto voi olla liian suuri."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vCardia ei voi jäsentää odottamattomasta syystä."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Muotoa ei tueta."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Annettujen vCard-tiedostojen sisällönkuvaustietojen noutaminen epäonnistui."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Ainakin yhden tiedoston tuominen epäonnistui (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Kohde <xliff:g id="FILENAME">%s</xliff:g> on viety."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Yhteystiedot on viety."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Yhteystiedot vietiin. Jaa yhteystiedot klikkaamalla ilmoitusta."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Jaa yhteystiedot napauttamalla."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Kohteen <xliff:g id="FILENAME">%s</xliff:g> vienti peruutettiin."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Viedään yhteystietoja"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Yhteystietoja viedään."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Tietokannan tietojen hakeminen epäonnistui."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Vietäviä yhteystietoja ei ole. Jos laitteessasi on yhteystietoja, tietojen tarjoaja on saattanut estää niiden viemisen puhelimesta."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard-luonti ei käynnistynyt oikein."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Vieminen epäonnistui"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Yhteystietoja ei viety.\nSyy: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Tuodaan kohdetta <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard-tietojen lukeminen epäonnistui"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard-tietojen lukeminen peruutettiin"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> on tuotu"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Kohteen <xliff:g id="FILENAME">%s</xliff:g> tuonti peruutettiin"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> tuodaan pian."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Tiedosto tuodaan pian."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard-tuontipyyntö hylättiin. Yritä myöhemmin uudelleen."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> viedään pian."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Tiedosto viedään pian."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Yhteystiedot viedään hetken kuluttua."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard-vientipyyntö hylättiin. Yritä myöhemmin uudelleen."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"yhteystieto"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Lisätään vCard-tietojen välimuistiversiot paikalliseen väliaikaistallennustilaan. Tuonti alkaa pian."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard-tietojen tuominen epäonnistui."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Yht. saatu (NFC)"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Viedäänkö yhteystietoja?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Vie välimuistiin"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Tuodaan <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Vie .vcf-tiedostoon"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Lajitteluperuste"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Etunimi"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sukunimi"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Nimen muoto"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Etunimi ensin"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Sukunimi ensin"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Uusien yhteystietojen oletustili"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synkronoi yhteystietojen kuvaustiedot"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Tietoja Yhteystiedoista"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Asetukset"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Jaa näkyvät yhteystiedot"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Näkyvien yhteystietojen jakaminen epäonnistui."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Jaa suosikkiyhteystiedot"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Jaa kaikki yhteystiedot"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Yhteystietojen jakaminen epäonnistui."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Tuo/vie yhteystietoja"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Tuo yhteystietoja"</string>
-    <string name="share_error" msgid="5642622973966851784">"Yhteystieto ei jaettavissa"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Jaettavia yhteystietoja ei ole."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Haku"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Etsi yhteystietoja"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Suosikit"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ei yhteystietoja."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ei näkyviä yhteystietoja."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ei suosikkeja"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ei yhteystietoja ryhmässä <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Tyhjennä usein käytetyt"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Valitse SIM-kortti"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Hallinnoi tilejä"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Tuo/vie"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"lähteestä <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> lähteestä <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"lopeta hakeminen"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Tyhjennä haku"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Yhteystietojen näyttöasetukset"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Tili"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Käytä kaikille puheluille"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Valitse puhelinoperaattori:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Kirjoita muistiinpano lähetettäväksi puhelun kanssa…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"LÄHETÄ JA SOITA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-välilehti."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-välilehti. <xliff:g id="COUNT_3">%2$d</xliff:g> lukematonta kohdetta. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-välilehti. <xliff:g id="COUNT_1">%2$d</xliff:g> lukematon kohde. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Koontiversio"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Avoimen lähdekoodin käyttöluvat"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Avoimen lähdekoodin ohjelmiston käyttöluvan tiedot"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Tietosuojakäytäntö"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Käyttöehdot"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Avoimen lähdekoodin käyttöluvat"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URL-osoitteen avaus epäonnistui."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videopuhelu"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Jaa ja soita"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
index 82f5492..63a0917 100644
--- a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texte copié."</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copier dans le presse-papiers"</string>
     <string name="call_custom" msgid="3041673234638990874">"Appeler le <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Appeler le numéro de téléphone du domicile"</string>
     <string name="call_mobile" msgid="967589404494150813">"Appeler le numéro de téléphone mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Appeler le téléavertisseur professionnel"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Appeler le numéro de téléphone MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Appel)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Envoyer un SMS au numéro de téléphone du domicile"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Envoyer un SMS au numéro de téléphone mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Envoyer un SMS au téléavertisseur professionnel"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Envoyer un SMS au numéro de téléph MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Effacer les contacts fréquents?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Cette opération efface la liste des personnes avec qui vous communiquez le plus souvent dans les applications Contacts et Téléphone, et forcera les applications de courriel à mémoriser de nouveau les adresses que vous utilisez le plus."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Suppression des contacts fréquents…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupé(e)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Meilleures suggestions"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Annuaire professionnel"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Recherche en cours…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Plus de <xliff:g id="COUNT">%d</xliff:g> contacts ont été trouvés."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Aucun contact"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> contact trouvé</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contacts trouvés</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sans nom)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Appels fréquents"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contacts fréquents"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Afficher le contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Tous les contacts disposant d\'un numéro de téléphone"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacts du profil professionnel"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Envoyer un courriel à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Envoyer un courriel"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rue"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Case postale"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Quartier"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ville"</string>
     <string name="postal_region" msgid="1730369286225469192">"État/province"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Code postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Clavarder via ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Clavarder via Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Clavarder"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"supprimer"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Développer ou réduire les champs de nom"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Développer ou réduire les champs de noms phonétiques"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tous les contacts"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Terminé"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Annuler"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts du compte \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacts en affichage personnalisé"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Enregistrer les contacts importés ici :"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importer depuis la carte SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importer de la carte SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importer de la carte SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importer d\'un fichier .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Annuler l\'importation du fichier <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Impossible annuler import./export. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erreur inconnue."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Impossible d\'ouvrir le fichier « <xliff:g id="FILE_NAME">%s</xliff:g> » : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Impossible de démarrer le programme d\'exportation pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Aucun contact ne peut être exporté."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Vous avez désactivé une autorisation obligatoire."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Une erreur s\'est produite lors de l\'exportation : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Le nom de fichier requis est trop long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erreur d\'E/S."</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Mémoire insuffisante. Le fichier est peut-être trop volumineux."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Impossible d\'analyser le fichier vCard pour une raison inattendue."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Le format n\'est pas compatible."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Impossible de collecter des métadonnées contenues dans le ou les fichiers vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Impossible d\'importer un ou plusieurs fichiers (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> terminée"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Les contacts ont été exportés"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Les contacts ont été exportés. Cliquez sur la notification pour les partager."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Touchez ici pour partager des contacts."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportation des données des contacts en cours"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Les données des contacts sont en cours d\'exportation."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Impossible d\'obtenir les informations concernant la base de données."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre appareil, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts à partir de l\'appareil."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Le système de composition vCard n\'a pas démarré correctement."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Échec exportation"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Les données du contact n\'ont pas été exportées.\nMotif : <xliff:g id="FAIL_REASON">%s</xliff:g>."</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importation (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Impossible de lire les données vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lecture des données vCard annulée"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Le fichier vCard <xliff:g id="FILENAME">%s</xliff:g> a bien été importé"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être importé."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Le fichier va bientôt être importé."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"La demande d\'importation du fichier vCard a été rejetée. Veuillez réessayer plus tard."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être exporté."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Le fichier sera bientôt exporté."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Les contacts seront exportés sous peu."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer plus tard."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Impossible d\'importer le fichier vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact reçu par NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exporter les contacts?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Mise en cache…"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importation de <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> : <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exporter en format .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Trier par"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prénom"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nom de famille"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format de nom"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prénom en premier"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nom de famille en premier"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Compte par défaut pour les nouveaux contacts"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synchroniser les métadonnées des contacts"</string>
-    <string name="setting_about" msgid="5253319937596745755">"À propos de Contacts"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Paramètres"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Partager les contacts visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Échec du partage des contacts visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Partager les contacts favoris"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Partager tous les contacts"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Impossible de partager les contacts."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importer/exporter des contacts"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importer des contacts"</string>
-    <string name="share_error" msgid="5642622973966851784">"Impossible de partager ce contact."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Il n\'y a aucun contact à partager."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Rechercher"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Rechercher des contacts"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoris"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Aucun contact."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Aucun contact visible"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Aucun favori"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Aucun contact dans <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Effacer les contacts fréquents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Sélectionner une carte SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gérer les comptes"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importer/exporter"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"par <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> par <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"arrêter la recherche"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Effacer les termes de recherche"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Options d\'affichage des contacts"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Appeler avec"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Tapez une note à envoyer avec l\'appel..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVOYER ET APPELER"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> : <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Onglet <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> élément non lu. </item>
       <item quantity="other"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> éléments non lus. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Version"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licences de logiciels libres"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Détails des licences de logiciels libres"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Politique de confidentialité"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Modalités"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licences de logiciels libres"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Échec de l\'ouverture de l\'URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Appel vidéo"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Partager et appeler"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fr/strings.xml b/java/com/android/contacts/common/res/values-fr/strings.xml
index 474d721..a3955bb 100644
--- a/java/com/android/contacts/common/res/values-fr/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texte copié"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copier dans le presse-papiers"</string>
     <string name="call_custom" msgid="3041673234638990874">"Appeler le <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Appeler le numéro de téléphone du domicile"</string>
     <string name="call_mobile" msgid="967589404494150813">"Appeler le numéro de téléphone mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Appeler le téléavertisseur professionnel"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Appeler le numéro de téléphone MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (appeler)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Envoyer un SMS au numéro de téléphone du domicile"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Envoyer un SMS au numéro de téléphone mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Envoyer un SMS au téléavertisseur professionnel"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Envoyer un SMS au numéro de téléphone MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (envoyer un SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Effacer les contacts fréquents ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Cette opération efface la liste des personnes que vous contactez le plus souvent dans les applications Contacts et Téléphone, et entraîne une réinitialisation des adresses mémorisées comme celles que vous utilisez le plus fréquemment dans vos applications de messagerie électronique."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Suppression des contacts fréquents…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Absent"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupé"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principaux dossiers recommandés"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Contacts professionnels"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Recherche..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Plus de <xliff:g id="COUNT">%d</xliff:g> contacts ont été trouvés."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Aucun contact"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> contact trouvé.</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contacts trouvés.</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sans nom)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Appels fréquents"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contacts fréquents"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Afficher le contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Tous les contacts disposant d\'un numéro de téléphone"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacts du profil professionnel"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Envoyer un e-mail à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Envoyer un e-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rue"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Boîte postale"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Quartier"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ville"</string>
     <string name="postal_region" msgid="1730369286225469192">"État"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Code postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatter via ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatter via Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"supprimer"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Développer ou réduire les champs de nom"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Développer ou réduire les champs de nom phonétique"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tous les contacts"</string>
-    <string name="menu_done" msgid="1817505539263889535">"OK"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Annuler"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts du compte \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacts avec affichage perso."</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Enregistrer les contacts importés sur :"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importer depuis la carte SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importer depuis fichier .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Annuler l\'importation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Impossible annuler import./export. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erreur inconnue."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Impossible d\'ouvrir le fichier <xliff:g id="FILE_NAME">%s</xliff:g> pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Impossible de démarrer le programme d\'exportation pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Aucun contact ne peut être exporté."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Vous avez désactivé une autorisation nécessaire."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Une erreur s\'est produite lors de l\'exportation : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Le nom de fichier requis est trop long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erreur d\'E/S."</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Mémoire insuffisante. Le fichier est peut-être trop volumineux."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Impossible d\'analyser le fichier vCard pour une raison inattendue."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Le format n\'est pas compatible."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Impossible de collecter des métadonnées contenues dans le ou les fichiers vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Impossible d\'importer un ou plusieurs fichiers (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> terminée"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Les contacts ont bien été exportés"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Les contacts ont bien été exportés. Cliquez sur la notification pour les partager."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Appuyez pour partager les contacts."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportation des données des contacts"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Les données de contact sont en cours d\'exportation."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Impossible d\'obtenir les informations concernant la base de données."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre appareil, il est possible que votre fournisseur de données n\'autorise pas leur exportation."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Le système de composition vCard n\'a pas démarré correctement."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Échec exportation"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Les données du contact n\'ont pas été exportées.\nMotif : <xliff:g id="FAIL_REASON">%s</xliff:g>."</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importation (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Impossible de lire les données vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lecture des données vCard annulée"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Le fichier vCard <xliff:g id="FILENAME">%s</xliff:g> a bien été importé"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être importé."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Le fichier va bientôt être importé."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"La demande d\'importation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être exporté."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Le fichier va bientôt être exporté."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Les contacts seront bientôt exportés."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Impossible d\'importer le fichier vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact reçu via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exporter les contacts ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Mise en cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importation <xliff:g id="CURRENT_NUMBER">%s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%s</xliff:g> (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exporter dans fichier .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Trier par"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prénom"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nom"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format du nom"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prénom en premier"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nom en premier"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Compte par défaut pour les nouveaux contacts"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synchroniser les métadonnées des contacts"</string>
-    <string name="setting_about" msgid="5253319937596745755">"À propos de Contacts"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Paramètres"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Partager les contacts visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Échec du partage des contacts visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Partager les contacts favoris"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Partager tous les contacts"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Échec du partage des contacts."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importer/Exporter des contacts"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importer des contacts"</string>
-    <string name="share_error" msgid="5642622973966851784">"Impossible de partager ce contact."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Aucun contact à partager"</string>
-    <string name="menu_search" msgid="1241802591112035764">"Rechercher"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Rechercher des contacts"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoris"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Aucun contact"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Aucun contact visible"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Aucun favori"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Aucun contact dans <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Effacer les contacts fréquents"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Sélectionner une carte SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gérer les comptes"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importer/Exporter"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"arrêter la recherche"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Effacer la recherche"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Options d\'affichage des contacts"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Appeler avec"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Saisissez une note pour accompagner l\'appel..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVOYER ET APPELER"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Onglet <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> élément non lu. </item>
       <item quantity="other"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> éléments non lus. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Version de build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licences Open Source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Informations sur les licences des logiciels Open Source"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Règles de confidentialité"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Conditions d\'utilisation"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licences Open Source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Impossible d\'ouvrir l\'URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Appel vidéo"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Partager et appeler"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-gl/strings.xml b/java/com/android/contacts/common/res/values-gl/strings.xml
index 4a3262a..a558558 100644
--- a/java/com/android/contacts/common/res/values-gl/strings.xml
+++ b/java/com/android/contacts/common/res/values-gl/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar no portapapeis"</string>
     <string name="call_custom" msgid="3041673234638990874">"Chamar ao <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Chama á casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Chamar ao móbil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Chamar ao buscapersoas do traballo"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Chamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Chamar ao número de teléfono de MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamar)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar unha mensaxe a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar unha mensaxe á casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar unha mensaxe ao teléfono móbil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar unha mensaxe ao buscapersoas do traballo"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar unha mensaxe a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar unha mensaxe ao teléfono da MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (enviar mensaxe)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Borrar contactados con frecuencia?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Borra a lista de persoas coas que contactaches frecuentemente das aplicacións Contactos e Teléfono, e obriga ás aplicacións de correo electrónico a que memoricen as túas preferencias de enderezos desde cero."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactados frecuencia..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suxestións destacadas"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de traballo"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suxestións"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Buscando..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Encontráronse máis de <xliff:g id="COUNT">%d</xliff:g> contactos."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Non hai contactos"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactos encontrados</item>
-      <item quantity="one">1 contacto encontrado</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sen nome)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Chamados frecuentemente"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactos frecuentes"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contactos con números de teléfono"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos do perfil de traballo"</string>
@@ -96,9 +85,9 @@
     <string name="full_name" msgid="648186563998465740">"Nome"</string>
     <string name="name_given" msgid="5096576006314820536">"Nome"</string>
     <string name="name_family" msgid="6646235805198547467">"Apelidos"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Tratamento do nome"</string>
+    <string name="name_prefix" msgid="9215326539658838">"Forma de tratamento"</string>
     <string name="name_middle" msgid="703755205331582769">"Segundo nome"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Información profesional do nome"</string>
+    <string name="name_suffix" msgid="5777083390282548702">"Título académico ou profesional"</string>
     <string name="name_phonetic" msgid="1650870996361663089">"Nome fonético"</string>
     <string name="name_phonetic_given" msgid="618812334274603170">"Nome fonético"</string>
     <string name="name_phonetic_middle" msgid="4826820763384625538">"Segundo nome fonético"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar correo electrónico a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar correo electrónico"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rúa"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Apartado de correos"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Barrio"</string>
     <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatear con ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatear con Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chatear"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"eliminar"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Amplía ou contrae os campos do nome"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Amplía ou reduce campos de nome fonético"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contactos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Feito"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contactos na vista personalizada"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Un só contacto"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Gardar contactos importados en:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar da tarxeta SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar da SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar da SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar de ficheiro .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancelar importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancelar exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Imposible cancelar import./export. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erro descoñecido"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Non se puido abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Non se puido iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Non hai ningún contacto exportable."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Desactivaches un permiso necesario."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Produciuse un erro durante a exportación: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"O nome do ficheiro necesario é demasiado longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erro de E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Non hai memoria suficiente. É posible que o ficheiro sexa demasiado grande."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Non se puido analizar o vCard debido a un motivo inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"O formato non é compatible."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Non se puido recoller a información meta de determinados ficheiros vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Non se puideron importar un ou máis ficheiros (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Finalizouse a exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Finalizou a exportación dos contactos."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Finalizou a exportación dos contactos. Fai clic na notificación para compartilos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toca para compartir os contactos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Cancelouse a exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportando datos de contacto"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Estanse exportando os datos dos contactos."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Non se puido obter información da base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Non hai ningún contacto exportable. Se tes contactos no teu dispositivo, é posible que algúns provedores de datos non permitan exportalos desde este dispositivo."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"O redactor de vCard non se iniciou correctamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Imposible exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Non se exportaron os datos dos contactos.\n Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importando <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Non se puideron ler os datos de vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lectura dos datos de vCard cancelada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Acabouse de importar o vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importación de <xliff:g id="FILENAME">%s</xliff:g> cancelada"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> importarase en breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"O ficheiro importarase en breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Rexeitouse a solicitude de importación de vCard. Téntao de novo máis tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> exportarase en breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"O ficheiro exportarase en breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Exportaranse os contactos en breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Rexeitouse a solicitude de exportación do vCard. Téntao de novo máis tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contacto"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Almacenando vCard na memoria caché do almacenamento temporal local. A importación real iniciarase en breve."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Non se puido importar o vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contacto por NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportar contactos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Almacenando na caché"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar a ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelidos"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato do nome"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro os apelidos"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Conta predeterminada para novos contactos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadatos de contacto"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Información sobre Contactos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Configuración"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Compartir contactos visibles"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Produciuse un erro ao compartir os contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Compartir todos os contactos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Erro ao compartir os contactos."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contactos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contactos"</string>
-    <string name="share_error" msgid="5642622973966851784">"Non se pode compartir este contacto."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Non hai contactos para compartir."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Buscar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Buscar contactos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Non hai contactos."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ningún contacto visible"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Sen favoritos"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ningún contacto en <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar frecuentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Seleccionar tarxeta SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Xestionar contas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"a través de <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"detén a busca"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Borrar busca"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcións de visualización de contactos"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Usar sempre para as chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Chamar con"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escribe unha nota para enviala coa chamada…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E CHAMAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Pestana <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Pestana <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos non lidos. </item>
       <item quantity="one"> Pestana <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento non lido. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versión de compilación"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenzas de código aberto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalles da licenza para software de código aberto"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de privacidade"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Condicións de servizo"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenzas de código aberto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Produciuse un erro ao abrir o URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Comparte e chama"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-gu/strings.xml b/java/com/android/contacts/common/res/values-gu/strings.xml
index 536aceb..a24c438 100644
--- a/java/com/android/contacts/common/res/values-gu/strings.xml
+++ b/java/com/android/contacts/common/res/values-gu/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"ટેક્સ્ટ કૉપિ કર્યો"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ક્લિપબોર્ડ પર કૉપિ કરો"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ને કૉલ કરો"</string>
     <string name="call_home" msgid="125893483593803791">"ઘરે કૉલ કરો"</string>
     <string name="call_mobile" msgid="967589404494150813">"મોબાઇલ પર કૉલ કરો"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"કાર્યાલયના પેજર પર કૉલ કરો"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ને કૉલ કરો"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS પર કૉલ કરો"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (કૉલ કરો)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
     <string name="sms_home" msgid="3527719551060295243">"ઘરે ટેક્સ્ટ કરો"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"મોબાઇલ પર ટેક્સ્ટ કરો"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"કાર્યાલયના પેજર પર ટેક્સ્ટ કરો"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (સંદેશ મોકલો)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"વારંવાર સંપર્ક કરેલા સાફ કરીએ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"તમે સંપર્કો અને ફોન એપ્લિકેશન્સમાં વારંવાર સંપર્ક કરેલ સૂચિને સાફ કરશો અને ઇમેઇલ એપ્લિકેશન્સને તમારી સંબોધન પસંદગીઓને શરૂઆતથી જાણવા માટે ફરજ પાડશો."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"વારંવાર સંપર્ક કરેલા સાફ કરે છે…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"દૂર"</string>
     <string name="status_busy" msgid="5990832098713248503">"વ્યસ્ત"</string>
     <string name="contactsList" msgid="8806067891419291513">"સંપર્કો"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ટોચના સૂચવેલ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"અન્ય"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"નિર્દેશિકા"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"કાર્ય નિર્દેશિકા"</string>
     <string name="local_search_label" msgid="907622822323119235">"તમામ સંપર્કો"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"સૂચનો"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"હું"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"શોધી રહ્યું છે..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> કરતાં વધુ મળ્યાં."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"કોઈ સંપર્કો નથી"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> મળ્યાં</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> મળ્યાં</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> માટે ઝડપી સંપર્ક"</string>
     <string name="missing_name" msgid="978606963362745020">"(નામ નથી)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"વારંવાર કૉલ કરેલા"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"વારંવાર સંપર્ક કરેલા"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"સંપર્ક જુઓ"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ફોન નંબર્સ સાથેના તમામ સંપર્કો"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"કાર્ય પ્રોફાઇલના સંપર્કો"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ને ઇમેઇલ કરો"</string>
     <string name="email" msgid="2807318537887091606">"ઇમેઇલ"</string>
     <string name="postal_street" msgid="6918171741240802474">"શેરી"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"પોસ્ટ બોક્સ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"પડોશ"</string>
     <string name="postal_city" msgid="8674569121430005628">"શહેર"</string>
     <string name="postal_region" msgid="1730369286225469192">"રાજ્ય"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"પિન કોડ"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ નો ઉપયોગ કરીને ચેટ કરો"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber નો ઉપયોગ કરીને ચેટ કરો"</string>
     <string name="chat" msgid="1020428260359370236">"ચેટ"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"કાઢી નાખો"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"નામ ફીલ્ડ્સ વિસ્તૃત કરો અથવા સંકુચિત કરો"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ધ્વન્યાત્મક નામ ફીલ્ડ્સ વિસ્તૃત કરો અથવા સંકુચિત કરો"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"તમામ સંપર્કો"</string>
-    <string name="menu_done" msgid="1817505539263889535">"થઈ ગયું"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"રદ કરો"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> માં સંપર્કો"</string>
     <string name="listCustomView" msgid="5306282632413086731">"કસ્ટમ દૃશ્યમાં સંપર્કો"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"એકલ સંપર્ક"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"આયાત કરેલ સંપર્કોને આની પર સાચવો:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM કાર્ડમાંથી આયાત કરો"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> માંથી આયાત કરો"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> માંથી આયાત કરો"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ફાઇલમાંથી આયાત કરો"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> ના આયાતને રદ કરીએ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> ના નિકાસને રદ કરીએ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard આયાત/નિકાસને રદ કરી શક્યાં નહીં"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"અજાણી ભૂલ."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ખોલી શક્યાં નથી: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"નિકાસકર્તા શરૂ કરી શક્યાં નહીં: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"કોઈ નિકાસયોગ્ય સંપર્ક નથી."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"તમે આવશ્યક પરવાનગી અક્ષમ કરી છે."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"નિકાસ દરમિયાન ભૂલ આવી: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"જરૂરી ફાઇલનું નામ ખૂબ લાંબું છે (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O ભૂલ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"પર્યાપ્ત મેમરી નથી. આ ફાઇલ ખૂબ મોટી હોઈ શકે છે."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"અનપેક્ષિત કારણસર vCard નું વિશ્લેષણ કરી શકાયું નથી."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ફોર્મેટ સમર્થિત નથી."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"આપેલ vCard ફાઇલ(લો)ની મેટા માહિતી ભેગી કરી શકાઈ નથી."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"એક અથવા વધુ ફાઇલો આયાત કરી શકાઈ નથી (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> ને નિકાસ કરવું સમાપ્ત થયું."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"સંપર્કોને નિકાસ કરવાનું સમાપ્ત થયું."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"નિકાસ કરવાનું સમાપ્ત થયું, સંપર્કો શેર કરવા માટે સૂચના ક્લિક કરો."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"સંપર્કો શેર કરવા માટે ટૅપ કરો."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> ને નિકાસ કરવું રદ કર્યું."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"સંપર્ક ડેટા નિકાસ કરી રહ્યાં છે"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"સંપર્ક ડેટાનો નિકાસ કરવામાં આવી રહ્યો છે."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ડેટાબેસ જાણકારી મેળવી શકાઈ નથી."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"કોઈ નિકાસયોગ્ય સંપર્કો નથી. જો તમારી પાસે તમારા ઉપકરણ પર કોઈ સંપર્કો નથી, તો કેટલાક ડેટા પ્રદાતા ઉપકરણ પરથી સંપર્કોને નિકાસ કરવાની મંજૂરી આપી શકશે નહીં."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard કમ્પોઝર ઠીકથી પ્રારંભ થયું નથી."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"નિકાસ કરી શક્યાં નથી"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"સંપર્ક ડેટા નિકાસ કર્યો નહોતો.\nકારણ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> ને આયાત કરી રહ્યાં છે"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard ડેટા વાંચી શકાયો નથી"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard ડેટા વાંચવું રદ કર્યું"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> ને આયાત કરવું સમાપ્ત થયું"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ને આયાત કરવું રદ કર્યું"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ને ટૂંક સમયમાં આયાત કરવામાં આવશે."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ફાઇલ ટૂંક સમયમાં આયાત કરવામાં આવશે."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard આયાતની વિનંતી નકારી હતી. પછીથી ફરી પ્રયાસ કરો."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ને ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ફાઇલને ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"સંપર્કોનો ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard નિકાસની વિનંતી નકારી હતી. પછીથી ફરી પ્રયાસ કરો."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"સંપર્ક"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"સ્થાનિક અસ્થાયી સ્ટોરેજ પર vCard કેશ કરી રહ્યાં છે. વાસ્તવિક આયાત જલ્દી જ શરૂ થશે."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard આયાત કરી શકાયો નથી."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC પર સંપર્ક પ્રાપ્ત"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"સંપર્કો નિકાસ કરીએ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"કેશ કરી રહ્યાં છે"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ફાઇલ પર નિકાસ કરો"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"આ પ્રમાણે સૉર્ટ કરો"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"પ્રથમ નામ"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"છેલ્લું નામ"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"નામ ફોર્મેટ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"પ્રથમ નામ પહેલા"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"છેલ્લું નામ પહેલા"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"નવા સંપર્કો માટે ડિફોલ્ટ એકાઉન્ટ"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"સંપર્ક મેટાડેટાને સમન્વયિત કરો"</string>
-    <string name="setting_about" msgid="5253319937596745755">"સંપર્કો વિશે"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"સેટિંગ્સ"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"દૃશ્યક્ષમ સંપર્કોને શેર કરો"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"દૃશ્યક્ષમ સંપર્કો શેર કરવામાં નિષ્ફળ થયાં."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"મનપસંદ સંપર્કોને શેર કરો"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"તમામ સંપર્કોને શેર કરો"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"સંપર્કોને શેર કરવામાં નિષ્ફળ થયાં."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"સંપર્કો આયાત/નિકાસ કરો"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"સંપર્કો આયાત કરો"</string>
-    <string name="share_error" msgid="5642622973966851784">"આ સંપર્ક શેર કરી શકાતો નથી."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"શેર કરવા માટે કોઇ સંપર્કો નથી"</string>
-    <string name="menu_search" msgid="1241802591112035764">"શોધો"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"સંપર્કો શોધો"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"મનપસંદ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"કોઈ સંપર્કો નથી."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"કોઈ દૃશ્યક્ષમ સંપર્કો નથી."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"કોઈ મનપસંદ નથી"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> માં કોઈ સંપર્કો નથી"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"વારંવારના સાફ કરો"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM કાર્ડ પસંદ કરો"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"એકાઉન્ટ્સ સંચાલિત કરો"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"આયાત/નિકાસ કરો"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> મારફતે"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> મારફતે <xliff:g id="DATE">%1$s</xliff:g> ના રોજ"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"શોધવાનું રોકો"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"શોધ સાફ કરો"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"સંપર્ક પ્રદર્શન વિકલ્પો"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"એકાઉન્ટ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"આની સાથે કૉલ કરો"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"કૉલ સાથે મોકલવા માટે એક નોંધ લખો ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"મોકલો અને કૉલ કરો"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ટૅબ."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ટૅબ. <xliff:g id="COUNT_3">%2$d</xliff:g> વાંચ્યા વગરની આઇટમ. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ટૅબ. <xliff:g id="COUNT_3">%2$d</xliff:g> વાંચ્યા વગરની આઇટમ. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"બિલ્ડ સંસ્કરણ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ઓપન સોર્સ લાઇસેંસેસ"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ખુલ્લા સ્ત્રોતના સોફ્ટવેર માટે લાઇસેંસની વિગતો"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"ગોપનીયતા નીતિ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"સેવાની શરતો"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ખુલ્લા સ્રોત લાઇસન્સીસ"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url ખોલવામાં નિષ્ફળ થયાં."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"વિડિઓ કૉલ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"શેર કરો અને કૉલ કરો"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hi/strings.xml b/java/com/android/contacts/common/res/values-hi/strings.xml
index c61e195..1d49d79 100644
--- a/java/com/android/contacts/common/res/values-hi/strings.xml
+++ b/java/com/android/contacts/common/res/values-hi/strings.xml
@@ -17,8 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"लेख की प्रतिलिपि बनाई गई"</string>
-    <string name="copy_text" msgid="5890820280087874642">"क्‍लिपबोर्ड पर प्रतिलिपि बनाएं"</string>
+    <string name="toast_text_copied" msgid="8979281391599667362">"लेख को कॉपी किया गया"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> पर कॉल करें"</string>
     <string name="call_home" msgid="125893483593803791">"घर के फ़ोन नंबर पर कॉल करें"</string>
     <string name="call_mobile" msgid="967589404494150813">"मोबाइल पर कॉल करें"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"कार्यालय के पेजर पर कॉल करें"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> पर कॉल करें"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS पर कॉल करें"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (कॉल करें)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> पर लेख संदेश भेजें"</string>
     <string name="sms_home" msgid="3527719551060295243">"घर के फ़ोन नंबर पर लेख संदेश भेजें"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"मोबाइल पर लेख संदेश भेजें"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"कार्यालय के पेजर पर लेख संदेश भेजें"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> पर लेख संदेश भेजें"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS पर लेख संदेश भेजें"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (संदेश भेजें)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"अक्‍सर किए जाने वाले संपर्क साफ करें?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"आपको संपर्क और फ़ोन ऐप्स से अक्सर संपर्क किए जाने वाली सूची साफ़ करनी होगी, और अपने ईमेल ऐप्स को आपकी पता प्राथमिकताओं को प्रारंभ से जानने के लिए बाध्य करना होगा."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"अक्सर किए जाने वाले संपर्क साफ कर रहा है…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"दूर"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"शीर्ष सुझाव"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सभी संपर्क"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझाव"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मुझे"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"खोज रहा है..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> से अधिक मिले."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"कोई संपर्क नहीं"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> मिले</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> मिले</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> के लिए त्वरित संपर्क"</string>
     <string name="missing_name" msgid="978606963362745020">"(कोई नाम नहीं)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"बार-बार कॉल किए गए"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"बार-बार संपर्क किए गए"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"संपर्क देखें"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"फ़ोन नंबरों वाले सभी संपर्क"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफ़ाइल के संपर्क"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> पर ईमेल करें"</string>
     <string name="email" msgid="2807318537887091606">"ईमेल करें"</string>
     <string name="postal_street" msgid="6918171741240802474">"मार्ग का नाम"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"पीओ बॉक्स"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"पड़ोस"</string>
     <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
     <string name="postal_region" msgid="1730369286225469192">"राज्य"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"पिन कोड"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ का उपयोग करके बातचीत करें"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber का उपयोग करके बातचीत करें"</string>
     <string name="chat" msgid="1020428260359370236">"बातचीत करें"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"हटाएं"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"नाम फ़ील्ड विस्तृत या संक्षिप्त करें"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"फ़ोनेटिक नाम फ़ील्ड विस्‍तृत या संक्षिप्त करें"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"सभी संपर्क"</string>
-    <string name="menu_done" msgid="1817505539263889535">"पूर्ण"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"अभी नहीं"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> के संपर्क"</string>
     <string name="listCustomView" msgid="5306282632413086731">"कस्टम दृश्य में संपर्क"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"एकल संपर्क"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"आयातित संपर्कों को इसमें सहेजें:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"सिम कार्ड से आयात करें"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> सिम से आयात करें"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> सिम से आयात करें"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf फ़ाइल से आयात करें"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> का आयात रहने दें?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात रहने दें?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard आयात/निर्यात रद्द नहीं हो सका"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"अज्ञात गड़बड़ी‍."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" नहीं खोली जा सकी: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"निर्यातकर्ता प्रारंभ नहीं किया जा सका: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"कोई भी निर्यात-योग्‍य संपर्क नहीं है."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"आपने एक आवश्यक अनुमति को अक्षम कर दिया है."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"निर्यात करते समय कोई गड़बड़ी हुई: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"आवश्‍यक फ़ाइल नाम बहुत बड़ा है (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O गड़बड़ी"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"स्‍मृति पर्याप्त नहीं है. हो सकता है फ़ाइल बहुत बड़ी हो."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"किसी अप्रत्‍याशित कारण से vCard पार्स नहीं किया जा सका."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"प्रारूप समर्थित नहीं है."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"दी गई vCard फ़ाइल (फ़ाइलों) की मेटा जानकारी एकत्र नहीं की जा सकी."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"एक या अधिक फ़ाइलें आयात नहीं की जा सकीं (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात पूरा हो गया."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"संपर्कों का निर्यात किया जाना समाप्त हो गया."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"संपर्कों का निर्यात पूरा हो गया है, संपर्क साझा करने के लिए नोटिफ़िकेशन क्लिक करें."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"संपर्क साझा करने के लिए टैप करें."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> को निर्यात करना रद्द कर दिया गया."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"संपर्क डेटा निर्यात हो रहा है"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"संपर्क डेटा निर्यात किया जा रहा है."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"डेटाबेस जानकारी नहीं मिल सकी."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"कोई भी निर्यात-योग्‍य संपर्क नहीं है. यदि आपके पास अपने डिवाइस पर संपर्क हों, तो हो सकता है कि कुछ डेटा प्रदाता संपर्कों को डिवाइस से निर्यात ना करने दें."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard कंपोज़र ठीक से प्रारंभ नहीं हुआ."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"निर्यात नहीं कर सका"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"संपर्क डेटा निर्या‍त नहीं किया गया था.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> आयात कर रहा है"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard डेटा नहीं पढ़ा जा सका"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard डेटा को पढ़ना रद्द कर दिया गया"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> आयात करना पूर्ण"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> को आयात करना रद्द कर दिया गया"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> को जल्‍दी ही आयात किया जाएगा."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"फ़ाइल शीघ्र ही आयात की जाएगी."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard आयात अनुरोध अस्‍वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> को जल्‍दी ही निर्यात किया जाएगा."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"फ़ाइल शीघ्र ही निर्यात की जाएगी."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"संपर्कों को शीघ्र ही निर्यात किया जाएगा."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard निर्यात अनुरोध अस्‍वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"संपर्क"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard को स्‍थानीय अस्‍थायी मेमोरी में संचित कर रहा है. वास्‍तविक आयात जल्‍दी ही प्रारंभ होगा."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard आयात नहीं कर सका."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC पर प्राप्त संपर्क"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"संपर्कों को निर्यात करें?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"संचय कर रहा है"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> आयात कर रहा है: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf फाइल में निर्यात करें"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"इससे क्रमित करें"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाम"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"उपनाम"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"नाम प्रारूप"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाम पहले"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"उपनाम पहले"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"नए संपर्कों के लिए डिफ़ॉल्ट खाता"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"संपर्क मेटाडेटा समन्वयनित करें"</string>
-    <string name="setting_about" msgid="5253319937596745755">"संपर्क के बारे में"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"सेटिंग"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"दिखाई देने वाले संपर्क साझा करें"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"दृश्‍यमान संपर्क साझा करने में विफल रहा."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"पसंदीदा संपर्कों को साझा करें"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"सभी संपर्कों को साझा करें"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"संपर्कों को साझा करना विफल रहा."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"संपर्कों को आयात/निर्यात करें"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"संपर्क आयात करें"</string>
-    <string name="share_error" msgid="5642622973966851784">"यह संपर्क साझा नहीं किया जा सकता."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"साझा करने के लिए कोई भी संपर्क नहीं है."</string>
-    <string name="menu_search" msgid="1241802591112035764">"खोजें"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"संपर्क ढूंढें"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"पसंदीदा"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"कोई संपर्क नहीं."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"कोई दृश्यमान संपर्क नहीं."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"कोई पसंदीदा नहीं"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> में कोई संपर्क नहीं"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"अक्सर किए जाने वाले साफ़ करें"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"सिम कार्ड चुनें"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"खाते प्रबंधित करें"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"आयात करें/निर्यात करें"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> द्वारा"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> द्वारा <xliff:g id="DATE">%1$s</xliff:g> को"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"खोजना बंद करें"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"खोज साफ़ करें"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"संपर्क प्रदर्शन विकल्प"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"खाता"</string>
     <string name="set_default_account" msgid="7966099951006467572">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"इस सिम से कॉल करें"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"कॉल के साथ भेजने के लिए नोट लिखें ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"भेजें और कॉल करें"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> टैब."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> टैब. <xliff:g id="COUNT_3">%2$d</xliff:g> नहीं पढ़े गए आइटम. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> टैब. <xliff:g id="COUNT_3">%2$d</xliff:g> नहीं पढ़े गए आइटम. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"बिल्ड वर्शन"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ओपन सोर्स लाइसेंस"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ओपन सोर्स सॉफ़्टवेयर के लाइसेंस वि‍वरण"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"निजता नीति"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"सेवा की शर्तें"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ओपन सोर्स लाइसेंस"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url खोलने में विफल रहा."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"वीडियो कॉल"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"साझा करें और कॉल करें"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hr/strings.xml b/java/com/android/contacts/common/res/values-hr/strings.xml
index 66986dd..2aa9272 100644
--- a/java/com/android/contacts/common/res/values-hr/strings.xml
+++ b/java/com/android/contacts/common/res/values-hr/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiran"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiraj u međuspremnik"</string>
     <string name="call_custom" msgid="3041673234638990874">"Nazovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Nazovi kućni broj"</string>
     <string name="call_mobile" msgid="967589404494150813">"Nazovi mobitel"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Nazovi poslovni dojavljivač"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Nazovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Nazovi MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (poziv)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Pošalji SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Pošalji SMS na kućni"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Pošalji SMS na mobitel"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji SMS na poslovni dojavljivač"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Pošalji SMS na <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Pošalji SMS na MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (poruka)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Brisati podatke o čestim kontaktima?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Izbrisat ćete popis osoba s kojima često kontaktirate u aplikacijama Kontakti i Osobe, pa će aplikacije e-pošte morati ispočetka učiti vaše postavke adresiranja."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih..."</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zauzet"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktorij"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni direktorij"</string>
     <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Pretraživanje…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Pronađeno je više od <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nema kontakata"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> pronađen</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> pronađena</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> pronađenih</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Brzi kontakt za korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Bez imena)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Često nazivani"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Često kontaktirani"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti s telefonskim brojevima"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Poslovni kontakti"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Pošalji e-poruku kontaktu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Pošalji e-poruku"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Poštanski pretinac"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Četvrt"</string>
     <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Država"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
@@ -145,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatajte pomoću ICQ-a"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatajte uz Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"izbriši"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Proširi ili sažmi nazive polja"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Proširivanje ili sažimanje polja fonetskih imena"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gotovo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Odustani"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti na računu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Jedan kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Spremite uvezene kontakte na račun:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Uvoz sa SIM kartice"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Uvoz sa SIM-a <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Uvoz sa SIM-a <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Uvezi iz .vcf datoteke"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Otkazati uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Otkazati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Uvoz/izvoz kartice vCard nije otkazan"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nepoznata pogreška."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nije moguće otvoriti datoteku \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Alat za izvoz ne može se pokrenuti: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nema kontakata koji se mogu izvoziti."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Onemogućili ste obavezno dopuštenje."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Tijekom izvoza došlo je do pogreške: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Obavezan naziv datoteke predug je (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O pogreška"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nema dovoljno memorije. Datoteka je možda prevelika."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Iz neočekivanog razloga nije moguće analizirati vCard datoteku."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format nije podržan."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Neuspješno prikupljanje metainformacija danih datoteka kartice vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Uvoz jedne ili više datoteka nije uspio (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Završetak izvoza datoteke <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Dovršen je izvoz kontakata."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Dovršen je izvoz kontakata. Kliknite obavijest za dijeljenje kontakata."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Dodirnite za dijeljenje kontakata."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> otkazan je."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Izvoz podataka o kontaktu"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Podaci kontakata izvoze se."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Dohvaćanje podataka iz baze podataka nije uspjelo."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nema kontakata koji se mogu izvoziti. Ako na svojem telefonu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tog uređaja."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Sastavljač za vCard nije se ispravno pokrenuo."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Izvoz nije uspio"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Podaci o kontaktu nisu izvezeni.\nRazlog: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Uvozi se <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Čitanje podataka vCarda nije uspjelo"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Čitanje podataka kartice vCard otkazano"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Završetak uvoza datoteke <xliff:g id="FILENAME">%s</xliff:g> kartice vCard"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> otkazan je"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti uvezena."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Datoteka će uskoro biti uvezena."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Zahtjev za uvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti izvezena."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Datoteka će se uskoro izvesti."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakti će se uskoro izvesti."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Zahtjev za izvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Spremanje vCard datoteka u lokalnu privremenu pohranu. Stvarni uvoz počet će uskoro."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Uvoz vCard datoteke nije uspio."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt NFC-om"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Izvesti kontakte?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Spremanje u predmemoriju"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Uvoz <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Izvezi u .vcf datoteku"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Poredaj po"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezime"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Oblik imena"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprije ime"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprije prezime"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Zadani račun za nove kontakte"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinkronizacija metapodataka kontakta"</string>
-    <string name="setting_about" msgid="5253319937596745755">"O kontaktima"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Postavke"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Dijeli vidljive kontakte"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nije uspjelo dijeljenje vidljivih kontakata"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Podijeli omiljene kontakte"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Podijeli sve kontakte"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Dijeljenje kontakata nije uspjelo."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Uvoz/izvoz kontakata"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Uvezi kontakte"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ovaj kontakt nije moguće dijeliti."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nema kontakata za dijeljenje."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Traži"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Potražite kontakte"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoriti"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nema kontakata."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nema vidljivih kontakata."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nema favorita"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nema kontakata pod: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Briši često kontaktirane"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Odaberite SIM karticu"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Upravljaj računima"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Uvoz/izvoz"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"putem izvora <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> putem izvora <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavi pretraživanje"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Brisanje pretraživanja"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcije prikaza kontakata"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Uvijek upotrebljavaj za pozive"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Poziv putem usluge"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Napišite bilješku koju ćete poslati uz poziv..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I NAZOVI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
       <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
       <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Međuverzija"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licence otvorenog izvornog koda"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Pojedinosti o licenci za softver otvorenog koda"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Pravila o privatnosti"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Uvjeti pružanja usluge"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licence otvorenog izvornog koda"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Otvaranje URL-a nije uspjelo."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videopoziv"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Dijeli i pozovi"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hu/strings.xml b/java/com/android/contacts/common/res/values-hu/strings.xml
index 22bf509..347609c 100644
--- a/java/com/android/contacts/common/res/values-hu/strings.xml
+++ b/java/com/android/contacts/common/res/values-hu/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Másolt szöveg"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Másolás vágólapra"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> hívása"</string>
     <string name="call_home" msgid="125893483593803791">"Otthoni szám hívása"</string>
     <string name="call_mobile" msgid="967589404494150813">"Mobil hívása"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Munkahelyi csipogó hívása"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> hívása"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS-ben szereplő telefonszám hívása"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hívás)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS küldése haza"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS küldése mobiltelefonra"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS küldése munkahelyi csipogóra"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS küldése ide: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS küldése MMS-ben szereplő számra"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (üzenet)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Törli a gyakran keresetteket?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Törölni fogja a gyakran keresett személyek listáját a Névjegyek és a Telefon alkalmazásban, és arra kényszeríti az e-mail alkalmazásokat, hogy elölről kezdjék az Ön címzési szokásainak megtanulását."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Gyakran keresettek törlése..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Nincs a gépnél"</string>
     <string name="status_busy" msgid="5990832098713248503">"Elfoglalt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Címtár"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Legjobb javaslatok"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Egyéb"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Címtár"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Munkahelyi névjegyek címtára"</string>
     <string name="local_search_label" msgid="907622822323119235">"Összes névjegy"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Javaslatok"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Én"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Keresés…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Több mint <xliff:g id="COUNT">%d</xliff:g> találat."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nincsenek névjegyek"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> találat</item>
-      <item quantity="one">1 találat</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> gyors elérése"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nincs név)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Gyakran hívott"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Gyakran keresettek"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Névjegy megtekintése"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Minden névjegy telefonszámokkal"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Munkaprofilhoz tartozó névjegyek"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-mail küldése a(z) <xliff:g id="CUSTOM">%s</xliff:g> címre"</string>
     <string name="email" msgid="2807318537887091606">"E-mail küldése"</string>
     <string name="postal_street" msgid="6918171741240802474">"Utca, házszám"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postafiók"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Környék"</string>
     <string name="postal_city" msgid="8674569121430005628">"Település"</string>
     <string name="postal_region" msgid="1730369286225469192">"Állam"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Irányítószám"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Csevegés az ICQ-n"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Csevegés Jabberen"</string>
     <string name="chat" msgid="1020428260359370236">"Csevegés"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"törlés"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Névmezők részletes vagy listanézete"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Fonetikus névmezők kinyitása és összecsukása"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Az összes névjegy"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Kész"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Mégse"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Ismerősök itt: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Egyéni nézet névjegyei"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Egyetlen névjegy"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Importált névjegyek mentési helye:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importálás SIM kártyáról"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importálás a következő SIM kártyáról: <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importálás a következő SIM kártyáról: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importálás .vcf fájlból"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Megszakítja <xliff:g id="FILENAME">%s</xliff:g> importálását?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Megszakítja <xliff:g id="FILENAME">%s</xliff:g> exportálását?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard imp./exp. megszakítása sikertelen"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Ismeretlen hiba."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"A(z) „<xliff:g id="FILE_NAME">%s</xliff:g>” fájl nem nyitható meg: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nem sikerült elindítani az exportálót: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nincs exportálható névjegy."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Letiltott egy szükséges engedélyt."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Hiba történt az exportálás során: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"A fájlnév túl hosszú („<xliff:g id="FILENAME">%s</xliff:g>”)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O hiba"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nincs elég memória. Lehet, hogy túl nagy a fájl."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Váratlan ok miatt nem sikerült a vCard szintaktikai elemzése."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"A formátum nem támogatott."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nem sikerült begyűjteni a vCard-fájl(ok) metaadatait."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Egy vagy több fájl nem importálható (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"A(z) <xliff:g id="FILENAME">%s</xliff:g> exportálása befejeződött."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"A névjegyek exportálása befejeződött."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Az exportálás befejeződött. A névjegyek megosztásához kattintson az értesítésre."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Koppintson rá a névjegyek megosztásához."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"A(z) <xliff:g id="FILENAME">%s</xliff:g> exportálása megszakítva."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Névjegyadatok exportálása"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"A névjegyadatok exportálása folyamatban van."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nem sikerült lekérni az adatbázis-információkat."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nincsenek exportálható névjegyek. Ha vannak névjegyek az eszközön, előfordulhat, hogy az adatszolgáltató nem teszi lehetővé a névjegyek exportálását az eszközről."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"A vCard-készítő nem megfelelően indult el."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Sikertelen export"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Nem sikerült a névjegyadatok exportálása.\nOk: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importálás – <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nem sikerült beolvasni a vCard adatait."</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"A vCard-adatok beolvasása megszakítva"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"A(z) <xliff:g id="FILENAME">%s</xliff:g> vCard importálása befejeződött"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"A(z) <xliff:g id="FILENAME">%s</xliff:g> importálása megszakítva"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"A(z) <xliff:g id="FILENAME">%s</xliff:g> hamarosan importálva lesz."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"A fájl importálása nemsokára megtörténik."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"A vCard-importálási kérelem elutasítva. Próbálja újra később."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"A(z) <xliff:g id="FILENAME">%s</xliff:g> hamarosan exportálva lesz."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"A fájl exportálása hamarosan megtörténik."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"A névjegyek exportálása hamarosan megtörténik."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"A vCard-exportálási kérelem elutasítva. Próbálja újra később."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"névjegy"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(ok) mentése az ideiglenes helyi tárolóba. A tényleges importálás hamarosan megkezdődik."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Nem sikerült a vCard importálása."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC-n kapott név"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportálja a névjegyeket?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Gyorsítótárazás"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importálás – <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportálás .vcf fájlba"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rendezés alapja"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Utónév"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Vezetéknév"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Névformátum"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Utónév elöl"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Vezetéknév elöl"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Alapértelmezett fiók az új névjegyek számára"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Névjegyek metaadatainak szinkronizálása"</string>
-    <string name="setting_about" msgid="5253319937596745755">"A Névjegyekről"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Beállítások"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Látható névjegyek megosztása"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nem sikerült megosztani a látható névjegyeket."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Kedvenc névjegyek megosztása"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Az összes névjegy megosztása"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Nem sikerült megosztani a névjegyeket."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Névjegyek importálása/exportálása"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Névjegyek importálása"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ezt a névjegyet nem lehet megosztani."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nincsenek megosztható névjegyek."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Keresés"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Névjegy keresése"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Kedvencek"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nincsenek névjegyek."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nincsenek látható névjegyek."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nincsenek kedvencek"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nincsenek névjegyek itt: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Gyakran keresettek törlése"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM kártya kiválasztása"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Fiókok kezelése"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importálás/exportálás"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"itt: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> itt: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"keresés leállítása"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Keresés törlése"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Névjegy megjelenítési lehetőségei"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Fiók"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Mindig ezt használja hívásokhoz"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Hívás a következővel:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Írjon üzenetet, amelyet elküldhetünk a hívással együtt…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"KÜLDÉS ÉS HÍVÁS"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="LIMIT">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> lap."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> lap. <xliff:g id="COUNT_3">%2$d</xliff:g> olvasatlan elem. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> lap. <xliff:g id="COUNT_1">%2$d</xliff:g> olvasatlan elem. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Build verziószáma"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Nyílt forráskódú licencek"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"A nyílt forráskódú szoftverekhez kapcsolódó licenc részletei"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Adatvédelmi irányelvek"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Általános Szerződési Feltételek"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Nyílt forráskódú licencek"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Nem sikerült megnyitni az URL-címet."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videohívás"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Megosztás és hívás"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hy/strings.xml b/java/com/android/contacts/common/res/values-hy/strings.xml
index 85c9023..0a6cfa2 100644
--- a/java/com/android/contacts/common/res/values-hy/strings.xml
+++ b/java/com/android/contacts/common/res/values-hy/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Տեքսը պատճենված է"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Պատճենել սեղմատախտակին"</string>
     <string name="call_custom" msgid="3041673234638990874">"Զանգել <xliff:g id="CUSTOM">%s</xliff:g> համարին"</string>
     <string name="call_home" msgid="125893483593803791">"Զանգել տուն"</string>
     <string name="call_mobile" msgid="967589404494150813">"Զանգել շարժականին"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Զանգել աշխատավայրի փեյջերին"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Զանգել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
     <string name="call_mms" msgid="4958811711741872901">"Զանգել MMS համարին"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Զանգ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Հաղորդագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
     <string name="sms_home" msgid="3527719551060295243">"Հաղորդագրել տուն"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Հաղորդագրել բջջայինին"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Հաղորդագրել աշխատանքային փեյջերին"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Հաղորդագրել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Հաղորդագրել MMS համարին"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Հաղորդագրություն)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Մաքրե՞լ հաճախակի հաղորդակցվածները"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Դուք կմաքրեք հաճախակի հաղորդակցվողների ցանկը Կոնտակտներ և Հեռախոս հավելվածներում, և ձեր էլփոստի ծրագիրը զրոյից կսովորի ձեր հասցեագրումների նախընտրությունները:"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Հաճախակի հաղորդակցումների մաքրում..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Տեղում չէ"</string>
     <string name="status_busy" msgid="5990832098713248503">"Զբաղված"</string>
     <string name="contactsList" msgid="8806067891419291513">"Կոնտակտներ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Լավագույն առաջարկներ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Այլ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Գրացուցակ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Աշխատանքային գրացուցակ"</string>
     <string name="local_search_label" msgid="907622822323119235">"Բոլոր կոնտակտները"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Առաջարկներ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ես"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Որոնում..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Գտնվել են <xliff:g id="COUNT">%d</xliff:g>-ից ավելի:"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Կոնտակտներ չկան"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> found</item>
-      <item quantity="other">Գտնվել է <xliff:g id="COUNT">%d</xliff:g> կոնտակտ</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Արագ կապ <xliff:g id="NAME">%1$s</xliff:g>-ի հետ"</string>
     <string name="missing_name" msgid="978606963362745020">"(Անանուն)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Հաճախակի կանչվող"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Հաճախակի հաղորդակցվող"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Դիտել կոնտակտը"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Բոլոր հեռախոսահամարներով կոնտատկները"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Աշխատանքային պրոֆիլի կոնտակտներ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Նամակագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
     <string name="email" msgid="2807318537887091606">"Էլփոստ"</string>
     <string name="postal_street" msgid="6918171741240802474">"Փողոց"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Բաժանորդային արկղը"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Շրջակայքը"</string>
     <string name="postal_city" msgid="8674569121430005628">"Քաղաքը"</string>
     <string name="postal_region" msgid="1730369286225469192">"Նահանգը"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Փոստային կոդը"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Զրուցել ICQ-ով"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Զրուցել Jabber-ով"</string>
     <string name="chat" msgid="1020428260359370236">"Զրույց"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ջնջել"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ընդարձակել կամ սեղմել անունների դաշտերը"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Ընդարձակել կամ կոծկել տառադարձված անվան դաշտերը"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Բոլոր կոնտակտները"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Պատրաստ է"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Չեղարկել"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>-ի կոնտակտները"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Հատուկ տեսքով կոնտակտներ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Մեկ կոնտակտ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Պահել ներմուծված կոնտակտներն այստեղ՝"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Ներմուծել SIM քարտից"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Ներմուծել <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM-ից"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Ներմուծել <xliff:g id="SIM_NAME">%1$s</xliff:g> SIM-ից"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Ներմուծել .vcf ֆայլից"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի ներմուծումը:"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Հնարավոր չէ չեղարկել vCard-ի ներմուծումը/արտահանումը"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Անհայտ սխալ:"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Հնարավոր չէ բացել «<xliff:g id="FILE_NAME">%s</xliff:g>» ֆայլը՝ <xliff:g id="EXACT_REASON">%s</xliff:g>:"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Հնարավոր չէ մեկնարկել արտահանողին. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Արտահանելի կոնտակտներ չկան:"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Դուք անջատել եք անհրաժեշտ թույլտվությունը:"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Արտահանման ընթացքում սխալ է տեղի ունեցել. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Պահանջվող ֆայլի անունը («<xliff:g id="FILENAME">%s</xliff:g>») շատ երկար է:"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O սխալ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Հիշողությունը բավարար չէ: Հնարավոր է` ֆայլը չափազանց մեծ է:"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Չհաջողվեց վերլուծել vCard-ը անսպասելի պատճառով:"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Ձևաչափը չի աջակցվում:"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Հնարավոր չէ հավաքել vCard ֆայլ(եր)ի մետա տեղեկատվությունը:"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Հնարավոր չէ ներմուծել մեկ կամ ավելի ֆայլեր (%s):"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումն ավարտվեց:"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Կոնտակտների արտահանումն ավարտվեց:"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Կոնտակտներն արտահանվեցին: Սեղմեք ծանուցումը՝ դրանք հասանելի դարձնելու համար:"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Հպեք՝ կոնտակտները հասանելի դարձնելու համար:"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը չեղարկվեց:"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Կոնտակտային տվյալների արտահանում"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Կոնտակտային տվյալներն արտահանվում են:"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Հնարավոր չէ ստանալ տվյալների շտեմարանի տեղեկատվությունը:"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Արտահանելու կոնտակտներ չկան: Հնարավոր է՝ որոշ տվյալների մատակարարներ չեն թույլատրում սարքից կոնտակտների արտահանումը:"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard-ի կազմիչը ճիշտ չի մեկնարկել:"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Հնարավոր չէ արտահանել"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Կոնտակտային տվյալները չեն արտահանվել:\nՊատճառը՝ «<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>-ի ներմուծում"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Չհաջողվեց ընթերցել vCard-ի տվյալները"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard տվյալների ընթերցումը չեղարկվեց"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g>-ի ներմուծումը ավարտվեց vCard-ից"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>-ի ներմուծումը չեղարկվեց"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g>-ը շուտով կներմուծվի:"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Ֆայլը շուտով կներմուծվի:"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard-ի ներմուծման հայցը մերժվել է: Կրկին փորձեք ավելի ուշ:"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g>-ը կարտահանվի շուտով:"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Ֆայլը շուտով կարտահանվի:"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Կոնտակտները շուտով կարտահանվեն:"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard-ի արտահանման հայցը մերժվեց: Փորձեք կրկին ավելի ուշ:"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"կոնտակտ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(եր)-ի քեշավորում ժամանակավոր պաոց: Փաստացի ներմուծումը կսկսվի շուտով:"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Չհաջողվեց ներմուծել vCard-ը:"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC-ով ստացված կոնտակտ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Արտահանե՞լ կոնտակտները"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Քեշավորում"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Ներմուծվում է <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>. <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Արտահանել .vcf ֆայլ"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Դասավորել ըստ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Անվան"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Ազգանվան"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Անվան ձևաչափ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Սկզբում՝ անունը"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Սկզբում՝ ազգանունը"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Կանխադրված հաշիվ նոր կոնտակտների համար"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Համաժամացնել կոնտակտի մետատվյալները"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Կոնտակտների մասին"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Կարգավորումներ"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Փոխանցել տեսանելի կոնտակտները"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Չհաջողվեց համօգտագործել տեսանելի կոնտակտները:"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Ուղարկել կոնտակտների ընտրանին"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Տրամադրել բոլոր կոնտակտները"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Չհաջողվեց տրամադրել կոնտակտները:"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Կոնտակտների ներմուծում/արտահանում"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Ներմուծել կոնտակտներ"</string>
-    <string name="share_error" msgid="5642622973966851784">"Հնարավոր չէ տարածել կոնտակտը:"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Հասանելի կոնտակտներ չկան։"</string>
-    <string name="menu_search" msgid="1241802591112035764">"Որոնում"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Կոնտակտների որոնում"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Ընտրյալներ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Կոնտակտներ չկան:"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Տեսանելի կոնտակտներ չկան:"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ընտրանի չկա"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>-ում կոնտակտներ չկան"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Մաքրել հաճախակիները"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Ընտրեք SIM քարտը"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Հաշիվների կառավարում"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Ներմուծել/արտահանել"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g>-ի միջոցով"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>` <xliff:g id="SOURCE">%2$s</xliff:g>-ի միջոցով"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"դադարեցնել որոնումը"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Մաքրել որոնման դաշտը"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Կոնտակտի ցուցադրման ընտրանքները"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Հաշիվ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Միշտ օգտագործել սա՝ զանգերի համար"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Զանգել հետևյալով"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Մուտքագրեք նշում՝ զանգի հետ ուղարկելու համար ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ՈՒՂԱՐԿԵԼ ԵՎ ԶԱՆԳԵԼ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ներդիր:"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ներդիր: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթերցված տարր: </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Կառուցման տարբերակը"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Բաց կոդով ծրագրերի արտոնագրեր"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Բաց կոդով ծրագրային ապահովման արտոնագրերի մանրամասներ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Գաղտնիության քաղաքականություն"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Օգտագործման պայմաններ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Բաց կոդով ծրագրակազմի արտոնագրեր"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Չհաջողվեց բացել url-ը:"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Տեսազանգ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Կիսվել և զանգել"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-in/strings.xml b/java/com/android/contacts/common/res/values-in/strings.xml
index d7ee8bf..a332790 100644
--- a/java/com/android/contacts/common/res/values-in/strings.xml
+++ b/java/com/android/contacts/common/res/values-in/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teks disalin"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Salin ke papan klip"</string>
     <string name="call_custom" msgid="3041673234638990874">"Hubungi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Telepon rumah"</string>
     <string name="call_mobile" msgid="967589404494150813">"Hubungi nomor seluler"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Hubungi pager kantor"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Hubungi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Hubungi MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telepon)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS rumah"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS nomor seluler"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS pager kantor"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Hapus yang sering dihubungi?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Anda akan menghapus daftar yang sering dihubungi pada aplikasi Kontak dan Ponsel, serta memaksa aplikasi email untuk mempelajari preferensi penanganan dari awal."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Menghapus yang sering dihubungi..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Keluar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontak"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Paling Disarankan"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Lainnya"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
     <string name="local_search_label" msgid="907622822323119235">"Semua kontak"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Saran"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Menelusuri…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Ditemukan lebih dari <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Tidak ada kontak"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Ditemukan <xliff:g id="COUNT">%d</xliff:g> kontak</item>
-      <item quantity="one">Ditemukan 1 kontak</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Kontak cepat untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Tanpa nama)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Paling sering dipanggil"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Paling sering dihubungi"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Lihat kontak"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Semua kontak dengan nomor telepon"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontak profil kerja"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Jalan"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Kotak postingan"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Lingkungan"</string>
     <string name="postal_city" msgid="8674569121430005628">"Kota"</string>
     <string name="postal_region" msgid="1730369286225469192">"Negara Bagian"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Kode pos"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Ngobrol menggunakan ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Ngobrol menggunakan Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Ngobrol"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"hapus"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Luaskan atau ciutkan bidang nama"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Luaskan atau ciutkan bidang nama fonetik"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Semua kontak"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Selesai"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Batal"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontak di <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontak dalam tampilan khusus"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Kontak tunggal"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Simpan kontak yang diimpor ke:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Impor dari kartu SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Impor dari SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Impor dari SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Impor dari file .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Batalkan impor <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Batalkan ekspor <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Tidak dapat membatalkan impor/ekspor vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Kesalahan tidak dikenal."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Tidak dapat memulai pengekspor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Tidak ada kontak yang dapat diekspor."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Anda telah menonaktifkan izin yang diperlukan."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Terjadi kesalahan saat ekspor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Nama file yang diperlukan terlalu panjang (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Kesalahan I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Memori tidak cukup. File mungkin terlalu besar."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Tidak dapat mengurai vCard karena alasan yang tak terduga."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format tidak didukung."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Tidak dapat mengumpulkan informasi meta dari file vCard yang diberikan."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Satu file atau lebih tidak dapat diimpor (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Selesai mengekspor <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Selesai mengekspor kontak."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Selesai mengekspor kontak, klik notifikasi untuk membagikan kontak."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Ketuk untuk membagikan kontak."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Batal mengekspor <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Mengekspor data kontak"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Data kontak sedang diekspor."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Tidak dapat memperoleh informasi basis data."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Tidak ada data kontak yang dapat diekspor. Jika Anda menyimpan kontak di perangkat, beberapa penyedia data mungkin tidak mengizinkan kontak diekspor dari perangkat tersebut."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Penyusun vCard tidak memulai dengan semestinya."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Tak dapat mengekspor"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Data kontak tidak diekspor.\nAlasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Mengimpor <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Tidak dapat membaca data vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Batal membaca data vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Selesai mengimpor vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Batal mengimpor <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diimpor."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"File akan segera diimpor."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Permintaan impor vCard ditolak. Coba lagi nanti."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diekspor."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"File akan segera diekspor."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontak akan segera diekspor."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Permintaan ekspor vCard ditolak. Coba lagi nanti."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontak"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Menyimpan vCard ke dalam cache penyimpanan lokal sementara. Impor yang sebenarnya akan segera dimulai."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Tidak dapat mengimpor vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontak diterima lewat NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Ekspor kontak?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Menyimpan ke cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Mengimpor <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Ekspor ke file .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Urutkan menurut"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nama depan"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nama belakang"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format nama"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nama depan terlebih dulu"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nama belakang terlebih dulu"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Akun default untuk kontak baru"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinkronkan metadata kontak"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Tentang Kontak"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Setelan"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Bagikan kontak yang terlihat"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Gagal membagikan kontak yang terlihat."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Bagikan kontak favorit"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Bagikan semua kontak"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Gagal membagikan kontak."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Impor/ekspor kontak"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Impor kontak"</string>
-    <string name="share_error" msgid="5642622973966851784">"Kontak ini tidak dapat dibagi."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Tidak ada kontak untuk dibagikan."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Telusuri"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Temukan kontak"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favorit"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Tidak ada kontak."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Tidak ada kontak yang terlihat."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Tidak ada favorit"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Tidak ada kontak di <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Hapus yang sering"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Pilih kartu SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Kelola akun"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Impor/ekspor"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"melalui <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> melalui <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"menghentikan penelusuran"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Hapus penelusuran"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opsi tampilan kontak"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Akun"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Selalu gunakan ini untuk telepon"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Telepon dengan"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Ketik catatan untuk dikirim dengan panggilan telepon ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"KIRIM &amp; TELEPON"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> item belum dibaca. </item>
       <item quantity="one"> Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item belum dibaca. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versi build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Lisensi sumber terbuka"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detail lisensi untuk software sumber terbuka"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Kebijakan privasi"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Persyaratan layanan"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Lisensi sumber terbuka"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Gagal membuka url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Membagikan dan menelepon"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-is/strings.xml b/java/com/android/contacts/common/res/values-is/strings.xml
index 26c1aef..24d3d54 100644
--- a/java/com/android/contacts/common/res/values-is/strings.xml
+++ b/java/com/android/contacts/common/res/values-is/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texti afritaður"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Afrita á klippiborð"</string>
     <string name="call_custom" msgid="3041673234638990874">"Hringja í <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Hringja heim"</string>
     <string name="call_mobile" msgid="967589404494150813">"Hringa í farsíma"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Hringja í vinnusímboða"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Hringja í <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Hringja í MMS-númer"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hringja)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Senda textaskilaboð í <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Senda textaskilaboð heim"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Senda textaskilaboð í farsíma"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Senda textaskilaboð í vinnusímboða"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Senda textaskilaboð til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Senda textaskilaboð í MMS-númer"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (senda SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Hreinsa mest notaða tengiliði?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Þetta hreinsar tengiliðina sem þú hefur mest samskipti við úr forritunum Tengiliðir og Sími og þvingar tölvupóstforrit til að læra upp á nýtt hvernig þú notar netföng."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Hreinsar mest notaða tengiliði…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Í burtu"</string>
     <string name="status_busy" msgid="5990832098713248503">"Upptekin(n)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Tengiliðir"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Helstu tillögur"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annað"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Skrá"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Vinnuskrá"</string>
     <string name="local_search_label" msgid="907622822323119235">"Allir tengiliðir"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Tillögur"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ég"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Leitar…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Yfir <xliff:g id="COUNT">%d</xliff:g> fundust."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Engir tengiliðir"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> fannst</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> fannst</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Flýtitengiliður fyrir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nafn vantar)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Oft hringt í"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Oft haft samband við"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Skoða tengilið"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Allir tengiliðir með símanúmer"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Tengiliðir í vinnusniði"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Senda tölvupóst til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Senda tölvupóst"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gata"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Pósthólf"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Hverfi"</string>
     <string name="postal_city" msgid="8674569121430005628">"Borg/bær"</string>
     <string name="postal_region" msgid="1730369286225469192">"Ríki"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Póstnúmer"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Spjalla með ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Spjalla með Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Spjalla"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"eyða"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Birta fleiri eða færri nafnareiti"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Birta fleiri eða færri nafnareiti"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Allir tengiliðir"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Lokið"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Hætta við"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Tengiliðir á <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Tengiliðir á sérsniðnu yfirliti"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Einn tengiliður"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Vista innflutta tengiliði á:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Flytja inn af SIM-korti"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Flytja inn af SIM-korti <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Flytja inn af SIM-korti <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Flytja inn úr .vcf-skrá"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Hætta við innflutning á <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Hætta við útflutning á <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Ekki tókst að hætta við flutning vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Óþekkt villa."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Ekki tókst að opna „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Ekki tókst að ræsa útflutningsverkfærið: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Engir tengiliðir sem flytja má út."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Þú hefur gert nauðsynlegt leyfi óvirkt."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Villa kom upp við útflutninginn: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Skráarheitið er of langt („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Inntaks-/úttaksvilla"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ekki nægt minni. Skráin kann að vera of stór."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Ekki tókst að þátta vCard-skrána af óþekktri ástæðu."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Ekki er stuðningur við sniðið."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Ekki tókst að safna lýsigögnum fyrir uppgefna(r) vCard-skrá(r)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Ekki tókst að flytja inn eina eða fleiri skrár (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Útflutningi á <xliff:g id="FILENAME">%s</xliff:g> lokið."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Útflutningi tengiliða lokið."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Útflutningi tengiliða lokið, smelltu á tilkynninguna til að deila tengiliðum."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Ýttu til að deila tengiliðum."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Hætt við útflutning á <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Flytur út tengiliðagögn"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Verið er að flytja út tengiliðagögnin þín."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Ekki tókst að sækja upplýsingar úr gagnagrunni."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Engir tengiliðir til flytja út. Ef þú ert með tengiliði í tækinu getur verið að vissar gagnaveitur leyfi ekki útflutning tengiliða úr tækinu."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Ræsing vCard-skrifviðmótsins tókst ekki."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Flutningur mistókst"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Tengiliðagögn voru ekki flutt út.\nÁstæða: „<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Flytur inn <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Ekki tókst að lesa gögn úr vCard-skrá"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Hætt við lestur vCard-gagna"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Innflutningi lokið á vCard-skránni <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Hætt við innflutning á <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> verður flutt inn innan skamms."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Skráin verður flutt inn innan skamms."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Beiðni um innflutning vCard-skrár hafnað. Reyndu aftur síðar."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> verður flutt út innan skamms."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Skráin verður flutt út innan skamms."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Tengiliðir verður fluttir út eftir smástund."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Beiðni um útflutning vCard-skrár hafnað. Reyndu aftur síðar."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"tengiliður"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Setur vCard í skyndiminni í staðbundinni geymslu. Raunverulegur innflutningur hefst innan skamms."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Ekki tókst að flytja vCard-skrána inn."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Tengiliður mótt. um NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Flytja út tengiliði?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Setur í skyndiminni"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Flytur inn <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Flytja út í .vcf-skrá"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Raða eftir"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornafn"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Eftirnafn"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Nafnasnið"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornafn fyrst"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Eftirnafn fyrst"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Sjálfgefinn reikningur fyrir nýja tengiliði"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Samstilla lýsigögn tengiliða"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Um tengiliði"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Stillingar"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Deila sýnilegum tengiliðum"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Mistókst að deila sýnilegum tengiliðum."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Deila eftirlætistengiliðum"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Deila öllum tengiliðum"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Ekki tókst að deila tengiliðum."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Tengiliðir fluttir inn/út"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Flytja tengiliði inn"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ekki er hægt að deila þessum tengilið."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Engir tengiliðir til að deila."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Leita"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Finna tengiliði"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Uppáhald"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Engir tengiliðir."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Engir sýnilegir tengiliðir."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ekkert uppáhald"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Engir tengiliðir í <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Hreinsa algenga tengiliði"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Veldu SIM-kort"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Stjórna reikningum"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Innflutningur og útflutningur"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"í gegnum <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> í gegnum <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"hætta leit"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Hreinsa leit"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Birtingarkostir fyrir tengiliði"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Reikningur"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Nota þetta alltaf fyrir símtöl"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Hringja með"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Sláðu inn texta til að senda með símtalinu..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SENDA OG HRINGJA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Flipinn <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Flipinn <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ólesið atriði. </item>
       <item quantity="other"> Flipinn <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ólesin atriði. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Útgáfa smíðar"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Leyfi opins kóða"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Leyfisupplýsingar fyrir hugbúnað með opnum kóða"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Persónuverndarstefna"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Þjónustuskilmálar"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Leyfi opins kóða"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Ekki tókst að opna slóðina."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Hringja myndsímtal"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Deila og hringja"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-it/strings.xml b/java/com/android/contacts/common/res/values-it/strings.xml
index 8ea5648..3414bf8 100644
--- a/java/com/android/contacts/common/res/values-it/strings.xml
+++ b/java/com/android/contacts/common/res/values-it/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Testo copiato"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copia negli appunti"</string>
     <string name="call_custom" msgid="3041673234638990874">"Chiama <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Chiama casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Chiama cellulare"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Chiama cercapersone lavoro"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Chiama <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Chiama MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chiama)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS a casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS a cellulare"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS a cercapersone lavoro"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Invia SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Cancellare contattati di frequente?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Verrà cancellato l\'elenco dei contatti frequenti nelle app Contatti e Telefono e le app email dovranno apprendere da zero le tue preferenze di comunicazione."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Cancellazione contattati di frequente…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Assente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Occupato"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatti"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Suggerimenti più popolari"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directory di lavoro"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tutti i contatti"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggerimenti"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Io"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Ricerca..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Più di <xliff:g id="COUNT">%d</xliff:g> trovati."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nessun contatto"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> trovati</item>
-      <item quantity="one">1 trovato</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Accesso rapido ai contatti per <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nessun nome)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Numeri più chiamati"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contattati spesso"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizza contatto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Tutti i contatti con numeri di telefono"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatti del profilo di lavoro"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Invia email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Invia email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Via"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Casella postale"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Quartiere"</string>
     <string name="postal_city" msgid="8674569121430005628">"Città"</string>
     <string name="postal_region" msgid="1730369286225469192">"Provincia"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Codice postale"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatta su ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatta su Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"elimina"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Espandi o comprimi i campi dei nomi"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Espandi o comprimi i campi dei nomi fonetici"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tutti i contatti"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Fine"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Annulla"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatti in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contatti in visualizzazione personalizzata"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contatto singolo"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Salva i contatti importati in:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importa da scheda SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importa da SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importa da SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importa da file .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Annullare l\'importazione di <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Annullare l\'esportazione di <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Annull. import./esport. vCard non riuscito"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Errore sconosciuto."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Impossibile aprire \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Avvio dell\'utilità di esportazione non riuscito: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nessun contatto esportabile."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Hai disattivato un\'autorizzazione obbligatoria."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Si è verificato un errore durante l\'esportazione: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Il nome file richiesto è troppo lungo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Errore I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Memoria insufficiente. Il file potrebbe essere troppo grande."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Analisi vCard non riuscita per motivo imprevisto."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Il formato non è supportato."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Raccolta dei metadati dei file vCard specificati non riuscita."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Importazione di uno o più file non riuscita (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Esportazione di <xliff:g id="FILENAME">%s</xliff:g> terminata."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Esportazione dei contatti terminata."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Esportazione dei contatti terminata. Fai clic sulla notifica per condividere i contatti."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tocca per condividere i contatti."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Esportazione di <xliff:g id="FILENAME">%s</xliff:g> annullata."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Esportazione dati contatti"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Esportazione dei dati dei contatti in corso."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Recupero informazioni database non riuscito."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Non sono presenti contatti esportabili. Se hai contatti sul dispositivo, è possibile che alcuni fornitori di dati non consentano l\'esportazione dei contatti dal dispositivo."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Il compositore di vCard non si è avviato correttamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Impossibile esportare"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"I dati dei contatti non sono stati esportati.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importazione di <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Lettura dati vCard non riuscita"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lettura dati vCard annullata"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importazione vCard <xliff:g id="FILENAME">%s</xliff:g> terminata"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importazione di <xliff:g id="FILENAME">%s</xliff:g> annullata"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"La vCard <xliff:g id="FILENAME">%s</xliff:g> verrà importata a breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Il file sarà importato a breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Richiesta importazione vCard rifiutata. Riprova più tardi."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"La vCard <xliff:g id="FILENAME">%s</xliff:g> verrà esportata a breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Il file verrà esportato a breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"I contatti verranno esportati a breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Richiesta esportazione vCard rifiutata. Riprova più tardi."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contatto"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Memorizzazione delle vCard nella cache di archiviazione temporanea locale. L\'importazione reale inizierà a breve."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Importazione vCard non riuscita."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contatto via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Esportare contatti?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Memorizzazione nella cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importazione di <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Esporta in file .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordina per"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Cognome"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato nome"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prima il nome"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prima il cognome"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Account predefinito per i nuovi contatti"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizza i metadati dei contatti"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Informazioni su Contatti"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Impostazioni"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Condividi contatti visibili"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Impossibile condividere i contatti visibili."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Condividi i contatti preferiti"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Condividi tutti i contatti"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Impossibile condividere i contatti."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importa/esporta contatti"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importa contatti"</string>
-    <string name="share_error" msgid="5642622973966851784">"Questo contatto non può essere condiviso."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nessun contatto da condividere."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Cerca"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Trova contatti"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Preferiti"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nessun contatto."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nessun contatto visibile."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nessun preferito"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nessun contatto in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Cancella frequenti"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Seleziona scheda SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gestisci account"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importa/esporta"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"tramite <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> tramite <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"interrompi ricerca"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Cancella ricerca"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opzioni di visualizzazione dei contatti"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Usa sempre questa per chiamare"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Chiama con"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Digita una nota da inviare con la chiamata..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"INVIA E CHIAMA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Scheda <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Scheda <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementi da leggere. </item>
       <item quantity="one"> Scheda <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento da leggere. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versione build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenze open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Dettagli delle licenze per il software open source"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Norme sulla privacy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Termini di servizio"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenze open source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Impossibile aprire l\'URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videochiamata"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Condividi e chiama"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-iw/strings.xml b/java/com/android/contacts/common/res/values-iw/strings.xml
index 2a6b2c1..381b5d1 100644
--- a/java/com/android/contacts/common/res/values-iw/strings.xml
+++ b/java/com/android/contacts/common/res/values-iw/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"טקסט שהועתק"</string>
-    <string name="copy_text" msgid="5890820280087874642">"העתק ללוח"</string>
     <string name="call_custom" msgid="3041673234638990874">"התקשר אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"התקשר לבית"</string>
     <string name="call_mobile" msgid="967589404494150813">"התקשר לנייד"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"התקשר לזימונית של העבודה"</string>
     <string name="call_assistant" msgid="4177478845473789294">"התקשר אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"‏התקשר ל-MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (שיחה)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"שלח הודעת טקסט אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"שלח הודעת טקסט לבית"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"שלח הודעת טקסט לנייד"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"שלח הודעת טקסט לזימונית של עבודה"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"שלח הודעת טקסט אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"‏שלח הודעת טקסט ל-MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (הודעה)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"האם למחוק אנשי קשר קבועים?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"הפעולה הזו תמחק מהאפליקציות \'אנשים\' ו\'טלפון\' את רשימת אנשי הקשר שאיתם אתה יוצר קשר בתדירות גבוהה, ויהיה עליך ללמד מחדש את אפליקציות האימייל את הכתובות המועדפות עליך."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"מוחק אנשי קשר קבועים…"</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"לא נמצא"</string>
     <string name="status_busy" msgid="5990832098713248503">"לא פנוי"</string>
     <string name="contactsList" msgid="8806067891419291513">"אנשי קשר"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"הצעות מובילות"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"אחר"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ספריה"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ספריית עבודה"</string>
     <string name="local_search_label" msgid="907622822323119235">"כל אנשי הקשר"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"הצעות"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"אני"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"מחפש..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"נמצאו יותר מ-<xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"אין אנשי קשר"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="two">נמצאו <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="many">נמצאו <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">נמצאו <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">נמצא אחד</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"קשר מהיר עבור <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(ללא שם)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"התקשרות לעתים קרובות"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"בקשר לעתים קרובות"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"הצג איש קשר"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"כל אנשי הקשר עם מספרי טלפון"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"אנשי הקשר של פרופיל העבודה"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"שלח אימייל אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"שלח אימייל"</string>
     <string name="postal_street" msgid="6918171741240802474">"רחוב"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"תא דואר"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"שכונה"</string>
     <string name="postal_city" msgid="8674569121430005628">"עיר"</string>
     <string name="postal_region" msgid="1730369286225469192">"מדינה"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"מיקוד"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"‏שוחח בצ\'אט באמצעות ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"‏שוחח בצ\'אט באמצעות Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"צ\'אט"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"מחק"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"הרחב או כווץ שמות של שדות"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"הרחב או כווץ שדות של שמות פונטיים"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"כל אנשי הקשר"</string>
-    <string name="menu_done" msgid="1817505539263889535">"סיום"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ביטול"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"אנשי קשר ב-<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"אנשי קשר בתצוגה מותאמת אישית"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"איש קשר יחיד"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"שמור אנשי קשר שיובאו ב-:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"‏יבא מכרטיס SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"‏יבא מ-SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"‏יבא מ-SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"‏יבא מקובץ ‎.vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"האם לבטל את הייבוא של <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"האם לבטל את הייצוא של <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"‏לא ניתן היה לבטל ייבוא/ייצוא של vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"שגיאה לא ידועה."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"לא היה ניתן לפתוח את \"<xliff:g id="FILE_NAME">%s</xliff:g>\"‏: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"לא ניתן להפעיל את המייצא: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"אין אנשי קשר הניתנים לייצוא."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"השבתת הרשאה נדרשת."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"אירעה שגיאה במהלך הייצוא: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"שם הקובץ הדרוש ארוך מדי (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"שגיאת קלט/פלט"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"אין מספיק זיכרון. ייתכן שהקובץ גדול מדי."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"‏לא ניתן היה לנתח את ה-vCard מסיבה בלתי צפויה."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"הפורמט אינו נתמך."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"‏לא ניתן היה לאסוף מטא-מידע של קובצי vCard נתונים."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"‏לא ניתן היה לייבא קובץ אחד או יותר (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> הסתיים."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"ייצוא אנשי הקשר הושלם."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"יצוא אנשי הקשר הסתיים, לחץ על ההודעה כדי לשתף אנשי קשר."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"הקש כדי לשתף אנשי קשר."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> בוטל."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"מייצא נתונים של אנשי קשר"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"יצוא הנתונים של אנשי הקשר מתבצע כעת."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"לא ניתן היה לקבל מידע ממסד הנתונים."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"אין אנשי קשר שניתן לייצא. אם במכשיר מוגדרים אנשי קשר, ייתכן שספקי הנתונים שלהם לא מאפשרים לייצא אותם מהטלפון."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"‏יישום יצירת ה-vCard לא הופעל כהלכה."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"לא ניתן היה לייצא"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"נתוני אנשי הקשר לא יוצאו.\nסיבה: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"מייבא את <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"‏לא ניתן היה לקרוא נתוני vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"‏קריאת נתוני ה-VCard בוטלה"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"‏הייבוא של קובץ vCard ‏<xliff:g id="FILENAME">%s</xliff:g> הסתיים"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"הייבוא של <xliff:g id="FILENAME">%s</xliff:g> בוטל"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"הייבוא של <xliff:g id="FILENAME">%s</xliff:g> יתבצע בהקדם."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ייבוא הקובץ יתבצע בהקדם."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"‏הבקשה לייבוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> יתבצע בהקדם."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ייצוא הקובץ יתבצע בעוד זמן קצר."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"יצוא אנשי הקשר יבוצע תוך זמן קצר."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"‏הבקשה לייצוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"איש קשר"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"‏קובצי ה-vCard נשמרים כקבצים באחסון מקומי זמני. הייבוא בפועל יחל בקרוב."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"‏לא ניתן היה לייבא את ה-vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"‏איש הקשר התקבל באמצעות NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"לייצא את אנשי הקשר?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"שומר כקובץ שמור"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"מייבא <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>‏: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"‏יצא לקובץ ‎.vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"מיון לפי"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"שם פרטי"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"שם משפחה"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"פורמט השם"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"שם פרטי יופיע ראשון"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"שם משפחה יופיע ראשון"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"חשבון ברירת מחדל לאנשי קשר חדשים"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"שתף מטא נתונים של איש קשר"</string>
-    <string name="setting_about" msgid="5253319937596745755">"מידע על אנשי קשר"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"הגדרות"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"שתף אנשי קשר שמוצגים כעת"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"שיתוף של התוכן הגלוי נכשל."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"שתף אנשי קשר מועדפים"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"שתף את כל אנשי הקשר"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"הניסיון לשתף את אנשי הקשר נכשל."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"יבא/יצא אנשי קשר"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"יבא אנשי קשר"</string>
-    <string name="share_error" msgid="5642622973966851784">"לא ניתן לשתף איש קשר זה."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"אין אנשי קשר לשיתוף."</string>
-    <string name="menu_search" msgid="1241802591112035764">"חפש"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"חפש אנשי קשר"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"מועדפים"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"אין אנשי קשר."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"אין אנשי קשר גלויים."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"אין מועדפים"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"אין אנשי קשר ב-<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"מחק אנשי קשר קבועים"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"‏בחר כרטיס SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"נהל חשבונות"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ייבוא/ייצוא"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"באמצעות <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> באמצעות <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"הפסק לחפש"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"נקה חיפוש"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"אפשרויות להצגת אנשי קשר"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"חשבון"</string>
     <string name="set_default_account" msgid="7966099951006467572">"השתמש תמיד עבור שיחות"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"התקשר באמצעות"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"הקלד הערה לשליחה עם השיחה..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"שלח והתקשר"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"‎<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>‎"</string>
     <string name="tab_title" msgid="3387876802026074288">"הכרטיסייה <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="two">הכרטיסייה <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> פריטים שלא נקראו. </item>
@@ -258,13 +159,6 @@
       <item quantity="other">הכרטיסייה <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> פריטים שלא נקראו. </item>
       <item quantity="one">הכרטיסייה <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> פריט שלא נקרא. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"‏גרסת Build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"רישיונות קוד פתוח"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"פרטי רישיון לתוכנות קוד פתוח"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"מדיניות פרטיות"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"תנאים והגבלות"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"רישיונות קוד פתוח"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"לא ניתן לפתוח את כתובת האתר."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"שיחת וידאו"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"שיתוף והתקשרות"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml b/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml
index e05c6d6..29512c0 100644
--- a/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml
+++ b/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 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
+  -->
+
 <resources>
   <!-- If true, an option is shown in Display Options UI to choose a sort order -->
   <bool name="config_sort_order_user_changeable">false</bool>
@@ -14,7 +30,4 @@
 
   <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
   <bool name="config_editor_field_order_primary">false</bool>
-
-  <!-- If true, phonetic name is included in the contact editor by default -->
-  <bool name="config_editor_include_phonetic_name">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values-ja/strings.xml b/java/com/android/contacts/common/res/values-ja/strings.xml
index 3271b46..f4af8fa 100644
--- a/java/com/android/contacts/common/res/values-ja/strings.xml
+++ b/java/com/android/contacts/common/res/values-ja/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"テキストをコピーしました"</string>
-    <string name="copy_text" msgid="5890820280087874642">"クリップボードにコピー"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>に発信"</string>
     <string name="call_home" msgid="125893483593803791">"自宅に発信"</string>
     <string name="call_mobile" msgid="967589404494150813">"モバイル端末に発信"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ポケベル（勤務先）に発信"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>に発信"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMSに発信"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> さん（通話を発信）"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>にSMS"</string>
     <string name="sms_home" msgid="3527719551060295243">"自宅にSMS"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"モバイル端末にSMS"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ポケベル（勤務先）にSMS"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>にSMS"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMSにSMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> さん（メッセージを送信）"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"よく使う連絡先を消去しますか？"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"連絡帳アプリや電話アプリのよく使う連絡先リストを消去し、メールアプリがアドレス設定を初めから保存していくようにします。"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"よく使う連絡先を消去しています…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"不在"</string>
     <string name="status_busy" msgid="5990832098713248503">"取り込み中"</string>
     <string name="contactsList" msgid="8806067891419291513">"連絡先"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"おすすめ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"その他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ディレクトリ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"仕事用の連絡先リスト"</string>
     <string name="local_search_label" msgid="907622822323119235">"すべての連絡先"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"候補"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"自分"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"検索中..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>件以上見つかりました。"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"連絡先はありません"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 件見つかりました</item>
-      <item quantity="one">1 件見つかりました</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g>さんのクイックコンタクト"</string>
     <string name="missing_name" msgid="978606963362745020">"（名前なし）"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"よく使う連絡先"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"よく使う連絡先"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"連絡先を表示"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"電話番号のあるすべての連絡先"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"仕事用プロファイルの連絡先"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>にメール"</string>
     <string name="email" msgid="2807318537887091606">"メール"</string>
     <string name="postal_street" msgid="6918171741240802474">"番地"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"私書箱"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"街区（中国等で使用）"</string>
     <string name="postal_city" msgid="8674569121430005628">"市区町村"</string>
     <string name="postal_region" msgid="1730369286225469192">"都道府県"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"郵便番号"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQでチャット"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabberでチャット"</string>
     <string name="chat" msgid="1020428260359370236">"チャット"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"削除"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"名前フィールドの展開/折りたたみ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"フリガナ項目を展開または折りたたみます"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"すべての連絡先"</string>
-    <string name="menu_done" msgid="1817505539263889535">"完了"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"キャンセル"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>の連絡先"</string>
     <string name="listCustomView" msgid="5306282632413086731">"連絡先のカスタム表示"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"単独の連絡先"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"インポートされた連絡先の保存先:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIMカードからインポート"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM（<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>）からインポート"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM（<xliff:g id="SIM_NAME">%1$s</xliff:g>）からインポート"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcfからインポート"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g>のインポートをキャンセルしますか？"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートをキャンセルしますか？"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCardインポート/エクスポート取り消し不可"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"不明なエラーです。"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"「<xliff:g id="FILE_NAME">%s</xliff:g>」を開けませんでした。理由: <xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"エクスポータを起動できませんでした: 「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"エクスポートできる連絡先がありません。"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"必要な権限が無効にされています。"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"エクスポート中にエラーが発生しました: 「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ファイル名（必須）が長すぎます（「<xliff:g id="FILENAME">%s</xliff:g>」）。"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"送受信エラー"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"メモリが不足しています。ファイルが大きすぎる可能性があります。"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"予期しない理由によりvCardを解析できませんでした。"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"このフォーマットには対応していません。"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"指定されたvCardファイルのメタ情報を取得できませんでした。"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"1つ以上のファイルをインポートできませんでした（%s）。"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートの完了"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"連絡先のエクスポートの完了"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"連絡先のエクスポートが終了しました。通知をタップして連絡先を共有してください。"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"タップして連絡先を共有してください。"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートのキャンセル"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"連絡先データのエクスポート"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"連絡先データをエクスポートしています。"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"データベース情報を取得できませんでした。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"エクスポートできる連絡先がありません。端末に連絡先を保存していても、データ プロバイダによっては連絡先をエクスポートできないことがあります。"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCardコンポーザーが正しく起動しませんでした。"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"エクスポート失敗"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"連絡先データはエクスポートされませんでした。\n理由: 「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>をインポート中"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCardデータの読み取りの失敗"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCardデータの読み取りのキャンセル"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCardの<xliff:g id="FILENAME">%s</xliff:g>のインポートの終了"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>のインポートのキャンセル"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g>はまもなくインポートされます。"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ファイルはまもなくインポートされます。"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCardのインポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g>はまもなくエクスポートされます。"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ファイルはまもなくエクスポートされます。"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"連絡先のエクスポートをまもなく開始します。"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCardのエクスポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"連絡先"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCardをローカル一時ストレージにキャッシュしています。まもなくインポート処理を開始します。"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCardをインポートできませんでした。"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC受信の連絡先"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"連絡先をエクスポートしますか？"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"キャッシュ中"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>（<xliff:g id="NAME">%s</xliff:g>）をインポート中"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcfにエクスポート"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"並べ替え"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"名前の形式"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名が先"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓が先"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"新しい連絡先のデフォルトアカウント"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"連絡先メタデータの同期"</string>
-    <string name="setting_about" msgid="5253319937596745755">"連絡先について"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"設定"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"表示可能な連絡先を共有"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"表示可能な連絡先を共有できませんでした。"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"お気に入りの連絡先を共有"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"すべての連絡先を共有"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"連絡先を共有できませんでした。"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"連絡先のインポート/エクスポート"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"連絡先をインポート"</string>
-    <string name="share_error" msgid="5642622973966851784">"この連絡先は共有できません。"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"共有する連絡先がありません。"</string>
-    <string name="menu_search" msgid="1241802591112035764">"検索"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"連絡先を検索"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"お気に入り"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"連絡先はありません。"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"表示できる連絡先はありません。"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"お気に入りはありません"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>の連絡先はありません"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"よく使う連絡先のクリア"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIMカードの選択"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"アカウントを管理"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"インポート/エクスポート"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"更新元: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>、更新元: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"検索を停止"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"検索をクリア"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"連絡先表示オプション"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"アカウント"</string>
     <string name="set_default_account" msgid="7966099951006467572">"このSIMを常に通話に使用する"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"発信用の端末アカウントを選択してください"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"発信時に送信するメモを入力..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"送信 / 通話"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g>、<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> タブ。"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> タブ。<xliff:g id="COUNT_3">%2$d</xliff:g> 件の未読項目。</item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> タブ。<xliff:g id="COUNT_1">%2$d</xliff:g> 件の未読項目。</item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ビルドバージョン"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"オープンソースライセンス"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"オープンソースソフトウェアに関するライセンスの詳細"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"プライバシーポリシー"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"利用規約"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"オープンソース ライセンス"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"この URL を開けませんでした。"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ビデオ通話"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"共有して発信"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ka/strings.xml b/java/com/android/contacts/common/res/values-ka/strings.xml
index ebbee6e..8ae8da9 100644
--- a/java/com/android/contacts/common/res/values-ka/strings.xml
+++ b/java/com/android/contacts/common/res/values-ka/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"კოპირებული ტექსტი"</string>
-    <string name="copy_text" msgid="5890820280087874642">"კოპირება გაცვლის ბუფერში"</string>
     <string name="call_custom" msgid="3041673234638990874">"დარეკვა <xliff:g id="CUSTOM">%s</xliff:g> ნომერზე"</string>
     <string name="call_home" msgid="125893483593803791">"დარეკვა სახლში"</string>
     <string name="call_mobile" msgid="967589404494150813">"დარეკვა მობილურზე"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"დარეკვა სამსახურის პეიჯერზე"</string>
     <string name="call_assistant" msgid="4177478845473789294">"დარეკვა <xliff:g id="ASSISTANT">%s</xliff:g>-თან"</string>
     <string name="call_mms" msgid="4958811711741872901">"დარეკვა MMS-ის ნომერზე"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ზარი)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="CUSTOM">%s</xliff:g>-ზე"</string>
     <string name="sms_home" msgid="3527719551060295243">"ტექსტური შეტყობინების გაგზავნა სახლში"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ტექსტური შეტყობინების გაგზავნა მობილურზე"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ტექსტური შეტყობინების გაგზავნა სამსახურის პეიჯერზე"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="ASSISTANT">%s</xliff:g>-ისთვის"</string>
     <string name="sms_mms" msgid="5187888900503248542">"ტექსტური შეტყობინების გაგზავნა MMS ნომერზე"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (შეტყობინება)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"გსურთ ხშირი კონტაქტების წაშლა?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"თქვენ წაშლით ხშირად დაკავშირებულთა სიას კონტაქტებიდან და ტელეფონის აპლიკაციიდან და აიძულებთ ელ-ფოსტის აპლიკაციებს შეისწავლონ თქვენი ადრესატების პრიორიტეტები ნულიდან."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ხშირი კონტაქტები იშლება…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"გასული"</string>
     <string name="status_busy" msgid="5990832098713248503">"დაკავებული"</string>
     <string name="contactsList" msgid="8806067891419291513">"კონტაქტები"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"საუკეთესო შეთავაზებები"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"სხვა"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"კატალოგი"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"სამსახურის კატალოგი"</string>
     <string name="local_search_label" msgid="907622822323119235">"ყველა კონტაქტი"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"შეთავაზებები"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"მე"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"ძიება..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"ნაპოვნია <xliff:g id="COUNT">%d</xliff:g>-ზე მეტი."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"კონტაქტები არ არის"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">მოიძებნა <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">მოიძებნა 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"სწრაფი დაკავშირება <xliff:g id="NAME">%1$s</xliff:g>-თან"</string>
     <string name="missing_name" msgid="978606963362745020">"(სახელის გარეშე)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"ხშირად დარეკილი"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ხშირი კონტაქტები"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"კონტაქტის ნახვა"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ყველა ტელეფონის ნომრიანი კონტაქტი"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"სამსახურის პროფილის კონტაქტები"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"ელფოსტის გაგზავნა <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"ელფოსტის გაგზავნა"</string>
     <string name="postal_street" msgid="6918171741240802474">"ქუჩა"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"საფოსტო ყუთი"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"უბანი"</string>
     <string name="postal_city" msgid="8674569121430005628">"ქალაქი"</string>
     <string name="postal_region" msgid="1730369286225469192">"შტატი"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ZIP-კოდი"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ჩეთი ICQ-ით"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"ჩეთი Jabber-ით"</string>
     <string name="chat" msgid="1020428260359370236">"ჩეთი"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"წაშლა"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"სახელთა ველების გაშლა ან აკეცვა"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ფონეტიკური სახელების ველების გაშლა ან ჩაკეცვა"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ყველა კონტაქტი"</string>
-    <string name="menu_done" msgid="1817505539263889535">"დასრულდა"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"გაუქმება"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"კონტაქტები <xliff:g id="NAME">%s</xliff:g>-ში"</string>
     <string name="listCustomView" msgid="5306282632413086731">"კონტაქტები მორგებულ ხედში"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ერთი კონტაქტი"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"იმპორტირებული კონტაქტების შენახვა აქ:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM ბარათიდან იმპორტი"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"იმპორტი SIM-იდან <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"იმპორტი SIM-იდან <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"იმპორტი .vcf ფაილიდან"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"გსურთ <xliff:g id="FILENAME">%s</xliff:g>-ის იმპორტის გაუქმება?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"გსურთ <xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტის გაუქმება?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard-ის იმპორტი/ექსპორტი ვერ გაუქმდა"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"უცნობი შეცდომა."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"„<xliff:g id="FILE_NAME">%s</xliff:g>“-ის გახსნა ვერ მოხერხდა: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ექსპორტერის გაშვება ვერ მოხერხდა: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ექსპორტირებადი კონტაქტი არ არსებობს."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"თქვენ გათიშული გაქვთ საჭირო ნებართვა."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"შეცდომის გამო ექსპორტი ვერ მოხერხდა: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"საჭირო ფაილის სახელი ძალიან გრძელია („<xliff:g id="FILENAME">%s</xliff:g>“)"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O შეცდომა"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"მეხსიერება არასაკმარისია. შესაძლოა ფაილი ძალიან დიდია."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vCard ფაილის გარჩევა ვერ მოხერხდა გაუთვალისწინებული მიზეზით."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ფორმატი მხარდაუჭერელია."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"მოცემული vCard ფაილ(ებ)ის მეტა ინფორმაციის შეგროვება ვერ მოხერხდა."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ერთი ან მეტი ფაილის იმპორტი ვერ მოხერხდა (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტი დასრულდა."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"კონტაქტების ექსპორტი დასრულდა."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"კონტაქტების ექსპორტი დასრულდა. კონტაქტების გასაზიარებლად, შეეხეთ შეტყობინებას."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"შეეხეთ კონტაქტების გასაზიარებლად."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტი გაუქმდა."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"მიმდინარეობს კონტაქტების მონაცემების ექსპორტი"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"მიმდინარეობს კონტაქტების მონაცემების ექსპორტი."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"მონაცემთა ბაზის შესახებ ინფორმაციის მიღება ვერ მოხერხდა."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ექსპორტირებადი კონტაქტები არ არის. თუ კონტაქტები ნამდვილად არის თქვენს მოწყობილობაში, შესაძლოა ზოგიერთი მონაცემთა პროვაიდერი არ იძლევა მოწყობილობიდან მათი ექსპორტის უფლებას."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard ფაილის კომპოზიტორი გაშვებულია არასწორად."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ექსპორტი ჩაიშალა."</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"კონტაქტების მონაცემები არ არის ექსპორტირებული.\nმიზეზი: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"იმპორტირდება <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard მონაცემთა წაკითხვა ვერ მოხერხდა"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard მონაცემთა წაკითხვა გაუქმდა"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard ფაილის <xliff:g id="FILENAME">%s</xliff:g> იმპორტი დასრულდა"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>-ის იმპორტი გაუქმდა"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> მალე იმპორტირდება."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ეს ფაილი მალე იმპორტირდება."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard-ის იმპორტის მოთხოვნა უარყოფილია. სცადეთ მოგვიანებით."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> მალე ექსპორტირდება."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ამ ფაილის ექსპორტი მალე შესრულდება."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"კონტაქტების ექსპორტი მალე განხორციელდება."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard-ის ექსპორტის მოთხოვნა უარყოფილია. სცადეთ მოგვიანებით."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"კონტაქტი"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"მიმდინარეობს vCard ფაილ(ებ)ის ქეშირება ადგილობრივ დროებით მეხსიერებაში. ფაქტიური იმპორტი დაიწყება მალე."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard-ის იმპორტი ვერ მოხერხდა."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"კონტაქტი NFC-ით"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"გსურთ კონტაქტების ექსპორტი?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ქეშირება"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"იმპორტირდება <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>-დან: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"ექსპორტი .vcf ფაილში"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"სორტირება:"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"სახელით"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"გვარით"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"სახელის ფორმატი"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ჯერ სახელი"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ჯერ გვარი"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"ნაგულისხმევი ანგარიში ახალი კონტაქტებისთვის"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"კონტაქტების მეტამონაცემების სინქრონიზაცია"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Contacts-ის შესახებ"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"პარამეტრები"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ხილული კონტაქტების გაზიარება"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ხილული კონტაქტების გაზიარება ვერ მოხერხდა."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"რჩეული კონტაქტების გაზიარება"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ყველა კონტაქტის გაზიარება"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"კონტაქტების გაზიარება ვერ მოხერხდა."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"კონტაქტების იმპორტი/ექსპორტი"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"კონტაქტების იმპორტი"</string>
-    <string name="share_error" msgid="5642622973966851784">"ამ კონტაქტის გაზიარება შეუძლებელია."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"გასაზიარებელი კონტაქტები არ არის."</string>
-    <string name="menu_search" msgid="1241802591112035764">"ძიება"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"კონტაქტების პოვნა"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"რჩეულები"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"კონტაქტები არ არის."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ხილული კონტაქტები არ არის."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"რჩეულები არ არის"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>-ში კონტაქტები არ არის"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ხშირი კონტაქტების წაშლა"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"აირჩიეთ SIM ბარათი"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ანგარიშების მართვა"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"იმპორტი/ექსპორტი"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="SOURCE">%2$s</xliff:g>-ის მეშვეობით"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ძიების შეჩერება"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ძიების გასუფთავება"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"კონტაქტის ჩვენების ვარიანტები"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ანგარიში"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ზარებისთვის მუდამ ამის გამოყენება"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"დარეკვა ანგარიშით:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"აკრიფეთ შენიშვნა ზართან ერთად გასაგზავნად ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"გაგზავნა და დარეკვა"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ცხრ."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ცხრ. <xliff:g id="COUNT_3">%2$d</xliff:g> წაუკითხავი ერთეული. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ცხრ. <xliff:g id="COUNT_1">%2$d</xliff:g> წაუკითხავი ერთეული. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ანაწყობის ვერსია"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ღია კოდის ლიცენზიები"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ღია კოდის პროგრამული უზრუნველყოფის ლიცენზირების დეტალები"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"კონფიდენციალურობის დებულება"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"მომსახურების პირობები"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ღია კოდის ლიცენზიები"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Url-ის გახსნა ვერ მოხერხდა."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ვიდეოზარი"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"გაზიარება და დარეკვა"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-kk/strings.xml b/java/com/android/contacts/common/res/values-kk/strings.xml
index 327532a..401a90f 100644
--- a/java/com/android/contacts/common/res/values-kk/strings.xml
+++ b/java/com/android/contacts/common/res/values-kk/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Мәтін көшірмесі жасалды"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Аралық сақтағышқа көшіру"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="call_home" msgid="125893483593803791">"Үйге қоңырау шалу"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ұялы телефонға қоңырау шалу"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Жұмыс пэйджеріне қоңырау шалу"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне қоңырау соғу"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS нөміріне қоңырау шалу"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Қоңырау)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> мәтін-хабар жіберу"</string>
     <string name="sms_home" msgid="3527719551060295243">"Үй телефонына мәтін-хабар жіберу"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Ұялы телефонған мәтін-хабар жіберу"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Жұмыс пейджеріне мәтін-хабар жіберу"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне мәтін-хабар жіберу"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Хабар)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Жиі қолданылғандар тазартылсын ба?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Контактілер және Телефондар қолданбаларындағы жиі хабарласатындар тізімі тазаланады және электрондық пошта қолданбалары мекенжай параметрлерін басынан үйренуге мәжбүрленеді."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Жиі қолданылғандар тазартылуда…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Желіден тыс"</string>
     <string name="status_busy" msgid="5990832098713248503">"Бос емес"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контактілер"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Үздік ұсыныстар"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Басқа"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Анықтама"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Жұмыс каталогы"</string>
     <string name="local_search_label" msgid="907622822323119235">"Барлық контактілер"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ұсыныстар"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Іздеуде…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> көбірек табылды."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Контактілер жоқ"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> табылды</item>
-      <item quantity="one">1 табылды</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> үшін жылдам байланыс"</string>
     <string name="missing_name" msgid="978606963362745020">"(Атаусыз)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Қоңырау жиі шалынғандар"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Жиі қолданылғандар"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Контактіні көру"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Телефон нөмірі бар барлық контактілер"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Жұмыс профилінің контактілері"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> мекенжайына хат жіберу"</string>
     <string name="email" msgid="2807318537887091606">"Хат жіберу"</string>
     <string name="postal_street" msgid="6918171741240802474">"Көше"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Пошта жәшігі"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Аудан"</string>
     <string name="postal_city" msgid="8674569121430005628">"Қала"</string>
     <string name="postal_region" msgid="1730369286225469192">"Штат"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Индекс"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ қолданып чаттасу"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber қолданып чаттасу"</string>
     <string name="chat" msgid="1020428260359370236">"Чаттасу"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"жою"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ат аймақтарын кеңейту немесе қирату"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Фонетикалық атау өрістерін жаю немесе жию"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Барлық контактілер"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Дайын"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Тоқтату"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ішіндегі контактілер"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Контактілердің жеке көрінісі"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Жалғыз контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Импортталған контактілерді келесіге сақтау:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM картадан импорттау"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM картасынан импорттау"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM картасынан импорттау"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf файлынан импорттау"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> импорттау тоқтатылсын ба?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау тоқтатылсын ба?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vКартасын импорттау/экспорттауды тоқтату мүмкін болмады"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Белгісіз қателік."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" файлын аша алмады: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Экспорттаушыны бастау мүмкін болмады: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Экспортталатын контакт жоқ."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Сіз міндетті рұқсатты өшірдіңіз."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Экспорттау кезінде қателік орын алды: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Қажетті файл атауы тым ұзақ (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O қателігі"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Жад жеткіліксіз. Файл тым үлкен болуы мүмкін."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vКартасын талдау күтпеген себеппен мүмкін болмады."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Форматтың қолдауы жоқ."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Осы vКарта файлдары туралы мета ақпарат жинай алмады."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Бір немесе бірнеше карталарды импорттау мүмкін болмады (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау аяқталды."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Контактілер экспортталып болды."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Контактілерді экспорттау аяқталды, контактілерді бөлісу үшін хабарландыруды басыңыз."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Контактілерді бөлісу үшін түртіңіз."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау тоқтатылды."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Контакт дерекқор экспортталуда"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Контактінің деректері экспортталуда."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Дерекқор ақпаратын ала алмады."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Экспорттауға болатын контактілер жоқ. Құрылғыңызда контактілер болса, кейбір провайдерлер контактілердің құрылғыдан экспортталуына рұқсат бермейді."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vКарта жасақтаушы дұрыс басталмады."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Экспорттай алмады"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Контакт деректері экспортталмады. \nСебебі: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> импортталуда"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vКарта дерекқорын оқи алмады"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vКарта дерекқорын оқу тоқтатылды"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vКарта файлын импорттау аяқталды"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> импорттау тоқтатылды"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> жуық арада импортталады."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файл жуық арада импортталады."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vКартасын импорттау өтініші қабылданбады. Кейінірек қайта әрекеттеніп көріңіз."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> жуық арада экспортталады."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Файл қысқа уақыттан кейін экспортталады."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Контактілер жуық арада экспортталады."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vКартасын экспорттау өтініші қабылданбады. Кейінірек қайта әрекеттеніп көріңіз."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vКарталарын жергілікті уақытша жадқа кэштеу. Импорттау жуық арада басталады."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vКартасын экспорттау мүмкін болмады."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"ЖӨБ контактісі"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Контактілер экспортталсын ба?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кэштеу"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g>/<xliff:g id="CURRENT_NUMBER">%s</xliff:g> импортталуда: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf файлына экспорттау"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сұрыптау шарты"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Аты"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Тегі"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ат пішімі"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Алдымен аты"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Алдымен тегі"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Жаңа контактілерге арналған әдепкі есептік жазба"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Контакт метадеректерін синхрондау"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Контактілер туралы"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Параметрлер"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Көрінетін контактілерді бөлісу"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Көрінетін контактілерді бөлісу сәтсіз аяқталды."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Таңдаулы контактілерді бөлісу"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Барлық контактілерді бөлісу"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Контактілерді бөлісу сәтсіз аяқталды."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Контактілерді импорттау/экспорттау"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Контактілерді импорттау"</string>
-    <string name="share_error" msgid="5642622973966851784">"Бұл контактіні бөлісу мүмкін болмады"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Бөлісетін контактілер жоқ."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Іздеу"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Контактілерді табу"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Сүйіктілер"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ешқандай контактілер жоқ."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ешқандай көрінетін контактілер жоқ."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Таңдаулылар жоқ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> контактілер жоқ"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Жиі қолданылғандары өшіру"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM картасын таңдау"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Есептік жазбаларды басқару"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Импорттау/экспорттау"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> арқылы"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> дерегі <xliff:g id="SOURCE">%2$s</xliff:g> арқылы"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"іздеуді тоқтату"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Іздеуді өшіру"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Контактілерді көрсету опциялары"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Есептік жазба"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Осыны қоңыраулар үшін әрқашан пайд."</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Келесімен қоңырау шалу"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Қоңыраумен жіберу үшін ескертпе теріңіз ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ЖІБЕРУ ЖӘНЕ ҚОҢЫРАУ ШАЛУ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> қойындысы."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> қойындысы. <xliff:g id="COUNT_3">%2$d</xliff:g> оқылмаған элемент. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> қойындысы. <xliff:g id="COUNT_1">%2$d</xliff:g> оқылмаған элемент. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Жинақ нұсқасы"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Ашық бағдарлама лицензиялары"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Ашық бастапқы код бағдарламасына арналған лицензия туралы мәліметтер"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Құпиялылық саясаты"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Қызмет көрсету шарттары"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Бастапқы коды ашық бағдарлама лицензиялары"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Url ашылған жоқ."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Бейне қоңырау"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Бөлісу және қоңырау шалу"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-km/strings.xml b/java/com/android/contacts/common/res/values-km/strings.xml
index 5030167..f602dec 100644
--- a/java/com/android/contacts/common/res/values-km/strings.xml
+++ b/java/com/android/contacts/common/res/values-km/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"បាន​ចម្លង​អត្ថបទ"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ចម្លង​ទៅ​ក្ដារ​តម្បៀត​ខ្ទាស់"</string>
     <string name="call_custom" msgid="3041673234638990874">"ហៅ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"ហៅ​ទៅ​ផ្ទះ"</string>
     <string name="call_mobile" msgid="967589404494150813">"ហៅ​ទៅ​ទូរស័ព្ទ​ចល័ត"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ហៅ​ទៅ​ភេយ័រ​កន្លែង​ធ្វើការ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"ហៅ​ទៅ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"ហៅ MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ហៅ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"អត្ថបទ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"​សារ​ទៅ​​ផ្ទះ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"អត្ថបទ​ទូរស័ព្ទ​ចល័ត"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"អត្ថបទ​ភេ​យ័រ​កន្លែង​ធ្វើការ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"អត្ថបទ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"អត្ថបទ MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (សារ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"សម្អាត​ទំនាក់ទំនង​ញឹកញាប់?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"អ្នកនឹងជម្រះបញ្ជីដែលអ្នកទាក់ទងជាញឹកញាប់នៅក្នុងកម្មវិធីទូរស័ព្ទ និងទំនាក់ទំនង ហើយបង្ខំឲ្យកម្មវិធីអ៊ីមែលស្វែងយល់ពីចំណូលចិត្តទំនាក់ទំនងរបស់អ្នកតាំងពីដំបូង។"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"សម្អាត​ទំនាក់ទំនង​ញឹកញាប់..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ចាក​ឆ្ងាយ"</string>
     <string name="status_busy" msgid="5990832098713248503">"រវល់"</string>
     <string name="contactsList" msgid="8806067891419291513">"ទំនាក់ទំនង"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"បាន​ណែនាំ​​កម្រិត​ខ្ពស់"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ផ្សេងៗ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ថត"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ថតកន្លែងការងារ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ទំនាក់ទំនង​ទាំងអស់"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ការ​ណែនាំ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ខ្ញុំ"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"កំពុង​ស្វែងរក..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"បាន​រក​ឃើញ​ច្រើន​ជាង <xliff:g id="COUNT">%d</xliff:g> ។"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"គ្មាន​ទំនាក់ទំនង"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">បាន​រកឃើញ <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">បាន​រកឃើញ 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"ទំនាក់ទំនង​រហ័ស​សម្រាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(គ្មាន​ឈ្មោះ)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"បាន​ហៅ​ញឹកញាប់"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"បាន​ទាក់ទង​ញឹកញាប់"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"មើល​ទំនាក់ទំនង"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ទំនាក់ទំនង​ទាំងអស់​ដែល​មាន​លេខ​ទូរស័ព្ទ"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"ទំនាក់ទំនងប្រវត្តិរូបការងារ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"អ៊ីមែល <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"អ៊ីមែល"</string>
     <string name="postal_street" msgid="6918171741240802474">"ផ្លូវ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"ប្រអប់​សំបុត្រ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"អ្នក​ជិត​ខាង"</string>
     <string name="postal_city" msgid="8674569121430005628">"ទីក្រុង"</string>
     <string name="postal_region" msgid="1730369286225469192">"រដ្ឋ"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"លេខ​កូដ​តំបន់"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ជជែក​ដោយ​ប្រើ ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"ជជែក​ដោយ​ប្រើ Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"ជជែក​​"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"លុប​"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"ពង្រីក ឬ​បង្រួម​វាល​ឈ្មោះ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ពង្រីក និងបង្រួមប្រអប់ឈ្មោះសូរសព្ទ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ទំនាក់ទំនងទាំងអស់"</string>
-    <string name="menu_done" msgid="1817505539263889535">"រួចរាល់"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"បោះ​បង់​"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"ទំនាក់ទំនង​នៅ​ក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"ទំនាក់ទំនង​ក្នុង​ទិដ្ឋភាព​ផ្ទាល់ខ្លួន"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ទំនាក់ទំនង​ទោល"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"រក្សាទំនាក់ទំនងដែលបាននាំចូលទៅ៖"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"នាំចូល​ពី​ស៊ីម​កាត"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"នាំចូល​ពី​ស៊ីម <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"នាំចូល​ពី​ស៊ីម <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"នាំចូូលពីឯកសារ .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"បោះបង់​ការ​នាំចូល <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"បោះបង់​ការ​នាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"មិន​អាច​បោះបង់​ការ​នាំចេញ/នាំចូល vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"មិន​ស្គាល់​កំហុស។"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"មិន​អាច​បើក \"<xliff:g id="FILE_NAME">%s</xliff:g>\"៖ <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"មិន​អាច​ចាប់ផ្ដើម​កម្មវិធី​នាំ​ចេញ៖ \"<xliff:g id="EXACT_REASON">%s</xliff:g>\" ។"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"មិន​មាន​ទំនាក់ទំនង​ដើម្បី​នាំចេញ​ទេ។"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"អ្នកបានបិទសិទ្ធិអនុញ្ញាតដែលតម្រូវឲ្យមាន។"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"មាន​កំហុស​កើតឡើង​ពេល​នាំចេញ៖ \"<xliff:g id="EXACT_REASON">%s</xliff:g>\" ។"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ឈ្មោះ​ឯកសារ​ដែល​បាន​ទាមទារ​គឺ​វែង​ពេក (\"<xliff:g id="FILENAME">%s</xliff:g>\") ។"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"កំហុស I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"អង្គ​ចងចាំ​មិន​គ្រប់គ្រាន់ (ប្រហែលជា​ឯកសារ​ធំ​ពេក​)"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"មិន​អាច​ញែក vCard បាន​ព្រោះ​ហេតុផល​មិន​រំពឹង​ទុក។"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"មិន​គាំទ្រ​ទ្រង់ទ្រាយ។"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"មិន​អាច​ប្រមូល​ព័ត៌មាន​មេតា​របស់​ឯកសារ vCard ដែល​បាន​ផ្ដល់។"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"មាន​ឯកសារ​មួយ ឬ​ច្រើន​ដែល​មិន​អាច​នាំចូល (%s​) បាន​។"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"បាន​បញ្ចប់​ការ​នាំ​ចេញ <xliff:g id="FILENAME">%s</xliff:g> ។"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"បានបញ្ចប់ការនាំចេញទំនាក់ទំនង។"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"បានបញ្ចប់ការនាំចេញទំនាក់ទំនង សូមចុចការជូនដំណឹងនោះដើម្បីចែករំលែកទំនាក់ទំនង"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"ប៉ះដើម្បីចែករំលែកទំនាក់ទំនង"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"បាន​បោះបង់​ការ​នាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ។"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"កំពុង​នាំចេញ​ព័ត៌មាន​ទំនាក់ទំនង"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"ទិន្នន័យចំណាំកំពុងត្រូវបាននាំចេញ"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"មិន​អាច​យក​ព័ត៌មាន​មូលដ្ឋាន​ទិន្នន័យ។"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"មិនមានទំនាក់ទំនងដែលអាចនាំចេញបានទេ។ ប្រសិនបើអ្នកពិតជាមានទំនាក់ទំនងនៅក្នុង​ឧបករណ៍​របស់អ្នកមែន នោះក្រុមហ៊ុនផ្ដល់ទិន្នន័យប្រហែលជាមិនអនុញ្ញាតឲ្យនាំចេញទំនាក់ទំនងទាំងនោះ​​ពី​ឧបករណ៍​​ទេ។"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"កម្មវិធី​តែង​របស់ vCard មិន​បាន​ចាប់ផ្ដើម​ត្រឹមត្រូវ​ទេ។"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"មិន​អាច​នាំចេញ"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"មិន​បាន​នាំចេញ​ព័ត៌មាន​ទំនាក់ទំនង។\nមូលហេតុ៖ \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"ការ​នាំចូល <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"មិន​អាច​អាន​ទិន្នន័យ vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"បាន​បោះបង់​ការ​អាន​ទិន្នន័យ vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"បាន​បញ្ចប់​ការ​នាំចូល vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"បាន​បោះបង់​ការ​នាំចូល <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"នឹង​នាំចូល <xliff:g id="FILENAME">%s</xliff:g> ក្នុង​ពេល​ឆាប់ៗ។"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"នឹង​នាំចូល​ឯកសារ​ក្នុង​ពេល​ឆាប់ៗ។"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"បាន​បដិសេធ​សំណើ​នាំចូល vCard ។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ​។"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"នឹង​នាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ក្នុង​ពេល​ឆាប់ៗ។"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"នឺងនាំចេញឯកសារក្នុងពេលឆាប់ៗ។"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ទំនាក់ទំនងនឹងត្រូវបាននាំចេញក្នុងពេលបន្តិចទៀតនេះ"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"បាន​បដិសេធ​សំណើ​នាំចេញ vCard ។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ​។"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"ទំនាក់ទំនង"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"ការ​ផ្ទុក vCard(s​) ទៅកាន់​ឧបករណ៍​ផ្ទុក​បណ្ដោះអាសន្ន​មូលដ្ឋាន។ ការ​នាំ​ចូល​ពិតប្រាកដ​នឹង​ចាប់ផ្ដើម​ក្នុង​ពេល​ឆាប់ៗ។"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"មិន​អាច​នាំចូល vCard ។"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"ទំនាក់ទំនង​ដែល​បាន​ទទួល​តាម NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"នាំចេញ​ទំនាក់ទំនង?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ការ​ផ្ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"កំពុង​នាំចូល <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>៖ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"នាំចេញទៅឯកសារ .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"តម្រៀប​តាម"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"នាម​ខ្លួន"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"នាមត្រកូល"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"ទម្រង់ឈ្មោះ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"នាម​ខ្លួន​មុន"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"នាមត្រកូល​មុន"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"គណនីលំនាំដើមសម្រាប់ទំនាក់ទំនងថ្មី"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"ធ្វើសមកាលកម្មទិន្នន័យមេតា"</string>
-    <string name="setting_about" msgid="5253319937596745755">"អំពីទំនាក់ទំនង"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ការ​កំណត់"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ចែករំលែក​ទំនាក់ទំនង​ដែល​អាច​មើល​ឃើញ"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"បានបរាជ័យក្នុងការចែករំលែកទំនាក់ទំនងដែលអាចមើលឃើញ។"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ចែករំលែកទំនាក់ទំនងសំណព្វចិត្ត"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ចែករំលែកទំនាក់ទំនងទាំងអស់"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"បរាជ័យក្នុងការចែករំលែកទំនាក់ទំនង"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"នាំចេញ/នាំចូល​ទំនាក់ទំនង"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"នាំចូល​ទំនាក់ទំនង"</string>
-    <string name="share_error" msgid="5642622973966851784">"ទំនាក់ទំនង​នេះ​មិន​អាច​ចែករំលែក​បាន​ទេ។"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"មិនមានទំនាក់ទំនងដើម្បីចែករំលែកទេ"</string>
-    <string name="menu_search" msgid="1241802591112035764">"ស្វែងរក"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"រក​ទំនាក់ទំនង"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"សំណព្វ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"មិន​មាន​ទំនាក់ទំនង។"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"មើល​មិន​ឃើញ​ទំនាក់ទំនង។"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"គ្មានសំណព្វទេ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"មិន​មាន​ទំនាក់ទំនង​នៅ​ក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"សម្អាត​ញឹកញាប់"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"ជ្រើស​ស៊ី​ម​កាត"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"គ្រប់គ្រងគណនី"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"នាំចេញ/នាំចូល"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"តាមរយៈ <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> តាមរយៈ <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"បញ្ឈប់​ការ​ស្វែងរក"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"សម្អាត​ការ​ស្វែងរក"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"ជម្រើស​បង្ហាញ​ទំនាក់ទំនង"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"គណនី"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ហៅ​ជាមួយ"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"វាយបញ្ចូលចំណាំដែលត្រូវផ្ញើជាមួយការហៅទូរស័ព្ទ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ផ្ញើ &amp; ហៅ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"ផ្ទាំង <xliff:g id="TITLE">%1$s</xliff:g>។"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">ផ្ទាំង <xliff:g id="TITLE_2">%1$s</xliff:g>។ ធាតុមិនទាន់​អាន <xliff:g id="COUNT_3">%2$d</xliff:g> </item>
       <item quantity="one">ផ្ទាំង <xliff:g id="TITLE_0">%1$s</xliff:g>។ ធាតុមិនទាន់​អាន <xliff:g id="COUNT_1">%2$d</xliff:g> </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"កំណែបង្កើត"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"អាជ្ញាប័ណ្ណប្រភពកូដចំហ"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"សេចក្ដីលម្អិតអាជ្ញាបណ្ណសម្រាប់កម្មវិធីប្រភពកូដបើកចំហ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"គោលនយោបាយ​ភាព​​ឯកជន​"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"លក្ខខណ្ឌប្រើប្រាស់"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"អាជ្ញាប័ណ្ណប្រភពកូដចំហ"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"បាន​បរាជ័យ​ក្នុង​ការ​បើក URL។"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ការ​ហៅវីដេអូ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"ចែករំលែក និង​ហៅ​ទូរសព្ទ"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-kn/strings.xml b/java/com/android/contacts/common/res/values-kn/strings.xml
index 446e078..08ac7db 100644
--- a/java/com/android/contacts/common/res/values-kn/strings.xml
+++ b/java/com/android/contacts/common/res/values-kn/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"ಪಠ್ಯವನ್ನು ನಕಲಿಸಲಾಗಿದೆ"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿ"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="call_home" msgid="125893483593803791">"ಮನೆಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="call_mobile" msgid="967589404494150813">"ಮೊಬೈಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ಕರೆ ಮಾಡಿ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_home" msgid="3527719551060295243">"ನಿವಾಸಕ್ಕೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ಸಂದೇಶ ಕಳುಹಿಸಿ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಫೋನ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಪದೇ ಪದೇ ಸಂಪರ್ಕಪಡಿಸಿರುವ ಪಟ್ಟಿಯನ್ನು ನೀವು ತೆರುವುಗೊಳಿಸುತ್ತೀರಿ ಮತ್ತು ಮೊದಲಿನಿಂದ ನಿಮ್ಮ ವಿಳಾಸ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ತಿಳಿಯಲು ಇಮೇಲ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಒತ್ತಾಯಿಸಿ."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ದೂರ"</string>
     <string name="status_busy" msgid="5990832098713248503">"ಕಾರ್ಯನಿರತ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ಸಂಪರ್ಕಗಳು"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ಉನ್ನತ ಸಲಹೆ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ಇತರೆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ಡೈರೆಕ್ಟರಿ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ಸಲಹೆಗಳು"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ನಾನು"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ಗಿಂತ ಹೆಚ್ಚಾಗಿ ಕಂಡುಬಂದಿದೆ."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಕಂಡುಬಂದಿವೆ</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಕಂಡುಬಂದಿವೆ</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> ಇವರಿಗಾಗಿ ತಕ್ಷಣದ ಸಂಪರ್ಕ"</string>
     <string name="missing_name" msgid="978606963362745020">"(ಯಾವುದೇ ಹೆಸರಿಲ್ಲ)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"ಪದೇ ಪದೇ ಕರೆ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದು"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ಫೋನ್‌ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಎಲ್ಲ ಸಂಪರ್ಕಗಳು"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸಂಪರ್ಕಗಳು"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ಇಮೇಲ್‌ ಮಾಡಿ"</string>
     <string name="email" msgid="2807318537887091606">"ಇಮೇಲ್"</string>
     <string name="postal_street" msgid="6918171741240802474">"ಗಲ್ಲಿ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO ಬಾಕ್ಸ್‌"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ನೆರೆಹೊರೆ"</string>
     <string name="postal_city" msgid="8674569121430005628">"ನಗರ"</string>
     <string name="postal_region" msgid="1730369286225469192">"ರಾಜ್ಯ"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ಪಿನ್ ಕೋಡ್"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
     <string name="chat" msgid="1020428260359370236">"ಚಾಟ್"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ಅಳಿಸಿ"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"ಹೆಸರಿನ ಕ್ಷೇತ್ರಗಳನ್ನು ವಿಸ್ತರಿಸಿ ಅಥವಾ ಸಂಕುಚಿಸಿ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ಫೊನೆಟಿಕ್ ಹೆಸರಿನ ಕ್ಷೇತ್ರಗಳನ್ನು ವಿಸ್ತರಿಸಿ ಅಥವಾ ಸಂಕುಚಿಸಿ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ಮುಗಿದಿದೆ"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ರದ್ದುಮಾಡಿ"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ನಲ್ಲಿ ಸಂಪರ್ಕಗಳು"</string>
     <string name="listCustomView" msgid="5306282632413086731">"ಕಸ್ಟಮ್‌ ವೀಕ್ಷಣೆಯಲ್ಲಿನ ಸಂಪರ್ಕಗಳು"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ಏಕೈಕ ಸಂಪರ್ಕ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ಆಮದು ಮಾಡಲಾದ ಸಂಪರ್ಕಗಳನ್ನು ಇಲ್ಲಿ ಉಳಿಸಿ:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಆಮದು ಮಾಡಿ"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM ನಿಂದ ಆಮದು ಮಾಡಿ"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM ನಿಂದ ಆಮದು ಮಾಡಿ"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ಫೈಲ್‌ನಿಂದ ಆಮದು ಮಾಡಿ"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> ಆಮದು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> ಅನ್ನು ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard ಆಮದು/ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"ಅಪರಿಚಿತ ದೋಷ."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ರಫ್ತುದಾರರನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ಯಾವುದೇ ರಫ್ತುಮಾಡಬಹುದಾದ ಸಂಪರ್ಕವಿಲ್ಲ."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"ನೀವು ಅಗತ್ಯವಿರುವ ಅನುಮತಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿರುವಿರಿ."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ರಫ್ತು ಮಾಡುವ ಸಂದರ್ಭದಲ್ಲಿ ದೋಷವೊಂದು ಕಂಡುಬಂದಿದೆ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ಅಗತ್ಯವಿರುವ ಫೈಲ್‌‌ ಹೆಸರು ತುಂಬಾ ದೊಡ್ಡದಾಗಿದೆ (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O ದೋಷ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"ಸಾಕಷ್ಟು ಮೆಮೊರಿ ಇಲ್ಲ. ಫೈಲ್‌ ತುಂಬಾ ದೊಡ್ಡದಾಗಿರಬಹುದು."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ಅನಿರೀಕ್ಷಿತ ಕಾರಣದಿಂದಾಗಿ vCard ಪಾರ್ಸ್ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ಸ್ವರೂಪಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ನೀಡಿದ vCard ಫೈಲ್‌(ಗಳ) ಮೆಟಾ ಮಾಹಿತಿಯನ್ನು ಸಂಗ್ರಹಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಫೈಲ್‌ಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುವುದಿಲ್ಲ (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮುಗಿದಿದೆ."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"ಸಂಪರ್ಕಗಳ ರಫ್ತು ಮಾಡುವಿಕೆ ಮುಗಿದಿದೆ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡುವುದನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲಾಗಿದೆ, ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಧಿಸೂಚನೆ ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ರಫ್ತುಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ಡೇಟಾಬೇಸ್ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ಯಾವುದೇ ರಫ್ತುಮಾಡುವಂತಹ ಸಂಪರ್ಕಗಳಿಲ್ಲ. ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ನೀವು ಸಂಪರ್ಕಗಳನ್ನು ಹೊಂದಿದ್ದರೆ, ಸಾಧನದಿಂದ ರಫ್ತು ಮಾಡಲಿರುವ ಸಂಪರ್ಕಗಳಿಗೆ ಕೆಲವು ಡೇಟಾ ಪೂರೈಕೆದಾರರು ಅನುಮತಿ ನೀಡದಿರಬಹುದು."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard ಸಂಯೋಜಕ ಸರಿಯಾಗಿ ಪ್ರಾರಂಭವಾಗಿಲ್ಲ."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ರಫ್ತು ಮಾಡಲಾಗುವುದಿಲ್ಲ"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ರಫ್ತು ಮಾಡಲಿಲ್ಲ.\nಕಾರಣ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard ಡೇಟಾವನ್ನು ಓದಲಾಗಲಿಲ್ಲ"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard ಡೇಟಾ ಓದುವಿಕೆ ರದ್ದಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vCard ಆಮದು ಮುಕ್ತಾಯಗೊಂಡಿದೆ"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ಆಮದು ರದ್ದುಪಡಿಸಲಾಗಿದೆ"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ಅನ್ನು ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ಆಮದು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ಫೈಲ್‌ ಅನ್ನು ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ಆಮದು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard ಆಮದು ವಿನಂತಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ರಫ್ತು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ಫೈಲ್‌ ಅನ್ನು ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ರಪ್ತು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ಸಂಪರ್ಕಗಳನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಆಮದು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard ರಫ್ತು ವಿನಂತಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"ಸಂಪರ್ಕ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(ಗಳು) ಅನ್ನು ಸ್ಥಳೀಯ ತಾತ್ಕಾಲಿಕ ಸಂಗ್ರಹಣೆಗೆ ಸಂಗ್ರಹ ಮಾಡಲಾಗುತ್ತಿದೆ. ನಿಜವಾದ ಆಮದು ಶೀಘ್ರದಲ್ಲೇ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard ಆಮದು ಮಾಡಲಾಗಿಲ್ಲ."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC ಮೂಲಕ ಸ್ವೀಕರಿಸಲಾದ ಸಂಪರ್ಕ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"ಸಂಪರ್ಕಗಳನ್ನು ರವಾನಿಸುವುದೇ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ಸಂಗ್ರಹಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ಫೈಲ್‌ಗೆ ರಫ್ತು ಮಾಡಿ"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ಮೊದಲ ಹೆಸರು"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ಕೊನೆಯ ಹೆಸರು"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"ಹೆಸರಿನ ಫಾರ್ಮ್ಯಾಟ್‌"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ಮೊದಲ ಹೆಸರು ಮೊದಲು"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ಕೊನೆಯ ಹೆಸರು ಮೊದಲು"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"ಹೊಸ ಸಂಪರ್ಕಗಳಿಗೆ ಡಿಫಾಲ್ಟ್‌ ಖಾತೆ"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"ಸಂಪರ್ಕ ಮೆಟಾಡೇಟಾವನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="setting_about" msgid="5253319937596745755">"ಸಂಪರ್ಕಗಳ ಕುರಿತು"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ಮೆಚ್ಚಿನ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು/ರವಾನೆ ಮಾಡಿ"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string>
-    <string name="share_error" msgid="5642622973966851784">"ಈ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ಹಂಚಿಕೊಳ್ಳಲು ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
-    <string name="menu_search" msgid="1241802591112035764">"ಹುಡುಕಿ"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ಮೆಚ್ಚಿನವುಗಳು"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ಯಾವುದೇ ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ಯಾವುದೇ ಮೆಚ್ಚಿನವುಗಳಿಲ್ಲ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> ರಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ಪುನರಾವರ್ತನೆಗಳನ್ನು ತೆರುವುಗೊಳಿಸಿ"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ಆಮದು/ರವಾನೆ ಮಾಡು"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> ಮೂಲಕ"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> ಮೂಲಕ"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ಹುಡುಕಾಟವನ್ನು ನಿಲ್ಲಿಸಿ"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ಹುಡುಕಾಟವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"ಸಂಪರ್ಕ ಡಿಸ್‌ಪ್ಲೇ ಆಯ್ಕೆಗಳು"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ಖಾತೆ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ಕರೆ ಕಳುಹಿಸಲು ಟಿಪ್ಪಣಿಯನ್ನು ಟೈಪ್ ಮಾಡಿ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ಕಳುಹಿಸು ಮತ್ತು ಕರೆಮಾಡು"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ಟ್ಯಾಬ್."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ಟ್ಯಾಬ್. <xliff:g id="COUNT_3">%2$d</xliff:g> ಓದದಿರುವ ಐಟಂಗಳು. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ಟ್ಯಾಬ್. <xliff:g id="COUNT_3">%2$d</xliff:g> ಓದದಿರುವ ಐಟಂಗಳು. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ಬಿಲ್ಡ್ ಆವೃತ್ತಿ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ಮುಕ್ತ ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"ಗೌಪ್ಯತೆ ನೀತಿ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"ಸೇವಾ ನಿಯಮಗಳು"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url ತೆರೆಯಲು ವಿಫಲವಾಗಿದೆ."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ko/strings.xml b/java/com/android/contacts/common/res/values-ko/strings.xml
index 4c2bd4f..3f4eafc 100644
--- a/java/com/android/contacts/common/res/values-ko/strings.xml
+++ b/java/com/android/contacts/common/res/values-ko/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"텍스트 복사됨"</string>
-    <string name="copy_text" msgid="5890820280087874642">"클립보드에 복사"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>(으)로 전화걸기"</string>
     <string name="call_home" msgid="125893483593803791">"집으로 전화걸기"</string>
     <string name="call_mobile" msgid="967589404494150813">"휴대전화로 전화걸기"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"직장 호출기로 전화 걸기"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 전화걸기"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS로 전화걸기"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g>(전화)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>에 문자 보내기"</string>
     <string name="sms_home" msgid="3527719551060295243">"집으로 문자 보내기"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"휴대전화로 문자 보내기"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"직장 호출기로 문자 보내기"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 문자 보내기"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS로 문자 보내기"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g>(메시지)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"자주 연락하는 사람들 목록을 삭제하시겠습니까?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"주소록 및 휴대전화 앱에서 자주 연락하는 사람의 목록을 삭제하고 이메일 앱이 주소록 환경설정을 처음부터 다시 반영하도록 합니다."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"자주 연락하는 사람들 목록을 삭제하는 중…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"자리 비움"</string>
     <string name="status_busy" msgid="5990832098713248503">"다른 용무 중"</string>
     <string name="contactsList" msgid="8806067891419291513">"주소록"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"인기 추천"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"기타"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"디렉토리"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"직장 디렉토리"</string>
     <string name="local_search_label" msgid="907622822323119235">"모든 연락처"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"추천"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"나"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"검색 중..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>개 이상 찾았습니다."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"주소록이 없습니다."</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>개 찾음</item>
-      <item quantity="one">1개 찾음</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g>님의 빠른 주소록"</string>
     <string name="missing_name" msgid="978606963362745020">"(이름 없음)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"자주 통화한 목록"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"자주 연락하는 사람들"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"연락처 보기"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"전화번호가 포함된 모든 연락처"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"직장 프로필 연락처"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>에 이메일 보내기"</string>
     <string name="email" msgid="2807318537887091606">"이메일 보내기"</string>
     <string name="postal_street" msgid="6918171741240802474">"도로명"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"사서함"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"인근 지역"</string>
     <string name="postal_city" msgid="8674569121430005628">"시"</string>
     <string name="postal_region" msgid="1730369286225469192">"도"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"우편번호"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ로 채팅"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber로 채팅"</string>
     <string name="chat" msgid="1020428260359370236">"채팅"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"삭제"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"이름 입력란 펼치기/접기"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"이름(소리나는 대로) 입력란 펼치기 또는 접기"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"모든 연락처"</string>
-    <string name="menu_done" msgid="1817505539263889535">"완료"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"취소"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>의 주소록"</string>
     <string name="listCustomView" msgid="5306282632413086731">"주소록 맞춤 보기"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"단일 연락처"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"가져온 주소록을 저장할 계정:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM 카드에서 가져오기"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>에서 가져오기"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>에서 가져오기"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".VCF 파일에서 가져오기"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> 가져오기를 취소하시겠습니까?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기를 취소하시겠습니까?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard 가져오기/내보내기를 취소하지 못했습니다."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"알 수 없는 오류입니다."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\'<xliff:g id="FILE_NAME">%s</xliff:g>\'을(를) 열지 못했습니다. 이유: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"내보내기를 시작하지 못했습니다. 이유: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"내보낼 수 있는 연락처가 없습니다."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"필수 권한을 사용 중지했습니다."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"내보내는 중에 오류가 발생했습니다. 이유: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"필수 파일 이름이 너무 깁니다(\'<xliff:g id="FILENAME">%s</xliff:g>\')."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O 오류"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"메모리가 부족합니다. 파일이 너무 크기 때문일 수 있습니다."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"예기치 못한 이유로 인해 vCard를 파싱하지 못했습니다."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"지원되지 않는 형식입니다."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"지정한 vCard 파일에 대한 메타 정보를 수집하지 못했습니다."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"하나 이상의 파일을 가져오지 못했습니다(%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기 완료됨"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"연락처 내보내기 완료"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"연락처 내보내기가 끝나면 알림을 클릭하여 연락처를 공유하세요."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"연락처를 공유하려면 탭하세요."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기 취소됨"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"연락처 데이터 내보내기"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"연락처 데이터를 내보내는 중입니다."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"데이터베이스 정보를 가져오지 못했습니다."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"내보낼 수 있는 연락처가 없습니다. 기기에 연락처가 있다면 일부 데이터 제공업체에서 연락처를 기기에서 내보내지 못하도록 했기 때문일 수 있습니다."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard 작성기가 제대로 시작되지 않았습니다."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"내보내기 실패"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"주소록 데이터를 내보내지 못했습니다.\n(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> 가져오는 중"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard 데이터를 읽지 못함"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard 데이터 읽기 취소"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vCard 가져오기 완료됨"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> 가져오기 취소됨"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g>을(를) 곧 가져옵니다."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"파일을 곧 가져옵니다."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard 가져오기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g>을(를) 곧 내보냅니다."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"파일을 곧 내보냅니다."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"곧 연락처를 내보냅니다."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard 내보내기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"연락처"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard를 로컬 임시 저장공간에 캐시하는 중입니다. 곧 가져오기가 시작됩니다."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard를 가져오지 못했습니다."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC를 통해 받은 연락처"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"주소록을 내보내시겠습니까?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"캐시"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> 가져오는 중: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".VCF 파일로 내보내기"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"정렬 기준:"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"이름"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"성"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"이름 형식"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"이름 먼저"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"성 먼저"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"새 연락처에 대한 기본 계정"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"연락처 메타데이터 동기화"</string>
-    <string name="setting_about" msgid="5253319937596745755">"주소록 정보"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"설정"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"표시되는 연락처 모두 공유"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"표시되는 연락처를 공유하지 못했습니다."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"자주 사용하는 연락처 공유"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"모든 연락처 공유"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"연락처를 공유할 수 없습니다."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"주소록 가져오기/내보내기"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"주소록 가져오기"</string>
-    <string name="share_error" msgid="5642622973966851784">"연락처를 공유할 수 없습니다."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"공유할 연락처가 없습니다."</string>
-    <string name="menu_search" msgid="1241802591112035764">"검색"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"연락처 찾기"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"즐겨찾기"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"연락처가 없습니다."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"표시할 수 있는 연락처가 없습니다."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"즐겨찾기가 없습니다."</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>에 연락처가 없습니다."</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"자주 연락하는 사람 목록 삭제"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM 카드 선택"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"계정 관리"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"가져오기/내보내기"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"출처: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>(출처: <xliff:g id="SOURCE">%2$s</xliff:g>)"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"검색 중지"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"검색창 지우기"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"연락처 표시 옵션"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"계정"</string>
     <string name="set_default_account" msgid="7966099951006467572">"통화에 항상 사용"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"통화에 사용할 SIM"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"통화에 함께 전송할 메모를 입력하세요..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"보내기 및 전화 걸기"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> 탭"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> 탭. 읽지 않은 항목 <xliff:g id="COUNT_3">%2$d</xliff:g>개 </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> 탭. 읽지 않은 항목 <xliff:g id="COUNT_1">%2$d</xliff:g>개 </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"빌드 버전"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"오픈소스 라이선스"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"오픈소스 소프트웨어 라이선스 세부정보"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"개인정보처리방침"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"서비스 약관"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"오픈소스 라이선스"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URL을 열지 못했습니다."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"화상 통화"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"공유 및 전화 걸기"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ky/strings.xml b/java/com/android/contacts/common/res/values-ky/strings.xml
index e5bab45..3a0f0c3 100644
--- a/java/com/android/contacts/common/res/values-ky/strings.xml
+++ b/java/com/android/contacts/common/res/values-ky/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"SMS көчүрүлдү"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Алмашуу буферине көчүрүү"</string>
     <string name="call_custom" msgid="3041673234638990874">"Чалуу <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Үйгө чалуу"</string>
     <string name="call_mobile" msgid="967589404494150813">"Мобилге чалуу"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Жумушчу пейжерге чалуу"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Чалуу <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS номурна чалуу"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Чалуу)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Үйгө SMS жөнөтүү"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Мобилге SMS жөнөтүү"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Жумушчу пейжерге SMS жөнөтүү"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Текст жөнөтүү <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS телефонго SMS жөнөтүү"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Билдирүү жөнөтүү)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Көп чалынгандар тизмеси тазалансынбы?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Байланыштар жана Телефон колдонмолорунан көп байланышкан адамдар тизмесин тазалап, даректүү жеке жөндөөлөр тууралуу билүү үчүн электрондук почта колдонмолорун иштетиңиз."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Көп чалынгандар тизмеси тазаланууда…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Чыгып кетти"</string>
     <string name="status_busy" msgid="5990832098713248503">"Бош эмес"</string>
     <string name="contactsList" msgid="8806067891419291513">"Байланыштар"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Эң көп сунушталгандар"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Башка"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директорий"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Жумуш профилиндеги байланыштар китепчеси"</string>
     <string name="local_search_label" msgid="907622822323119235">"Бардык байланыштар"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Сунуштар"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Изделүүдө…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ашык табылды."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Байланыштар жок"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> табылды</item>
-      <item quantity="one">1 табылды</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> үчүн тез байланышуу"</string>
     <string name="missing_name" msgid="978606963362745020">"(Аты жок)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Көп чалынган"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Көп байланышып турган"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Байланыштын чоо-жайын карап көрүү"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Телефон номерлери бар бардык байланыштар"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Жумуш профилиндеги байланыштар"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Кат жазуу (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Электрондук кат жазуу"</string>
     <string name="postal_street" msgid="6918171741240802474">"Көчөсү"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Абонент кутусу"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Району"</string>
     <string name="postal_city" msgid="8674569121430005628">"Шаары"</string>
     <string name="postal_region" msgid="1730369286225469192">"Облусу"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Индекси"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ аркылуу чатташуу"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber аркылуу чатташуу"</string>
     <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"жок кылуу"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Аттар талааларын жаюу же түрүү"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Фонетикалык аталыш талааларын жайып көрсөтүү же жыйыштыруу"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Бардык байланыштар"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Даяр"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Жокко чыгаруу"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> байланыштары"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Байланыштардын ыңгайлаштырылган көрүнүшү"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Жалгыз байланыш"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Импорттолгон байланыштар төмөнкүгө сакталсын:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM-картадан импорттоо"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> ичинен импорттоо"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> ичинен импорттоо"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf файлынан импорттоо"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> импортто токтотулсунбу?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> экспорттоо токтотулсунбу?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard импортоо/экспортоо токтотулбады."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Белгисиз ката."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ачылбай жатат: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Экспортчу башталбай жатат: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Экспортко жарактуу байланыш жок."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Керектүү уруксатты өчүрүп койгонсуз."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Экспорттоо учурунда ката кетти: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Талап кылынган файл аты өтө узун (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O катасы"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Эс тутум жетишсиз. Файл өтө чоң окшойт."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Аныкталбаган себептерден улам vCard\'ды талданбай албай жатат."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Бул формат колдоого алынбайт."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Берилген vCard файл(дар)ынын мета маалыматтарын чогултуу мүмкүн болбой жатат."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Бир же эки файл импорттолбой жатат (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> экспорттоо аяктады."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Байланыштар өткөрүлүп бүттү."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Байланыштар өткөрүлүп берилди, байланыштар менен бөлүшүү үчүн эскертмени басыңыз."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Байланыштар менен бөлүшүү үчүн таптап коюңуз."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> экспортто токтотулду."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Байланыш берилиштери экспорттолууда"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Байланыштын чоо-жайы өткөрүлүп берилүүдө."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Берилиштер корунун маалыматтарын алуу мүмкүн эмес."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Экспорттоло турган байланыштар жок. Эгер байланыштар түзмөгүңүздө болсо, айрым дайындарды камсыздоочулар байланыштарды түзмөктөн экспорттоого жол бербеши мүмкүн."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard түзүүчү туура эмес иштеп баштады."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Экспорттоо мүмкүн эмес"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Байланыш маалыматтары экспорттолгон жок.\nСебеби: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> импорттолууда"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard берилиштерин окуу мүмкүн эмес"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard берилиштерин окуу токтотулду"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> vCard импорттолуп бүттү"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> файлын импорттоо токтотулду"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> жакынкы убакытта импорттолот."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файл жакынкы убакытта импорттолот."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard импорттоо талабы четке кагылды. Кийинчерээк кайра аракеттениңиз."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> жакынкы убакытта экспорттолот."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Файл бир аздан кийин өткөрүлүп берилет."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Байланыштар жакында өткөрүлүп берилет."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard экспорттоо талабы четке кагылды. Кийинчерээк кайра аракеттениңиз."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"байланыш"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(дар) жергиликтүү убактылуу жайга топтолууда. Чыныгы импорт жакында башталат."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard импорт кылынган жок."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Байланыш NFC аркылуу алынды"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Байланыштар экспорттолсунбу?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Топтоо"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> импорттолууда"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf файлга экспорттоо"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Төмөнкү боюнча иреттештирүү"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ысымы"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Фамилиясы"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ысым форматы"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Биринчи ысымы"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Биринчи фамилиясы"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Жаңы байланыштар үчүн демейки каттоо эсеби"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Байланыш метадайындарын шайкештирүү"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Байланыштар жөнүндө"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Жөндөөлөр"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Көрүнүктүү байланыштарды бөлүшүү"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Көрүнүктүү байланыштар бөлүшүлбөй койду."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Сүйүктүү байланыштарды бөлүшүү"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Бардык байланыштарды бөлүшүү"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Байланыштар бөлүшүлбөй калды."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Байланыштарды өткөрүп алуу/берүү"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Байланыштарды өткөрүп алуу"</string>
-    <string name="share_error" msgid="5642622973966851784">"Бул байланышты бөлүшүү мүмкүн эмес."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Бөлүшө турган байланыштар жок."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Издөө"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Байланыштарды табуу"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Сүйүктүүлөр"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Эч бир байланыш жок."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Көрүнүктүү байланыштар жок."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Сүйүктүүлөр тизмеси бош"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> ичинде байланыштар жок"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Көп чалуулар тизмесин тазалоо"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM карта тандаңыз"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Каттоо эсептерин башкаруу"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Импорттоо/экспорттоо"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> аркылуу"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>  <xliff:g id="SOURCE">%2$s</xliff:g> аркылуу"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"издөөнү токтотуу"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Издөөнү тазалоо"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Байланышты көрсөтүү параметрлери"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Каттоо эсеби"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Бул ар дайым чалуулр үчн колдонулсн"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Төмөнкү менен чалуу"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Чалуу менен жөнөтүлө турган кыска жазууну териңиз …"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ЖӨНӨТҮҮ ЖАНА ЧАЛУУ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"\"<xliff:g id="TITLE">%1$s</xliff:g>\" өтмөгү."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> \"<xliff:g id="TITLE_2">%1$s</xliff:g>\" өтмөгү. <xliff:g id="COUNT_3">%2$d</xliff:g> нерсе окула элек. </item>
       <item quantity="one"> \"<xliff:g id="TITLE_0">%1$s</xliff:g>\" өтмөгү. <xliff:g id="COUNT_1">%2$d</xliff:g> нерсе окула элек. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Куралыш версиясы"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Ачык программа уруксаттамалары"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Баштапкы коду ачык программанын уруксаттамасынын чоо-жайы"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Купуялуулук саясаты"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Тейлөө шарттары"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Ачык программа уруксаттамалары"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url ачылбай калды."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видео чалуу"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Бөлүшүү жана чалуу"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lo/strings.xml b/java/com/android/contacts/common/res/values-lo/strings.xml
index c649539..5e78002 100644
--- a/java/com/android/contacts/common/res/values-lo/strings.xml
+++ b/java/com/android/contacts/common/res/values-lo/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"ສຳເນົາຂໍ້ຄວາມແລ້ວ"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ສຳເນົາໃສ່ຄລິບບອດ"</string>
     <string name="call_custom" msgid="3041673234638990874">"ໂທຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"ໂທຫາເບີບ້ານ"</string>
     <string name="call_mobile" msgid="967589404494150813">"ໂທຫາເບີມືຖື"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ໂທຫາ pager ບ່ອນເຮັດວຽກ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"ໂທ​ຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"ໂທຫາເບີ MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ໂທ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"ສົ່ງຂໍ້ຄວາມຫາເບີບ້ານ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ສົ່ງຂໍ້ຄວາມຫາເບີມືຖື"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ສົ່ງຂໍ້ຄວາມຫາເບີ pager ບ່ອນເຮັດວຽກ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"ສົ່ງຂໍ້ຄວາມຫາເບີ MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ສົ່ງຂໍ້ຄວາມ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ລຶບລາຍຊື່ທີ່ຕິດຕໍ່ເລື້ອຍໆອອກ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ທ່ານຈະລຶບຂໍ້ມູນລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆຢູ່ໃນແອັບຯລາຍ​ຊື່ ແລະໂທ​ລະ​ສັບ ພ້ອມທັງບັງຄັບໃຫ້ແອັບຯອີເມວເລີ່ມຮຽນຮູ້ຄ່າກຳນົດທີ່ຢູ່ຂອງທ່ານໃໝ່ຕັ້ງແຕ່ຕົ້ນ."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ກຳລັງລຶບລ້າງລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ບໍ່ຢູ່"</string>
     <string name="status_busy" msgid="5990832098713248503">"ບໍ່ຫວ່າງ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ແນະນຳຫຼາຍທີ່ສຸດ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ອື່ນໆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ໄດເຣັກທໍຣີ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ຄຳແນະນຳ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ຂ້ອຍ"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"ກຳລັງຊອກຫາ..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"ພົບຫຼາຍກວ່າ <xliff:g id="COUNT">%d</xliff:g> ລາຍການ."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">ພົບ <xliff:g id="COUNT">%d</xliff:g> ລາຍການ</item>
-      <item quantity="one">ພົບ 1 ລາຍການ</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"ຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່ດ່ວນຂອງ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(ບໍ່ມີຊື່)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"ເບີທີ່ໂທເລື້ອຍໆ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ຕິດຕໍ່ຫາເລື້ອຍໆ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"ເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດທີ່ມີເບີໂທລະສັບ"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"ສົ່ງອີ​ເມວຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"ສົ່ງອີເມວ"</string>
     <string name="postal_street" msgid="6918171741240802474">"ຖະໜົນ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"ຕູ້ໄປສະນີ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ບໍລິເວນໃກ້ຄຽງ"</string>
     <string name="postal_city" msgid="8674569121430005628">"ເມືອງ"</string>
     <string name="postal_region" msgid="1730369286225469192">"ລັດ"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ລະຫັດ ZIP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ສົນທະນາໂດຍໃຊ້ ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"ສົນທະນາໂດຍໃຊ້ Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"ສົນທະນາ"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ລຶບ"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"ຂະຫຍາຍ ຫຼືຫຍໍ້ຊ່ອງຂໍ້ມູນຊື່"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ຂະ​ຫຍາຍ ຫຼື ຫຍໍ້​ບ່ອນ​ໃສ່​ຊື່​ຕາມ​ການ​ອອກ​ສຽງ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ລາຍ​ຊື່​ຜູ້ຕິດ​ຕໍ່​ທັງ​ໝົດ"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ແລ້ວໆ"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ຍົກເລີກ"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນ <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນມຸມມອງກຳນົດເອງ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ລາຍຊື່ຜູ່ຕິດຕໍ່ດ່ຽວ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ບັນ​ທຶກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ນຳ​ເຂົ້າ​ແລ້ວ​ໃສ່:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"ນຳເຂົ້າຈາກ SD card"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"ນຳ​ເຂົ້າ​ຈາກ SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"​ນຳ​ເຂົ້າ​ຈາກ SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"ນຳ​ເຂົ້າ​ຈາກ​ໄຟ​ລ໌ .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"ຍົກເລີກການນຳເຂົ້າ <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"ຍົກເລີກການສົ່ງອອກ <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"ບໍ່ສາມາດຍົກເລີກ ການນຳເຂົ້າ/ສົ່ງອອກ vCard ໄດ້"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"ຄວາມຜິດພາດບໍ່ຮູ້ສາຍເຫດ."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"ບໍ່ສາມາດເປີດ \"<xliff:g id="FILE_NAME">%s</xliff:g>\" ໄດ້: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ບໍ່ສາມາດເລີ່ມໂປຣແກຣມສົ່ງອອກໄດ້: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"ທ່ານປິດການນຳໃຊ້ສິດອະນຸຍາດທີ່ຈຳເປັນໄວ້ແລ້ວ."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການສົ່ງອອກ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ຊື່ໄຟລ໌ທີ່ຕ້ອງການຍາວເກີນໄປ (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O ຜິດພາດ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"ໜ່ວຍຄວາມຈຳບໍ່ພໍ. ເປັນໄປໄດ້ວ່າໄຟລ໌ໃຫຍ່ເກີນໄປ."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ບໍ່ສາມາດວິເຄາະຂໍ້ມູນ vCard ຂອງທ່ານໄດ້ເນື່ອງຈາກສາຍເຫດທີ່ບໍ່ຄາດຄິດ."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ບໍ່ຮອງຮັບຮູບແບບນີ້."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ບໍ່ສາມາດເກັບກຳຂໍ້ມູນ meta ຂອງໄຟລ໌ vCard ທີ່ລະບຸໄດ້."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ມີໄຟລ໌ນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນບໍ່ສາມາດນຳເຂົ້າໄດ້ (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"ສິ້ນສຸດການສົ່ງອອກແລ້ວ <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"ສຳ​ເລັດ​ການ​ສົ່ງ​ອອກລາຍ​ຊື່​ອ​ແລ້ວ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"ເມື່ອສຳເລັດການສົ່ງອອກລາຍຊື່ຜູ້ຕິດຕໍ່ແລ້ວ, ໃຫ້ຄລິກການແຈ້ງເຕືອນເພື່ອແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"ແຕະເພື່ອແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"ການສົ່ງອອກ <xliff:g id="FILENAME">%s</xliff:g> ຖືກຍົກເລີກແລ້ວ."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"ກຳລັງສົ່ງອອກຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"ຂໍ້ມູນລາຍຊື່ຜູ້ຕິດຕໍ່ກຳລັງຖືກສົ່ງອອກ."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ບໍ່ສາມາດດຶງຂໍ້ມູນຖານຂໍ້ມູນໄດ້."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້. ຫາກທ່ານມີລາຍຊື່ຜູ້ຕິດຕໍ່ໃນອຸປະກອນຂອງທ່ານ ແຕ່ບໍ່ສາມາດສົ່ງອອກໄດ້ ກໍອາດເປັນເພາະບາງຜູ້ໃຫ້ບໍລິການຂໍ້ມູນບໍ່ອະນຸຍາດ ໃຫ້ສົ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ອອກຈາກອຸປະກອນໄດ້."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"ໂປຣແກຣມຂຽນ vCard ຖືກເລີ່ມຢ່າງບໍ່ຖືກຕ້ອງ."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ບໍ່ສາມາດສົ່ງອອກໄດ້"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"ຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່ຍັງບໍ່ໄດ້ຖືກສົ່ງອອກເທື່ອ.\nເຫດຜົນ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"ກຳລັງນຳເຂົ້າ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"ບໍ່ສາມາດອ່ານຂໍ້ມູນ vCard ໄດ້"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"ການອ່ານຂໍ້ມູນ vCard ຖືກຍົກເລີກແລ້ວ"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"ການນຳເຂົ້າໄຟລ໌ vCard <xliff:g id="FILENAME">%s</xliff:g> ສິ້ນສຸດແລ້ວ"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"ການນຳເຂົ້າ <xliff:g id="FILENAME">%s</xliff:g> ຖືກຍົກເລີກແລ້ວ"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ຈະຖືກນຳເຂົ້າໃນໄວໆນີ້."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ໄຟລ໌ຈະຖືກນຳເຂົ້າໃນໄວໆນີ້."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"ການຮ້ອງຂໍການນຳເຂົ້າ vCard​ ຖືກປະຕິເສດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ຈະຖືກສົ່ງອອກໃນໄວໆນີ້."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ໄຟ​ລ໌​ຈະ​ຖືກ​ສົ່ງ​ອອກ​ໄວໆ​ນີ້."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຈະຖືກສົ່ງອອກໃນໄວໆນີ້."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"ຄຳຂໍການສົ່ງອອກ vCard ຖືກປະຕິເສດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"ກຳລັງເກັບຂໍ້ມູນ vCard ໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນຊົ່ວຄາວໃນອຸປະກອນ. ການນຳເຂົ້າຈະເລີ່ມຂຶ້ນໃນໄວໆນີ້."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"ບໍ່ສາມາດນຳເຂົ້າ vCard ໄດ້."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ໄດ້ຮັບຜ່ານ NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"ສົ່ງອອກລາຍຊື່ຜູ້ຕິດຕໍ່ບໍ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ກຳລັງຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"ກຳລັງນຳເຂົ້າ <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"ສົ່ງ​ອອກ​ຫາ​ໄຟ​ລ໌ .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ຮຽງຕາມ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ຊື່"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ນາມສະກຸນ"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"​ຮູບ​ແບບ​ຊື່"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"​ຊື່​ກ່ອນ"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"​ນາມ​ສະ​ກຸນ​ກ່ອນ"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"ບັນ​ຊີ​ເລີ່ມຕົ້ນ​ສຳ​ລັບ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃໝ່"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"ຊິ້ງຂໍ້ມູນເມຕາເດຕາຂອງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="setting_about" msgid="5253319937596745755">"ກ່ຽວກັບລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ການຕັ້ງຄ່າ"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ແບ່ງປັນລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ເບິ່ງເຫັນໄດ້"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ສາ​ມາດ​ເຫັນ​ໄດ້​ບໍ່​ສຳ​ເລັດ."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ມັກ"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ແບ່ງປັນທຸກລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"ແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່ບໍ່ສຳເລັດ."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"ນຳເຂົ້າ/ສົ່ງອອກ ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"ນຳເຂົ້າລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="share_error" msgid="5642622973966851784">"ບໍ່ສາມາດແບ່ງປັນລາຍຊື່ລາຍຊື່ຜູ່ຕິດຕໍ່ນີ້ໄດ້."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຈະແບ່ງປັນ."</string>
-    <string name="menu_search" msgid="1241802591112035764">"ຊອກຫາ"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ລາຍການທີ່ມັກ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ເບິ່ງເຫັນໄດ້."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ບໍ່ມີລາຍການທີ່ມັກ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ໃນ <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ລຶບລາຍຊື່ຄົນທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"ເລືອກ SIM ກາດ"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ຈັດການບັນຊີ"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ນຳເຂົ້າ/ສົ່ງອອກ"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"ຜ່ານ <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> ຜ່ານ <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ຢຸດ​ການ​ຊອກ​ຫາ"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ລຶບ​ການ​ຊອກ​ຫາ"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"​ໂຕ​ເລືອກ​ການ​ສະ​ແດງ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ບັນຊີ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ໃຊ້​ຊິມ​ນີ້​ເພື່ອ​ການໂທທຸກ​ເທື່ອ"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ໂທ​ດ້ວຍ"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ພິມ​ບັນ​ທຶກ ເພື່ອ​ສົ່ງ​ກັບ​ການ​ໂທ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ສົ່ງ ແລະ ໂທ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"ແຖບ <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">ແຖບ <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
       <item quantity="one">ແຖບ <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ເວີຊັນທີ່ສ້າງ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"​ລິ​ຂະ​ສິດ​ໂອ​ເພນ​ຊອດ"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ລາຍລະອຽດລິຂະສິດຂອງຊອບແວແຫຼ່ງເປີດ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"​ນະ​ໂຍ​ບາຍ​ຄວາມ​ເປັນ​ສ່ວນ​ໂຕ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"​ເງື່ອນ​ໄຂ​ການ​ໃຫ້​ບໍ​ລິ​ການ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ລິຂະສິດໂອເພນຊອດ"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"ເປີດ URL ລົ້ມເຫລວ."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ໂທວິດີໂອ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"ແບ່ງປັນ ແລະ ໂທ"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lt/strings.xml b/java/com/android/contacts/common/res/values-lt/strings.xml
index b74bd99..ed6cc7f 100644
--- a/java/com/android/contacts/common/res/values-lt/strings.xml
+++ b/java/com/android/contacts/common/res/values-lt/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekstas nukopijuotas"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopijuoti į iškarpinę"</string>
     <string name="call_custom" msgid="3041673234638990874">"Skambinti <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Skambinti namų telefono numeriu"</string>
     <string name="call_mobile" msgid="967589404494150813">"Skambinti mobiliojo telefono numeriu"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Skambinti darbo pranešimų gaviklio numeriu"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Skambinti <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Skambinti MMS telefono numeriu"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (skambutis)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Siųsti teksto pranešimą <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Siųsti teksto pranešimą namų telefono numeriu"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Siųsti teksto pranešimą mobiliojo telefono numeriu"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Siųsti teksto pranešimą darbo pranešimų gaviklio numeriu"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Siųsti teksto pranešimą <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Siųsti MMS telefono numeriu"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (pranešimas)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Išvalyti dažniausius kontaktus?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Išvalysite dažniausių kontaktų sąrašą Kontaktų ir Telefono programose, o el. pašto programoms reikės iš naujo gauti adresavimo nuostatas."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Valomi dažniausi kontaktai…"</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Pasišalinęs"</string>
     <string name="status_busy" msgid="5990832098713248503">"Užsiėmęs"</string>
     <string name="contactsList" msgid="8806067891419291513">"Adresinė"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populiariausi siūlomi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Kita"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalogas"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Darbo katalogas"</string>
     <string name="local_search_label" msgid="907622822323119235">"Visi kontaktai"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Pasiūlymai"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Aš"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Ieškoma…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Rasta daugiau nei <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Kontaktų nėra"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Rastas <xliff:g id="COUNT">%d</xliff:g> kontaktas</item>
-      <item quantity="few">Rasti <xliff:g id="COUNT">%d</xliff:g> kontaktai</item>
-      <item quantity="many">Rasta <xliff:g id="COUNT">%d</xliff:g> kontakto</item>
-      <item quantity="other">Rasta <xliff:g id="COUNT">%d</xliff:g> kontaktų</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Spartusis <xliff:g id="NAME">%1$s</xliff:g> kontaktas"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nėra pavadinimo)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Dažniausiai skambinta"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Dažniausiai susisiekta"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Žr. išsamią kontaktinę informaciją"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Visi kontaktai su telefonų numeriais"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Darbo profilio kontaktai"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"El. paštas <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"El. paštas"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gatvė"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Pašto dėžutė"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Kaimynystė"</string>
     <string name="postal_city" msgid="8674569121430005628">"Miestas"</string>
     <string name="postal_region" msgid="1730369286225469192">"Valstija"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Pašto kodas"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Kalbėti naudojant ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Kalbėti naudojant „Jabber“"</string>
     <string name="chat" msgid="1020428260359370236">"Pokalbis"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ištrinti"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Išskleisti arba sutraukti pavadinimų laukus"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Išskleisti arba sutraukti fonetinių pavadinimų laukus"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Visi kontaktai"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Atlikta"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Atšaukti"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> kontaktai"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontaktai tinkintame rodinyje"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Vienas kontaktas"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Importuotus kontaktus išsaugoti paskyroje:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importuoti iš SIM kortelės"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importuoti iš SIM kortelės „<xliff:g id="SIM_NAME">^1</xliff:g>“ – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importuoti iš SIM kortelės „<xliff:g id="SIM_NAME">%1$s</xliff:g>“"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importuoti iš VCF failo"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Atšaukti „<xliff:g id="FILENAME">%s</xliff:g>“ importavimą?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Atšaukti „<xliff:g id="FILENAME">%s</xliff:g>“ eksportavimą?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Nepav. atš. el. viz. kort. imp. / eksp."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nežinoma klaida."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nepavyko atidaryti „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nepavyko paleisti eksportavimo priemonės: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nėra eksportuojamo kontakto."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Išjungėte būtiną leidimą."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Eksportuojant įvyko klaida: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Reikalingo failo pavadinimas per ilgas („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Įvesties / išvesties klaida"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nepakanka atminties. Gali būti, kad failas per didelis."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Dėl netikėtos priežasties nepavyko išanalizuoti el. vizitinės kortelės."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatas nepalaikomas."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nepavyko surinkti pateikto (-ų) el. vizitinės kortelės failo (-ų) metainformacijos."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nepavyko importuoti vieno ar daugiau failų (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Baigta eksportuoti „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Baigta eksportuoti kontaktus."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktai baigti eksportuoti. Spustelėkite pranešimą ir bendrinkite kontaktus."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Palieskite, kad bendrintumėte kontaktus."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"„<xliff:g id="FILENAME">%s</xliff:g>“ eksportavimas atšauktas."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Eksportuojami kontaktų duomenys"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktų duomenys eksportuojami."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nepavyko gauti duomenų informacijos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nėra jokių eksportuojamų kontaktų. Jei įrenginyje yra kontaktų, kai kurie duomenų paslaugų teikėjai gali neleisti eksportuoti kontaktų iš įrenginio."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"El. vizitinių kortelių rengyklė nebuvo tinkamai paleista."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Nepavyko eksportuoti"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontakto duomenys nebuvo eksportuoti.\nPriežastis: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importuojama <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nepavyko nusk. el. vizit. kort. duomenų"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"El. vizit. kort. duomenų skaitymas atš."</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Baigtas „<xliff:g id="FILENAME">%s</xliff:g>“ el. vizit. kort. importavimas"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Atšauktas „<xliff:g id="FILENAME">%s</xliff:g>“ importavimas"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"„<xliff:g id="FILENAME">%s</xliff:g>“ bus netrukus importuotas."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Failas bus netrukus importuotas."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"El. vizitinės kortelės importavimo užklausa atmesta. Vėliau bandykite dar kartą."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"„<xliff:g id="FILENAME">%s</xliff:g>“ bus netrukus eksportuotas."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Failas bus eksportuotas netrukus."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Netrukus kontaktai bus eksportuoti."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"El. vizitinės kortelės eksportavimo užklausa buvo atmesta. Vėliau bandykite dar kartą."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontaktas"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"El. vizitinė (-ės) kortelė (-ės) padedama (-os) į vietinę laikinąją saugyklą. Netrukus bus pradėtas tikrasis importavimas."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Nepavyko importuoti el. vizit. kortelės."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kont. g. per ALR"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Eksportuoti kontaktus?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Dedama į talpyklą"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importuojama: <xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g>, <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportuoti į VCF failą"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rūšiuoti pagal"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vardas"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Pavardė"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Vardo formatas"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Pirmiausia vardas"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Pirmiausia pavardė"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Numatytoji naujų kontaktų paskyra"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Kontaktų metaduomenų sinchronizavimas"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Apie Kontaktus"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Nustatymai"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Bendrinti matomus kontaktus"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nepavyko bendrinti matomų kontaktų."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Bendrinti mėgstamiausius kontaktus"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Bendrinti visus kontaktus"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Nepavyko bendrinti kontaktų."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontaktų importavimas / eksportavimas"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importuoti kontaktus"</string>
-    <string name="share_error" msgid="5642622973966851784">"Šio kontakto negalima bendrinti."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nėra bendrintinų kontaktų."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Paieška"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Ieškoti kontaktų"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Mėgstamiausi"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Kontaktų nėra."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nėra matomų kontaktų."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nėra mėgstamiausių"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"„<xliff:g id="NAME">%s</xliff:g>“ kontaktų nėra"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Valyti dažniausiai naudojamus"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Pasirinkite SIM kortelę"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Valdyti paskyras"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importuoti / eksportuoti"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"naudojant „<xliff:g id="SOURCE">%1$s</xliff:g>“"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> naudojant „<xliff:g id="SOURCE">%2$s</xliff:g>“"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"sustabdyti paiešką"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Išvalyti paiešką"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontaktų rodymo parinktys"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Paskyra"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Visada naudoti tai skambučiams"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Skambinkite naudodami"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Įveskite užrašą, kurį galima išsiųsti skambinant..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SIŲSTI IR SKAMBINTI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Skirtukas „<xliff:g id="TITLE">%1$s</xliff:g>“."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaitytas elementas. </item>
@@ -258,13 +159,6 @@
       <item quantity="many"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaityto elemento. </item>
       <item quantity="other"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaitytų elementų. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versija"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Atvirojo šaltinio licencijos"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Išsami atvirojo šaltinio programinės įrangos licencijos informacija"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privatumo politika"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Paslaugų teikimo sąlygos"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Atvirojo šaltinio licencijos"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Nepavyko atidaryti URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Vaizdo skambutis"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Bendrinti ir skambinti"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lv/strings.xml b/java/com/android/contacts/common/res/values-lv/strings.xml
index c09a27f..494919e 100644
--- a/java/com/android/contacts/common/res/values-lv/strings.xml
+++ b/java/com/android/contacts/common/res/values-lv/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teksts ir nokopēts"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopēt starpliktuvē"</string>
     <string name="call_custom" msgid="3041673234638990874">"Zvanīt: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Zvanīt uz mājas tālruni"</string>
     <string name="call_mobile" msgid="967589404494150813">"Zvanīt uz mobilo tālruni"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Zvanīt uz darba peidžeri"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Zvanīt: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Zvanīt uz multiziņas numuru"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (zvanīt)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Sūtīt īsziņu: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Sūtīt īsziņu uz mājas tālruņa numuru"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Sūtīt īsziņu uz mobilo tālruni"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Sūtīt īsziņu uz darba peidžeri"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Sūtīt īsziņu: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Sūtīt multiziņu"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sūtīt īsziņu)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vai dzēst bieži lietotos kontaktus?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Tiks dzēsts bieži lietoto kontaktpersonu saraksts lietotnēs Kontaktpersonas un Tālrunis, un e-pasta lietotnēs no jauna tiks sākta adrešu preferenču saglabāšana."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Bieži lietoto kontaktu dzēšana..."</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Prombūtnē"</string>
     <string name="status_busy" msgid="5990832098713248503">"Aizņemts"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktpersonas"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populārākie ieteikumi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Cits"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalogs"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Darba katalogs"</string>
     <string name="local_search_label" msgid="907622822323119235">"Visas kontaktpersonas"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ieteikumi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Es"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Notiek meklēšana…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Atrastas vairāk nekā <xliff:g id="COUNT">%d</xliff:g> kontaktpersonas."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nav kontaktpersonu"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="zero">Atrastas <xliff:g id="COUNT">%d</xliff:g> kontaktpersonas</item>
-      <item quantity="one">Atrasta <xliff:g id="COUNT">%d</xliff:g> kontaktpersona</item>
-      <item quantity="other">Atrastas <xliff:g id="COUNT">%d</xliff:g> kontaktpersonas</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Ātrā saziņa ar kontaktpersonu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Nav vārda)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Kontaktpersonas, kurām bieži zvanāt"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Personas, ar kurām bieži sazināties"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Skatīt kontaktpersonu"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Visas kontaktpersonas ar tālruņa numuriem"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktpersonas darba profilā"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Sūtīt e-pasta ziņojumu uz: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Sūtīt e-pasta ziņojumu"</string>
     <string name="postal_street" msgid="6918171741240802474">"Iela"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Abonenta kastīte"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Teritoriālā vienība"</string>
     <string name="postal_city" msgid="8674569121430005628">"Pilsēta"</string>
     <string name="postal_region" msgid="1730369286225469192">"Štats"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Pasta indekss"</string>
@@ -145,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Tērzēt, izmantojot ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Tērzēt, izmantojot Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Tērzēt"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"dzēst"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Izvērst vai sakļaut nosaukumu laukus"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Izvērst vai sakļaut vārda izrunas laukus"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Visas kontaktpersonas"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gatavs"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Atcelt"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktpersonas sarakstā <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Lietotāju filtrs"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Viena kontaktpersona"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Saglabāt importētās kontaktpersonas šeit:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importēt no SIM kartes"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importēt no SIM kartes <xliff:g id="SIM_NAME">^1</xliff:g> — <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importēt no SIM kartes <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importēt no .vcf faila"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vai atcelt faila <xliff:g id="FILENAME">%s</xliff:g> importēšanu?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vai atcelt faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšanu?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Nevarēja atcelt vCard f. imp./eksp."</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nezināma kļūda."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nevarēja atvērt failu <xliff:g id="FILE_NAME">%s</xliff:g>: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nevarēja startēt eksportētāju: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nav eksportējamu kontaktpersonu datu."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Jūs esat atspējojis obligātu atļauju."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Eksportēšanas laikā radās kļūda: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Faila nosaukums ir pārāk garš (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Ievades/izvades kļūda"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Atmiņā nepietiek vietas. Iespējams, fails ir pārāk liels."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Neparedzēta iemesla dēļ nevarēja parsēt vCard failu."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Šāds formāts netiek atbalstīts."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nevarēja iegūt metainformāciju par vienu vai vairākiem konkrētiem vCard failiem."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nevarēja importēt vienu vai vairākus failus (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšana pabeigta"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontaktpersonu eksportēšana ir pabeigta."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktpersonu eksportēšana ir pabeigta. Lai kopīgotu kontaktpersonas, noklikšķiniet uz paziņojuma."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Pieskarieties, lai kopīgotu kontaktpersonas."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšana atcelta"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontaktpersonu datu eksportēšana"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktpersonu dati tiek eksportēti."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nevarēja iegūt informāciju no datu bāzes."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nav nevienas eksportējamas kontaktpersonas. Ja jūsu ierīcē ir saglabātas kontaktpersonas, iespējams, datu pakalpojumu sniedzējs neļauj eksportēt kontaktpersonas no ierīces."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard veidotājs netika pareizi startēts."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Nevarēja eksportēt"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktpersonas dati netika eksportēti.\nIemesls: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Notiek importēšana: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nevarēja nolasīt vCard datus"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Atcelta vCard datu lasīšana"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard faila <xliff:g id="FILENAME">%s</xliff:g> importēšana pabeigta"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Faila <xliff:g id="FILENAME">%s</xliff:g> importēšana atcelta"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Fails <xliff:g id="FILENAME">%s</xliff:g> drīzumā tiks importēts."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fails drīzumā tiks importēts."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Tika noraidīts vCard faila importēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Fails <xliff:g id="FILENAME">%s</xliff:g> drīzumā tiks eksportēts."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fails drīzumā tiks eksportēts."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktpersonas drīzumā tiks eksportētas."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Tika noraidīts vCard faila eksportēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontaktpersona"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Notiek vCard failu saglabāšana vietējā pagaidu kešatmiņā. Importēšana tiks sākta pēc neilga brīža."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Nevarēja importēt vCard datus."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kont. saņ., izm. NFC."</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Vai eksportēt kontaktp. datus?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Notiek saglabāšana kešatmiņā"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importē <xliff:g id="CURRENT_NUMBER">%s</xliff:g>. no <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportēt .vcf failā"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Kārtot pēc"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vārds"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Uzvārds"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Vārda formāts"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Vispirms rādīt vārdu"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Vispirms rādīt uzvārdu"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Noklusējuma konts jaunām kontaktpersonām"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Kontaktpersonu metadatu sinhronizācija"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Par lietotni Kontaktpersonas"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Iestatījumi"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Kopīgot redzamo kontaktpersonu datus"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Neizdevās kopīgot redzamās kontaktpersonas."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Kopīgot izlases kontaktpersonas"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Kopīgot visas kontaktpersonas"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Neizdevās kopīgot kontaktpersonas."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontaktpersonu importēšana/eksportēšana"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importēt kontaktpersonas"</string>
-    <string name="share_error" msgid="5642622973966851784">"Šīs kontaktpersonas datus nevar kopīgot."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nav nevienas kontaktpersonas, ko kopīgot."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Meklēt"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Meklēt kontaktpersonas"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Izlase"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nav kontaktpersonu."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nav redzamu kontaktpersonu."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Izlasē nav nevienas kontaktpersonas."</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nav kontaktpersonu šādā grupā: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Dzēst bieži lietotos kontaktus"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Atlasiet SIM karti"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Pārvaldīt kontus"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importēt/eksportēt"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"izmantojot <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>, izmantojot <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"pārtraukt meklēšanu"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Notīrīt meklēšanas lauku"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontaktpersonu rādīšanas opcijas"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konts"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Vienmēr izmantot zvaniem"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Zvanīt, izmantojot"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Ierakstiet piezīmi, ko nosūtīt ar zvanu..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SŪTĪT UN ZVANĪT"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> no <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Cilne “<xliff:g id="TITLE">%1$s</xliff:g>”"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="zero"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīti vienumi. </item>
       <item quantity="one"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīts vienums. </item>
       <item quantity="other"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīti vienumi. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versija"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Atklātā pirmkoda licences"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licences informācija par atklātā pirmkoda programmatūru"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Konfidencialitātes politika"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Pakalpojumu sniegšanas noteikumi"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Atklātā pirmkoda licences"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Neizdevās atvērt URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videozvans"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Kopīgot un zvanīt"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-mk/strings.xml b/java/com/android/contacts/common/res/values-mk/strings.xml
index da1530f..a7283da 100644
--- a/java/com/android/contacts/common/res/values-mk/strings.xml
+++ b/java/com/android/contacts/common/res/values-mk/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текстот е копиран"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Копирај во клип-табла"</string>
     <string name="call_custom" msgid="3041673234638990874">"Повикај <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Јави се дома"</string>
     <string name="call_mobile" msgid="967589404494150813">"Повикај мобилен"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Повикај пејџер на работа"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Повикај <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Повикај MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Повик)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Испрати текстуална порака на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Испрати текстуална порака дома"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Испрати текстуална порака на мобилен"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Испрати текстуална порака на пејџер на работа"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Испрати текстуална порака на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Испрати текстуална порака на MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Порака)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Исчисти често контактирани?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Ќе го исчистите списокот на често контактирани лица во апликациите „Контакти“ и „Телефон“ и ќе ги принудите апликациите на е-пошта одново да ги дознаат вашите параметри на обраќање."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Чистење често контактирани..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Отсутен"</string>
     <string name="status_busy" msgid="5990832098713248503">"Зафатен"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Нејдобри предложени"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Друг"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Адресар"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Работен директориум"</string>
     <string name="local_search_label" msgid="907622822323119235">"Сите контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Јас"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Се пребарува..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Повеќе од <xliff:g id="COUNT">%d</xliff:g> се пронајдени."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Нема контакти"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> пронајдени</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> пронајдени</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Брз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Без име)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Често повикувани"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Често контактирани"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Прегледајте контакт"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Сите контакти со телефонски броеви"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти на Работниот профил"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> е-пошта"</string>
     <string name="email" msgid="2807318537887091606">"E-пошта"</string>
     <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Поштенски фах"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Соседство"</string>
     <string name="postal_city" msgid="8674569121430005628">"Град"</string>
     <string name="postal_region" msgid="1730369286225469192">"Држава"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Поштенски број"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Разговор на ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Разговор на Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Разговор"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"избриши"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Отвори или затвори полиња со име"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Прошири ги или собери ги полињата за фонетско име"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Сите контакти"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Готово"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Откажи"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти во <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Контакти во прилагоден приказ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Еден контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Зачувајте ги увезените контакти до:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Увези од SIM картичка"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Увези од SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Увези од SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Увези од датотеката .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Откажи увоз на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Откажи извоз на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Не можеше да се откаже увоз/извоз на визит картичка"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Непозната грешка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"„<xliff:g id="FILE_NAME">%s</xliff:g>“ не можеше да се отвори: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Не можеше да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Нема контакт што може да се извезе."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Оневозможивте потребна дозвола."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Настанаи грешка при извоз: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Бараното име на датотеката е предолго („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O грешка"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Нема доволно меморија. Датотеката е можеби премногу голема."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Визит картичката не можеше да се разложи од неочекувана причина."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Форматот не е поддржан."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Не можеше да собере мета информации за дадени датотека(и) на визит картичка(и)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Една или повеќе датотеки не можеа да се увезат (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Заврши извезувањето на <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Извозот на контакти заврши."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Извозот на контакти заврши. Кликнете на известувањето за да ги споделите контактите."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Допрете за споделување контакти."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Извезувањето на <xliff:g id="FILENAME">%s</xliff:g> е откажано."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Извезување податоци за контакт"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Се врши извоз на податоците за контакт."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Не можеше да добие информации за базата на податоци."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Нема контакти на кои може да се изврши извоз. Ако имате контакти на вашиот уред, некои оператори може да не дозволуваат извоз на контактите од уредот."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Композиторот на визит картичката не започна правилно."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Не можеа да се извезат"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Податоците за контакт не се извезоа.\nПричина: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Увезување <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Не можеше да прочита податоци од визит картичка"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Читањето податоци од визит картичка е откажано"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Заврши увезувањето на визит картичката <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Увезувањето на <xliff:g id="FILENAME">%s</xliff:g> е откажано"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ќе се увезе наскоро."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Датотеката ќе се увезе наскоро."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Барањето за увезување визит картичка беше одбиено. Обидете се повторно подоцна."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ќе се извезе наскоро."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Датотеката ќе се извезе наскоро."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Наскоро ќе се изврши извоз на контактите."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Барањето за извезување визит картичка беше одбиено. Обидете се повторно подоцна."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Кеширање визит картичка(и) во локална привремена меморија. Реалниот увоз ќе започне наскоро."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Не можеше да се увезе визит картичка."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Контакт добиен преку NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Извези контакти?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кеширање"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Се увезуваат <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Извези во датотеката .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Подреди по"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Име"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Презиме"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат на име"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Прво името"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прво презимето"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Стандардна сметка за новите контакти"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронизација на метаподатоци за контакт"</string>
-    <string name="setting_about" msgid="5253319937596745755">"За Контакти"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Поставки"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Сподели видливи контакти"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Не успеаја да се споделат видливите контакти."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Сподели ги омилените контакти"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Сподели ги сите контакти"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Не успеа да се споделат контактите."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Увези/извези контакти"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Увези контакти"</string>
-    <string name="share_error" msgid="5642622973966851784">"Овој контакт не може да се сподели."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Нема контакти за споделување."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Барај"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Пронајди контакти"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Омилени"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Нема контакти."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Нема видливи контакти."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Нема омилени"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Нема контакти во <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Исчисти чести"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Изберете SIM-картичка"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Управувај со сметки"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Увези/извези"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"од <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"на <xliff:g id="DATE">%1$s</xliff:g> од <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"запри пребарување"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Исчисти го полето за пребарување"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Опции за прикажување контакт"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Сметка"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Секогаш користи го ова за повици"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Повикајте со"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Напишете белешка да се испрати со повикот..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ИСПРАТИ И ПОВИКАЈ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Картичка <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Картичка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитана ставка. </item>
       <item quantity="other"> Картичка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитани ставки. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Верзија"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Лиценци за софтвер со отворен код"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Детали за лиценцата за софтвер со отворен код"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Политика за приватност"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Услови на користење"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Лиценци за софтвер со отворен код"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Врската не успеа да се отвори."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видеоповик"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Сподели и повикај"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ml/strings.xml b/java/com/android/contacts/common/res/values-ml/strings.xml
index 7e92749..c36226d 100644
--- a/java/com/android/contacts/common/res/values-ml/strings.xml
+++ b/java/com/android/contacts/common/res/values-ml/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"വാചകം പകർത്തി"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തുക"</string>
     <string name="call_custom" msgid="3041673234638990874">"വിളിക്കുക <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"വീട്ടിലെ ഫോണിലേക്ക് വിളിക്കുക"</string>
     <string name="call_mobile" msgid="967589404494150813">"മൊബൈലിലേക്ക് വിളിക്കുക"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ഔദ്യോഗിക പേജറിലേക്ക് വിളിക്കുക"</string>
     <string name="call_assistant" msgid="4177478845473789294">"വിളിക്കുക <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (വിളിക്കുക)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_home" msgid="3527719551060295243">"വീട്ടിലെ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ഔദ്യോഗിക പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS നമ്പറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (സന്ദേശം)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കണോ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"നിങ്ങൾ കോൺടാക്‌റ്റുകളുടെയും ഫോണിന്റെയും അപ്ലിക്കേഷനുകളിലെ പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവരുടെ ലിസ്റ്റ് മായ്‌ക്കുകയും സ്‌ക്രാച്ചിൽ നിന്നും ബന്ധപ്പെടൽ മുൻഗണനകൾ അറിയാൻ ഇമെയിൽ അപ്ലിക്കേഷനുകളെ പ്രേരിപ്പിക്കുകയും ചെയ്യും."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കുന്നു…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ലഭ്യമല്ല"</string>
     <string name="status_busy" msgid="5990832098713248503">"തിരക്കിലാണ്"</string>
     <string name="contactsList" msgid="8806067891419291513">"കോണ്ടാക്റ്റ്"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"കൂടുതൽ നിർദ്ദേശിച്ചിരിക്കുന്നവ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"മറ്റുള്ളവ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ഡയറക്‌ടറി"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ഔദ്യോഗിക ഡയറക്‌ടറി"</string>
     <string name="local_search_label" msgid="907622822323119235">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ഞാന്‍"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"തിരയുന്നു…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>-ൽ കൂടുതൽ കണ്ടെത്തി."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"കോൺടാക്റ്റുകളൊന്നുമില്ല"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> എണ്ണം കണ്ടെത്തി</item>
-      <item quantity="one">ഒരെണ്ണം കണ്ടെത്തി</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്"</string>
     <string name="missing_name" msgid="978606963362745020">"(പേരില്ല)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"പതിവായി വിളിച്ചവർ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"പതിവ് കോൺടാക്റ്റുകൾ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"കോൺടാക്റ്റ് കാണുക"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ഫോൺ നമ്പറുകളുള്ള എല്ലാ കോൺടാക്റ്റുകളും"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"ഔദ്യോഗിക പ്രൊഫൈൽ കോൺടാക്റ്റുകൾ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> എന്നതിലേക്ക് ഇമെയിൽ ചെയ്യുക"</string>
     <string name="email" msgid="2807318537887091606">"ഇമെയിൽ"</string>
     <string name="postal_street" msgid="6918171741240802474">"സ്‌ട്രീറ്റ്"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO ബോക്സ്"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"സമീപസ്ഥലം"</string>
     <string name="postal_city" msgid="8674569121430005628">"നഗരം"</string>
     <string name="postal_region" msgid="1730369286225469192">"സംസ്ഥാനം"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"തപാൽ കോഡ്"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
     <string name="chat" msgid="1020428260359370236">"ചാറ്റുചെയ്യുക"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ഇല്ലാതാക്കുക"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"പേരിന്റെ ഫീൽഡുകൾ വിപുലീകരിക്കുക അല്ലെങ്കിൽ ചുരുക്കുക"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ഫോണിറ്റിക്ക് പേരിന്റെ ഫീൽഡുകൾ വികസിപ്പിക്കുക അല്ലെങ്കിൽ ചുരുക്കുക"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="menu_done" msgid="1817505539263889535">"പൂർത്തിയായി"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"റദ്ദാക്കുക"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> എന്നതിലെ കോൺടാക്റ്റുകൾ"</string>
     <string name="listCustomView" msgid="5306282632413086731">"ഇഷ്‌ടാനുസൃതകാഴ്‌ചയിലെ കോൺടാക്റ്റ്"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"സിംഗിൾ കോൺടാക്റ്റ്"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ഇമ്പോർട്ടുചെയ്ത കോൺടാക്റ്റുകൾ ഇനിപ്പറയുന്നതിലേക്ക് സംരക്ഷിക്കുക:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"സിം കാർഡിൽ നിന്നും ഇമ്പോർട്ടുചെയ്യുക"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM-ൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM-ൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ഫയലിൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യൂ"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് ഇമ്പോർട്ടുചെയ്യുന്നത് റദ്ദാക്കണോ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് എക്‌സ്‌പോർട്ടുചെയ്യുന്നത് റദ്ദാക്കണോ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard ഡൗൺലോഡ്/അപ്‌ലോഡ് റദ്ദാക്കാനായില്ല"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"അജ്ഞാത പിശക്."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" തുറക്കാനായില്ല: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"എക്‌സ്‌പോർട്ടർ ആരംഭിക്കാനായില്ല: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"എക്‌സ്‌പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റ് ഒന്നുമില്ല."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"ആവശ്യമായ ഒരു അനുമതി നിങ്ങൾ പ്രവർത്തനരഹിതമാക്കി."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"എക്‌സ്‌പോർട്ടുചെയ്യുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ആവശ്യമായ ഫയലിന്റെ പേര് ദൈർഘ്യമേറിയതാണ് (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O പിശക്"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"ആവശ്യമായ മെമ്മറിയില്ല. ഫയൽ വളരെ വലുതായിരിക്കാം."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ഒരു അപ്രതീക്ഷിത കാരണത്താൽ vCard പാഴ്‌സുചെയ്യാനായില്ല."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ഫോർമാറ്റിനെ പിന്തുണയ്‌ക്കില്ല."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"നൽകിയിരിക്കുന്ന vCard ഫയലിന്റെ (ഫയലുകളുടെ) മീറ്റ വിവരം ശേഖരിക്കാനായില്ല."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ഒന്നോ അതിലധികമോ ഫയലുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്കുചെയ്യുക."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"കോൺടാക്റ്റുകൾ പങ്കിടാൻ ടാപ്പുചെയ്യുക."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ റദ്ദാക്കി."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്യുന്നു"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"കോൺടാക്റ്റ് ഡാറ്റ എക്സ്പോർട്ടുചെയ്യുകയാണ്."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ഡാറ്റാബേസ് വിവരം നേടാനായില്ല."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"എക്‌സ്‌പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റുകളൊന്നുമില്ല. നിങ്ങളുടെ ഫോണിൽ കോൺടാക്റ്റുകളുണ്ടെങ്കിൽ, ഫോണിൽ നിന്നും കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യാൻ ചില സേവന ദാതാക്കൾ അനുവദിക്കാനിടയില്ല."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard കമ്പോസർ ശരിയായി ആരംഭിച്ചില്ല."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"എക്‌സ്‌പോർട്ടുചെയ്യാനായില്ല"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്‌തില്ല.\nകാരണം: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> എന്നയാളെ ഇമ്പോർട്ടുചെയ്യുന്നു."</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard ഡാറ്റ വായിക്കാനായില്ല"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard ഡാറ്റ വായിക്കുന്നത് റദ്ദാക്കി"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> ഇമ്പോർട്ടുചെയ്യൽ പൂർത്തിയായി"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ഇമ്പോർട്ടുചെയ്യൽ റദ്ദാക്കി"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് ഉടൻ ഇമ്പോർട്ടുചെയ്യും."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ഈ ഫയൽ ഉടൻ ഇമ്പോർട്ടുചെയ്യും."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard ഇമ്പോർട്ടുചെയ്യൽ അഭ്യർത്ഥന നിരസിച്ചു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് ഉടൻ എക്‌സ്‌പോർട്ടുചെയ്യും."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ഫയൽ ഉടൻ എക്സ്പോർട്ടുചെയ്യും."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"കോൺടാക്റ്റുകൾ താമസിയാതെ എക്സ്പോർട്ടുചെയ്യും."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard എക്‌സ്‌പോർട്ടുചെയ്യൽ അഭ്യർത്ഥന നിരസിച്ചു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"കോൺടാക്റ്റ്"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"പ്രാദേശിക താൽക്കാലിക സംഭരണത്തിലേക്ക് vCard (vCard-കൾ) കാഷെ ചെയ്യുന്നു. യഥാർത്ഥ ഇമ്പോർട്ടുചെയ്യൽ ഉടൻ ആരംഭിക്കും."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard ഇമ്പോർട്ടുചെയ്യാനായില്ല."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC മുഖേന ലഭിച്ച കോൺടാക്റ്റ്"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യണോ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"കാഷെ ചെയ്യൽ"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ഇമ്പോർട്ടുചെയ്യുന്നു: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ഫയലിലേക്ക് എക്സ്പോർട്ട് ചെയ്യൂ"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ഇതുപ്രകാരം അടുക്കുക"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ഫസ്റ്റ് നെയിം"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ലാസ്റ്റ് നെയിം"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"പേരിന്റെ ഫോർമാറ്റ്"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ഫസ്റ്റ് നെയിം ആദ്യം"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ലാസ്റ്റ് നെയിം ആദ്യം"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"പുതുകോൺടാക്റ്റുകൾക്കുള്ള ഡിഫോൾട്ട് അക്കൗണ്ട്"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"കോൺടാക്റ്റ് മെറ്റാഡാറ്റ സമന്വയിപ്പിക്കുക"</string>
-    <string name="setting_about" msgid="5253319937596745755">"കോണ്‍ടാക്റ്റുകളെ കുറിച്ച്"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ക്രമീകരണം"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ദൃശ്യമായ കോൺടാക്റ്റുകൾ പങ്കിടുക"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ദൃശ്യമായ കോൺടാക്റ്റുകൾ പങ്കിടുന്നത് പരാജയപ്പെട്ടു."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"പ്രിയപ്പെട്ട കോൺടാക്റ്റുകൾ പങ്കിടുക"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"എല്ലാ കോൺടാക്റ്റുകളും പങ്കിടുക"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"കോൺടാക്റ്റുകൾ പങ്കിടുന്നത് പരാജയം."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"കോൺടാക്റ്റ് ഡൗൺലോഡ്/അപ്‌ലോഡ്"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string>
-    <string name="share_error" msgid="5642622973966851784">"ഈ കോൺടാക്റ്റ് പങ്കിടാനാകില്ല."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"പങ്കിടാൻ കോൺടാക്റ്റുകളൊന്നും ഇല്ല."</string>
-    <string name="menu_search" msgid="1241802591112035764">"തിരയുക"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"കോൺടാക്റ്റ് കണ്ടെത്തൂ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"പ്രിയപ്പെട്ടവർ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"കോൺടാക്റ്റുകൾ ഒന്നുമില്ല."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ദൃശ്യമായ കോൺടാക്റ്റുകളൊന്നുമില്ല."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"പ്രിയപ്പെട്ടവയൊന്നുമില്ല"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> എന്നതിൽ കോൺടാക്റ്റുകളൊന്നുമില്ല"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കൂ"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"മാനേജുചെയ്യുക"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ഡൗൺലോഡ്/അപ്‌ലോഡ്"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> വഴി"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> വഴി <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"തിരയൽ നിർത്തുക"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"തിരയൽ മായ്ക്കുക"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"കോൺടാക്‌റ്റ് ഡിസ്പ്ലേ ഓപ്ഷനുകൾ"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"അക്കൗണ്ട്"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"കോളിനൊപ്പം അയയ്ക്കുന്നതിന് ഒരു കുറിപ്പ് ടൈപ്പുചെയ്യുക ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"അയയ്‌ക്കുകയും വിളിക്കുകയും ചെയ്യുക"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ടാബ്."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ടാബ്. <xliff:g id="COUNT_3">%2$d</xliff:g> വായിക്കാത്ത ഇനങ്ങൾ. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ടാബ്. <xliff:g id="COUNT_1">%2$d</xliff:g> വായിക്കാത്ത ഇനം. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ബിൽഡ് പതിപ്പ്"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസ്"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയറിനായുള്ള ലൈസൻസ് വിശദാംശങ്ങൾ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"സ്വകാര്യതാ നയം"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"സേവന നിബന്ധനകൾ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസ്"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url തുറക്കാനായില്ല."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"വീഡിയോ കോള്‍"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-mn/strings.xml b/java/com/android/contacts/common/res/values-mn/strings.xml
index f0a8c92..b91b9a9 100644
--- a/java/com/android/contacts/common/res/values-mn/strings.xml
+++ b/java/com/android/contacts/common/res/values-mn/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текст хуулагдав"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Түр санах ойд хуулах"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> руу залгах"</string>
     <string name="call_home" msgid="125893483593803791">"Гэрийн утас руу залгах"</string>
     <string name="call_mobile" msgid="967589404494150813">"Гар утас руу залгах"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ажлын пейжер рүү залгах"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> руу залгах"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS рүү залгах"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Залгах)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> руу зурвас илгээх"</string>
     <string name="sms_home" msgid="3527719551060295243">"Гэрийн утас руу зурвас илгээх"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Гар утас руу зурвас илгээх"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Ажлын пейжэр рүү зурвас илгээх"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> руу зурвас бичих"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS руу зурвас илгээх"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Зурвас илгээх)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Та холбоо барих хэсэг болон утасны програмд байгаа тогтмол холбоо баридаг хаягуудыг устгах ба имэйл програмуудыг таны холбоо барих хаягуудыг эрэмбэлэх үйлдлийг идэвхжүүлэх болно."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгаж байна…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Холдсон"</string>
     <string name="status_busy" msgid="5990832098713248503">"Завгүй"</string>
     <string name="contactsList" msgid="8806067891419291513">"Харилцагчид"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Санал болгосон шилдэг"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Бусад"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директор"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Ажлын лавлагаа"</string>
     <string name="local_search_label" msgid="907622822323119235">"Бүх харилцагчид"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Санал болголт"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Би"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Хайж байна..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>-с олон олдлоо."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Харилцагч байхгүй"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> олдсон</item>
-      <item quantity="one">1 олдсон</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g>-тай шууд холбогдох"</string>
     <string name="missing_name" msgid="978606963362745020">"(нэр байхгүй)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Байнга залгасан"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Байнга холбоо барьдаг"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Харилцагчийг харах"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Утасны дугаартай бүх харилцагчид"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Ажлын профайлын харилцагч"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> рүү имэйлдэх"</string>
     <string name="email" msgid="2807318537887091606">"Имэйлдэх"</string>
     <string name="postal_street" msgid="6918171741240802474">"Гудамж"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"ШХ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Хөрш"</string>
     <string name="postal_city" msgid="8674569121430005628">"Хот"</string>
     <string name="postal_region" msgid="1730369286225469192">"Муж улс"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Зип код"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ ашиглан чатлах"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber ашиглан чатлах"</string>
     <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"устгах"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Нэрийн талбаруудыг дэлгэх буюу хумих"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Нэр галиглах талбарыг дэлгэх болон хумих"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Бүх харилцагч"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Дууссан"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Цуцлах"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> доторх харилцагчид"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Хувийн тохиргоотой харагдац дахь харилцагчид"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Ганц харилцагч"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Импортолсон харилцагчийн хаягийг хадгалах:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM картаас импортлох"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>-с импортлох"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>-с импортлох"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf файлаас импортлох"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g>-г импорт хийхийг цуцлах уу?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийхийг цуцлах уу?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard импорт/экспорт хийхийг цуцлаж чадсангүй"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Тодорхойгүй алдаа."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\"-г нээж чадсангүй: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Экспорт хийгчийг эхлүүлж чадсангүй: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Экспорт хийж болох харилцагч байхгүй."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Та шаардлагатай зөвшөөрлийг идэвхгүй болгосон байна."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Экспорт хийх явцад алдаа гарсан: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Шаардагдах файлын нэр хэт урт (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O алдаа"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Санах ой хүрэхгүй байна. Файл хэт том байж магадгүй."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Тодорхойгүй шалтгаанаар vCard-г задлаж чадсангүй."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Формат нь дэмжигдэхгүй байна."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Өгөгдсөн vCard файлын мета мэдээллийг цуглуулж чадсангүй."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Нэг буюу хэд хэдэн файлыг импорт хийж чадсангүй (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийж дууссан."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Харилцагчийн жагсаалтыг экспортолж дууслаа."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Харилцагчдыг экспортолж дууссан. Харилцагчдыг хуваалцахын тулд мэдэгдлийг дарна уу."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Харилцагчдыг хуваалцахын тулд дарна уу."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийхийг цуцлав."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Харилцагчийн өгөгдлийг экспорт хийж байна"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Харилцагчийн датаг экспортолсон."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Өгөгдлийн сангийн мэдээллийг авч чадсангүй"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Экспорт хийж болох харилцагчид алга байна. Хэрэв та төхөөрөмжиндөө харилцагчидтай байгаа бол зарим дата нийлүүлэгчээс харилцагчдын мэдээллийг төхөөрөмжөөс экспорт хийхийг зөвшөөрөхгүй байж магадгүй."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard бичигч зохих ёсоор эхэлсэнгүй."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Экспорт хийж чадсангүй"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Харилцагчийн өгөгдлийг экспорт хийсэнгүй.\nШалтгаан: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>-г импорт хийж байна"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard өгөгдлийг уншиж чадсангүй"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard өгөгдөл уншихыг цуцлав"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> -г импорт хийж дууссан"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>-г импорт хийхийг цуцлав"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g>-г удахгүй импортлох болно."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файлыг удахгүй импортлох болно."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard импортлох хүсэлтийг зөвшөөрсөнгүй. Дараа дахин оролдоно уу."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g>-г удахгүй экспорт хийх болно."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Энэ файлыг удахгүй экспортлох болно."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Харилцагчдыг удахгүй экспортлох болно."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard экспорт хийх хүсэлтийг зөвшөөрсөнгүй. Дараа дахин оролдоно уу."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"харилцагч"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard-г дотоод түр санд кеш хийж байна. Удахгүй бодитоор импорт хийж эхлэх болно."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard-г импорт хийж чадсангүй."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC-р хүлээн авсан харилцагч"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Харилцагчдыг экспорт хийх үү?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кеш хийж байна"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>-г импортолж байна: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf файл болгож экспортлох"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Эрэмбэлэх"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Өөрийн нэр"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Овог"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Нэрийн формат"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Нэрийг эхэнд нь"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Овгийг эхэнд нь"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Шинэ харилцагчийн өгөгдмөл бүртгэл"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Харилцагчдын мета-өгөгдлийг синк хийх"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Харилцагчийн хаягийн тухай"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Тохиргоо"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Харагдах харилцагчдыг хуваалцах"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Харагдаж байгаа харилцагчийн хаягийг хуваалцаж чадсангүй."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Дуртай харилцагчдаа хуваалцах"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Бүх харилцагчдыг хуваалцах"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Харилцагчдыг хуваалцаж чадсангүй."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Харилцагчид импортлох/экспортлох"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Харилцагчид импортлох"</string>
-    <string name="share_error" msgid="5642622973966851784">"Энэ харилцагчийг хуваалцах боломжгүй."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Хуваалцах харилцагчийн жагсаалт алга."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Хайлт"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Харилцагч хайх"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Дуртай"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Харилцагч байхгүй."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Харагдах харилцагчид байхгүй."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Дуртай зүйл алга"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> дотор харилцагчид байхгүй"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Байнга харилцсаныг арилгах"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM карт сонгоно уу"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Бүртгэлийг удирдах"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Импорт/экспорт"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g>-р"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g>-н <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"хайлтыг зогсоох"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Хайлтыг цэвэрлэх"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Харилцагчийн харагдах сонголт"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Бүртгэл"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Залгах"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Дуудлаганд илгээх тэмдэглэл бичнэ үү..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ИЛГЭЭХ, ДУУДЛАГА"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> таб."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> таб. <xliff:g id="COUNT_3">%2$d</xliff:g> уншаагүй зүйл. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> таб. <xliff:g id="COUNT_1">%2$d</xliff:g> уншаагүй зүйл. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Боловсруулсан хувилбар"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Нээлттэй Эхийн Лиценз"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Нээлттэй эхийн програм хангамжийн лицензийн мэдээлэл"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Нууцлалын Бодлого"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Үйлчилгээний нөхцөл"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Нээлттэй эхийн лиценз"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URL-г нээж чадсангүй."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видео дуудлага"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Хуваалцаад залгах"</string>
 </resources>
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 96504c7..a0172e6 100644
--- a/java/com/android/contacts/common/res/values-mr/strings.xml
+++ b/java/com/android/contacts/common/res/values-mr/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"मजकूर कॉपी केला"</string>
-    <string name="copy_text" msgid="5890820280087874642">"क्लिपबोर्डवर कॉपी करा"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ला कॉल  करा"</string>
     <string name="call_home" msgid="125893483593803791">"निवासस्‍थानी कॉल करा"</string>
     <string name="call_mobile" msgid="967589404494150813">"मोबाईलवर कॉल करा"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"कार्यस्‍थानी पेजरवर कॉल करा"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ला कॉल  करा"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS वर कॉल करा"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (कॉल करा)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> मजकूर पाठवा"</string>
     <string name="sms_home" msgid="3527719551060295243">"निवासस्थानी मजकूर पाठवा"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"मोबाईलवर मजकूर पाठवा"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"कार्य पेजरवर मजकूर पाठवा"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> मजकूर पाठवा"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS वर मजकूर पाठवा"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (संदेश पाठवा)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"वारंवार सपर्क साधलेले साफ करायचे?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"आपण संपर्क आणि फोन अ‍ॅप्‍स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अ‍ॅप्‍सना सुरवातीपासून आपली पत्ता प्राधान्‍ये जाणून घेण्‍याची सक्ती कराल."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"वारंवार सपर्क साधलेले साफ करीत आहे..."</string>
@@ -70,35 +67,27 @@
     <string name="status_away" msgid="2298688367552893953">"दूर आहे"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"सुचविलेले उत्कृष्ट"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"इतर"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सर्व संपर्क"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सूचना"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मी"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"शोधत आहे..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> पेक्षा जास्त आढळले."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"कोणतेही संपर्क नाहीत"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> सापडला</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> सापडले</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> साठी द्रुत संपर्क"</string>
     <string name="missing_name" msgid="978606963362745020">"(नाव नाही)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"वारंवार कॉल केलेले"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"वारंवार संपर्क केलेले"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"संपर्क पहा"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"फोन नंबरसह सर्व संपर्क"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफाईल संपर्क"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"अद्यतने पहा"</string>
-    <string name="account_phone" msgid="7067809073194061035">"केवळ डिव्हाइस, संकालित न केलेला"</string>
+    <string name="view_updates_from_group" msgid="9011641093168385729">"अपडेट पहा"</string>
+    <string name="account_phone" msgid="7067809073194061035">"केवळ डीव्हाइस, संकालित न केलेला"</string>
     <string name="nameLabelsGroup" msgid="7730465833159557471">"नाव"</string>
     <string name="nicknameLabelsGroup" msgid="6310556912361840029">"टोपणनाव"</string>
     <string name="full_name" msgid="648186563998465740">"नाव"</string>
     <string name="name_given" msgid="5096576006314820536">"नाव"</string>
     <string name="name_family" msgid="6646235805198547467">"आडनाव"</string>
-    <string name="name_prefix" msgid="9215326539658838">"नाव प्रत्यय"</string>
+    <string name="name_prefix" msgid="9215326539658838">"नाव उपसर्ग"</string>
     <string name="name_middle" msgid="703755205331582769">"मधले नाव"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"नाव प्रत्यय"</string>
+    <string name="name_suffix" msgid="5777083390282548702">"नाव उपसर्ग"</string>
     <string name="name_phonetic" msgid="1650870996361663089">"ध्वन्यात्मक नाव"</string>
     <string name="name_phonetic_given" msgid="618812334274603170">"ध्वन्यात्मक नाव"</string>
     <string name="name_phonetic_middle" msgid="4826820763384625538">"ध्वन्यात्मक मधले नाव"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> वर ईमेल करा"</string>
     <string name="email" msgid="2807318537887091606">"ईमेल"</string>
     <string name="postal_street" msgid="6918171741240802474">"मार्ग"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO बॉक्स"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"अतिपरिचित क्षेत्र"</string>
     <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
     <string name="postal_region" msgid="1730369286225469192">"राज्य"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"पिनकोड"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ चा वापर करून चॅट करा"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber चा वापर करून चॅट करा"</string>
     <string name="chat" msgid="1020428260359370236">"चॅट करा"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"हटवा"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"नाव फील्‍ड विस्‍तृत करा किंवा संकुचित करा"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ध्वन्यात्मक नाव फील्ड विस्तृत करा किंवा संकुचित करा"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"सर्व संपर्क"</string>
-    <string name="menu_done" msgid="1817505539263889535">"पूर्ण झाले"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"रद्द करा"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> मधील संपर्क"</string>
     <string name="listCustomView" msgid="5306282632413086731">"सानुकूल दृश्यामधील संपर्क"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"एकल संपर्क"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"आयात केलेले संपर्क यावर जतन करा:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"सिमकार्डवरुन आयात करा"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM वरून आयात करा"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM वरून आयात करा"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf फाईल वरून आयात करा"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> चे आयात रद्द करायचे?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> चे निर्यात रद्द करायचे?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard आयात/निर्यात रद्द करू शकलो नाही"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"अज्ञात त्रुटी."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" उघडू शकलो नाही: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"निर्यातकर्ता प्रारंभ करू शकला नाही: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"कोणताही निर्यात करण्‍यायोग्‍य संपर्क नाही."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"आपण आवश्‍यक असलेली एक परवानगी अक्षम केली आहे."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"निर्यात दरम्‍यान त्रुटी आली: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"आवश्‍यक फाईल नाव (\"<xliff:g id="FILENAME">%s</xliff:g>\") खूप मोठे आहे."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O त्रुटी"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"पुरेशी मेमरी नाही. फाईल कदाचित खूप मोठी असू शकते."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"अनपेक्षित कारणासाठी vCard विश्लेषण करू शकलो नाही."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"स्वरूपन समर्थित नाही."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"दिलेल्‍या vCard फाईल(यली) ची मेटा माहिती संकलित करू शकलो नाही."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"एक किंवा अधिक फायली आयात केल्‍या जाऊ शकत नाहीत(%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे समाप्त झाले."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"संपर्क आयात करणे समाप्त झाले"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"संपर्क निर्यात करणे समाप्त झाले, संपर्क सामायिक करण्यासाठी सूचनेवर क्लिक करा."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"संपर्क सामायिक करण्यासाठी टॅप करा."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे रद्द केले."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"संपर्क डेटा निर्यात करीत आहे"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"संपर्क डेटा निर्यात केला जात आहे."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"डेटाबेस माहिती मिळवू शकलो नाही."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"निर्यात करण्‍यायोग्‍य कोणतेही संपर्क नाहीत. आपल्‍या डिव्हाइसवर आपल्याकडे संपर्क असल्‍यास, काही डेटा प्रदाते डिव्हाइस मधून संपर्क निर्यात करण्‍यास कदाचित अनुमती देणार नाहीत."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard रचनाकाराने योग्‍यरित्‍या प्रारंभ केला नाही."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"निर्यात करू शकलो नाही"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"संपर्क डेटा निर्यात केला नाही.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> आयात करीत आहे"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard डेटा वाचू शकलो नाही"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard डेटा वाचणे रद्द केले"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> आयात करणे समाप्त झाले"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> आयात करणे रद्द झाले"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> लवकरच आयात केली जाईल."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"फाईल लवकरच आयात केली जाईल."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard आयात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> लवकरच निर्यात केली जाईल."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"फाईल लवकरच निर्यात केली जाईल."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"संपर्क लवकरच निर्यात केले जातील."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard निर्यात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"संपर्क"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅश   करीत आहे. वास्‍तविक आयात लवकरच प्रारंभ होईल."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard आयात करू शकलो नाही."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC वरील संपर्काचे पुनरावलोकन केले"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"संपर्क निर्यात करायचे?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"कॅश   करीत आहे"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"आयात करत आहे <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf फाईलवर निर्यात करा"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"नुसार क्रमवारी लावा"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाव"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"आडनाव"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"नाव स्वरूपन"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाव प्रथम"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"आडनाव प्रथम"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"नवीन संपर्कांसाठी डीफॉल्ट खाते"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"संपर्क मेटाडेटा संकालित करा"</string>
-    <string name="setting_about" msgid="5253319937596745755">"संपर्कांबद्दल"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"सेटिंग्ज"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"दृश्यमान संपर्क सामायिक करा"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"दृश्यमान संपर्क सामायिक करण्‍यात अयशस्वी झाले."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"आवडते संपर्क सामायिक करा"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"सर्व संपर्क सामायिक करा"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"संपर्क सामायिक करण्यात अयशस्वी झाले."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"संपर्क आयात/निर्यात करा"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"संपर्क आयात करा"</string>
-    <string name="share_error" msgid="5642622973966851784">"हा संपर्क सामायिक केला जाऊ शकत नाही."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"सामायिक करण्यासाठी कोणतेही संपर्क नाहीत."</string>
-    <string name="menu_search" msgid="1241802591112035764">"शोधा"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"संपर्क शोधा"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"आवडते"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"कोणतेही संपर्क नाहीत."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"कोणतेही दृश्यमान संपर्क नाहीत."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"कोणतेही मनपसंत नाही"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> मध्ये कोणतेही सपंर्क नाहीत"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"वारंवारता साफ करा"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"सिम कार्ड निवडा"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"खाती व्यवस्थापित करा"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"आयात/निर्यात"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> द्वारे"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> द्वारे <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"शोध थांबवा"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"शोध साफ करा"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"संपर्क प्रदर्शन पर्याय"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"खाते"</string>
     <string name="set_default_account" msgid="7966099951006467572">"कॉलसाठी हे नेहमी वापरा"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"यासह कॉल करा"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"कॉलसह पाठविण्‍यासाठी एक टीप टाइप करा..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"पाठवा आणि कॉल करा"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> टॅब."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> टॅब. <xliff:g id="COUNT_3">%2$d</xliff:g> न वाचलेला आयटम. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> टॅब. <xliff:g id="COUNT_3">%2$d</xliff:g> न वाचलेले आयटम. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"बिल्ड आवृत्ती"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"मुक्त स्त्रोत परवाने"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"मुक्त स्त्रोत सॉफ्टवेअरसाठी परवाना तपशील"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"गोपनीयता धोरण"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"सेवा अटी"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"मुक्त स्त्रोत परवाने"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url उघडण्यात अयशस्वी झाले."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"व्हिडिओ कॉल"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"सामायिक करा आणि कॉल करा"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ms/strings.xml b/java/com/android/contacts/common/res/values-ms/strings.xml
index 60d2b7a..5616c09 100644
--- a/java/com/android/contacts/common/res/values-ms/strings.xml
+++ b/java/com/android/contacts/common/res/values-ms/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teks disalin"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Salin ke papan keratan"</string>
     <string name="call_custom" msgid="3041673234638990874">"Panggil <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Panggil nombor rumah"</string>
     <string name="call_mobile" msgid="967589404494150813">"Panggil nombor mudah alih"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Panggil alat kelui tempat kerja"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Panggil <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Panggil MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Panggil)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS rumah"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS telefon mudah alih"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS alat kelui tempat kerja"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS nombor MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Hantar mesej)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Padam bersih senarai kerap dihubungi?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Anda akan mengosongkan senarai yang kerap dihubungi dalam apl Kenalan dan Telefon serta memaksa apl e-mel untuk mempelajari pilihan alamat anda dari awal."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Memadam bersih senarai kerap dihubungi..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Tiada"</string>
     <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kenalan"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Teratas Dicadangkan"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Lain-lain"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
     <string name="local_search_label" msgid="907622822323119235">"Semua kenalan"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Cadangan"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Mencari..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"lebih daripada <xliff:g id="COUNT">%d</xliff:g> ditemui"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Tiada kenalan"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ditemui</item>
-      <item quantity="one">1 ditemui</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Kenalan pantas untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Tiada nama)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Kerap dipanggil"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Kerap dihubungi"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Lihat kenalan"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Semua kenalan dengan nombor telefon"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kenalan profil kerja"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-mel <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-mel"</string>
     <string name="postal_street" msgid="6918171741240802474">"Jalan"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Peti surat"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Kawasan kejiranan"</string>
     <string name="postal_city" msgid="8674569121430005628">"Bandar"</string>
     <string name="postal_region" msgid="1730369286225469192">"Negeri"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poskod"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Sembang menggunakan ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Sembang menggunakan Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Sembang"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"padam"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Kembangkan atau runtuhkan medan nama"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Kembangkan atau runtuhkan medan nama fonetik"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Semua kenalan"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Selesai"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Batal"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kenalan dalam <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kenalan dalam paparan tersuai"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Kenalan tunggal"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Simpan kenalan yang diimport ke:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Import daripada kad SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Import dari SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Import dari SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Import daripada fail .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Batalkan import <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Batalkan eksport <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Tidak dapat membatalkan import/eksport vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Ralat tidak diketahui."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Tidak dapat memulakan pengeksport: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Tiada kenalan yang dapat dieksport."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Anda telah melumpuhkan kebenaran yang diperlukan."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ralat berlaku semasa eksport: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Nama fail yang diperlukan terlalu panjang (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Ralat I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Tidak cukup memori. Fail itu mungkin terlalu besar."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Tidak dapat menghurai vCard atas sebab-sebab yang tidak dijangka."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format tidak disokong."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Tidak dapat mengumpul maklumat meta fail Vcard yang dinyatakan."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Satu atau lebih fail tidak dapat diimport (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Selesai mengeksport <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Selesai mengeksport kenalan."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Selesai mengeksport kenalan, klik pemberitahuan untuk berkongsi kenalan."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Ketik untuk berkongsi kenalan."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Mengeksport <xliff:g id="FILENAME">%s</xliff:g> dibatalkan."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Mengeksport data kenalan"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Data kenalan sedang dieksport."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Tidak boleh mendapatkan maklumat pangkalan data."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Tiada kenalan yang boleh dieksport. Jika anda mempunyai kenalan pada peranti anda, sesetengah penyedia data mungkin tidak membenarkan kenalan dieksport daripada peranti."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Komposer vCard tidak bermula dengan betul."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Tidak dapat mengeksport"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Data kenalan tidak dieksport.\nAlasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Mengimport <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Tidak dapat membaca data vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Membaca data vCard dibatalkan"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Selesai mengimport vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Pengimportan <xliff:g id="FILENAME">%s</xliff:g> dibatalkan"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> akan diimport sebentar lagi."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fail akan diimport sebentar lagi."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Permintaan import vCard telah ditolak. Cuba lagi nanti."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g>akan dieksport sebentar lagi."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fail akan dieksport sebentar lagi."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kenalan akan dieksport sebentar lagi."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Permintaan eksport vCard telah ditolak. Cuba lagi nanti."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kenalan"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Membuat cache vCard ke storan sementara setempat. Pengimportan sebenar akan bermula tidak lama lagi."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Tidak dapat mengimport vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Diterima dr NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Eksport kenalan?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Mengcache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Mengimport <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksport ke fail .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Isih mengikut"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nama pertama"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nama keluarga"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format nama"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nama pertama dahulu"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nama keluarga dahulu"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Akaun lalai untuk kenalan baharu"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Segerakkan metadata kenalan"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Perihal Kenalan"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Tetapan"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Kongsi kenalan yang kelihatan"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Gagal berkongsi kenalan yang kelihatan"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Kongsi kenalan kegemaran"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Kongsi semua kenalan"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Gagal berkongsi kenalan."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Import/eksport kenalan"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Import kenalan"</string>
-    <string name="share_error" msgid="5642622973966851784">"Kenalan ini tidak boleh dikongsi."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Tiada kenalan untuk dikongsi."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Carian"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Cari kenalan"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Kegemaran"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Tiada kenalan."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Tiada kenalan yang dapat dilihat."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Tiada kegemaran"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Tiada kenalan dalam <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Padam bersih kerap dihubungi"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Pilih kad SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Urus akaun"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import/eksport"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"melalui <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> melalui <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"berhenti mencari"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Kosongkan carian"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Pilihan paparan kenalan"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Akaun"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Sentiasa gunakan ini untuk panggilan"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Panggil dengan"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Taip nota untuk dihantar dengan panggilan…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"HANTAR &amp; PANGGIL"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> item belum dibaca. </item>
       <item quantity="one">Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item belum dibaca. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versi binaan"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Lesen sumber terbuka"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Butiran lesen untuk perisian sumber terbuka"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Dasar privasi"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Syarat perkhidmatan"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Lesen sumber terbuka"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Gagal membuka url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Panggilan video"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Kongsi dan panggil"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-my/strings.xml b/java/com/android/contacts/common/res/values-my/strings.xml
index d81e895..007c147 100644
--- a/java/com/android/contacts/common/res/values-my/strings.xml
+++ b/java/com/android/contacts/common/res/values-my/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"စာသားကူးယူပြီး"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ခဏကူးယူထားပါ"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="call_home" msgid="125893483593803791">"အိမ်ကိုခေါ်ပါ"</string>
     <string name="call_mobile" msgid="967589404494150813">"မိုဘိုင်းကိုခေါ်ပါ"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"အလုပ်ပေဂျာကိုခေါ်ပါ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS ကိုခေါ်ပါ"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ခေါ်ပါ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> သို့ စာပို့ပါ"</string>
     <string name="sms_home" msgid="3527719551060295243">"အိမ်သို့ စာပို့ပါ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"မိုဘိုင်းသို့ စာပို့ပါ"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"အလုပ်ပေ့ဂျာသို့ စာပို့ပါ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>ထံ စာပို့ပါ"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (မက်ဆေ့ဂ်ျပို့ပါ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"အသုံးများသောလိပ်စာများရှင်းပစ်မလား?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"အသုံးများသော အဆက်အသွယ်စာရင်းအား Contacts နှင့် Phone app များမှ သင် ရှင်းလင်းပစ်မှာဖြစ်ပြီး၊ အီးမေးလ် app များအား သင့်နှစ်သက်ရာ ​ပ​ြောဆိုဆက်ဆံမှုပုံစံကို အစမှပြန်လည် လေ့လာခိုင်းမည်။"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"အသုံးများသောလိပ်စာများ ရှင်းလင်းနေစဉ်"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"အဝေးရောက်နေပါသည်"</string>
     <string name="status_busy" msgid="5990832098713248503">"အလုပ်များနေသည်"</string>
     <string name="contactsList" msgid="8806067891419291513">"အဆက်အသွယ်များ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ထိပ်တန်း အကြံပြုထားပါသည်"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"တစ်ခြား"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"လမ်းညွှန်"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"အလုပ်လမ်းညွှန်"</string>
     <string name="local_search_label" msgid="907622822323119235">"လိပ်စာများအားလုံး"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"အကြံပြုချက်များ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ကျွန်ုပ်"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"ရှာဖွေနေသည်…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ထက်ပိုတွေ့ရှိသည်"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"အဆက်အသွယ်များမရှိပါ"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ခု တွေ့ပါသည်</item>
-      <item quantity="one">၁ ခု တွေ့ပါသည်</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> အတွက် အမြန်ဆက်သွယ်လိပ်စာ"</string>
     <string name="missing_name" msgid="978606963362745020">"(အမည်မရှိ)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"မကြာခဏခေါ်ရန်သူများ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"မကြာခဏဆက်သွယ်ရန်သူများ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"အဆက်အသွယ်ကိုကြည့်ရန်"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ဖုန်းနံပါတ်ပါသော လိပ်စာများအားလုံး"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"အလုပ်ပရိုဖိုင် အဆက်အသွယ်များ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"အီးမေးလ် <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"အီးမေးလ်"</string>
     <string name="postal_street" msgid="6918171741240802474">"လမ်း"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"စာတိုက်သေတ္တာ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ပတ်ဝန်းကျင်"</string>
     <string name="postal_city" msgid="8674569121430005628">"မြို့"</string>
     <string name="postal_region" msgid="1730369286225469192">"ပြည်နယ်"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"စာပို့သင်္ကေတ"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabberသုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
     <string name="chat" msgid="1020428260359370236">"ချက်တင်းပြောသည်"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ဖျက်သည်"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"နာမည်အကွက်များအား ဖြန့်ချ သို့မဟုတ် လိပ်တင်ပါ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"အသံထွက်ဆိုင်ရာ အကွက်များကို တိုးချဲ့ သို့မဟုတ် ခေါက်သိမ်းပါ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ဆက်သွယ်အားလုံး"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ပြီးပါပြီ"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"မလုပ်တော့ပါ"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ထဲမှ အဆက်အသွယ်များ"</string>
     <string name="listCustomView" msgid="5306282632413086731">"မိမိစိတ်ကြိုက် မြင်ကွင်းမှ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"အဆက်အသွယ်တစ်ခုတည်း"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"သွင်းထားသည့် အဆက်အသွယ်များကို သိမ်းဆည်းရန် −"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"ဆင်းမ်ကဒ်ထဲမှ အထဲသို့သွင်းရန်"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"ဆင်းမ်ကဒ်မှ သွင်းယူရန် <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"ဆင်းမ်ကဒ်မှ သွင်းယူရန် <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ဖိုင်မှသွင်းမည်"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> ကို အထဲသို့သွင်းခြင်းအား ရပ်တန့်မလား?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> ကိုအပြင်သို့ထုတ်ခြင်းအား ရပ်တန့်မလား?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"လိပ်စာကဒ် အသွင်း၊အထုတ်ကို ရပ်၍မရပါ"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"အမည်မသိသော မှားယွင်းမှု"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ကို ဖွင့်၍မရပါ - <xliff:g id="EXACT_REASON">%s</xliff:g>။"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"အပြင်ထုတ်သောစနစ်အား စတင်လို့မရပါ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"အပြင်သို့ထုတ်ယူရနိုင်သော အဆက်အသွယ်မရှိပါ"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"လိုအပ်သည့် ခွင့်ပြုချက်ကို သင်ပိတ်လိုက်သည်။"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"အပြင်ထုတ်နေစဉ် အမှားပေါ်ပါသည်: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"လိုအပ်သောဖိုင်နာမည် အလွန်ရှည်နေပါသည် (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O အမှား"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"လုံလောက်သော မှတ်ဉာဏ်မရှိပါ။ ဖိုင်အရမ်းကြီးနေတာ ဖြစ်နိုင်ပါသည်"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"လိပ်စာကဒ်အား အမျိုးအမည်မသိအမှားကြောင့် ဖတ်လို့မရပါ"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ပံ့ပိုးမှုပေးနိုင်သော ပုံစံမဟုတ်ပါ"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ဖော်ပြပါ လိပ်စာကဒ်ဖိုင်(များ)၏ အချက်အလက်များအား စုဆောင်းလို့မရပါ"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ဖိုင်တစ်ခု သို့မဟုတ် တစ်ခုထက်ပိုသော ဖိုင်များအား အထဲသို့သွင်းလို့မရပါ(%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> ကို အပြင်ထုတ်ခြင်းပြီးစီးပါပြီး"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"အဆက်အသွယ်များ တင်ပို့ခြင်း ပြီးပါပြီ။"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"အဆက်အသွယ်များကို တင်ပို့ပြီးပါပြီ၊ အဆက်အသွယ်များကို မျှဝေရန် အကြောင်းကြားချက်ကိုနှိပ်ပါ။"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"အဆက်အသွယ်များကို မျှဝေရန် နှိပ်ပါ။"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> ကို အပြင်ထုတ်ခြင်းအား ပယ်ဖျက်ပြီး"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"အဆက်အသွယ်ဒေတာများအား အပြင်သို့ထုတ်နေစဉ်"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"အဆက်အသွယ်အချက်အလက်ကို တင်ပို့နေသည်။"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ဒေတာဘေ့စ်အချက်အလက်အား မရရှိနိုင်ပါ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"တင်ပို့နိုင်သောအဆက်အသွယ် မရှိပါ။ သင့်ကိရိယာတွင် အဆက်အသွယ်များရှိပါက ဒေတာဝန်ဆောင်မှုအချို့က အဆက်အသွယ်များကို ကိရိယာမှ တင်ပို့ခွင့်မပေးခြင်းမျိုး ဖြစ်နိုင်ပါသည်။"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"လိပ်စာကဒ်ပြုလုပ်သောစန် ကောင်းမွန်စာ မစတင်ပါ"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"အပြင်ထုတ်လို့မရပါ"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"အဆက်အသွယ် အချက်အလက်ကို \nအကြောင်းပြချက်ကြောင့် မထုတ်နိုင်ပါ။  \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> အား အထဲသွင်းစဉ်"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"လိပ်စာကဒ်ဒေတာအား ဖတ်မရပါ"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"လိပ်စာကဒ်ဒေတာဖတ်ခြင်းအား ရပ်တန့်ပြီး"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> လိပ်စာကဒ် အထဲသွင်းခြင်း ပြီးပါပြီ"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> အားအထဲသွင်းခြင်း ရပ်ဆိုင်းပြီး"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ကို မကြာမှီ အထဲသို့ သွင်းပါမည်"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ဖိုင်အား မကြာမှီ အထဲသို့ သွင်းပါမည်"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"လိပ်စာကဒ်အား အထဲသွင်းရန် တောင်းဆိုမှု ငြင်းဆန်ခံရပါသည်။ နောင်မှ ပြန်လည်ကြိုးစားပါ"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ကို မကြာမီ အပြင်သို့ ထုတ်ပါမည်"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ဖိုင်အား မကြာမီ တင်ပို့ပါလိမ့်မည်။"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"အဆက်အသွယ်များကို မကြာမီ တင်ပို့သွားပါမည်။"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"လိပ်စာကဒ်အား အပြင်ထုတ်ရန် တောင်းဆိုမှု ငြင်းဆန်ခံရပါသည်။ နောင်မှ ပြန်လည်ကြိုးစားပါ"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"အဆက်အသွယ်"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"လိပ်စာကဒ်(များ)ကို စက်တွင်း ခဏသိမ်းဆည်းရာနေရာသို့ ပို့နေပါသည်။ အမှန်တကယ် တင်သွင်းခြင်း မကြာခင် စပါမည်။"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"လိပ်စာကဒ်အား အထဲသွင်းလို့မရပါ"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFCမှရသောလိပ်စာ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"လိပ်စာများအပြင်သို့ထုတ်မလား?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ယာယီသိမ်းထားခြင်း"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ကို သွင်းနေသည် - <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ဖိုင်သို့ထုတ်မည်"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ဖြင့် စီပေးရန်"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ပထမ အမည်"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"နောက်ဆုံး အမည်"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"အမည် ချထားပုံစံ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ပထမ အမည် ဦးစွာ"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"နောက်ဆုံး အမည် ဦးစွာ"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"အဆက်အသွယ် အသစ်များအတွက် မူရင်း အကောင့်"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"အဆက်အသွယ် မက်တာဒေတာကို စင့်ခ်လုပ်ပါ"</string>
-    <string name="setting_about" msgid="5253319937596745755">"အဆက်အသွယ်များ အကြောင်း"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"အပြင်အဆင်များ"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"မြင်နိုင်သော အဆက်အသွယ်များအား မျှဝေပါ"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"မြင်သာသော အဆက်အသွယ်တွေကိုဝေမျှခြင်းမပြုနိုင်ခဲ့ပါ။"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"အကြိုက်ဆုံးအဆက်အသွယ်များကို မျှဝေပါ"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"အဆက်အသွယ်များအားလုံးကို မျှဝေပါ"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"အဆက်အသွယ်များကို မျှဝေခြင်းမအောင်မြင်ပါ။"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"အဆက်အသွယ်များ သွင်းယူ၊ ထုတ်ယူရန်"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"အဆက်အသွယ်များ သွင်းပါ"</string>
-    <string name="share_error" msgid="5642622973966851784">"ဒီလိပ်စာအား မျှဝေလို့ မရပါ"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"မျှဝေရန် အဆက်အသွယ်များမရှိပါ။"</string>
-    <string name="menu_search" msgid="1241802591112035764">"ရှာဖွေရန်"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"အဆက်အသွယ်များရှာပါ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"အနှစ်သက်ဆုံးများ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"အဆက်အသွယ်များမရှိပါ။"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"မြင်နိုင်သော အဆက်အသွယ်မရှိပါ"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"အနှစ်သက်ဆုံး မရှိပါ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> ထဲတွင် အဆက်အသွယ်မရှိပါ"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"မကြာခဏအရာများအား ဖယ်ရှားရန်"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"အကောင့်များကို စီမံကွပ်ကဲရန်"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"သွင်းယူ၊ ထုတ်ယူခြင်း"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတဆင့်"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> မှတဆင့် <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ရှာဖွေမှုကို ရပ်ရန်"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ရှာဖွေမှုကို ရှင်းပါ"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"အဆက်အသွယ် ပြသမှု ရွေးစရာများ"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"အကောင့်"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ဖြင့် ခေါ်ဆိုရန်"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ခေါ်ဆိုမှုဖြင့် ပေးပို့ရန် မှတ်စုတစ်ခု ရိုက်ပါ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ပေးပို့ပြီး ခေါ်ပါ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> တဘ်။"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> တဘ်။ မဖတ်ရသေးသည့် အရာ <xliff:g id="COUNT_3">%2$d</xliff:g> ခု။ </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> တဘ်။ မဖတ်ရသေးသည့် အရာ <xliff:g id="COUNT_1">%2$d</xliff:g> ခု။ </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"တည်ဆောက်မှု ဗားရှင်း"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"အခမဲ့ ရင်းမြစ် လိုင်စင်များ"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"အခမဲ့  ဆော့ဝဲအတွက် လိုင်စင် အသေးစိတ်များ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"ပုဂ္ဂိုလ်ရေးဆိုင်ရာ မူဝါဒ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"ဝန်ဆောင်မှုဆိုင်ရာ စည်းမျဉ်းများ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"အခမဲ့ရင်းမြစ်လိုင်စင်များ"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url ကို ဖွင့်၍မရပါ။"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-nb/strings.xml b/java/com/android/contacts/common/res/values-nb/strings.xml
index 7085cb3..707033a 100644
--- a/java/com/android/contacts/common/res/values-nb/strings.xml
+++ b/java/com/android/contacts/common/res/values-nb/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiert"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopier til utklippstavlen"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ring mobilnummer"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ring personsøkernummer (arbeid)"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ring multimediemeldingnummer"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Send tekstmelding til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Send tekstmelding til hjemmenummer"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Send tekstmelding til mobilnummer"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Send tekstmelding til personsøkernummer (arbeid)"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Send tekstmelding til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Send tekstmelding til multimediemeldingnummer"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send en melding)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du fjerne ofte kontaktede personer?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Fjerner ofte kontaktede personer ..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Borte"</string>
     <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Søker …"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Fant mer enn <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ingen kontakter"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> er funnet</item>
-      <item quantity="one">1 er funnet</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Uten navn)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Ofte oppringt"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Ofte kontaktet"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontakten"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakter med telefonnumre"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Jobbprofilkontakter"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Send e-post (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Send e-post"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gate"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postboks"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Nabolag"</string>
     <string name="postal_city" msgid="8674569121430005628">"By"</string>
     <string name="postal_region" msgid="1730369286225469192">"Fylke/delstat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Nettprat med ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Nettprat med Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Nettprat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"slett"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Vis eller skjul navnefelt"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Vis eller skjul fonetiske navnefelt"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakter"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Ferdig"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Avbryt"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Enkeltkontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Lagre importerte kontakter i:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importér fra SIM-kort"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importer fra .vcf-fil"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vil du avbryte importeringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vil du avbryte eksporteringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Kunne ikke avbryte imp./eksp. av vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Ukjent feil."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Kunne ikke åpne «<xliff:g id="FILE_NAME">%s</xliff:g>»: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Kunne ikke starte eksporteringen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Du har ingen kontakter som kan eksporteres."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Du har slått av en nødvendig tillatelse."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Det oppsto en feil under eksporteringen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Det obligatoriske filnavnet er for langt (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Inn-/ut-feil"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ikke nok minne. Det er mulig at filen er for stor."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Kan ikke analysere vCard pga. uventet årsak."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatet støttes ikke."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Kunne ikke hente metainformasjon for aktuell(e) vCard-fil(er)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"En eller flere filer kan ikke importeres (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> er fullført."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Eksportering av kontaktene er fullført."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktdataene er eksportert. Klikk på varselet for å dele kontaktene."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Trykk for å dele kontaktene."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> ble avbrutt."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Eksporterer kontaktdata"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktdataene eksporteres."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Kunne ikke hente databaseinformasjon."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Du har ingen kontakter som kan eksporteres. Har du kontakter på enheten din, vil enkelte dataleverandører muligens ikke tillate at kontaktene eksporteres."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard-oppretteren startet ikke som den skulle."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksporten mislyktes"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktdataene ble ikke eksportert.\nÅrsak: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importerer <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Kunne ikke lese vCard-dataene"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lesingen av vCard-dataene ble avbrutt"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importen av vCard-filen <xliff:g id="FILENAME">%s</xliff:g> er fullført"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importeringen av <xliff:g id="FILENAME">%s</xliff:g> ble avbrutt"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> blir snart importert."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Filen importeres snart."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Forespørselen om vCard-importering ble avvist. Prøv på nytt senere."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> blir snart eksportert."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Filen eksporteres snart."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktene eksporteres snart."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Bufrer vCard for import til lokal, midlertidig lagring. Selve importeringen starter snart."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Kunne ikke importere vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt mottatt via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Vil du eksportere kontaktene?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Bufrer"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importerer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportér til .vcf-fil"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér etter"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Etternavn"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavnet først"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Etternavnet først"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standardkonto for nye kontakter"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synkroniser metadata for kontakter"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Om Kontakter"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Innstillinger"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Del synlige kontakter"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Delingen av synlige kontakter mislyktes."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Del favorittkontaktene"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Del alle kontaktene"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kunne ikke dele kontaktene."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importér/eksportér kontakter"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importér kontakter"</string>
-    <string name="share_error" msgid="5642622973966851784">"Denne kontakten kan ikke deles."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Det finnes ingen kontakter å dele."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Søk"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Finn kontakter"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritter"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ingen kontakter."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ingen synlige kontakter."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ingen favoritter"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ingen kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Fjern ofte kontaktede personer"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Velg SIM-kort"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Administrer kontoer"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importér/eksportér"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"avslutt søket"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Slett søk"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Alternativer for visning av kontakter"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Bruk alltid dette for samtaler"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Skriv et notat du vil sende med anropet …"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-fanen."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_3">%2$d</xliff:g> uleste elementer. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_1">%2$d</xliff:g> ulest element. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Delversjon"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Åpen kildekode-lisenser"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Lisensdetaljer for programvare med åpen kildekode"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Personvern"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Vilkår for bruk"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Lisenser for åpen kildekode"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Kunne ikke åpne nettadressen."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtale"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ne/strings.xml b/java/com/android/contacts/common/res/values-ne/strings.xml
index 1f54232..6a41f67 100644
--- a/java/com/android/contacts/common/res/values-ne/strings.xml
+++ b/java/com/android/contacts/common/res/values-ne/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"पाठको प्रतिलिपि  गरियो"</string>
-    <string name="copy_text" msgid="5890820280087874642">"क्लिपबोर्डमा प्रतिलिपि गर्नुहोस्"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> लाई कल गर्नुहोस्"</string>
     <string name="call_home" msgid="125893483593803791">"घरमा कल गर्नुहोस्"</string>
     <string name="call_mobile" msgid="967589404494150813">"मोबाइलमा कल गर्नुहोस्"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"काम पेजरमा कल गर्नुहोस्"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> लाई कल गर्नुहोस्"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS लाई कल गर्नुहोस्"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (फोन गर्नुहोस्)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"पाठ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"पाठ घर"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"पाठ मोबाइल"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"पाठ काम पेजर"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"पाठ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"पाठ MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"प्रायः सम्पर्क भएकालाई हटाउने?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"बारम्बार सम्पर्क गरिएकाहरूलाई मेटाउँदै ..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"टाढा"</string>
     <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
     <string name="contactsList" msgid="8806067891419291513">"सम्पर्क"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"सबैभन्दा धेरै सुझाव दिइएको"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"कार्यको निर्देशिका"</string>
     <string name="local_search_label" msgid="907622822323119235">"सबै सम्पर्कहरू"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझावहरू"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"म"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"खोजी गर्दै..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>भन्दा बढी पाइयो।"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"कुनै सम्पर्कहरू छैन।"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> भेट्टिए</item>
-      <item quantity="one">१ भेट्टियो</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g>लाई तत्काल सम्पर्क गर्नुहोस्"</string>
     <string name="missing_name" msgid="978606963362745020">"(नाम छैन)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"बारम्बार कल गरिएको"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"लगातार सम्पर्क गरिएको"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"सम्पर्क हेर्नुहोस्"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"फोन नम्बर भएका सबै सम्पर्कहरू"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफाइलका सम्पर्कहरू"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>लाई इमेल गर्नुहोस्"</string>
     <string name="email" msgid="2807318537887091606">"इमेल गर्नुहोस्"</string>
     <string name="postal_street" msgid="6918171741240802474">"सडक"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO Box:"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"छिमेक"</string>
     <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
     <string name="postal_region" msgid="1730369286225469192">"स्थिति"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ZIP कोड"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQको प्रयोग गरेर च्याट गर्नुहोस्"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"जाब्बरको प्रयोग गरेर च्याट गर्नुहोस्"</string>
     <string name="chat" msgid="1020428260359370236">"कुराकानी"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"मेटाउनुहोस्"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"नाम फिल्डहरू विस्तार गर्नुहोस् वा खुम्चाउनुहोस्"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"फोनेटिक नाम क्षेत्रहरू विस्तृत गर्नुहोस् वा संक्षिप्त गर्नुहोस्"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"सबै सम्पर्कहरू"</string>
-    <string name="menu_done" msgid="1817505539263889535">"सम्पन्न भयो"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"रद्द गर्नुहोस्"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>मा सम्पर्कहरू"</string>
     <string name="listCustomView" msgid="5306282632413086731">"कस्टम दृश्यमा रहेका सम्पर्कहरू"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"एकल सम्पर्क"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"आयातित् सम्पर्कहरू सुरक्षित गर्नुहोस्:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM कार्डबाट आयात गर्नुहोस्"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> बाट आयात"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> सिमबाट आयात"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf फाइलबाट आयात गर्नुहोस्"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g>को आयात रद्द गर्ने हो?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> को निर्यात रद्द गर्नहोस्?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"VCard आयात/निर्यात रद्द गर्न सकेन"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"अज्ञात त्रुटि।"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" लाई खोल्न सकिएन: <xliff:g id="EXACT_REASON">%s</xliff:g>।"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"निर्यातकले सुरु गर्न सकेन \" <xliff:g id="EXACT_REASON">%s</xliff:g> \"।"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"निर्यात गर्न मिल्ने कुनै सम्पर्क छैन।"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"तपाईँले आवश्यक अनुमति असक्षम गर्नुभएको छ।"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"निर्यात गर्दा एउटा त्रुटि देखा पर्‍यो \" <xliff:g id="EXACT_REASON">%s</xliff:g> \"।"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"आवश्यक फाइल नाम धेरै लामो छ (\" <xliff:g id="FILENAME">%s</xliff:g> \")।"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O त्रुटि"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"अप्रयाप्त मेमोरी। फाइल धेरै ठूलो हुन सक्छ।"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"एक अप्रत्यासित कारणले गर्दा vCard पार्स गर्न सकेन।"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"स्वरूप समर्थित छैन।"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"दिइएको vCard फाइल(हरू)को अधिजानकारी जम्मा गर्न सकेन।"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"एक वा बढी फाइलहरू आयात गर्न सकिएन (%s)।"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>निर्यात सकियो।"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"सम्पर्क ठेगानाहरू निर्यात गर्ने सकियो।"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"सम्पर्कहरूलाई निर्यात गर्ने काम सकियो, सम्पर्कहरूलाई साझेदारी गर्न सूचनामा क्लिक गर्नुहोस्।"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"सम्पर्कहरूलाई साझेदारी गर्न ट्याप गर्नुहोस्।"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात रद्द गरियो।"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"सम्पर्क डेटा निर्यात हुँदै"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"सम्पर्क सम्बन्धी डेटा निर्यात भइरहेको छ।"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"डेटाबेस जानकारी पाउन सकेन।"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"कुनै पनि सम्पर्क ठेगानाहरू निर्यात गर्न मिल्ने किसिमका छैनन्। तपाईँको यन्त्रमा सम्पर्कहरू पक्कै छन् भने पनि केही डेटा प्रदायकहरूले उक्त यन्त्रबाट ती सम्पर्कहरू निर्यात गर्ने अनुमति नदिन सक्छन्।"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard रचनाकार राम्ररी सुरु भएन।"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"निर्यात गर्न सकेन"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"सम्पर्क डेटा निर्यात गरिएको थिएन \n कारण: \" <xliff:g id="FAIL_REASON">%s</xliff:g> \""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>आयत गर्दै"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"VCard डेटा पढ्न सकेन"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard डेटा पढ्ने रद्द भयो"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard आयात गर्ने समाप्त भयो <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>आयत गर्ने रद्द भयो"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> केहीबेर मै आयात गरिने छ।"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"फाइल तुरुन्तै आयात गरिने छ।"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard आयात अनुरोध अस्वीकृत गरियो। पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> तुरुन्तै निर्यात गरिने छ।"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"फाइल तुरुन्तै निर्यात गरिने छ।"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"सम्पर्कहरूलाई चॉंडै निर्यात गरिने छ।"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard निर्यात अनुरोध अस्वीकार गरियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"सम्पर्क"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"स्थानीय अस्थायी भण्डारणका लागि vCard (हरू) क्यास गर्दै ।  वास्तविक आयात छिट्टै सुरु हुने छ।"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"VCard आयात गर्न सकेन।"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFCमा प्राप्त सम्पर्क"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"सम्पर्कहरू निर्यात गर्ने?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"क्यासिङ हुँदै"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> लाई आयात गर्दै: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf फाइलमा निर्यात गर्नुहोस्"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"क्रमवद्घ गर्नुहोस्"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाम"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"थर"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"नामको ढाँचा"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाम पहिले"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"थर पहिले"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"नयाँ सम्पर्कहरूका लागि पूर्वनिर्धारित खाता"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"सम्पर्क मेटाडाटालाई सिंक गर्नुहोस्"</string>
-    <string name="setting_about" msgid="5253319937596745755">"सम्पर्कहरूको बारेमा"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"सेटिङहरू"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"देखिने सम्पर्कहरू साझेदारी गर्नुहोस्"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"देख्न सकिने सम्पर्कहरू साझेदारी गर्न असफल भयो।"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"मनपर्ने सम्पर्क साझेदारी गर्नुहोस्"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"सबै सम्पर्क साझेदारी गर्नुहोस्"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"सम्पर्कहरू साझेदारी गर्न असफल भयो।"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"आयात/निर्यात सम्पर्कहरू"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"सम्पर्कहरूलाई आयात गर्नुहोस्"</string>
-    <string name="share_error" msgid="5642622973966851784">"यस सम्पर्कलाई साझेदारी गर्न सकिँदैन।"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"साझेदारी गर्न कुनै सम्पर्क ठेगानाहरू छैनन्।"</string>
-    <string name="menu_search" msgid="1241802591112035764">"खोजी गर्नुहोस्"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"सम्पर्क पत्ता लगाउनुहोस्"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"मनपर्नेहरू"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"कुनै सम्पर्क छैन।"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"देखिने कुनै सम्पर्कहरू छैनन्।"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"मनपर्नेहरू छैनन्"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> मा कुनै सम्पर्कहरू छैनन्"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"बारम्बारताहरू हटाउनुहोस्"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"सिम कार्ड चयन गर्नुहोस्"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"खाताहरू व्यवस्थापन गर्नुहोस्"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"आयात/निर्यात"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g>को मार्फत"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> मार्फत <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"खोजी गर्न  रोक्नुहोस्"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"खोजी सफा गर्नुहोस्"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"सम्पर्क प्रदर्शन विकल्पहरू"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"खाता"</string>
     <string name="set_default_account" msgid="7966099951006467572">"कल गर्नका लागि यसको प्रयोग सधैं गर्नुहोस्"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"संग कल"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"यस कलसँग पठाउन एक टिप्पणी  टाइप गर्नुहोस्"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"पठाउनुहोस् र कल गर्नुहोस्"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ट्याब।"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ट्याब। <xliff:g id="COUNT_3">%2$d</xliff:g> नपढिएका वस्तुहरू। </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ट्याब। <xliff:g id="COUNT_1">%2$d</xliff:g> नपढिएको वस्तु। </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"बिल्ड संस्करण"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"खुलास्रोत इजाजतपत्रहरू"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"खुला स्रोतका सफ्टवेयरका इजाजतपत्र सम्बन्धी विवरणहरू"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"गोपनीयता नीति"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"सेवा सर्तहरू"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"खुला स्रोत सम्बन्धी इजाजतपत्रहरू"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url खोल्न सकिएन।"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"भिडियो कल"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"आदान-प्रदान र कल गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-nl/strings.xml b/java/com/android/contacts/common/res/values-nl/strings.xml
index 9d41899..9fd2415 100644
--- a/java/com/android/contacts/common/res/values-nl/strings.xml
+++ b/java/com/android/contacts/common/res/values-nl/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst gekopieerd"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiëren naar klembord"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> bellen"</string>
     <string name="call_home" msgid="125893483593803791">"Privé bellen"</string>
     <string name="call_mobile" msgid="967589404494150813">"Mobiel bellen"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Pager werk bellen"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> bellen"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS bellen"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bellen)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Sms\'en naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Sms\'en naar huis"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Sms\'en naar mobiel"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Sms\'en naar pager werk"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Sms\'en naar <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Sms\'en naar MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sms\'en)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Lijst regelmatige contacten wissen?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Regelmatige contacten wissen..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Niet beschikbaar"</string>
     <string name="status_busy" msgid="5990832098713248503">"Bezet"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contacten"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Populaire suggesties"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Overig"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Zakelijke contactenlijst"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle contacten"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggesties"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ik"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Zoeken..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Meer dan <xliff:g id="COUNT">%d</xliff:g> gevonden."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Geen contacten"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> gevonden</item>
-      <item quantity="one">1 gevonden</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Snelcontact voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Geen naam)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Vaak gebeld"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Regelmatig contact mee opgenomen"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Contact weergeven"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle contacten met telefoonnummers"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacten uit werkprofiel"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-mailen naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-mailen"</string>
     <string name="postal_street" msgid="6918171741240802474">"Straat"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postbus"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Buurt"</string>
     <string name="postal_city" msgid="8674569121430005628">"Stad"</string>
     <string name="postal_region" msgid="1730369286225469192">"Staat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatten via ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatten via Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"verwijderen"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Naamvelden uitvouwen of samenvouwen"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Fonetische naamvelden uitvouwen of samenvouwen"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle contacten"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gereed"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Annuleren"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacten in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contacten in aangepaste weergave"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Eén contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Geïmporteerde contacten opslaan in:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importeren van simkaart"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importeren van simkaart <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importeren van simkaart <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importeren uit VCF-bestand"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Import van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Export van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Kan vCard-import/export niet annuleren"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Onbekende fout."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Kan \'<xliff:g id="FILE_NAME">%s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Kan het exportprogramma niet starten: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Er is geen contact dat kan worden geëxporteerd."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Je hebt een vereist recht uitgeschakeld."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Er is een fout opgetreden tijdens het exporteren: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Vereiste bestandsnaam is te lang (\'<xliff:g id="FILENAME">%s</xliff:g>\')."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O-fout"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Onvoldoende geheugen. Het bestand is mogelijk te groot."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Kan vCard om onverwachte reden niet parseren."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"De indeling wordt niet ondersteund."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Kan metadata niet verzamelen uit vCard-bestand(en)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Kan een of meer bestanden niet importeren (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> voltooid."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Contacten geëxporteerd."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"De contacten zijn geëxporteerd. Klik op de melding om contacten te delen."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tik om contacten te delen."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Contactgegevens exporteren"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Contactgegevens worden geëxporteerd."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Kan databasegegevens niet ophalen."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Er zijn geen exporteerbare contacten. Als je wel contacten op je apparaat hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van het apparaat mogelijk niet toe."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"De vCard-editor is niet correct gestart."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Kan niet exporteren"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"De contactgegevens zijn niet geëxporteerd.\nReden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> importeren"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Kan vCard-gegevens niet lezen"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lezen van vCard-gegevens geannuleerd"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importeren van vCard <xliff:g id="FILENAME">%s</xliff:g> voltooid"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importeren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> wordt binnenkort geïmporteerd."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Bestand wordt binnenkort geïmporteerd."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Verzoek voor vCard-import is geweigerd. Probeer het later opnieuw."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> wordt binnenkort geëxporteerd."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Dit bestand wordt binnenkort geëxporteerd."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Contacten worden binnenkort geëxporteerd."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Verzoek voor vCard-export is geweigerd. Probeer het later opnieuw."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Bezig met opslaan van vCard(s) in de lokale tijdelijke opslag. Het daadwerkelijke importeren begint binnenkort."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Kan vCard niet importeren."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contact via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Contacten exporteren?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"In cachegeheugen opslaan"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> importeren: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exporteren naar VCF-bestand"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sorteren op"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Voornaam"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Achternaam"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Naamindeling"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Voornaam eerst"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Achternaam eerst"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standaardaccount voor nieuwe contacten"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Metadata van contacten synchroniseren"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Over Contacten"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Instellingen"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Zichtbare contacten delen"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Kan zichtbare contacten niet delen."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Favoriete contacten delen"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Alle contacten delen"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kan contacten niet delen."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Contacten importeren/exporteren"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Contacten importeren"</string>
-    <string name="share_error" msgid="5642622973966851784">"Dit contact kan niet worden gedeeld."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Er zijn geen contacten om te delen."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Zoeken"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Contacten zoeken"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favorieten"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Geen contacten."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Geen zichtbare contacten."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Geen favorieten"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Geen contacten in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Regelmatige contacten wissen"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Simkaart selecteren"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Accounts beheren"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importeren/exporteren"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"stoppen met zoeken"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Zoekopdracht wissen"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opties voor contactweergave"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Altijd gebruiken voor oproepen"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Bellen met"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Typ een notitie om te verzenden met de oproep..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"VERZENDEN EN BELLEN"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tabblad <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Tabblad <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ongelezen items. </item>
       <item quantity="one">Tabblad <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ongelezen item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Buildversie"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Open-sourcelicenties"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licentiedetails voor open-sourcesoftware"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Privacybeleid"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Servicevoorwaarden"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Open-sourcelicenties"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Kan de URL niet openen."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videogesprek"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Delen en bellen"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-no/strings.xml b/java/com/android/contacts/common/res/values-no/strings.xml
index 7085cb3..707033a 100644
--- a/java/com/android/contacts/common/res/values-no/strings.xml
+++ b/java/com/android/contacts/common/res/values-no/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiert"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopier til utklippstavlen"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ring mobilnummer"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ring personsøkernummer (arbeid)"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ring multimediemeldingnummer"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Send tekstmelding til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Send tekstmelding til hjemmenummer"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Send tekstmelding til mobilnummer"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Send tekstmelding til personsøkernummer (arbeid)"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Send tekstmelding til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Send tekstmelding til multimediemeldingnummer"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send en melding)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du fjerne ofte kontaktede personer?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Fjerner ofte kontaktede personer ..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Borte"</string>
     <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Søker …"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Fant mer enn <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ingen kontakter"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> er funnet</item>
-      <item quantity="one">1 er funnet</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Uten navn)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Ofte oppringt"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Ofte kontaktet"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontakten"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakter med telefonnumre"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Jobbprofilkontakter"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Send e-post (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Send e-post"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gate"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postboks"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Nabolag"</string>
     <string name="postal_city" msgid="8674569121430005628">"By"</string>
     <string name="postal_region" msgid="1730369286225469192">"Fylke/delstat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Nettprat med ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Nettprat med Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Nettprat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"slett"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Vis eller skjul navnefelt"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Vis eller skjul fonetiske navnefelt"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakter"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Ferdig"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Avbryt"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Enkeltkontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Lagre importerte kontakter i:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importér fra SIM-kort"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importer fra .vcf-fil"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vil du avbryte importeringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vil du avbryte eksporteringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Kunne ikke avbryte imp./eksp. av vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Ukjent feil."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Kunne ikke åpne «<xliff:g id="FILE_NAME">%s</xliff:g>»: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Kunne ikke starte eksporteringen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Du har ingen kontakter som kan eksporteres."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Du har slått av en nødvendig tillatelse."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Det oppsto en feil under eksporteringen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Det obligatoriske filnavnet er for langt (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Inn-/ut-feil"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ikke nok minne. Det er mulig at filen er for stor."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Kan ikke analysere vCard pga. uventet årsak."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatet støttes ikke."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Kunne ikke hente metainformasjon for aktuell(e) vCard-fil(er)."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"En eller flere filer kan ikke importeres (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> er fullført."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Eksportering av kontaktene er fullført."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktdataene er eksportert. Klikk på varselet for å dele kontaktene."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Trykk for å dele kontaktene."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> ble avbrutt."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Eksporterer kontaktdata"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktdataene eksporteres."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Kunne ikke hente databaseinformasjon."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Du har ingen kontakter som kan eksporteres. Har du kontakter på enheten din, vil enkelte dataleverandører muligens ikke tillate at kontaktene eksporteres."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard-oppretteren startet ikke som den skulle."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksporten mislyktes"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktdataene ble ikke eksportert.\nÅrsak: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importerer <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Kunne ikke lese vCard-dataene"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Lesingen av vCard-dataene ble avbrutt"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importen av vCard-filen <xliff:g id="FILENAME">%s</xliff:g> er fullført"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importeringen av <xliff:g id="FILENAME">%s</xliff:g> ble avbrutt"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> blir snart importert."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Filen importeres snart."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Forespørselen om vCard-importering ble avvist. Prøv på nytt senere."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> blir snart eksportert."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Filen eksporteres snart."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktene eksporteres snart."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Bufrer vCard for import til lokal, midlertidig lagring. Selve importeringen starter snart."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Kunne ikke importere vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt mottatt via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Vil du eksportere kontaktene?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Bufrer"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importerer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportér til .vcf-fil"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér etter"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Etternavn"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavnet først"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Etternavnet først"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standardkonto for nye kontakter"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synkroniser metadata for kontakter"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Om Kontakter"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Innstillinger"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Del synlige kontakter"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Delingen av synlige kontakter mislyktes."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Del favorittkontaktene"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Del alle kontaktene"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kunne ikke dele kontaktene."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importér/eksportér kontakter"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importér kontakter"</string>
-    <string name="share_error" msgid="5642622973966851784">"Denne kontakten kan ikke deles."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Det finnes ingen kontakter å dele."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Søk"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Finn kontakter"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritter"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ingen kontakter."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ingen synlige kontakter."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ingen favoritter"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ingen kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Fjern ofte kontaktede personer"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Velg SIM-kort"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Administrer kontoer"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importér/eksportér"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"avslutt søket"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Slett søk"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Alternativer for visning av kontakter"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Bruk alltid dette for samtaler"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Skriv et notat du vil sende med anropet …"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-fanen."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_3">%2$d</xliff:g> uleste elementer. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_1">%2$d</xliff:g> ulest element. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Delversjon"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Åpen kildekode-lisenser"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Lisensdetaljer for programvare med åpen kildekode"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Personvern"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Vilkår for bruk"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Lisenser for åpen kildekode"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Kunne ikke åpne nettadressen."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtale"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pa/strings.xml b/java/com/android/contacts/common/res/values-pa/strings.xml
index c96510c..593abee 100644
--- a/java/com/android/contacts/common/res/values-pa/strings.xml
+++ b/java/com/android/contacts/common/res/values-pa/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"ਟੈਕਸਟ ਕਾਪੀ ਕੀਤਾ"</string>
-    <string name="copy_text" msgid="5890820280087874642">"ਕਲਿਪਬੋਰਡ ਤੇ ਕਾਪੀ ਕਰੋ"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="call_home" msgid="125893483593803791">"ਘਰ ਕਾਲ ਕਰੋ"</string>
     <string name="call_mobile" msgid="967589404494150813">"ਮੋਬਾਈਲ ਤੇ ਕਾਲ ਕਰੋ"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS ਕਾਲ ਕਰੋ"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ਕਾਲ ਕਰੋ)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_home" msgid="3527719551060295243">"ਘਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ਸੁਨੇਹਾ ਭੇਜੋ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ਕੀ ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾਉਣੇ ਹਨ?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ਤੁਸੀਂ ਵਾਰੀ-ਵਾਰੀ ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਐਪਸ ਵਿੱਚ ਸੰਪਰਕ ਕੀਤੀ ਸੂਚੀ ਹਟਾਓਗੇ ਅਤੇ ਈਮੇਲ ਐਪਸ ਤੇ ਸਕ੍ਰੈਚ ਨਾਲ ਤੁਹਾਡੀਆਂ ਪਤਾ ਲਗਾਉਣ ਦੀਆਂ ਤਰਜੀਹਾਂ ਜਾਣਨ ਲਈ ਜ਼ੋਰ ਪਾਓਗੇ।"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾ ਰਿਹਾ ਹੈ…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ਦੂਰ"</string>
     <string name="status_busy" msgid="5990832098713248503">"ਰੁੱਝਾ ਹੋਇਆ ਹੈ"</string>
     <string name="contactsList" msgid="8806067891419291513">"ਸੰਪਰਕ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ਪ੍ਰਮੁੱਖ ਸੁਝਾਏ ਗਏ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ਹੋਰ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ਡਾਇਰੈਕਟਰੀ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ਕੰਮ ਡਾਇਰੈਕਟਰੀ"</string>
     <string name="local_search_label" msgid="907622822323119235">"ਸਾਰੇ ਸੰਪਰਕ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ਸੁਝਾਅ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ਮੈਂ"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ਤੋਂ ਵੱਧ ਮਿਲੇ।"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਮਿਲਿਆ</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਮਿਲੇ</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> ਲਈ ਤਤਕਾਲ ਸੰਪਰਕ"</string>
     <string name="missing_name" msgid="978606963362745020">"(ਕੋਈ ਨਾਮ ਨਹੀਂ)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"ਅਕਸਰ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"ਸੰਪਰਕ ਦੇਖੋ"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ਫੋਨ ਨੰਬਰਾਂ ਵਾਲੇ ਸਾਰੇ ਸੰਪਰਕ"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੰਪਰਕ"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ਨੂੰ ਈਮੇਲ ਕਰੋ"</string>
     <string name="email" msgid="2807318537887091606">"ਈਮੇਲ"</string>
     <string name="postal_street" msgid="6918171741240802474">"ਗਲੀ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO ਬੌਕਸ"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ਗਵਾਂਢ"</string>
     <string name="postal_city" msgid="8674569121430005628">"ਸ਼ਹਿਰ"</string>
     <string name="postal_region" msgid="1730369286225469192">"ਰਾਜ"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ਜ਼ਿੱਪ ਕੋਡ"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
     <string name="chat" msgid="1020428260359370236">"ਚੈਟ"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ਮਿਟਾਓ"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"ਨਾਮ ਖੇਤਰਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ ਜਾਂ ਨਸ਼ਟ ਕਰੋ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ਫੋਨੈਟਿਕ ਨਾਮ ਖੇਤਰਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ ਜਾਂ ਨਸ਼ਟ ਕਰੋ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ਹੋ ਗਿਆ"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ਰੱਦ ਕਰੋ"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ਵਿੱਚ ਸੰਪਰਕ"</string>
     <string name="listCustomView" msgid="5306282632413086731">"ਕਸਟਮ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਸੰਪਰਕ"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ਸਿੰਗਲ ਸੰਪਰਕ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ਆਯਾਤ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ ਵਿੱਚ ਰੱਖਿਅਤ ਕਰੋ:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM ਕਾਰਡ ਵਿੱਚੋਂ ਆਯਾਤ ਕਰੋ"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> ਵਿੱਚੋਂ ਆਯਾਤ ਕਰੋ"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> ਵਿੱਚੋਂ ਆਯਾਤ ਕਰੋ"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ਫ਼ਾਈਲ ਤੋਂ ਆਯਾਤ ਕਰੋ"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"ਕੀ <xliff:g id="FILENAME">%s</xliff:g> ਦਾ ਆਯਾਤ ਰੱਦ ਕਰਨਾ ਹੈ?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"ਕੀ <xliff:g id="FILENAME">%s</xliff:g> ਦਾ ਨਿਰਯਾਤ ਰੱਦ ਕਰਨਾ ਹੈ?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard ਆਯਾਤ/ਨਿਰਯਾਤ ਰੱਦ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"ਅਗਿਆਤ ਅਸ਼ੁੱਧੀ।"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: <xliff:g id="EXACT_REASON">%s</xliff:g>।"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ਐਕਸਪੋਰਟ ਚਾਲੂ ਨਹੀੰ ਕਰ ਸਕਿਆ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"।"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ਕੋਈ ਵੀ ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"ਤੁਸੀਂ ਇੱਕ ਲੁੜੀਂਦੀ ਅਨੁਮਤੀ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਹੈ।"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ਨਿਰਯਾਤ ਕਰਨ ਦੌਰਾਨ ਇੱਕ ਅਸ਼ੁੱਧੀ ਵਾਪਰੀ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"।"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ਲੁੜੀਂਦਾ ਫਾਈਲ ਨਾਮ ਬਹੁਤ ਜ਼ਿਆਦਾ ਵੱਡਾ ਹੈ (\"<xliff:g id="FILENAME">%s</xliff:g>\")।"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O ਅਸ਼ੁੱਧੀ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"ਮੈਮਰੀ ਕਾਫ਼ੀ ਨਹੀਂ। ਫਾਈਲ ਬਹੁਤ ਜ਼ਿਆਦਾ ਵੱਡੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ਇੱਕ ਅਕਲਪਿਤ ਕਾਰਨ ਕਰਕੇ vCard ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ਫੌਰਮੈਟ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ਦਿੱਤੀ ਗਈ vCard ਫਾਈਲ(ਫਾਈਲਾਂ) ਦੀ meta ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ਇੱਕ ਜਾਂ ਵੱਧ ਫਾਈਲਾਂ ਆਯਾਤ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ (%s)।"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ, ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸੂਚਨਾ \'ਤੇ ਕਲਿੱਕ ਕਰੋ।"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ।"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"ਸੰਪਰਕ ਡੈਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ਡਾਟਾਬੇਸ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ਕੋਈ ਨਿਰਯਾਤ ਕਰਨਯੋਗ ਸੰਪਰਕ ਨਹੀਂ ਹਨ। ਜੇਕਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਕੋਈ ਸੰਪਰਕ ਹਨ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਡੈਟਾ ਪ੍ਰਦਾਨਕ ਸੰਪਰਕਾਂ ਨੂੰ ਡੀਵਾਈਸ ਤੋਂ ਨਿਰਯਾਤ ਕੀਤੇ ਜਾਣ ਦੀ ਇਜਾਜ਼ਤ ਨਾ ਦੇਣ।"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard ਕੰਪੋਜ਼ਰ ਸਹੀ ਢੰਗ ਨਾਲ ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ।"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ਨਿਰਯਾਤ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard ਡਾਟਾ ਨਹੀਂ ਪੜ੍ਹ ਸਕਿਆ"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard ਡਾਟਾ ਪੜ੍ਹਨਾ ਰੱਦ ਕੀਤਾ"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ।"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਆਯਾਤ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ਫਾਈਲ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਆਯਾਤ ਕੀਤੀ ਜਾਏਗੀ।"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard ਆਯਾਤ ਬੇਨਤੀ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ ਸੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ਫਾਈਲ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਨਿਰਯਾਤ ਕੀਤੀ ਜਾਏਗੀ।"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ਸੰਪਰਕਾਂ ਨੂੰ ਜਲਦ ਹੀ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard ਨਿਰਯਾਤ ਬੇਨਤੀ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ ਸੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"ਸੰਪਰਕ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"ਸਥਾਨਕ ਅਸਥਾਈ ਸਟੋਰੇਜ ਲਈ vCard ਕੈਚ ਕਰ ਰਿਹਾ ਹੈ। ਅਸਲੀ ਆਯਾਤ ਜਲਦੀ ਹੀ ਚਾਲੂ ਹੋਵੇਗਾ।"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard ਆਯਾਤ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC ਤੇ ਪ੍ਰਾਪਤ ਕੀਤਾ ਸੰਪਰਕ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"ਕੀ ਸੰਪਰਕ ਨਿਰਯਾਤ ਕਰਨੇ ਹਨ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ਕੈਚ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ਫ਼ਾਈਲ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ਪਹਿਲਾ ਨਾਮ"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ਆਖਰੀ ਨਾਮ"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"ਨਾਮ ਦੀ ਵੰਨਗੀ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ਪਹਿਲਾਂ ਪਹਿਲਾ ਨਾਮ"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ਪਹਿਲਾਂ ਆਖਰੀ ਨਾਮ"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"ਨਵੇਂ ਸੰਪਰਕਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਖਾਤਾ"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"ਸੰਪਰਕ ਮੈਟਾਡੈਟੇ ਨੂੰ ਸਮਕਾਲੀ ਕਰੋ"</string>
-    <string name="setting_about" msgid="5253319937596745755">"ਸੰਪਰਕਾਂ ਬਾਰੇ"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"ਦਿੱਸਦੇ ਸੰਪਰਕ ਸ਼ੇਅਰ ਕਰੋ"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ਦ੍ਰਿਸ਼ਮਾਨ ਸੰਪਰਕ ਸ਼ੇਅਰ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ਮਨਪਸੰਦ ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"ਸਾਰੇ ਸੰਪਰਕ ਸਾਂਝੇ ਕਰੋ"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"ਸੰਪਰਕ ਸਾਂਝੇ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"ਸੰਪਰਕ ਆਯਾਤ/ਨਿਰਯਾਤ ਕਰੋ"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"ਸੰਪਰਕ ਆਯਾਤ ਕਰੋ"</string>
-    <string name="share_error" msgid="5642622973966851784">"ਇਸ ਸੰਪਰਕ ਸ਼ੇਅਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
-    <string name="menu_search" msgid="1241802591112035764">"ਖੋਜੋ"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"ਸੰਪਰਕ ਲੱਭੋ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ਮਨਪਸੰਦ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ।"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ਕੋਈ ਦਿੱਸਦੇ ਸੰਪਰਕ ਨਹੀਂ।"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ਕੋਈ ਮਨਪਸੰਦ ਨਹੀਂ"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> ਵਿੱਚ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ਫ੍ਰੀਕਵੈਂਟਸ ਹਟਾਓ"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM ਕਾਰਡ ਚੁਣੋ"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ਖਾਤੇ ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ਆਯਾਤ/ਨਿਰਯਾਤ ਕਰੋ"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> ਰਾਹੀਂ <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ਖੋਜ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ਖੋਜ ਹਟਾਓ"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"ਸੰਪਰਕ ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ਖਾਤਾ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ਕਾਲ ਦੇ ਨਾਲ ਭੇਜਣ ਲਈ ਕੋਈ ਨੋਟ ਟਾਈਪ ਕਰੋ ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ਟੈਬ।"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ਟੈਬ। <xliff:g id="COUNT_3">%2$d</xliff:g> ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ਟੈਬ। <xliff:g id="COUNT_3">%2$d</xliff:g> ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"ਨਿਰਮਾਣ ਰੂਪ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ਖੁੱਲ੍ਹਾ ਸਰੋਤ ਲਾਇਸੰਸ"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ਓਪਨ ਸੋਰਸ ਸੌਫਟਵੇਅਰ ਲਈ ਲਾਇਸੰਸ ਵੇਰਵੇ"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"ਸੇਵਾ ਦੀਆਂ ਮਦਾਂ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ਖੁੱਲ੍ਹਾ ਸਰੋਤ ਲਾਇਸੰਸ"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ।"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pl/strings.xml b/java/com/android/contacts/common/res/values-pl/strings.xml
index c4e65f5..bbb3854 100644
--- a/java/com/android/contacts/common/res/values-pl/strings.xml
+++ b/java/com/android/contacts/common/res/values-pl/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Tekst skopiowany"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiuj do schowka"</string>
     <string name="call_custom" msgid="3041673234638990874">"Połącz – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Połącz – domowy"</string>
     <string name="call_mobile" msgid="967589404494150813">"Połącz – komórka"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Połącz – służbowy pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Połącz – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Połącz – MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (zadzwoń)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS – domowy"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS – komórka"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS – służbowy pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS – MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (wyślij wiadomość)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Wyczyścić częste kontakty?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Wyczyścisz listę częstych kontaktów w aplikacjach Kontakty i Telefon. Aplikacje pocztowe będą musiały od nowa poznać Twoje preferencje adresowe."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Czyszczę częste kontakty…"</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Nieobecny"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zajęty"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najlepsze sugestie"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Inny"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Katalog służbowy"</string>
     <string name="local_search_label" msgid="907622822323119235">"Wszystkie kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestie"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Wyszukiwanie..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Znaleziono więcej niż <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Brak kontaktów"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="few">Znaleziono <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="many">Znaleziono <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">Znaleziono <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Znaleziono 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Szybki kontakt dla: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Bez nazwy)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Częste połączenia"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Częste kontakty"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Pokaż kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Wszystkie kontakty z numerami telefonów"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty w profilu służbowym"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-mail – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Skrytka pocztowa"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Dzielnica"</string>
     <string name="postal_city" msgid="8674569121430005628">"Miasto"</string>
     <string name="postal_region" msgid="1730369286225469192">"Stan"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Kod pocztowy"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Czat w ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Czat w Jabberze"</string>
     <string name="chat" msgid="1020428260359370236">"Czat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"usuń"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Rozwiń lub zwiń pola imion i nazwisk"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Rozwiń lub zwiń pola nazwisk zapisanych fonetycznie"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Wszystkie kontakty"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Gotowe"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Anuluj"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty na koncie <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakty spełniające kryteria"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Jeden kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Zapisz zaimportowane kontakty na koncie:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importuj z karty SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importuj z karty SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importuj z karty SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importuj z pliku .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Anulować importowanie pliku <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Anulować eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Nie można anulować importu/eksportu vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Nieznany błąd."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nie udało się otworzyć pliku „<xliff:g id="FILE_NAME">%s</xliff:g>”: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nie udało się uruchomić programu eksportującego: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Brak kontaktów, które można wyeksportować."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Wyłączyłeś wymagane uprawnienia"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Podczas eksportu wystąpił błąd: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Wymagana nazwa pliku jest zbyt długa („<xliff:g id="FILENAME">%s</xliff:g>”)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Błąd wejścia/wyjścia"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Za mało pamięci. Plik może być zbyt duży."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Nie można przeanalizować pliku vCard z nieoczekiwanego powodu."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Format nie jest obsługiwany."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nie można zebrać metainformacji z podanych plików vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nie można zaimportować co najmniej jednego pliku (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Zakończono eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Eksportowanie kontaktów zostało zakończone."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontakty zostały wyeksportowane. Aby je udostępnić, kliknij powiadomienie."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Kliknij, by udostępnić kontakty."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Anulowano eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Eksportowanie danych kontaktowych"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Eksportuję dane kontaktów."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nie udało się pobrać informacji z bazy danych."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Brak kontaktów do eksportu. Jeśli masz na urządzeniu kontakty, być może niektórzy dostawcy danych nie zezwalają na ich eksport z urządzenia."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Obiekt tworzenia danych vCard nie uruchomił się poprawnie."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksport nieudany"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Dane kontaktów nie zostały wyeksportowane.\nPrzyczyna: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importowanie: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nie udało się odczytać danych vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Anulowano odczyt danych kart vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Zakończono importowanie pliku vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Anulowano importowanie pliku <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Plik <xliff:g id="FILENAME">%s</xliff:g> zostanie za chwilę zaimportowany."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Plik zostanie za chwilę zaimportowany."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Żądanie importu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Plik <xliff:g id="FILENAME">%s</xliff:g> zostanie za chwilę wyeksportowany."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Plik zostanie za chwilę wyeksportowany."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakty zostaną wyeksportowane wkrótce."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Żądanie eksportu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Trwa buforowanie plików vCard w lokalnym obszarze tymczasowym. Właściwy import rozpocznie się za chwilę."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Nie udało się zaimportować pliku vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt odebrany przez NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Wyeksportować kontakty?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Buforowanie"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importuję <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksportuj do pliku .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortuj według"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Imię"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nazwisko"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imienia i nazwiska"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najpierw imię"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najpierw nazwisko"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Domyślne konto dla nowych kontaktów"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synchronizuj metadane kontaktów"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Aplikacja Kontakty"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ustawienia"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Udostępnij widoczne kontakty"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nie udało się udostępnić widocznych kontaktów."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Udostępnij ulubione kontakty"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Udostępnij wszystkie kontakty"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Nie udało się udostępnić kontaktów."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importuj/eksportuj kontakty"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importuj kontakty"</string>
-    <string name="share_error" msgid="5642622973966851784">"Tego kontaktu nie można udostępnić."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Brak kontaktów do udostępnienia."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Szukaj"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Znajdź kontakty"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Ulubione"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Brak kontaktów"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Brak widocznych kontaktów"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Brak ulubionych"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Brak kontaktów w grupie <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Wyczyść częste kontakty"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Wybierz kartę SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Zarządzaj kontami"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importuj/eksportuj"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"przez: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> przez: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zatrzymaj wyszukiwanie"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Wyczyść wyszukiwanie"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opcje wyświetlania kontaktów"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Zawsze używaj do połączeń"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Zadzwoń, używając"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Wpisz notatkę, którą chcesz wysłać razem z połączeniem..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"WYŚLIJ I ZADZWOŃ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nieprzeczytane elementy. </item>
@@ -258,13 +159,6 @@
       <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nieprzeczytanego elementu. </item>
       <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> nieprzeczytany element. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Wersja kompilacji"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licencje open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Szczegóły licencji na oprogramowanie open source"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Polityka prywatności"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Warunki usługi"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licencje open source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Nie udało się otworzyć URL-a."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Rozmowa wideo"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Udostępnij i zadzwoń"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
index ee2b87c..f517c7a 100644
--- a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar para área de transferência"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ligar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ligar para residência"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ligar para celular"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ligar para pager comercial"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ligar para MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamada)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar SMS para residência"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS para celular"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS para pager comercial"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS para MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (mensagem)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Apagar contatos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Apagando contatos frequentes…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Pesquisando..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Mais de <xliff:g id="COUNT">%d</xliff:g> encontrados."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nenhum contato"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> encontrado</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> encontrados</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Mais chamados"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contatos frequentes"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizar contato"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contatos com números de telefone"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatos do perfil de trabalho"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar e-mail para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar e-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Caixa postal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Bairro"</string>
     <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"CEP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Bater papo usando o ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Bater papo usando o Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Bate-papo"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"excluir"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expandir ou recolher campos de nome"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expandir ou recolher campos de nome fonético"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contatos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Concluído"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatos em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Cont. na vis. pers."</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contato único"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Salvar contatos importados em:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar do cartão SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar do SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar do SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar de arquivo .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Impossível cancelar imp./export. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erro desconhecido."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Não há contato exportável."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Você desativou uma permissão obrigatória."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ocorreu um erro ao exportar: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"O nome de arquivo exigido é muito longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erro E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Não há memória suficiente. O arquivo pode ser muito grande."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Não foi possível analisar o vCard por um motivo inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"O formato não é suportado."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Não foi possível coletar informações meta de determinados arquivos vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Um ou mais arquivos não puderam ser importados (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> concluída."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"A exportação de contatos foi concluída."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"A exportação dos contatos foi concluída. Clique na notificação para compartilhar contatos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toque para compartilhar contatos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> cancelada."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportando dados do contato"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Os dados dos contatos estão sendo exportados."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Não foi possível obter as informações do banco de dados."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Não há contatos exportáveis. Se você tiver contatos no seu dispositivo, talvez alguns provedores de dados não permitam que eles sejam exportados."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"O criador do vCard não iniciou corretamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Impossível exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Os dados de contato não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importando <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Não foi possível ler os dados do vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Leitura dos dados do vCard cancelada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importação do vCard <xliff:g id="FILENAME">%s</xliff:g> concluída"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importação do vCard <xliff:g id="FILENAME">%s</xliff:g> cancelada"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> será importado em breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"O arquivo será importado em breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"O arquivo será exportado em breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Os contatos serão exportados em breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contato"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Armazenando VCards em cache no armazenamento temporário local. A importação real começará em breve."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Não foi possível importar o vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contato via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportar contatos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Armazenando em cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar p/ arquivo .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Classificar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sobrenome"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato de nome"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro o sobrenome"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Conta padrão para novos contatos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadados de contatos"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Sobre Contatos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Configurações"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Compartilhar contatos visíveis"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Falha ao compartilhar contatos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Compartilhar contatos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Compartilhar todos os contatos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Falha ao compartilhar contatos."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contatos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contatos"</string>
-    <string name="share_error" msgid="5642622973966851784">"Este contato não pode ser compartilhado."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Não há contatos para compartilhar."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Pesquisar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Localizar contatos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nenhum contato."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Não há contatos visíveis."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nenhum favorito"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nenhum contato em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Apagar frequentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Selecionar cartão SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gerenciar contas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opções de exibição de contato"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Sempre usar esta opção para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ligar com"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escreva uma nota para enviar com a chamada..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Guia \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> item não lido. </item>
       <item quantity="other">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versão"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenças de código aberto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalhes da licença do software de código aberto"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de Privacidade"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Termos de Serviço"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Falha ao abrir o URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartilhar e ligar"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
index 44bba14..4f612f5 100644
--- a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar para área de transf."</string>
     <string name="call_custom" msgid="3041673234638990874">"Telefonar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Telefonar para casa"</string>
     <string name="call_mobile" msgid="967589404494150813">"Telefonar para telemóvel"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Telefonar para o pager do trabalho"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Telefonar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Telefonar para um número MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chamada)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar mensagem de texto para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar mensagem de texto para o telefone de casa"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar mensagem de texto para telemóvel"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar mensagem de texto para o pager do trabalho"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar mensagem de texto para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar mensagem de texto para um número MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mensagem)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Limpar contactos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Limpa a lista de contactos frequentes nas aplicações Contactos e Telemóvel e força as aplicações de email a aprenderem as suas preferências de endereço de raiz."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"A limpar contactos frequentes..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado(a)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"A pesquisar..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Foram encontrados mais de <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Sem contactos"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> found</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> encontrados</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Números de marcação frequente"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactados frequentemente"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contactos com números de telefone"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos do perfil de trabalho"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Apartado"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Bairro"</string>
     <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chat através do ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chat através do Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"eliminar"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expandir ou reduzir campos dos nomes"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expandir ou reduzir campos de nomes fonéticos"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contactos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Concluído"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Contactos na vista personalizada"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Guardar contactos importados em:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar do cartão SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar do SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar do SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar de ficheiro .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Imposs. cancel. import./export. do vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erro desconhecido."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Não existe um contacto exportável."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Desativou uma autorização obrigatória."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ocorreu um erro durante a exportação: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Nome de ficheiro demasiado longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erro de E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Memória insuficiente. O ficheiro pode ser demasiado grande."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Não foi possível analisar o vCard por um motivo inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"O formato não é suportado."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Não foi possível recolher meta informações de determinado(s) ficheiro(s) vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Não foi possível importar um ou mais ficheiros (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"A exportação de <xliff:g id="FILENAME">%s</xliff:g> terminou."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Exportação de contactos concluída."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"A exportação dos contactos foi concluída. Clique na notificação para partilhar contactos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toque para partilhar contactos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"A exportação de <xliff:g id="FILENAME">%s</xliff:g> foi cancelada."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"A exportar dados do contacto"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Os dados de contactos estão a ser exportados."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Não foi possível obter informações da base de dados"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Não existem contactos para exportar. Se tiver contactos no seu dispositivo, alguns fornecedores de dados podem não permitir a exportação dos contactos a partir do dispositivo."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"O compositor vCard não iniciou corretamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Impossível exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Os dados de contactos não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"A importar <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Não foi possível ler dados do vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"A leitura de dados vCard foi cancelada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"A importação do vCard terminou <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"A importação de <xliff:g id="FILENAME">%s</xliff:g> foi cancelada"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> será importado em breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"O ficheiro será importado em breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"O <xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"O ficheiro é exportado em breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Os contactos serão exportados brevemente."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contacto"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"A colocar vCard(s) em cache no armazenamento temporário local. A importação efetiva começará brevemente."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Não foi possível importar o vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contacto recebido através de NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportar contactos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"A colocar em cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"A importar <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar p/ ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome próprio"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelido"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato do nome"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nome próprio em primeiro lugar"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apelido em primeiro lugar"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Conta predefinida para novos contactos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadados de contactos"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Acerca do Contactos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Definições"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Partilhar contactos visíveis"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Falha ao partilhar os contactos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Partilhar contactos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Partilhar todos os contactos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Falha ao partilhar os contactos."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contactos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contactos"</string>
-    <string name="share_error" msgid="5642622973966851784">"Não é possível partilhar este contacto."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Não existem contactos para partilhar."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Pesquisar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Localizar contactos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Sem contactos."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Sem contactos visíveis"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Sem favoritos"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Sem contactos em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Limpar frequentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Selecionar cartão SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gerir contas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"através do <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> através do <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opções de visualização de contactos"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Utilizar sempre este para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ao telefone com"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escrever uma nota para enviar com a chamada..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Separador <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
+      <item quantity="one"> Separador <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item não lido. </item>
       <item quantity="other"> Separador <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versão da compilação"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenças de código aberto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalhes da licença para software de código aberto"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de Privacidade"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Termos de Utilização"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Falha ao abrir o URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Partilhar e ligar"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt/strings.xml b/java/com/android/contacts/common/res/values-pt/strings.xml
index ee2b87c..f517c7a 100644
--- a/java/com/android/contacts/common/res/values-pt/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiar para área de transferência"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ligar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ligar para residência"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ligar para celular"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ligar para pager comercial"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ligar para MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamada)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Enviar SMS para residência"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS para celular"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS para pager comercial"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS para MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (mensagem)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Apagar contatos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Apagando contatos frequentes…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
     <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Pesquisando..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Mais de <xliff:g id="COUNT">%d</xliff:g> encontrados."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nenhum contato"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> encontrado</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> encontrados</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Mais chamados"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contatos frequentes"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizar contato"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contatos com números de telefone"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatos do perfil de trabalho"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Enviar e-mail para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Enviar e-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Caixa postal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Bairro"</string>
     <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"CEP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Bater papo usando o ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Bater papo usando o Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Bate-papo"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"excluir"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expandir ou recolher campos de nome"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expandir ou recolher campos de nome fonético"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contatos"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Concluído"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Cancelar"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatos em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Cont. na vis. pers."</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Contato único"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Salvar contatos importados em:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importar do cartão SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importar do SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importar do SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importar de arquivo .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Impossível cancelar imp./export. vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Erro desconhecido."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Não há contato exportável."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Você desativou uma permissão obrigatória."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ocorreu um erro ao exportar: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"O nome de arquivo exigido é muito longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Erro E/S"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Não há memória suficiente. O arquivo pode ser muito grande."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Não foi possível analisar o vCard por um motivo inesperado."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"O formato não é suportado."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Não foi possível coletar informações meta de determinados arquivos vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Um ou mais arquivos não puderam ser importados (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> concluída."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"A exportação de contatos foi concluída."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"A exportação dos contatos foi concluída. Clique na notificação para compartilhar contatos."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Toque para compartilhar contatos."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> cancelada."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Exportando dados do contato"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Os dados dos contatos estão sendo exportados."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Não foi possível obter as informações do banco de dados."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Não há contatos exportáveis. Se você tiver contatos no seu dispositivo, talvez alguns provedores de dados não permitam que eles sejam exportados."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"O criador do vCard não iniciou corretamente."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Impossível exportar"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Os dados de contato não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importando <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Não foi possível ler os dados do vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Leitura dos dados do vCard cancelada"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importação do vCard <xliff:g id="FILENAME">%s</xliff:g> concluída"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importação do vCard <xliff:g id="FILENAME">%s</xliff:g> cancelada"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> será importado em breve."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"O arquivo será importado em breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"O arquivo será exportado em breve."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Os contatos serão exportados em breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contato"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Armazenando VCards em cache no armazenamento temporário local. A importação real começará em breve."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Não foi possível importar o vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Contato via NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportar contatos?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Armazenando em cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportar p/ arquivo .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Classificar por"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sobrenome"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato de nome"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro o sobrenome"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Conta padrão para novos contatos"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizar metadados de contatos"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Sobre Contatos"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Configurações"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Compartilhar contatos visíveis"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Falha ao compartilhar contatos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Compartilhar contatos favoritos"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Compartilhar todos os contatos"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Falha ao compartilhar contatos."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importar/exportar contatos"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importar contatos"</string>
-    <string name="share_error" msgid="5642622973966851784">"Este contato não pode ser compartilhado."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Não há contatos para compartilhar."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Pesquisar"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Localizar contatos"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoritos"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nenhum contato."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Não há contatos visíveis."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nenhum favorito"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nenhum contato em <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Apagar frequentes"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Selecionar cartão SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gerenciar contas"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importar/exportar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opções de exibição de contato"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Sempre usar esta opção para chamadas"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ligar com"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Escreva uma nota para enviar com a chamada..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Guia \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> item não lido. </item>
       <item quantity="other">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versão"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenças de código aberto"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalhes da licença do software de código aberto"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Política de Privacidade"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Termos de Serviço"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Falha ao abrir o URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartilhar e ligar"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ro/strings.xml b/java/com/android/contacts/common/res/values-ro/strings.xml
index 358e7af..b4426cd 100644
--- a/java/com/android/contacts/common/res/values-ro/strings.xml
+++ b/java/com/android/contacts/common/res/values-ro/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text copiat"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Copiați în clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Apelați <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Apelați numărul de domiciliu"</string>
     <string name="call_mobile" msgid="967589404494150813">"Apelați numărul de mobil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Apelați numărul de pager de serviciu"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Apelați <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Apelați MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (apelați)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Trimiteți un mesaj text către <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Trimiteți un mesaj text către telefonul de domiciliu"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Trimiteți un mesaj text către numărul de mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Trimiteți un mesaj text către un număr de pager de serviciu"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Trimiteți un mesaj text către <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Trimiteți un mesaj text către un număr MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (trimiteți mesaj)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Ștergeți pers. frecvent contactate?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Veți șterge lista persoanelor contactate frecvent din aplicațiile Agendă și Telefon și veți forța aplicațiile de e-mail să vă învețe preferințele pentru adrese de la zero."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Se șterg pers. frecvent contactate…"</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Plecat(ă)"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ocupat(ă)"</string>
     <string name="contactsList" msgid="8806067891419291513">"Agendă"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Cele mai populare sugestii"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Altul"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Director"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directorul de serviciu"</string>
     <string name="local_search_label" msgid="907622822323119235">"Toată agenda"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestii"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Se caută…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"S-au găsit peste <xliff:g id="COUNT">%d</xliff:g> persoane de contact."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nu există persoane în agendă"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> găsite</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> găsite</item>
-      <item quantity="one">Una găsită</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Contact rapid pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Fără nume)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Apelate frecvent"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Contactate frecvent"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Vizualizați persoana din agendă"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Toate persoanele de contact cu numere de telefon"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Persoane de contact din profilul de serviciu"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Trimiteți un e-mail la <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Trimiteți un e-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Stradă"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Căsuță poștală"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Cartier"</string>
     <string name="postal_city" msgid="8674569121430005628">"Oraș"</string>
     <string name="postal_region" msgid="1730369286225469192">"Stat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Cod poștal"</string>
@@ -145,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Conversați prin ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Conversați prin Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Conversați prin chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ștergeți"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Extindeți sau restrângeți câmpurile pentru nume"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Extindeți sau restrângeți câmpurile pentru nume fonetice"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Toată agenda"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Terminat"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Anulați"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Agenda din <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Agenda în afișarea personalizată"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"O singură persoană de contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Salvați persoanele de contact importate în:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importați de pe cardul SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importați de pe cardul SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importați de pe cardul SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importați din fișier .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Anulați importul fișierului <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Anulați exportul fișierului <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Anulare import/export vCard nereușită"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Eroare necunoscută."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nu s-a putut deschide fișierul „<xliff:g id="FILE_NAME">%s</xliff:g>”: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nu s-a putut inițializa instrumentul de export: „<xliff:g id="EXACT_REASON">%s</xliff:g>”"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nu există persoane de contact care să poată fi exportate."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Ați dezactivat o permisiune necesară."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"A apărut o eroare în timpul exportului: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Numele de fișier solicitat este prea lung („<xliff:g id="FILENAME">%s</xliff:g>”)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Eroare I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Memoria este insuficientă (probabil fișierul este prea mare)."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Nu s-au putut analiza datele de pe vCard dintr-un motiv neașteptat."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatul nu este acceptat."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Nu s-au putut colecta metainformațiile pentru fișierele vCard indicate."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Unul sau mai multe fișiere nu s-au putut importa (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"S-a finalizat exportul fișierului <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Persoanele de contact au fost exportate."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"S-a încheiat exportul persoanelor de contact. Dați clic pe notificare pentru a trimite persoanele de contact."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Atingeți pentru a trimite persoanele de contact."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportul fișierului <xliff:g id="FILENAME">%s</xliff:g> a fost anulat."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Se exportă datele persoanelor de contact"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Se exportă datele privind persoanele de contact."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nu s-au putut obține informații din baza de date."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nu există persoane de contact care să poată fi exportate. Dacă aveți persoane de contact pe dispozitiv, este posibil ca exportul acestora de pe dispozitiv să nu fie permis de unii furnizori de date."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Editorul de vCard nu a pornit în mod corespunzător."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Nu s-a putut exporta"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Datele persoanelor de contact nu au fost exportate.\nMotivul: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Se importă <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nu s-au putut citi datele de pe vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Citirea datelor vCard a fost anulată"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"S-a finalizat importul fișierului vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importul <xliff:g id="FILENAME">%s</xliff:g> a fost anulat"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> va fi importat în curând."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fișierul va fi importat în curând."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Solicitarea de import a fișierului vCard a fost respinsă. Încercați din nou mai târziu."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> va fi exportat în curând."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fișierul va fi exportat în curând."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Persoanele de contact vor fi exportate în curând."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Solicitarea de export a fișierului vCard a fost respinsă. Încercați din nou mai târziu."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"persoană de contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Fișierele vCard se stochează în memoria cache într-un spațiu de stocare local temporar. Importul propriu-zis va începe în curând."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Nu s-a putut importa fișierul vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Persoană primită prin NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportați agenda?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Se stochează în cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Se importă <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportați ca fișier .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortați după"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prenume"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nume"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format pentru nume"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Întâi prenumele"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Întâi numele"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Contul prestabilit pentru persoanele de contact noi"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sincronizați metadatele pentru persoanele de contact"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Despre Agendă"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Setări"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Distribuiți persoanele de contact vizibile"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Persoanele de contact vizibile nu au putut fi trimise."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Trimiteți persoanele de contact preferate"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Trimiteți toate persoanele de contact"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Persoanele de contact nu s-au trimis."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importați/exportați agenda"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importați Agenda"</string>
-    <string name="share_error" msgid="5642622973966851784">"Nu se poate permite accesul la această intrare."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nu există persoane de contact de trimis."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Căutați"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Găsiți persoane de contact"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favorite"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nicio persoană de contact."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nicio persoană de contact nu este vizibilă."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nu există preferate"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nicio persoană de contact în <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Ștergeți contacte frecvente"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Selectați cardul SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Gestionați conturile"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importați/Exportați"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"prin <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> prin <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"nu mai căutați"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Ștergeți căutarea"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opțiuni de afișare pentru persoanele de contact"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Cont"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Utilizați mereu pentru apeluri"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Apelați cu"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Introduceți o notă ca să o trimiteți împreună cu apelul..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"TRIMITEȚI ȘI APELAȚI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Fila <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="few"> Fila <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elemente necitite. </item>
       <item quantity="other"> Fila <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> de elemente necitite. </item>
       <item quantity="one"> Fila <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> element necitit. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versiunea"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licențe open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detalii privind licența pentru software-ul open source"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Confidențialitate"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Termeni și condiții"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licențe open source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Adresa URL nu a putut fi deschisă."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Apel video"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Trimiteți și apelați"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ru/strings.xml b/java/com/android/contacts/common/res/values-ru/strings.xml
index 3442f2c..f8b70a7 100644
--- a/java/com/android/contacts/common/res/values-ru/strings.xml
+++ b/java/com/android/contacts/common/res/values-ru/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текст скопирован"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Копировать в буфер обмена"</string>
     <string name="call_custom" msgid="3041673234638990874">"Вызов:<xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Домашний"</string>
     <string name="call_mobile" msgid="967589404494150813">"Мобильный"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Рабочий пейджер"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Вызов: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Номер MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (вызов)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS: домашний"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS: мобильный"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS: рабочий пейджер"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS: номер MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Очистить список популярных контактов?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Список популярных контактов в приложениях \"Контакты\" и \"Телефон\" будет очищен, а приложения электронной почты начнут запоминать адреса заново."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Подождите…"</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Отсутствует"</string>
     <string name="status_busy" msgid="5990832098713248503">"Не беспокоить"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакты"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Топ рекомендуемых"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Другое"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Каталог контактов из рабочего профиля"</string>
     <string name="local_search_label" msgid="907622822323119235">"Все контакты"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Рекомендуемые"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Вы"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Поиск…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Найдено контактов: более <xliff:g id="COUNT">%d</xliff:g>"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Нет контактов"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Найден <xliff:g id="COUNT">%d</xliff:g> контакт</item>
-      <item quantity="few">Найдено <xliff:g id="COUNT">%d</xliff:g> контакта</item>
-      <item quantity="many">Найдено <xliff:g id="COUNT">%d</xliff:g> контактов</item>
-      <item quantity="other">Найдено <xliff:g id="COUNT">%d</xliff:g> контакта</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Быстрый вызов, контакт: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"Имя не указано"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Часто вызываемые"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Часто набираемые"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Посмотреть контакт"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Контакты с номерами телефонов"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакты из рабочего профиля"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Написать письмо (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"Написать письмо"</string>
     <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Абонентский ящик"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Район"</string>
     <string name="postal_city" msgid="8674569121430005628">"Город"</string>
     <string name="postal_region" msgid="1730369286225469192">"Регион"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Индекс"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Чат через ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Чат через Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"удалить"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Показать/скрыть дополнительные поля"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Показать или скрыть поля с транскрипцией имени"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Все контакты"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Готово"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Отмена"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакты аккаунта \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="listCustomView" msgid="5306282632413086731">"Пользовательский фильтр"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Один контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Куда сохранить контакты?"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Импорт с SIM-карты"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Импорт с SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Импорт с SIM-карты <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Импорт из файла VCF"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Отменить импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Отменить экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Не удалось отменить импорт/экспорт vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Неизвестная ошибка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Не удалось открыть файл <xliff:g id="FILE_NAME">%s</xliff:g>. <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Не удалось запустить инструмент экспорта. <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Нет контактов для экспорта."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Отсутствует необходимое разрешение."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Произошла ошибка экспорта. <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Слишком длинное название файла (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Ошибка ввода-вывода"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Недостаточно памяти. Возможно, файл слишком большой."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Не удалось выполнить синтаксический анализ файла vCard."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Формат не поддерживается."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Не удалось собрать метаданные файлов vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Не удалось импортировать один или несколько файлов (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" завершен"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Экспорт контактов завершен."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Экспорт контактов завершен. Чтобы открыть к ним доступ, нажмите на уведомление."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Нажмите, чтобы открыть доступ к контактам."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Экспорт данных контакта"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Экспорт контактов…"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"База данных недоступна."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Не найдены контакты для экспорта. Возможно, экспорт контактов с устройства не поддерживается поставщиком услуг передачи данных."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Сбой при запуске редактора vCard."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Ошибка экспорта"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Не удалось экспортировать данные.\nПричина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Импорт файла \"<xliff:g id="NAME">%s</xliff:g>\"…"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Данные файла vCard не прочитаны"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Чтение данных vCard отменено"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Файл \"<xliff:g id="FILENAME">%s</xliff:g>\" импортирован"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" скоро начнется."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Импорт файла скоро начнется."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Запрос на импорт данных vCard отклонен. Повторите попытку позже."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" скоро начнется."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Файл будет экспортирован в ближайшее время."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Контакты скоро будут экспортированы."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Выполняется кеширование файлов vCard в локальное временное хранилище, после чего начнется импорт."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Не удалось импортировать данные vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Получено по NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Экспортировать контакты?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кеширование…"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Импорт <xliff:g id="CURRENT_NUMBER">%s</xliff:g> из <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>..."</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Экспорт в файл VCF"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортировка"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"По имени"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"По фамилии"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат имени"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Сначала имя"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Сначала фамилия"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Аккаунт по умолчанию для новых контактов"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронизация метаданных контакта"</string>
-    <string name="setting_about" msgid="5253319937596745755">"О Контактах"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Настройки"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Передать видимые контакты"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Не удалось поделиться видимыми контактами."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Отправить избранные"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Отправить все контакты"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Не удалось отправить контакты"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Импорт/экспорт контактов"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Импортировать контакты"</string>
-    <string name="share_error" msgid="5642622973966851784">"Не удалось передать данные"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Доступных контактов нет"</string>
-    <string name="menu_search" msgid="1241802591112035764">"Поиск"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Поиск контактов"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Избранное"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Нет контактов"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Нет видимых контактов"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Здесь пока ничего нет"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Нет контактов в группе \"<xliff:g id="NAME">%s</xliff:g>\""</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Очистить популярные"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Выберите SIM-карту"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Управление аккаунтами"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Импорт/экспорт"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"в <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"прекратить поиск"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Очистить условия поиска"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Отображение контактов"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Аккаунт"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Всегда использовать для звонков"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Аккаунт для звонка"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Введите текст…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ОТПРАВИТЬ И ПОЗВОНИТЬ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Вкладка \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанный элемент. </item>
@@ -258,13 +159,6 @@
       <item quantity="many">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанных элементов. </item>
       <item quantity="other">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанного элемента. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Версия сборки"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Лицензии открытого ПО"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Сведения о лицензиях на ПО с открытым исходным кодом"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Политика конфиденциальности"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Условия использования"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Лицензии открытого ПО"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Не удалось открыть URL."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видеовызов"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Поделиться и позвонить"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-si/strings.xml b/java/com/android/contacts/common/res/values-si/strings.xml
index 72ca32d..94612ef 100644
--- a/java/com/android/contacts/common/res/values-si/strings.xml
+++ b/java/com/android/contacts/common/res/values-si/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"පෙළ පිටපත් කරන ලදී"</string>
-    <string name="copy_text" msgid="5890820280087874642">"පසුරු පුවරුවට පිටපත් කරන්න"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> අමතන්න"</string>
     <string name="call_home" msgid="125893483593803791">"ගෙදර අමතන්න"</string>
     <string name="call_mobile" msgid="967589404494150813">"ජංගම දුරකථනය අමතන්න"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"කාර්යාල පේජරය අමතන්න"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> අමතන්න"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS අමතන්න"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ඇමතුම)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_home" msgid="3527719551060295243">"නිවසට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"කාර්යාල පේජරයට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (පණිවිඩය)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"නිතරම සම්බන්ධ වන අය හිස් කරන්නද?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ඔබ සම්බන්ධතා සහ දුරකථන යෙදුම්වලින් නිතරම සම්බන්ධ වුණු අයගේ ලැයිස්තුව හිස් කර, මුල සිටම ඔබගේ ලිපින අභිරුචි ඉගෙනීමට ඊ-තැපැල් යෙදුම්වලට බල කරයි."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"නිතරම සම්බන්ධ වන අය හිස් කරමින්…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ළඟ නැත"</string>
     <string name="status_busy" msgid="5990832098713248503">"කාර්යබහුල"</string>
     <string name="contactsList" msgid="8806067891419291513">"සම්බන්ධතා"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ඉහළින්ම යෝජිත"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"වෙනත්"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"නාමාවලිය"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"කාර්යාල සම්බන්ධතා නාමාවලිය"</string>
     <string name="local_search_label" msgid="907622822323119235">"සියලුම සම්බන්ධතා"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"යෝජනා"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"මම"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"සොයමින්..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> ට වඩා සොයාගන්නා ලදී."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"සම්බන්ධතා නැත"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>ක් සොයා ගන්නා ලදි</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>ක් සොයා ගන්නා ලදි</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> සඳහා ඉක්මන් සම්බන්ධතාව"</string>
     <string name="missing_name" msgid="978606963362745020">"(නමක් නොමැත)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"නිතරම අමතන ලද"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"නිතරම සම්බන්ධ වන"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"සම්බන්ධතාව පෙන්වන්න."</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"දුරකථන අංක සහිත සම්බන්ධතා"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"කාර්යාල පැතිකඩ සම්බන්ධතා"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ඊ-තැපැල් කරන්න"</string>
     <string name="email" msgid="2807318537887091606">"ඊ-තැපෑල"</string>
     <string name="postal_street" msgid="6918171741240802474">"වීථිය"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"තැපැල් පෙට්ටිය"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"අසල්වැසි ප්‍රදේශය"</string>
     <string name="postal_city" msgid="8674569121430005628">"නගරය"</string>
     <string name="postal_region" msgid="1730369286225469192">"ජනපදය"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ZIP කේතය"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ භාවිතයෙන් කතාබස් කරන්න"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber භාවිතයෙන් කතාබස් කරන්න"</string>
     <string name="chat" msgid="1020428260359370236">"කතාබස්"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"මකන්න"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"නම් ක්ෂේත්‍ර විහිදන්න හෝ හකුළන්න"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ශබ්දිම නම් ක්ෂේත්‍ර විහිදීම හෝ හැකිළීම"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"සියලුම සම්බන්ධතා"</string>
-    <string name="menu_done" msgid="1817505539263889535">"හරි"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"අවලංගු කරන්න"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> හි සම්බන්ධතා"</string>
     <string name="listCustomView" msgid="5306282632413086731">"අභිරුචි පෙනුමේ සම්බන්ධතා"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"එක් සම්බන්ධතාවය"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"ආයාත කළ සම්බන්ධතා මෙහි සුරකින්න:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM පතෙන් ආයාත කරන්න"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> වෙතින් ආයාත කරන්න"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> වෙතින් ආයාත කරන්න"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ගොනුවකින් ආයාත කරන්න"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවලංගු කරන්නද?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවලංගු කරන්නද?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard ආයාත/නිර්යාත කිරීම අවලංගු කළ නොහැක"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"නොදන්නා දෝෂය."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" විවෘත කිරීමට නොහැකි විය: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"නිර්යාතකරු පටන් ගැනීමට නොහැක: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"නිර්යාත කළ හැකි සම්බන්ධතාවයක් නොමැත."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"ඔබ අවශ්‍ය අවසරයක් අබල කර ඇත."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"නිර්යාතය අතරතුර දෝෂයක් සිදු විය: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"අවශ්‍ය කරන ගොනු නම දිග වැඩිය (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O දෝෂය"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"මතකය මදිය. ගොනුව විශාල වැඩි විය හැක."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"බලාපොරොත්තු නොවූ හේතුවක් නිසා vCard ය විග්‍රහ කළ නොහැක."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"මෙම ආකෘතිය වෙත සහාය නොදක්වයි."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ලබාදුන් vCard ගොනු(ව) වල පාර දත්ත එකතු කළ නොහැකි විය."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ගොනු එකක් හෝ කිහිපයක් ආයාත කිරීමට නොහැකි විය (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවසන් කෙරුණි."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"සම්බන්ධතා නිර්යාත කිරීම අවසන් කෙරුණි."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"සම්බන්ධතා නිර්යාත කිරීම අවසන්ය, සම්බන්ධතා බෙදා ගැනීමට දැනුම්දීම ක්ලික් කරන්න."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"සම්බන්ධතා බෙදා ගැනීමට තට්ටු කරන්න."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවලංගු කෙරුණි."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"සම්බන්ධතා දත්ත නිර්යාත කිරීම"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"සම්බන්ධතා දත්ත නිර්යාත කරමින් තිබේ."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"දත්ත සමුදායේ තොරතුරු ලබාගත නොහැකි විය."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"නිර්යාත කළ හැකි සම්බන්ධතා නැත. ඔබේ උපාංගයේ සම්බන්ධතා තිබේ නම්, සමහර දත්ත සපයන්නන් උපාංගයෙන් සම්බන්ධතා නිර්යාත කිරීමට අවසර ලබා නොදිය හැකිය."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard සකසනය නිවැරදිව පටන් ගත්තේ නැත."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"නිර්යාත කළ නොහැකි වීය"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"සම්බන්ධතා දත්ත නිර්යාත නොකරන ලදි.\nහේතුව: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> ආයාත කරමින්"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard දත්ත කියවිය නොහැක විය"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard දත්ත කියවීම අවලංගු කෙරුණි"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවසන් විය"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවලංගු කෙරුණි"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> කෙටි වේලාවකින් ආයාත වනු ඇත."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ගොනුව කෙටි වේලාවකින් ආයාත කරනු ඇත."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard ආයාත ඉල්ලීම ප්‍රතික්ෂේප කරන ලදි. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> කෙටි වේලාවකින් නිර්යාත කරනු ඇත."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ගොනුව කෙටි වේලාවකින් නිර්යාත කරනු ඇත."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ටික වේලාවකින් සම්බන්ධතා නිර්යාත කරනු ඇත."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard නිර්යාත අයැදුම ප්‍රතික්ෂේප කරන ලදි. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"සම්බන්ධතාවය"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"පෙදෙසි තාවකාලික ආචයනයට vCard(s) හැඹිලිගත කරමින් පවතී. සැබෑ ආයාත කිරීම ඉක්මනින් පටන් ගනු ඇත."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard ආයාත කිරීමට නොහැකි විය."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC හරහා සම්බන්ධතාව ලැබුණි"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"සම්බන්ධතා නිර්යාත කරන්නද?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"හැඹිලි ගත කරමින්"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ආයාත කරමින්: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ගොනුවකට නිර්යාත කරන්න"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"අනුපිළිවෙලට සකසා ඇත්තේ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"පළමු නම"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"අවසාන නම"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"නමේ ආකෘතිය"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"මුල් නම මුලින්ම"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"අවසාන නම මුලින්ම"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"නව සම්බන්ධතා සඳහා පෙරනිමි ගිණුම"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"සම්බන්ධතා පාරදත්ත සමමුහුර්ත කරන්න"</string>
-    <string name="setting_about" msgid="5253319937596745755">"සම්බන්ධතා ගැන"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"සැකසීම්"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"පෙනෙන සම්බන්ධතා බෙදාගන්න"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"දෘශ්‍යමාන සම්බන්ධතා බෙදා ගැනීම අසාර්ථක විය."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ප්‍රියතම සම්බන්ධතා බෙදා ගන්න"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"සියලු සම්බන්ධතා බෙදා ගන්න"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"සම්බන්ධතා බෙදා ගැනීම අසාර්ථක විය."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"සම්බන්ධතා ආයාත/නිර්යාත කිරීම"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"සම්බන්ධතා ආයාත කරන්න"</string>
-    <string name="share_error" msgid="5642622973966851784">"මෙම සම්බන්ධතාව බෙදා ගත නොහැක."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"බෙදාගැනීමට සම්බන්ධතා නොමැත."</string>
-    <string name="menu_search" msgid="1241802591112035764">"සොයන්න"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"සම්බන්ධතා සොයන්න"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ප්‍රියතම"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"සම්බන්ධතා නැත."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"දෘශ්‍ය සම්බන්ධතා නැත."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ප්‍රියතම නැත"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> හි සම්බන්ධතා නැත"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"නිතරමයන් හිස් කරන්න"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM කාඩ්පත තෝරන්න"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ගිණුම් කළමනාකරණය කරන්න"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"ආයාත/නිර්යාත"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> හරහා"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> මඟින් <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"සෙවීම අවසන් කරන්න"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"සෙවීම හිස් කරන්න"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"දර්ශනය කිරීමේ විකල්පය සම්බන්ධ කරගන්න"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ගිණුම"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"සමඟ අමතන්න"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"ඇමතුම සමග යැවීමට සටහනක් ටයිප් කරන්න ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"යවන්න සහ අමතන්න"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ටැබය."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ටැබය. නොකියවූ අයිතම <xliff:g id="COUNT_3">%2$d</xliff:g>. </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ටැබය. නොකියවූ අයිතම <xliff:g id="COUNT_3">%2$d</xliff:g>. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"තැනුම් අනුවාදය"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"විවෘත මූලාශ්‍ර බලපත්‍ර"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"විවෘත මූලාශ්‍ර මෘදුකාංග සඳහා බලපත්‍ර විස්තර"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"පෞද්ගලිකත්ව ප්‍රතිපත්තිය"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"සේවා නියම"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"විවෘත මූලාශ්‍ර බලපත්‍ර"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"url විවෘත කිරීමට අසමත් විය."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"වීඩියෝ ඇමතුම"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"බෙදා ගෙන අමතන්න"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sk/strings.xml b/java/com/android/contacts/common/res/values-sk/strings.xml
index b85f63f..dc4d041 100644
--- a/java/com/android/contacts/common/res/values-sk/strings.xml
+++ b/java/com/android/contacts/common/res/values-sk/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Text bol skopírovaný"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopírovať do schránky"</string>
     <string name="call_custom" msgid="3041673234638990874">"Volať kontakt <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Volať na domáci telefón"</string>
     <string name="call_mobile" msgid="967589404494150813">"Volať na mobil"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Volať na pracovný pager"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Volať kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Volať na číslo MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hovor)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Poslať správu kontaktu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Poslať správu na domáci telefón"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Poslať správu na mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Poslať správu na pracovný pager"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Poslať správu kontaktu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Poslať správu na číslo MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (správa)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vymazať často kontaktované osoby?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vymažete zoznam často kontaktovaných osôb v aplikáciách Kontakty a Telefón a e-mailové aplikácie budú musieť odznova vytvoriť predvoľby adresátov."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Mazanie často kontaktov. osôb..."</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Som preč"</string>
     <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najviac odporúčané"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Iné"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Adresár"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovný adresár"</string>
     <string name="local_search_label" msgid="907622822323119235">"Všetky kontakty"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Hľadá sa…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Našlo sa viac ako <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Žiadne kontakty"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="few">Boli nájdené <xliff:g id="COUNT">%d</xliff:g> kontakty</item>
-      <item quantity="many">Bolo nájdených niekoľko (<xliff:g id="COUNT">%d</xliff:g>) kontaktov</item>
-      <item quantity="other">Bolo nájdených <xliff:g id="COUNT">%d</xliff:g> kontaktov</item>
-      <item quantity="one">Bol nájdený 1 kontakt</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Rýchly kontakt pre osobu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Bez mena)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Najčastejšie volané kontakty"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Najčastejšie používané kontakty"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Zobraziť kontakt"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Všetky kontakty s telefónnymi číslami"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty v pracovnom profile"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Poslať e-mail na adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Štvrť"</string>
     <string name="postal_city" msgid="8674569121430005628">"Mesto"</string>
     <string name="postal_region" msgid="1730369286225469192">"Štát"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"PSČ"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Zhovárať sa pomocou služby ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Zhovárať sa pomocou služby Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Četovať"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"odstrániť"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Rozbaliť alebo zbaliť pole mena"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Rozbaliť alebo zbaliť polia foneticky zadaných mien"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Všetky kontakty"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Hotovo"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Zrušiť"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty v účte <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakty vo vlastnom zobrazení"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Jednotlivý kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Účet na ukladanie importovaných kontaktov:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importovať zo SIM karty"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importovať zo SIM karty <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importovať zo SIM karty <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importovať zo súboru .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Zrušiť importovanie súboru <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Zrušiť exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Import alebo export vizitky nie je možné zrušiť"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Neznáma chyba."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Súbor <xliff:g id="FILE_NAME">%s</xliff:g> nebolo možné otvoriť: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Nástroj na exportovanie sa nepodarilo spustiť: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nedá sa exportovať žiadny kontakt."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Zakázali ste požadované povolenie."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Počas exportovania sa vyskytla chyba: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Požadovaný názov súboru (<xliff:g id="FILENAME">%s</xliff:g>) je príliš dlhý."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Chyba I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nedostatok pamäte. Súbor je možno príliš veľký."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Analýza karty vCard zlyhala z neznámeho dôvodu."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formát nie je podporovaný."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Metaúdaje daných súborov vizitiek vCard sa nepodarilo zhromaždiť."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Nepodaril sa import jedného alebo viacerých súborov (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo dokončené."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Exportovanie kontaktov bolo dokončené"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Exportovanie kontaktov bolo dokončené. Zdieľajte ich kliknutím na upozornenie."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Klepnutím zdieľajte kontakty."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo zrušené."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Export údajov kontaktov"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktné údaje sa exportujú."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Nepodarilo sa získať informácie z databázy."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Neboli nájdené žiadne kontakty, ktoré by bolo možné exportovať. Ak v zariadení skutočne máte kontakty, problém môže byť spôsobený tým, že niektorí poskytovatelia údajov nemusia umožňovať export kontaktov zo zariadenia."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Nástroj na tvorbu vizitiek vCard sa nespustil správne."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Exportovanie zlyhalo"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Údaje o kontaktoch sa neexportovali.\nDôvod: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importuje sa <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Nepodarilo sa prečítať údaje vizitky vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Čítanie údajov vizitky vCard bolo zrušené"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Import vizitky vCard <xliff:g id="FILENAME">%s</xliff:g> bol dokončený"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo zrušené"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro importovaná."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Súbor bude čoskoro importovaný."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro exportovaná."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Súbor bude čoskoro exportovaný."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakty budú čoskoro exportované."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Žiadosť o exportovanie vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Prebieha načítavanie vizitiek vCard do vyrovnávacej pamäte miestneho dočasného úložiska. Samotné importovanie začne o chvíľu."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Vizitku vCard sa nepodarilo importovať."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt cez NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Exportovať kontakty?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Ukladanie do vyrovnávacej pamäte..."</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importuje sa <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportovať do súboru .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Zoradiť podľa"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Krstné meno"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Priezvisko"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formát mena"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprv krstné meno"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprv priezvisko"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Predvolený účet pre nové kontakty"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synchronizácia metadát kontaktov"</string>
-    <string name="setting_about" msgid="5253319937596745755">"O aplikácii Kontakty"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Nastavenia"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Zdieľať viditeľné kontakty"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Nepodarilo sa zdieľať viditeľné kontakty"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Zdieľať obľúbené kontakty"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Zdieľať všetky kontakty"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Nepodarilo sa zdieľať kontakty."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Import a export kontaktov"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importovať kontakty"</string>
-    <string name="share_error" msgid="5642622973966851784">"Tento kontakt nie je možné zdieľať"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nemáte žiadne kontakty na zdieľanie."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Hľadať"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Hľadať kontakty"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Obľúbené"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Žiadne kontakty."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Žiadne kontakty nie sú viditeľné."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Žiadne obľúbené kontakty"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"V skupine <xliff:g id="NAME">%s</xliff:g> nie sú žiadne kontakty"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Vymazať často kontaktovaných"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Vybrať SIM kartu"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Spravovať účty"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import a export"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"zdroj: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>, zdroj: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"zastaviť vyhľadávanie"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Vymazať vyhľadávanie"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Možnosti zobrazenia kontaktov"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Účet"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Vždy používať pre hovory"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Volať pomocou"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Napíšte poznámku, ktorá sa odošle s hovorom..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ODOSLAŤ A VOLAŤ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> neprečítané položky. </item>
@@ -258,13 +159,6 @@
       <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> neprečítaných položiek. </item>
       <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> neprečítaná položka. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Verzia zostavy"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licencie open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Podrobnosti o licenciách pre softvér open source"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Pravidlá ochrany súkromia"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Zmluvné podmienky"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licencie open source"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Webovú adresu nebolo možné otvoriť"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videohovor"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Zdieľať a volať"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sl/strings.xml b/java/com/android/contacts/common/res/values-sl/strings.xml
index f4c39de..1a9eab7 100644
--- a/java/com/android/contacts/common/res/values-sl/strings.xml
+++ b/java/com/android/contacts/common/res/values-sl/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Besedilo kopirano"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiraj v odložišče"</string>
     <string name="call_custom" msgid="3041673234638990874">"Pokliči številko <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Pokliči domov"</string>
     <string name="call_mobile" msgid="967589404494150813">"Pokliči mobilni telefon"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Pokliči službeni pozivnik"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Pokliči številko pomočnika <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Pokliči telefon MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Pokliči)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Pošlji SMS na številko <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Pošlji SMS domov"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Pošlji SMS v mobilni telefon"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Pošlji SMS v službeni pozivnik"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Pošlji SMS pomočniku na številko <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Pošlji SMS na telefonsko številko MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Pošlji sporočilo)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Želite izbrisati seznam pog. stikov?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Izbrisali boste seznam pogostih stikov v aplikacijah Stiki in Telefon, zato bodo e-poštne aplikacije začele shranjevati pogoste naslovnike od začetka."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje seznama pogost. stikov ..."</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Odsoten"</string>
     <string name="status_busy" msgid="5990832098713248503">"Zaseden"</string>
     <string name="contactsList" msgid="8806067891419291513">"Stiki"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Najboljši predlogi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Delovni imenik"</string>
     <string name="local_search_label" msgid="907622822323119235">"Vsi stiki"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlogi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jaz"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Iskanje ..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Najdenih je bilo več kot toliko stikov: <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Ni stikov"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> najden stik</item>
-      <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> najdena stika</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> najdeni stiki</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> najdenih stikov</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Hitri stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Ni imena)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Pogosto klicani"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Pogosto uporabljeni stiki"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Ogled stika"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Vsi stiki s telefonskimi številkami"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Stiki za delovni profil"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Pošlji e-poštno sporočilo na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Pošlji e-poštno sporočilo"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Poštni predal"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Naselje"</string>
     <string name="postal_city" msgid="8674569121430005628">"Kraj"</string>
     <string name="postal_region" msgid="1730369286225469192">"Zvezna država"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Poštna številka"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Klepet s storitvijo ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Klepet s storitvijo Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Klepet"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"izbriši"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Razširi ali strni imenska polja"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Razširitev ali strnitev fonetičnih imenskih polj"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Vsi stiki"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Dokončano"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Prekliči"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Stiki v <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Stiki v pogledu po meri"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Posamezen stik"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Shranjevanje uvoženih stikov v račun:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Uvoz s kartice SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Uvoz s kartice SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Uvoz s kartice SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Uvoz iz datoteke .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Želite preklicati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Želite preklicati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Uvoza/izvoza vCard ni mogoče preklicati"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Neznana napaka."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Datoteke »<xliff:g id="FILE_NAME">%s</xliff:g>« ni bilo mogoče odpreti: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Funkcije za izvoz ni bilo mogoče zagnati: »<xliff:g id="EXACT_REASON">%s</xliff:g>«."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Ni stikov za izvoz."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Onemogočili ste zahtevano dovoljenje."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Pri izvozu je prišlo do napake: »<xliff:g id="EXACT_REASON">%s</xliff:g>«."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Zahtevano ime datoteke je predolgo (»<xliff:g id="FILENAME">%s</xliff:g>«)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Vhodno/izhodna napaka"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Ni dovolj pomnilnika. Morda je datoteka prevelika."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Datoteke vCard iz neznanega razloga ni bilo mogoče razčleniti."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Ta oblika ni podprta."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Metapodatkov za določene datoteke vCard ni bilo mogoče zbrati."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Ene ali več datotek ni bilo mogoče uvoziti (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je končan."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Izvoz stikov je končan."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Izvoz stikov je dokončan. Kliknite obvestilo, če želite dati stike v skupno rabo."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Dotaknite se, če želite dati stike v skupno rabo."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je preklican."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Izvažanje podatkov o stikih"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Podatki o stikih se izvažajo."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Informacij o zbirki podatkov ni bilo mogoče dobiti."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Na voljo ni noben stik, ki bi ga bilo mogoče izvoziti. Če imate v napravi stike, nekateri ponudniki podatkov morda ne omogočajo njihovega izvoza iz naprave."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Urejevalnik za vCard se ni pravilno zagnal."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Izvoz ni mogoč"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Podatki stika niso bili izvoženi.\nRazlog: »<xliff:g id="FAIL_REASON">%s</xliff:g>«"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Uvažanje <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Podatkov vCard ni bilo mogoče prebrati"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Branje podatkov vCard je preklicano"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Uvoz datoteke vCard <xliff:g id="FILENAME">%s</xliff:g> je končan"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je preklican"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> bo kmalu uvožena."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Datoteka bo kmalu uvožena."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Zahteva za uvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> bo kmalu izvožena."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Datoteka bo kmalu izvožena."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Stiki bodo kmalu izvoženi."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Zahteva za izvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"stik"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Predpomnjenje datotek vCard v lokalno začasno shrambo. Dejanski uvoz se bo začel kmalu."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Datoteke vCard ni mogoče uvoziti."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Stik prejet prek NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Želite izvoziti stike?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Predpomnjenje"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Uvažanje <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Izvoz v datoteko .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Razvrsti glede na"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Priimek"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Oblika imena"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprej ime"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprej priimek"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Privzeti račun za nove stike"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinhronizacija metapodatkov stikov"</string>
-    <string name="setting_about" msgid="5253319937596745755">"O Stikih"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Nastavitve"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Vidne stike deli z drugimi"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Deljenje vidnih stikov z drugimi ni uspelo."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Deljenje priljubljenih stikov"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Skupna raba vseh stikov"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Dajanje stikov v skupno rabo ni uspelo."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Uvoz/izvoz stikov"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Uvozi stike"</string>
-    <string name="share_error" msgid="5642622973966851784">"Tega stika ni mogoče dati v skupno rabo."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Ni stikov za deljenje z drugimi"</string>
-    <string name="menu_search" msgid="1241802591112035764">"Iskanje"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Najdi stike"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Priljubljene"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Ni stikov."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ni vidnih stikov."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Ni priljubljenih"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Ni stikov v kategoriji <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Izbriši seznam pogostih stikov"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Izberite kartico SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Upravljanje računov"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Uvozi/izvozi"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"vir: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"vir: <xliff:g id="SOURCE">%2$s</xliff:g> – <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ustavitev iskanja"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Počisti iskalno polje"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Možnosti prikaza stikov"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Vedno uporabi to možnost za klice"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Klicanje z …"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Vnesite zapisek, ki ga želite poslati s klicem ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"POŠLJI IN KLIČI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Zavihek »<xliff:g id="TITLE">%1$s</xliff:g>«."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebran element. </item>
@@ -258,13 +159,6 @@
       <item quantity="few"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebrani elementi. </item>
       <item quantity="other"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebranih elementov. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Delovna različica"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Odprtokodne licence"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Podrobnosti o licenci za odprtokodno programsko opremo"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Pravilnik o zasebnosti"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Pogoji storitve"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Odprtokodne licence"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Naslova URL ni bilo mogoče odpreti."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videoklic"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Klic s skupno rabo"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sq/strings.xml b/java/com/android/contacts/common/res/values-sq/strings.xml
index 553c46d..b40c98d 100644
--- a/java/com/android/contacts/common/res/values-sq/strings.xml
+++ b/java/com/android/contacts/common/res/values-sq/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Teksti u kopjua"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopjo në kujtesën e fragmenteve"</string>
     <string name="call_custom" msgid="3041673234638990874">"Telefono <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Telefono numrin e shtëpisë"</string>
     <string name="call_mobile" msgid="967589404494150813">"Telefono numrin celular"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Telefono numrin e biperit të punës"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Telefono <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Telefono numrin MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefono)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Dërgo mesazh te <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Dërgo mesazh te numri i shtëpisë"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Dërgo mesazh te numri celular"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Dërgo mesazh te numri i biperit"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Dërgo mesazh te <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Dërgo mesazh te numri i MMS-së"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesazh)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Të pastrohen kontaktet e shpeshta?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Do ta pastrosh listën e kontakteve të shpeshta në aplikacionet \"Kontaktet\" dhe \"Telefoni\" dhe do t\'i detyrosh aplikacionet e mail-it të mësojnë preferencat e tua të adresimit nga e para."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Po pastron kontaktet e shpeshta…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"I larguar"</string>
     <string name="status_busy" msgid="5990832098713248503">"I zënë"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktet"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Sugjerimet kryesore"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Tjetër"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoria"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Direktoria e punës"</string>
     <string name="local_search_label" msgid="907622822323119235">"Të gjitha kontaktet"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugjerimet"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Unë"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Po kërkon..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"U gjetën më shumë se <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Nuk ka asnjë kontakt"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> u gjetën</item>
-      <item quantity="one"> u gjet</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Kontakti i shpejtë për <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Pa emër)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Të telefonuara shpesh"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Të kontaktuara shpesh"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Shiko kontaktin"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Të gjitha kontaktet me numra telefoni"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktet e profilit të punës"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Dërgo mail në <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Dërgo mail"</string>
     <string name="postal_street" msgid="6918171741240802474">"Rruga"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Kutia postare"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Lagjja"</string>
     <string name="postal_city" msgid="8674569121430005628">"Qyteti"</string>
     <string name="postal_region" msgid="1730369286225469192">"Shteti"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Kodi ZIP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Bisedo me ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Bisedo me Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Bisedo"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"fshi"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Zgjero ose palos fushat e emrit"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Zgjero ose palos fushat e emrit fonetik"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Të gjitha kontaktet"</string>
-    <string name="menu_done" msgid="1817505539263889535">"U krye!"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Anulo"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktet në <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Pamja e personalizuar"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Një kontakt i vetëm"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Ruaji kontaktet e importuara në:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importo nga karta SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importo nga karta SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importo nga karta SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importo nga skedar .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Të anulohet importimi i <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Të anulohet eksportimi i <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Importimi/eksportimi i vCard nuk mund të anulohej"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Gabim i panjohur."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Nuk mund të hapej \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Eksportuesi nuk mund të nisej: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Nuk ka asnjë kontakt që mund të eksportohet."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Ke çaktivizuar një leje e cila është të detyrueshme."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ndodhi një gabim gjatë eksportimit: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Emri i kërkuar i skedarit është shumë i gjatë (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Gabim I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Nuk ka memorie të mjaftueshme. Skedari mund të jetë shumë i madh."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"vCard nuk mund të analizohej për një arsye të paparashikuar."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formati nuk mbështetet."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Informacionet e skedarit(ëve) të dhënë të vCard nuk mund të mblidheshin."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Një ose më shumë skedarë nuk mundën të importoheshin (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Eksportimi i <xliff:g id="FILENAME">%s</xliff:g> përfundoi."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Eksportimi i kontakteve përfundoi."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Eksportimi i kontakteve përfundoi, kliko njoftimin për të ndarë kontaktet."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Trokit për të ndarë kontaktet."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Eksportimi i <xliff:g id="FILENAME">%s</xliff:g> u anulua."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Po eksporton të dhënat e kontaktit"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Të dhënat e kontaktit po eksportohen."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Informacionet e bazës së të dhënave nuk mund të merreshin."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Nuk ka kontakte që mund të eksportohen. Nëse ke kontakte në pajisjen tënde, disa ofrues të të dhënave mund të mos lejojnë që kontaktet të eksportohen nga pajisja."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Kompozitori i vCard nuk u nis si duhet."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Nuk mund të eksportoheshin"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Të dhënat e kontaktit nuk u eksportuan.\nArsyeja: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Po importon <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Të dhënat e vCard nuk mund të lexoheshin"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Leximi i të dhënave të vCard u anulua."</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Importimi i <xliff:g id="FILENAME">%s</xliff:g> të vCard përfundoi"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importimi i <xliff:g id="FILENAME">%s</xliff:g> u anulua"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> do të importohet së shpejti."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Skedari do të importohet së shpejti."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Kërkesa e importit të vCard u refuzua. Provo përsëri më vonë."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> do të eksportohet së shpejti."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Skedari do të eksportohet së shpejti."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktet do të eksportohen së shpejti."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Kërkesa e eksportimit të vCard u refuzua. Provo përsëri më vonë."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakti"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Po ruan vCard në hapësirën ruajtëse lokale të përkohshme. Importimi aktual do të nisë së shpejti."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard nuk mund të eksportohej."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakti u mor nëpërmjet NFC-së"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Të eksportohen kontaktet?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Po ruan memorien e përkohshme"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Po importon <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Eksporto në skedar .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rendit sipas"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Emri"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Mbiemri"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Formati i emrit"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Emri në fillim"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Mbiemri në fillim"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Llogaria e parazgjedhur për kontaktet e reja"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sinkronizo të dhënat meta të kontakteve"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Rreth kontakteve"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Cilësimet"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Shpërnda kontaktet e dukshme"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Ndarja e kontakteve të dukshme dështoi."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Ndaj kontaktet e preferuara"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Ndaj të gjitha kontaktet"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Ndarja e kontakteve dështoi."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importo/eksporto kontaktet"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importo kontaktet"</string>
-    <string name="share_error" msgid="5642622973966851784">"Ky kontakt nuk mund të shpërndahet"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Nuk ka kontakte për të shpërndarë"</string>
-    <string name="menu_search" msgid="1241802591112035764">"Kërko"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Gjej kontaktet"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Të preferuarat"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Nuk ka asnjë kontakt."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Nuk ka kontakte të dukshme."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Nuk ka të preferuara"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Nuk ka kontakte në <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Pastro kontaktet e shpeshta"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Zgjidh kartën SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Menaxho llogaritë"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importo/eksporto"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"nëpërmjet <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> nëpërmjet <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ndalo kërkimin"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Pastro kërkimin"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Opsionet e paraqitjes së kontaktit"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Llogaria"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Përdor gjithmonë këtë për telefonatat"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Telefono me"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Shkruaj një shënim për të dërguar një telefonatë..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"DËRGO DHE TELEFONO"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Skeda <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Skeda <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> artikuj të palexuar. </item>
       <item quantity="one"> Skeda <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> artikull i palexuar. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versioni i ndërtimit"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licencat me burim të hapur"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Detajet e licencës për softuer me burim të hapur"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Politika e privatësisë"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Kushtet e shërbimit"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licencat me burim të hapur"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Dështoi në hapjen e url-së."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Telefonatë me video"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Ndaj dhe telefono"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sr/strings.xml b/java/com/android/contacts/common/res/values-sr/strings.xml
index 99997e6..f072f98 100644
--- a/java/com/android/contacts/common/res/values-sr/strings.xml
+++ b/java/com/android/contacts/common/res/values-sr/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текст је копиран"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Копирај у прив. меморију"</string>
     <string name="call_custom" msgid="3041673234638990874">"Позови <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Позови кућни телефон"</string>
     <string name="call_mobile" msgid="967589404494150813">"Позови мобилни телефон"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Позови пословни пејџер"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Позови <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Позови број за MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (позови)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Пошаљи SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Пошаљи SMS на кућни телефон"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Пошаљи SMS на мобилни телефон"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Пошаљи SMS на пословни пејџер"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Пошаљи SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Пошаљи SMS на број за MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (пошаљи SMS)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Бришете често контактиране?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Обрисаћете листу често контактираних у апликацијама Контакти и Телефон, па ће имејл апликације морати поново да прикупе информације о адресирању."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Брисање често контактираних..."</string>
@@ -70,23 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Одсутан/на"</string>
     <string name="status_busy" msgid="5990832098713248503">"Заузет/а"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Најпопуларнији предлози"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Другo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Директоријум"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Директоријум за Work"</string>
     <string name="local_search_label" msgid="907622822323119235">"Сви контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ја"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Претражује се…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Пронађено је више од <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Нема контаката"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Пронађен је <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="few">Пронађена су <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">Пронађено је <xliff:g id="COUNT">%d</xliff:g></item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Брзи контакт за корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Нема имена)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Често позивани"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Често контактирани"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Прикажи контакт"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Сви контакти са бројевима телефона"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти са профила за Work"</string>
@@ -126,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Пошаљи имејл на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Пошаљи имејл"</string>
     <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Поштански фах"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Крај"</string>
     <string name="postal_city" msgid="8674569121430005628">"Град"</string>
     <string name="postal_region" msgid="1730369286225469192">"Држава"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Поштански број"</string>
@@ -145,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Започни ћаскање преко ICQ-а"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Започни ћаскање преко Jabber-а"</string>
     <string name="chat" msgid="1020428260359370236">"Ћаскање"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"избриши"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Проширивање или скупљање поља за називе"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Прошири или скупи поља за фонетско име"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Сви контакти"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Готово"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Откажи"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти у групи <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Контакти у прилагођеном приказу"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Појединачни контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Сачувајте увезене контакте на:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Увези са SIM картице"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Увоз са SIM картице <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Увоз са SIM картице <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Увези из .vcf датотеке"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Желите ли да откажете увоз датотеке <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Желите ли да откажете извоз датотеке <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Није могуће отказати vCard увоз/извоз"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Непозната грешка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Нисмо успели да отворимо датотеку „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Није могуће покренути програм за извоз: „<xliff:g id="EXACT_REASON">%s</xliff:g>“"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Нема контаката за извоз."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Онемогућили сте обавезну дозволу."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Дошло је до грешке при извозу: „<xliff:g id="EXACT_REASON">%s</xliff:g>“"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Захтевани назив датотеке је предугачак („<xliff:g id="FILENAME">%s</xliff:g>“)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"У/И грешка"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Нема довољно меморије. Датотека је можда превелика."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Из неочекиваног разлога није могуће рашчланити vCard датотеку."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Формат није подржан."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Није могуће прикупити метаподатке наведених vCard датотека."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Није могућ увоз једне или више датотека (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Извоз датотеке <xliff:g id="FILENAME">%s</xliff:g> је завршен."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Извоз контаката је завршен."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Извоз контаката је завршен. Кликните на обавештење да бисте их делили."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Додирните да бисте делили контакте."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Извоз датотеке <xliff:g id="FILENAME">%s</xliff:g> је отказан."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Извоз података о контактима је у току"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Подаци о контактима се извозе."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Преузимање информација из базе података није могуће."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Нема контаката за извоз. Ако имате контакте на уређају, неки добављачи података можда не дозвољавају извоз контаката са уређаја."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Програм за израду vCard датотека се није исправно покренуо."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Извоз није могућ"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Подаци о контактима низу извезени.\nРазлог: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Увоз контакта <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Читање vCard података није могуће"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Читање vCard података је отказано"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Увоз vCard датотеке <xliff:g id="FILENAME">%s</xliff:g> је завршен"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Увоз датотеке <xliff:g id="FILENAME">%s</xliff:g> је отказан"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Датотека <xliff:g id="FILENAME">%s</xliff:g> ће ускоро бити увезена."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Датотека ће ускоро бити увезена."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Захтев за увоз vCard датотеке је одбијен. Пробајте поново касније."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Датотека <xliff:g id="FILENAME">%s</xliff:g> ће ускоро бити извезена."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Датотека ће ускоро бити извезена."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Контакти ће ускоро бити извезени."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Захтев за извоз vCard датотеке је одбијен. Пробајте поново касније."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Кеширање vCard датотекa у локалну привремену меморију. Увоз ће ускоро започети."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Увоз vCard датотеке није могућ."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Контакт преко NFC-а"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Желите ли да извезете контакте?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кеширање"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Увозимо <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Извези у .vcf датотеку"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортирај према"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Имену"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Презимену"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат имена и презимена"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Прво име"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прво презиме"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Подразумевани налог за нове контакте"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронизујте метаподатке контаката"</string>
-    <string name="setting_about" msgid="5253319937596745755">"О Контактима"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Подешавања"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Дели видљиве контакте"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Није успело дељење видљивих контаката."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Дели омиљене контакте"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Дели све контакте"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Дељење контаката није успело."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Увоз/извоз контаката"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Увези контакте"</string>
-    <string name="share_error" msgid="5642622973966851784">"Овај контакт не може да се дели."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Нема контаката за дељење."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Претражи"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Пронађите контакте"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Омиљено"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Нема контаката."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Нема видљивих контаката."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Нема омиљених"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Нема контаката у групи <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Обриши често контактиране"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Изаберите SIM картицу"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Управљај налозима"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Увези/извези"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"преко <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> преко <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"заустављање претраживања"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Брисање претраге"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Опције приказивања контаката"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Налог"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Увек користи ово за позиве"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Позови помоћу"</string>
@@ -249,20 +151,13 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Унесите белешку коју ћете послати уз позив..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ПОШАЉИ И ПОЗОВИ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Картица <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитана ставка. </item>
       <item quantity="few"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитане ставке. </item>
       <item quantity="other"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаних ставки. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Верзија"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Лиценце отвореног кода"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Детаљи лиценце за софтвер отвореног кода"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Политика приватности"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Услови коришћења услуге"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Лиценце отвореног кода"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Отварање URL-а није успело."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Видео позив"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Дели и позови"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sv/strings.xml b/java/com/android/contacts/common/res/values-sv/strings.xml
index 79e56e5..eb1976e 100644
--- a/java/com/android/contacts/common/res/values-sv/strings.xml
+++ b/java/com/android/contacts/common/res/values-sv/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Texten har kopierats"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopiera till Urklipp"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Ring hem"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ring mobilen"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ring upp jobbpersonsökare"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ring upp MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Skicka SMS till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Skicka SMS till hem"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Skicka SMS till mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Skicka SMS till jobbpersonsökare"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Skicka SMS till <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Skicka SMS till MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (meddelande)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vill du rensa listan?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du rensar listan över personer som du kontaktar ofta i apparna Kontakter och Telefon. E-postappar tvingas lära sig dina mottagarinställningar från början."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Listan rensas …"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Borta"</string>
     <string name="status_busy" msgid="5990832098713248503">"Upptagen"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Bästa förslagen"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Övrigt"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="907622822323119235">"Alla kontakter"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Förslag"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jag"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Söker…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Fler än <xliff:g id="COUNT">%d</xliff:g> hittades."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Inga kontakter"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> hittade</item>
-      <item quantity="one">En hittad</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Snabbkontakt för <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Inget namn)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Ringer ofta"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Kontaktar ofta"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Visa kontakten"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Alla kontakter med telefonnummer"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakter i jobbprofilen"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Skicka e-post till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"E-post"</string>
     <string name="postal_street" msgid="6918171741240802474">"Gatuadress"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Postbox"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Område"</string>
     <string name="postal_city" msgid="8674569121430005628">"Ort"</string>
     <string name="postal_region" msgid="1730369286225469192">"Delstat"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Chatta med ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Chatta med Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chatt"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ta bort"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Expandera eller komprimera namnfält"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Expandera eller komprimera fonetiska namnfält"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Alla kontakter"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Färdig"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Avbryt"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Kontakter i anpassad vy"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"En kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Spara importerade kontakter i:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Importera från SIM-kort"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Importera från SIM-kort <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Importera från SIM-kort <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Importera från VCF-fil"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Vill du avbryta importen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Vill du avbryta exporten av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Kunde ej avbryta import/export av vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Okänt fel."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Det gick inte att öppna <xliff:g id="FILE_NAME">%s</xliff:g>: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Det gick inte att starta exportverktyget: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Det finns ingen kontakt att exportera."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Du har inaktiverat en behörighet som krävs."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Ett fel inträffade under exporten: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Det obligatoriska filnamnet är för långt (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O-fel"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Det finns inte tillräckligt med minne. Filen kan vara för stor."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Det gick inte att analysera vCard av okänd anledning."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Formatet stöds inte."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Det gick inte att samla in metainformation för de angivna vCard-filerna."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"En eller flera filer kunde inte importeras (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> har exporterats."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontakterna har exporterats."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontakterna exporterade. Klicka på aviseringen om du vill dela dem."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Tryck här om du vill dela kontakterna."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Exporten av <xliff:g id="FILENAME">%s</xliff:g> avbröts."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontaktuppgifter exporteras"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontaktuppgifterna exporteras."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Det gick inte att hämta databasinformation."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Det finns inga kontakter att exportera. Om du har kontakter på mobilen tillåter kanske inte vissa dataleverantörer att kontakter exporteras från mobilen."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard-kompositören initierades inte korrekt."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Kunde inte exportera"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontaktuppgifterna exporterades inte.\nOrsak: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Importerar <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Det gick inte att läsa vCard-data"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Inläsningen av vCard-data avbröts"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard-filen <xliff:g id="FILENAME">%s</xliff:g> har importerats"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Importen av <xliff:g id="FILENAME">%s</xliff:g> avbröts"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> importeras snart."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Filen kommer snart att importeras."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Begäran om vCard-import avvisades. Försök igen vid ett senare tillfälle."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> exporteras snart."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Filen kommer snart att exporteras."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontakterna exporteras snart."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Begäran om vCard-export avvisades. Försök igen vid ett senare tillfälle."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard-fil(er) cachelagras till en lokal tillfällig lagringsenhet. Den faktiska importen börjar snart."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Det gick inte att importera vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Mott. v. NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Vill du exportera kontakter?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Cachelagrar"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Importerar <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Exportera till VCF-fil"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortera efter"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Förnamn"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Efternamn"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Namnformat"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Förnamn först"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Efternamn först"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Standardkonto för nya kontakter"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Synkronisera metadata för kontakter"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Om Kontakter"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Inställningar"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Dela synliga kontakter"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Det gick inte att dela synliga kontakter."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Dela favoritkontakterna"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Dela alla kontakter"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Det gick inte att dela kontakterna."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Importera/exportera kontakter"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Importera kontakter"</string>
-    <string name="share_error" msgid="5642622973966851784">"Den här kontakten kan inte delas."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Det finns inga kontakter att dela."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Sökning"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Sök efter kontakter"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Favoriter"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Inga kontakter."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Det finns inga synliga kontakter."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Inga favoriter"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Inga kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Rensa listan över kontakter"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Välj SIM-kort"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Hantera konton"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Importera/exportera"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"avbryt sökning"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Rensa sökning"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Visningsalternativ för kontakter"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Använd alltid för samtal"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Gör en anteckning som skickas när du ringer …"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"SKICKA OCH RING"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Fliken <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">Fliken <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> olästa poster. </item>
       <item quantity="one">Fliken <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> oläst post. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Programversion"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Licenser för öppen källkod"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Licensinformation för programvara med öppen källkod"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Sekretesspolicy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Användarvillkor"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Licenser för öppen källkod"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Det gick inte att öppna webbadressen."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtal"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Dela och ring"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sw/strings.xml b/java/com/android/contacts/common/res/values-sw/strings.xml
index 4d30271..9388649 100644
--- a/java/com/android/contacts/common/res/values-sw/strings.xml
+++ b/java/com/android/contacts/common/res/values-sw/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Maandishi yamenakiliwa"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Nakili kwenye ubao wa kunakili"</string>
     <string name="call_custom" msgid="3041673234638990874">"Pia simu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Piga simu nyumbani"</string>
     <string name="call_mobile" msgid="967589404494150813">"Pigia simu ya mkononi"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ipigie peja ya kazini"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Piga simu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Piga simu kwa MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Piga)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Tumia ujumbe wa maandishi kwa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Tuma ujumbe wa maandishi nyumbani"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Tumia simu ya mkononi ujumbe wa maandishi"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Itumie peja ya kazini ya kazini ujumbe"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Tuma ujumbe wa maandishi kwa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Tumia MMS ujmbe wa maandishi"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tuma Ujumbe)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Futa unaowasiliana nao mara kwa mara?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Utafuta orodha ya unaowasiliana nao mara kwa mara katika programu za Anwani na Simu, na ulazimishe programu za barua pepe zitambue mapendeleo yako ya anwani kutoka mwanzo."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Inafuta unaowasiliana nao mara kwa mara..."</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Mbali"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ana shughuli"</string>
     <string name="contactsList" msgid="8806067891419291513">"Anwani"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Mapendekezo Maarufu"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Nyingineyo"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Saraka"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Anwani za kazi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Anwani zote"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mapendekezo"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mimi"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Inatafuta…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Zaidi ya <xliff:g id="COUNT">%d</xliff:g> zimepatikana."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Hakuna anwani"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> zimepatikana</item>
-      <item quantity="one">1 imepatikana</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Anwani ya haraka ya  <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Hakuna jina)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Zinazopigwa mara kwa mara"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Unaowasiliana nao zaidi"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Angalia maelezo ya mawasiliano"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Anwani zote zilizo na nambari ya simu"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Anwani za watu wa kazini"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Tuma barua pepe kwenye <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Tuma barua pepe"</string>
     <string name="postal_street" msgid="6918171741240802474">"Barabara"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Sanduku la posta"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Mtaa"</string>
     <string name="postal_city" msgid="8674569121430005628">"Mji"</string>
     <string name="postal_region" msgid="1730369286225469192">"Jimbo"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Msimbo wa posta"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Piga gumzo kutumia ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Piga gumzo kutumia Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Gumzo"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"futa"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Panua au ukunje sehemu za jina"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Panua au ukunje sehemu za majina ya kifonetiki"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Anwani zote"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Kwisha"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Ghairi"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Anwani kwenye <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Anwani katika mwoneko maalum"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Anwani moja"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Hifadhi anwani zinazoingizwa kwenye:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Ingiza kutoka SIM kadi"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Leta kutoka SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Leta kutoka SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Leta kutoka faili ya .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Ghairi uhamisho wa <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Ighairi uhamisho wa <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Haikuweza kughairi uingizaji/uhamishaji wa vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Hitilafu isiyojulikana."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Imeshindwa kufungua \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Haikuweza kuanzisha kihamishaji: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Hakuna anwani inayoweza kuhamishwa."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Umezima idhini inayohitajika."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Hitilafu imetokea wakati wa uhamisho: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Jina la faili linalohitajika ni ndefu sana (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Hitilafu ya I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Hakuna kumbukumbu ya kutosha. Faili inaweza kuwa kubwa mno."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Haikuweza kuchanganua vCard kwa sababu isiyotarajiwa."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Muundo huu hautumiki."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Haikuweza kukusanya maelezo meta ya faili zilizotolewa za vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Moja au faili zaidi hazikuweza kuingizwa (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Imekamilisha kuhamisha anwani."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Imemaliza kuhamisha anwani, bofya kipengele cha arifa ili kushiriki anwani."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Gonga ili ushiriki anwani."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Inahamisha data ya anwani"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Inahamisha data ya anwani."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Haikupata maelezo ya hifadhidata."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Hakuna anwani zinazoweza kuhamishwa. Kama una anwani kwenye kompyuta kibao, huenda baadhi ya watoa huduma za data hawaruhusu anwani zihamishwe kutoka kwenye kifaa."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Kitunzi cha vCard hakikuanza vizuri."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Isingehamishika"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Data ya anwani haikuhamishwa.\nKwa sababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Inaleta <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Haikuweza kusoma data ya vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Kusoma data ya VCard kumeghairiwa"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Imemaliza kuleta <xliff:g id="FILENAME">%s</xliff:g> ya vCard"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Kuleta <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> italetwa hivi karibuni."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Faili italetwa hivi karibuni."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Ombi la kuleta vCard limekataliwa. Tafadhali jaribu baadaye."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> itahamishwa baada ya muda mfupi."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Faili itahamishwa baada ya dakika chache."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Itahamisha anwani baada ya muda mfupi."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Ombi la kuhamishwa kwa vCard limekataliwa. Jaribu tena baadaye."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"anwani"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Vcard Inaakibisha ndani ya hifadhi ya muda mfupi. Uhamisho halisi utaanza hivi karibuni."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Haikuweza kuleta vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Anwani imepokewa kupitia NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Anwani Zihamishwe?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Inaakibisha"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Inaleta <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Tuma kwenye faili ya .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Panga kulingana na"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Jina la kwanza"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Jina la mwisho"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Mpangilio wa majina"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Anza kwa jina la kwanza"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Anza kwa jina la mwisho"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Akaunti ya msingi ya anwani mpya"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Sawazisha metadata ya anwani"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Kuhusu Anwani"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Mipangilio"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Shiriki anwani zinazoonekana"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Imeshindwa kushiriki anwani zinazoonekana."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Shiriki anwani unazopenda"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Shiriki anwani zote"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Imeshindwa kushiriki anwani."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Ingiza au uhamishe anwani"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Ingiza anwani"</string>
-    <string name="share_error" msgid="5642622973966851784">"Anwani hii haiwezi kushirikiwa."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Hakuna anwani za kushiriki."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Tafuta"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Tafuta anwani"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Vipendwa"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Hakuna anwani."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Hakuna anwani zinazoonekana"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Hakuna vipendwa"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Hakuna anwani kwenye <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Futa za mara kwa mara"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Chagua SIM kadi"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Dhibiti akaunti"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Ingiza au uhamishe"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"kupitia <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> kupitia <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"acha kutafuta"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Futa utafutaji"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Chaguo za onyesho la anwani"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Akaunti"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Piga simu ukitumia"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Andika dokezo litakaloambatana na simu utakayopiga ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"TUMA na UPIGE SIMU"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Kichupo cha <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Kichupo cha <xliff:g id="TITLE_2">%1$s</xliff:g>. Vipengee <xliff:g id="COUNT_3">%2$d</xliff:g> havijasomwa. </item>
       <item quantity="one"> Kichupo cha <xliff:g id="TITLE_0">%1$s</xliff:g>. Kipengee <xliff:g id="COUNT_1">%2$d</xliff:g> hakijasomwa. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Toleo la muundo"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Leseni za programu huria"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Maelezo ya leseni ya programu huria"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Sera ya faragha"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Sheria na masharti"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Leseni za programu huria"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Imeshindwa kufungua url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Simu ya video"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Shiriki na upige simu"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sw600dp/dimens.xml b/java/com/android/contacts/common/res/values-sw600dp/dimens.xml
index cf67a1e..e5773b4 100644
--- a/java/com/android/contacts/common/res/values-sw600dp/dimens.xml
+++ b/java/com/android/contacts/common/res/values-sw600dp/dimens.xml
@@ -15,12 +15,9 @@
   -->
 
 <resources>
-  <dimen name="detail_item_side_margin">0dip</dimen>
-
   <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding
   </dimen>
   <dimen name="contact_browser_list_header_right_margin">24dip</dimen>
-  <dimen name="contact_browser_list_top_margin">16dip</dimen>
 
   <!-- Right margin of the floating action button -->
   <dimen name="floating_action_button_margin_right">32dp</dimen>
diff --git a/java/com/android/contacts/common/res/values-ta/strings.xml b/java/com/android/contacts/common/res/values-ta/strings.xml
index e041a99..182d7c7 100644
--- a/java/com/android/contacts/common/res/values-ta/strings.xml
+++ b/java/com/android/contacts/common/res/values-ta/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"உரை நகலெடுக்கப்பட்டது"</string>
-    <string name="copy_text" msgid="5890820280087874642">"கிளிப்போர்டுக்கு நகலெடு"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> மொபைல் எண்ணில் அழை"</string>
     <string name="call_home" msgid="125893483593803791">"வீட்டு தொலைபேசி எண்ணில் அழை"</string>
     <string name="call_mobile" msgid="967589404494150813">"மொபைல் எண்ணில் அழை"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"பணியிடத்தின் பேஜர் எண்ணில் அழை"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ஐ அழை"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (அழை)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_home" msgid="3527719551060295243">"வீட்டு தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"பணியிட பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (செய்தி அனுப்பு)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"அடிக்கடி தொடர்புகொண்ட தொடர்பை அழிக்கவா?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"தொடர்புகள் மற்றும் ஃபோன் பயன்பாடுகளில் உள்ள அடிக்கடி தொடர்பு கொண்டவர்களின் பட்டியல் அழிக்கப்பட்டு, தொடக்கத்திலிருந்து மீண்டும் உங்கள் முகவரியிடல் விருப்பத்தேர்வுகளை மின்னஞ்சல் பயன்பாடுகள் அறியும்படி செய்யப்படும்."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"அடிக்கடித் தொடர்புகொண்ட தொடர்பை அழிக்கிறது…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"வெளியே"</string>
     <string name="status_busy" msgid="5990832098713248503">"பணிமிகுதி"</string>
     <string name="contactsList" msgid="8806067891419291513">"தொடர்புகள்"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"அதிகம் பரிந்துரைத்தவை"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"மற்றவை"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"கோப்பகம்"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"பணிக் கோப்பகம்"</string>
     <string name="local_search_label" msgid="907622822323119235">"எல்லா தொடர்புகளும்"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"பரிந்துரைகள்"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"எனக்கு"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"தேடுகிறது..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> க்கும் மேற்பட்டவை கண்டறியப்பட்டன."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"தொடர்புகள் இல்லை"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> தொடர்புகள் உள்ளன</item>
-      <item quantity="one">1 தொடர்பு உள்ளது</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> க்கான விரைவு தொடர்பு"</string>
     <string name="missing_name" msgid="978606963362745020">"(பெயர் இல்லை)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"அடிக்கடி தொடர்புகொண்டவர்கள்"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"அடிக்கடி தொடர்புகொண்டவர்கள்"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"தொடர்பைக் காட்டும் பொத்தான்"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"மொபைல் எண்களுடனான எல்லா தொடர்புகளும்"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"பணிச் சுயவிவரத் தொடர்புகள்"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> க்கு மின்னஞ்சல் அனுப்பு"</string>
     <string name="email" msgid="2807318537887091606">"மின்னஞ்சல்"</string>
     <string name="postal_street" msgid="6918171741240802474">"தெரு"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"அஞ்சல் பெட்டி"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"சுற்றுப்புறங்கள்"</string>
     <string name="postal_city" msgid="8674569121430005628">"நகரம்"</string>
     <string name="postal_region" msgid="1730369286225469192">"மாநிலம்"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ஜிப் குறியீடு"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ இல் அரட்டையடி"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber இல் அரட்டையடி"</string>
     <string name="chat" msgid="1020428260359370236">"அரட்டை"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"நீக்கு"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"பெயர் புலங்களை விரிவுப்படுத்து அல்லது சுருக்கு"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ஒலிப்புமுறை பெயர் புலங்களை விரி அல்லது சுருக்கு"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"எல்லா தொடர்புகளும்"</string>
-    <string name="menu_done" msgid="1817505539263889535">"முடிந்தது"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ரத்துசெய்"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> இல் உள்ள தொடர்புகள்"</string>
     <string name="listCustomView" msgid="5306282632413086731">"தனிப்பயன் காட்சியில் உள்ள தொடர்புகள்"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ஒரு தொடர்பு"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"இறக்கிய தொடர்புகளை இதில் சேமி:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"சிம் கார்டிலிருந்து இறக்குமதிசெய்"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> என்ற SIM இல் இருந்து இறக்குமதிசெய்"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> என்ற SIM இல் இருந்து இறக்குமதிசெய்"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf கோப்பிலிருந்து இறக்கு"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> இன் இறக்குமதியை ரத்துசெய்யவா?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> இன் ஏற்றுமதியை ரத்துசெய்யவா?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard இன் இறக்குமதி/ஏற்றுமதியை ரத்துசெய்ய முடியவில்லை"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"தெரியாத பிழை."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\"ஐத் திறக்க முடியவில்லை: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ஏற்றுமதியைத் தொடங்க முடியவில்லை: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ஏற்றுமதி செய்யக்கூடிய தொடர்பு இல்லை."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"தேவைப்படும் அனுமதியை முடக்கியுள்ளீர்கள்."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ஏற்றுமதி செய்யும்போது பிழை: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"தேவையான கோப்பின் பெயர் மிகவும் நீளமாக உள்ளது (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O பிழை"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"போதுமான நினைவகம் இல்லை. கோப்பு மிகவும் பெரியதாக இருக்கலாம்."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"எதிர்பாராதவிதமாக vCard ஐப் பாகுபடுத்த முடியவில்லை."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"வடிவம் ஆதரிக்கப்படவில்லை."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"வழங்கப்பட்ட vCard கோப்பின்(களின்) மெட்டா தகவலைச் சேகரிக்க முடியவில்லை."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ஒன்று அல்லது அதற்கு மேற்பட்ட கோப்புகளை ஏற்றுமதி செய்ய முடியவில்லை (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> ஏற்றப்பட்டது."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"தொடர்புகள் ஏற்றப்பட்டன."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"தொடர்புகள் ஏற்றப்பட்டன. தொடர்புகளைப் பகிர, அறிவிப்பைக் கிளிக் செய்யவும்."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"தொடர்புகளைப் பகிர, தட்டவும்."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> ஐ ஏற்றுமதி செய்வது ரத்துசெய்யப்பட்டது."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"தொடர்பு தரவை ஏற்றுமதி செய்கிறது"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"தொடர்புத் தரவு ஏற்றப்படுகிறது."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"தரவுத்தளத் தகவலைப் பெற முடியவில்லை."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ஏற்றத்தக்க தொடர்புகள் இல்லை. சாதனத்தில் தொடர்புகள் இருந்தாலும், சாதனத்திலிருந்து அவற்றை ஏற்றுவதற்குச் சில தரவு வழங்குநர்கள் அனுமதிக்காமல் போகலாம்."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard தொகுப்பான் முறையாகத் தொடங்கவில்லை."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ஏற்றுமதி செய்ய முடியவில்லை"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"தொடர்பு தரவு ஏற்றுமதி செய்யப்படவில்லை.\nகாரணம்: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> ஐ இறக்குமதி செய்கிறது"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard தரவைப் படிக்க முடியவில்லை"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard தரவைப் படிப்பது ரத்துசெய்யப்பட்டது"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> இறக்கப்பட்டது"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> ஐ இறக்குமதிசெய்வது ரத்துசெய்யப்பட்டது"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> விரைவில் இறக்குமதி செய்யப்படும்."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"கோப்பு விரைவில் இறக்குமதி செய்யப்படும்."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard இன் இறக்குமதி கோரிக்கை நிராகரிக்கப்பட்டது. பிறகு முயற்சிக்கவும்."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> விரைவில் ஏற்றுமதி செய்யப்படும்."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"கோப்பு விரைவில் ஏற்றப்படும்."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"கூடிய விரைவில் தொடர்புகள் ஏற்றப்படும்."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard இன் ஏற்றுமதி கோரிக்கை நிராகரிக்கப்பட்டது. பிறகு முயற்சிக்கவும்."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"தொடர்பு"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(களை) ஐ அகச் சேமிப்பிடத்தில் தற்காலிகமாகச் சேமிக்கிறது. அசல் இறக்குமதி உடனடியாக தொடங்கப்படும்."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard ஐ இறக்குமதி செய்ய முடியவில்லை."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"NFC வழியாக தொடர்பு பெறப்பட்டது"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"தொடர்புகளை இறக்கவா?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"தற்காலிகமாகச் சேமித்தல்"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>ஐ இறக்குகிறது: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf கோப்பிற்கு ஏற்று"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"வரிசைப்படுத்து"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"முதல் பெயர்"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"இறுதிப் பெயர்"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"பெயர் வடிவம்"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"முதல் பெயர் முதலில்"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"இறுதிப் பெயர் முதலில்"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"புதிய தொடர்புகளுக்கான இயல்பு கணக்கு"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"தொடர்பின் மீத்தரவை ஒத்திசை"</string>
-    <string name="setting_about" msgid="5253319937596745755">"தொடர்புகள் விவரம்"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"அமைப்பு"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"தெரியும் தொடர்புகளைப் பகிர்"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"தெரியும் தொடர்புகளைப் பகிர்வதில் தோல்வி."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"பிடித்த தொடர்புகளைப் பகிர்"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"எல்லா தொடர்புகளையும் பகிர்"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"தொடர்புகளைப் பகிர முடியவில்லை."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"தொடர்புகளை இறக்கு/ஏற்று"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"தொடர்புகளை இறக்குமதி செய்"</string>
-    <string name="share_error" msgid="5642622973966851784">"தொடர்பைப் பகிர முடியவில்லை."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"பகிர்வதற்குத் தொடர்புகள் இல்லை."</string>
-    <string name="menu_search" msgid="1241802591112035764">"தேடு"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"தொடர்புகளைக் கண்டறி"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"பிடித்தவை"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"தொடர்புகள் இல்லை."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"தெரியும் தொடர்புகள் எதுவுமில்லை."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"பிடித்தவை எதுவும் இல்லை"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> இல் தொடர்புகள் இல்லை"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"அடிக்கடி தொடர்புகொண்டவர்களை அழி"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"சிம் ஐத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"கணக்குகளை நிர்வகி"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"இறக்கு/ஏற்று"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> வழியாக"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> வழியாக <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"தேடுவதை நிறுத்து"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"தேடலை அழி"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"தொடர்பின் காட்சி விருப்பத்தேர்வு"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"கணக்கு"</string>
     <string name="set_default_account" msgid="7966099951006467572">"அழைப்புகளுக்கு எப்போதும் இதைப் பயன்படுத்து"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"இதன் மூலம் அழை"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"அழைப்புடன் சேர்த்து அனுப்ப, குறிப்பை உள்ளிடவும்..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"அனுப்பி அழை"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> தாவல்."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> தாவல். படிக்காதவை (<xliff:g id="COUNT_3">%2$d</xliff:g>). </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> தாவல். படிக்காதது (<xliff:g id="COUNT_1">%2$d</xliff:g>). </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"பதிப்பு எண்"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ஓப்பன் சோர்ஸ் மென்பொருளுக்கான உரிம விவரங்கள்"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"தனியுரிமைக் கொள்கை"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"சேவை விதிமுறைகள்"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"urlஐத் திறக்க முடியவில்லை."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"வீடியோ அழைப்பைத் தொடங்குவதற்கான பொத்தான்"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"பகிர்ந்து அழைப்பதற்கான பொத்தான்"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-te/strings.xml b/java/com/android/contacts/common/res/values-te/strings.xml
index 6dd0e21..b1f2214 100644
--- a/java/com/android/contacts/common/res/values-te/strings.xml
+++ b/java/com/android/contacts/common/res/values-te/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"వచనం కాపీ చేయబడింది"</string>
-    <string name="copy_text" msgid="5890820280087874642">"క్లిప్‌బోర్డ్‌కు కాపీ చేయి"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>కు కాల్ చేయండి"</string>
     <string name="call_home" msgid="125893483593803791">"ఇంటికి కాల్ చేయండి"</string>
     <string name="call_mobile" msgid="967589404494150813">"మొబైల్‌కు కాల్ చేయండి"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"కార్యాలయ పేజర్‌కు కాల్ చేయండి"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>కు కాల్ చేయండి"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMSకు కాల్ చేయండి"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (కాల్ చేయి)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>కు వచనం పంపండి"</string>
     <string name="sms_home" msgid="3527719551060295243">"ఇంటికి వచనం పంపండి"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"మొబైల్‌కు వచనం పంపండి"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"కార్యాలయ పేజర్‌కు వచనం పంపండి"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>కు వచనం పంపండి"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMSకు వచనం పంపండి"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (సందేశం పంపు)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"తరచుగా సంప్రదించినవాటిని క్లియర్ చేయాలా?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"మీరు పరిచయాలు మరియు ఫోన్ అనువర్తనాల్లో తరచుగా సంప్రదించిన పరిచయాల జాబితాను తీసివేస్తారు మరియు స్క్రాచ్ నుండి మీ చిరునామా ప్రాధాన్యతలను తెలుసుకునేలా ఇమెయిల్ అనువర్తనాలను నిర్బంధిస్తారు."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"తరచుగా సంప్రదించినవాటిని క్లియర్ చేస్తోంది…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"దూరంగా ఉన్నారు"</string>
     <string name="status_busy" msgid="5990832098713248503">"బిజీగా ఉన్నారు"</string>
     <string name="contactsList" msgid="8806067891419291513">"పరిచయాలు"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"ఉత్తమ సూచనలు"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"ఇతరం"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"డైరెక్టరీ"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"కార్యాలయ డైరెక్టరీ"</string>
     <string name="local_search_label" msgid="907622822323119235">"అన్ని పరిచయాలు"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"సూచనలు"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"నేను"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"శోధిస్తోంది..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> కంటే ఎక్కువ కనుగొనబడ్డాయి."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"పరిచయాలు లేవు"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> కనుగొనబడ్డాయి</item>
-      <item quantity="one">1 కనుగొనబడింది</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> కోసం శీఘ్ర సంప్రదింపు"</string>
     <string name="missing_name" msgid="978606963362745020">"(పేరు లేదు)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"తరచుగా కాల్ చేయబడినవి"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"తరచుగా సంప్రదించబడినవి"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"పరిచయాన్ని వీక్షించండి"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"ఫోన్ నంబర్‌లు గల అన్ని పరిచయాలు"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"కార్యాలయ ప్రొఫైల్ పరిచయాలు"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>కు ఇమెయిల్ చేయండి"</string>
     <string name="email" msgid="2807318537887091606">"ఇమెయిల్ చేయండి"</string>
     <string name="postal_street" msgid="6918171741240802474">"వీధి"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO పెట్టె"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"పరిసరాలు"</string>
     <string name="postal_city" msgid="8674569121430005628">"నగరం"</string>
     <string name="postal_region" msgid="1730369286225469192">"రాష్ట్రం"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"జిప్ కోడ్"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQని ఉపయోగించి చాట్ చేయండి"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabberని ఉపయోగించి చాట్ చేయండి"</string>
     <string name="chat" msgid="1020428260359370236">"చాట్ చేయండి"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"తొలగించు"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"పేరు ఫీల్డ్‌లను విస్తరింపజేయి లేదా కుదించు"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ఫొనెటిక్ పేరు ఫీల్డ్‌లను విస్తరింపజేస్తుంది లేదా కుదిస్తుంది"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"అన్ని పరిచయాలు"</string>
-    <string name="menu_done" msgid="1817505539263889535">"పూర్తయింది"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"రద్దు చేయి"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>లో పరిచయాలు"</string>
     <string name="listCustomView" msgid="5306282632413086731">"అనుకూల వీక్షణలో పరిచయాలు"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"ఒక పరిచయం"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"దిగుమతి చేసిన పరిచయాలను దీనికి సేవ్ చేయి:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"సిమ్ కార్డు నుండి దిగుమతి చేయండి"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM నుండి దిగుమతి చేయండి"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM నుండి దిగుమతి చేయండి"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf ఫైల్ నుండి దిగుమతి చేయి"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క దిగుమతిని రద్దు చేయాలా?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క ఎగుమతిని రద్దు చేయాలా?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"vCard దిగుమతి/ఎగుమతిని రద్దు చేయడం సాధ్యపడలేదు"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"తెలియని లోపం."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\"ని ఈ కారణంగా తెరవడం సాధ్యపడలేదు: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"ఎక్స్‌పోర్టర్‌ను ప్రారంభించడం సాధ్యపడలేదు: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ఎగమతి చేయగల పరిచయం లేదు."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"మీరు అవసరమయ్యే అనుమతిని నిలిపివేసారు."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"ఎగుమతి సమయంలో లోపం సంభవించింది: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"అవసరమైన ఫైల్ పేరు (\"<xliff:g id="FILENAME">%s</xliff:g>\") చాలా పెద్దదిగా ఉంది."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O లోపం"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"తగినంత మెమరీ లేదు. ఫైల్ చాలా పెద్దదిగా ఉండవచ్చు."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ఊహించని కారణంగా vCardను అన్వయించడం సాధ్యపడలేదు."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ఆకృతికి మద్దతు లేదు."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"అందించిన vCard ఫైల్(లు) యొక్క మెటా డేటా సమాచారాన్ని సేకరించడం సాధ్యపడలేదు."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ఒకటి లేదా అంతకంటే ఎక్కువ ఫైల్‌లను (%s) దిగుమతి చేయడం సాధ్యపడలేదు."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>ని ఎగుమతి చేయడం పూర్తయింది."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"పరిచయాలను ఎగుమతి చేయడం పూర్తయింది."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"పరిచయాలను ఎగుమతి చేయడం పూర్తయింది, పరిచయాలను భాగస్వామ్యం చేయడానికి నోటిఫికేషన్‌ను క్లిక్ చేయండి."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"పరిచయాలను భాగస్వామ్యం చేయడానికి నొక్కండి."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>ని ఎగుమతి చేయడం రద్దు చేయబడింది."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"పరిచయ డేటాను ఎగుమతి చేస్తోంది"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"పరిచయ డేటా ఎగుమతి చేయబడుతోంది."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"డేటాబేస్ సమాచారాన్ని పొందడం సాధ్యపడలేదు."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ఎగుమతి చేయదగిన పరిచయాలు ఏవీ లేవు. మీరు మీ పరికరంలో పరిచయాలు కలిగి ఉన్నప్పటికీ, కొందరు డేటా ప్రదాతలు పరిచయాలను పరికరం నుండి ఎగుమతి చేయడానికి అనుమతించకుండా ఉండవచ్చు."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard కంపోజర్ సరిగ్గా ప్రారంభించబడలేదు."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ఎగుమతి చేయడం సాధ్యపడలేదు"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"పరిచయ డేటా ఎగుమతి చేయబడలేదు.\nకారణం: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g>ని దిగుమతి చేస్తోంది"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard డేటాను చదవడం సాధ్యపడలేదు"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard డేటాను చదవడం రద్దయింది"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g>ని దిగుమతి చేయడం పూర్తయింది"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>ని దిగుమతి చేయడం రద్దయింది"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> కొద్దిసేపట్లో దిగుమతి చేయబడుతుంది."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ఫైల్ కొద్దిసేపట్లో దిగుమతి చేయబడుతుంది."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard దిగుమతి అభ్యర్థన తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> కొద్దిసేపట్లో ఎగుమతి చేయబడుతుంది."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ఫైల్ కాసేపట్లో ఎగుమతి చేయబడుతుంది."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"పరిచయాలు కొద్ది సేపట్లో ఎగుమతి చేయబడతాయి."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard ఎగుమతి అభ్యర్థన తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"పరిచయం"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard(ల)ను స్థానిక తాత్కాలిక నిల్వకు కాష్ చేస్తోంది. అసలు దిగుమతి కొద్దిసేపట్లో ప్రారంభమవుతుంది."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCardని దిగుమతి చేయడం సాధ్యపడలేదు."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"పరిచయం NFC ద్వారా స్వీకరించబడింది"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"పరిచయాలను ఎగుమతి చేయాలా?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"కాష్ చేస్తోంది"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g>లో <xliff:g id="CURRENT_NUMBER">%s</xliff:g> దిగుమతి చేస్తోంది: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf ఫైల్‌కు ఎగుమతి చేయి"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ఇలా క్రమబద్ధీకరించు"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"మొదటి పేరు"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"చివరి పేరు"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"పేరు ఆకృతి"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ముందుగా మొదటి పేరు"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"ముందుగా చివరి పేరు"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"కొత్త పరిచయాల కోసం డిఫాల్ట్ ఖాతా"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"పరిచయ మెటాడేటాను సమకాలీకరించు"</string>
-    <string name="setting_about" msgid="5253319937596745755">"పరిచయాల గురించి"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"సెట్టింగ్‌లు"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"కనిపించే పరిచయాలను భాగస్వామ్యం చేయండి"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"కనిపించే పరిచయాలను భాగస్వామ్యం చేయడం విఫలమైంది."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"ఇష్టమైన పరిచయాలను భాగస్వామ్యం చేయి"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"పరిచయాలన్నీ భాగస్వామ్యం చేయి"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"పరిచయాలను భాగస్వామ్యం చేయడం విఫలమైంది."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"పరిచయాలను దిగుమతి/ఎగుమతి చేయండి"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"పరిచయాలను దిగుమతి చేయి"</string>
-    <string name="share_error" msgid="5642622973966851784">"ఈ పరిచయాన్ని భాగస్వామ్యం చేయడం సాధ్యపడదు."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"భాగస్వామ్యం చేయడానికి పరిచయాలు ఏవీ లేవు."</string>
-    <string name="menu_search" msgid="1241802591112035764">"శోధించండి"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"పరిచయాలను కనుగొనండి"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"ఇష్టమైనవి"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"పరిచయాలు లేవు."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"కనిపించే పరిచయాలు ఏవీ లేవు."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ఇష్టమైనవి లేవు"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>లో పరిచయాలు లేవు"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"తరచుగా ఉన్నవాటిని క్లియర్ చేయి"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"సిమ్ కార్డ్‌ను ఎంచుకోండి"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"ఖాతాలను నిర్వహించు"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"దిగుమతి చేయి/ఎగుమతి చేయి"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> ద్వారా <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"శోధించడం ఆపివేయి"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"శోధనను క్లియర్ చేయి"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"పరిచయ ప్రదర్శన ఎంపికలు"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"ఖాతా"</string>
     <string name="set_default_account" msgid="7966099951006467572">"కాల్‌ల కోసం ఎల్లప్పుడూ దీన్ని ఉపయోగించు"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"దీనితో కాల్ చేయండి"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"కాల్‌తో పాటు పంపడానికి గమనికను టైప్ చేయండి ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"పంపు &amp; కాల్ చేయి"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ట్యాబ్."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ట్యాబ్. <xliff:g id="COUNT_3">%2$d</xliff:g> చదవని అంశాలు. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ట్యాబ్. <xliff:g id="COUNT_1">%2$d</xliff:g> చదవని అంశం. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"బిల్డ్ సంస్కరణ"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ కోసం లైసెన్స్ వివరాలు"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"గోప్యతా విధానం"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"సేవా నిబంధనలు"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"urlని తెరవడంలో విఫలమైంది."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"వీడియో కాల్"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"భాగస్వామ్యం చేసి, కాల్ చేయి"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-th/strings.xml b/java/com/android/contacts/common/res/values-th/strings.xml
index b979e74..a5f8e9e 100644
--- a/java/com/android/contacts/common/res/values-th/strings.xml
+++ b/java/com/android/contacts/common/res/values-th/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"คัดลอกข้อความแล้ว"</string>
-    <string name="copy_text" msgid="5890820280087874642">"คัดลอกไปยังคลิปบอร์ด"</string>
     <string name="call_custom" msgid="3041673234638990874">"โทรหา <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"โทรเข้าบ้าน"</string>
     <string name="call_mobile" msgid="967589404494150813">"โทรเข้ามือถือ"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"โทรเข้าเพจเจอร์ที่ทำงาน"</string>
     <string name="call_assistant" msgid="4177478845473789294">"โทรหา <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"โทรหา MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (โทร)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"ส่งข้อความถึง <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"ส่งข้อความเข้าโทรศัพท์บ้าน"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"ส่งข้อความเข้ามือถือ"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"ส่งข้อความเข้าเพจเจอร์ที่ทำงาน"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"ส่งข้อความถึง MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ข้อความ)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ล้างรายชื่อที่ติดต่อบ่อยไหม"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contacts  และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"กำลังล้างรายชื่อที่ติดต่อบ่อย…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"ไม่อยู่"</string>
     <string name="status_busy" msgid="5990832098713248503">"ไม่ว่าง"</string>
     <string name="contactsList" msgid="8806067891419291513">"รายชื่อติดต่อ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"รายการแนะนำยอดนิยม"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"อื่นๆ"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ไดเรกทอรี"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"ไดเรกทอรีที่ทำงาน"</string>
     <string name="local_search_label" msgid="907622822323119235">"รายชื่อติดต่อทั้งหมด"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"รายการแนะนำ"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ฉัน"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"กำลังค้นหา…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"พบมากกว่า <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"ไม่มีรายชื่อติดต่อ"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">พบ <xliff:g id="COUNT">%d</xliff:g> รายการ</item>
-      <item quantity="one">พบ 1 รายการ</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"สมุดโทรศัพท์ด่วนสำหรับ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(ไม่มีชื่อ)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"โทรติดต่อบ่อย"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"ติดต่อบ่อยครั้ง"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"ดูผู้ติดต่อ"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"รายชื่อติดต่อทั้งหมดที่มีหมายเลขโทรศัพท์"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"รายชื่อติดต่อในโปรไฟล์งาน"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"ส่งอีเมลถึง <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"อีเมล"</string>
     <string name="postal_street" msgid="6918171741240802474">"ถนน"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"ตู้ ปณ."</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"ย่านใกล้เคียง"</string>
     <string name="postal_city" msgid="8674569121430005628">"เมือง"</string>
     <string name="postal_region" msgid="1730369286225469192">"รัฐ"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"รหัสไปรษณีย์"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"แชทโดยใช้ ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"แชทโดยใช้ Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"แชท"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"ลบ"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"ขยายหรือยุบฟิลด์ชื่อ"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"ขยายหรือยุบช่องคำอ่านชื่อ"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"รายชื่อติดต่อทั้งหมด"</string>
-    <string name="menu_done" msgid="1817505539263889535">"เสร็จสิ้น"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"ยกเลิก"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"รายชื่อติดต่อใน <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"รายชื่อติดต่อในมุมมองที่กำหนดเอง"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"รายชื่อติดต่อเดียว"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"บันทึกรายชื่อติดต่อที่นำเข้าลงใน:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"นำเข้าจากซิมการ์ด"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"นำเข้าจากซิม <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"นำเข้าจากซิม <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"นำเข้าจากไฟล์ .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"ยกเลิกการนำเข้า <xliff:g id="FILENAME">%s</xliff:g> หรือไม่"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"ยกเลิกการส่งออก <xliff:g id="FILENAME">%s</xliff:g> หรือไม่"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"ไม่สามารถยกเลิกการนำเข้า/ส่งออก vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"ข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"ไม่สามารถเปิด \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"เริ่มใช้งานโปรแกรมส่งออกไม่ได้: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"คุณได้ปิดใช้สิทธิ์ที่จำเป็น"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"เกิดข้อผิดพลาดระหว่างส่งออก: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"ชื่อไฟล์ที่ต้องระบุยาวเกินไป (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"ข้อผิดพลาด I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"หน่วยความจำไม่เพียงพอ ไฟล์อาจใหญ่เกินไป"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ไม่สามารถแยกวิเคราะห์ vCard ด้วยเหตุผลที่ไม่คาดคิด"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"ไม่สนับสนุนรูปแบบนี้"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"ไม่สามารถรวบรวมข้อมูลเมตาของ vCard ที่ระบุ"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"ไม่สามารถนำเข้าไฟล์ตั้งแต่หนึ่งไฟล์ขึ้นไป (%s)"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"ส่งออก <xliff:g id="FILENAME">%s</xliff:g> เสร็จแล้ว"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"ส่งออกรายชื่อติดต่อเรียบร้อยแล้ว"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"ส่งออกรายชื่อติดต่อเสร็จแล้ว คลิกการแจ้งเตือนเพื่อแชร์รายชื่อติดต่อ"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"แตะเพื่อแชร์รายชื่อติดต่อ"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"ยกเลิกการส่งออก <xliff:g id="FILENAME">%s</xliff:g> แล้ว"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"กำลังส่งออกข้อมูลสมุดโทรศัพท์"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"กำลังส่งออกข้อมูลผู้ติดต่อ"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ไม่สามารถดึงข้อมูลจากฐานข้อมูล"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้ หากคุณมีรายชื่อติดต่ออยู่ในอุปกรณ์จริงๆ อาจเป็นเพราะผู้ให้บริการข้อมูลบางรายไม่อนุญาตให้ส่งออกรายชื่อติดต่อจากอุปกรณ์"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"โปรแกรมเขียนข้อความ vCard เริ่มการทำงานไม่ถูกต้อง"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"ไม่สามารถส่งออก"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"ไม่ได้ส่งออกข้อมูลรายชื่อติดต่อ\nสาเหตุ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"กำลังนำเข้า <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"ไม่สามารถอ่านข้อมูล vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"ยกเลิกการอ่านข้อมูล vCard แล้ว"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"นำเข้า vCard <xliff:g id="FILENAME">%s</xliff:g> เรียบร้อยแล้ว"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"ยกเลิกการนำเข้า <xliff:g id="FILENAME">%s</xliff:g> แล้ว"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"การนำเข้า <xliff:g id="FILENAME">%s</xliff:g> จะเกิดขึ้นในไม่ช้า"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"ไฟล์จะถูกนำเข้าในไม่ช้า"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"คำขอนำเข้า vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"การส่งออก <xliff:g id="FILENAME">%s</xliff:g> จะเกิดขึ้นในไม่ช้า"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"ระบบจะส่งออกไฟล์ในอีกสักครู่"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"ระบบจะส่งออกรายชื่อติดต่อในไม่ช้า"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"คำขอส่งออก vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"รายชื่อติดต่อ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"กำลังแคช vCard ไปยังที่จัดเก็บข้อมูลชั่วคราวในตัวเครื่อง การนำเข้าจริงจะเริ่มต้นในอีกสักครู่"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"ไม่สามารถนำเข้า vCard"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"รับรายชื่อผ่าน NFC แล้ว"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"ส่งออกรายชื่อติดต่อ"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"กำลังแคช"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"กำลังนำเข้า <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"ส่งออกเป็นไฟล์ .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"จัดเรียงตาม"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ชื่อ"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"นามสกุล"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"รูปแบบชื่อ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ชื่อขึ้นก่อน"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"นามสกุลขึ้นก่อน"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"บัญชีเริ่มต้นสำหรับรายชื่อติดต่อใหม่"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"ซิงค์ข้อมูลเมตาของรายชื่อติดต่อ"</string>
-    <string name="setting_about" msgid="5253319937596745755">"เกี่ยวกับ \"รายชื่อติดต่อ\""</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"การตั้งค่า"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"แชร์รายชื่อติดต่อที่มองเห็น"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"ไม่สามารถแชร์รายชื่อติดต่อที่มองเห็นได้"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"แชร์รายชื่อติดต่อโปรด"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"แชร์รายชื่อติดต่อทั้งหมด"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"ไม่สามารถแชร์รายชื่อติดต่อ"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"นำเข้า/ส่งออกรายชื่อติดต่อ"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"นำเข้าสมุดโทรศัพท์"</string>
-    <string name="share_error" msgid="5642622973966851784">"ไม่สามารถแชร์รายชื่อติดต่อนี้ได้"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"ไม่มีรายชื่อติดต่อที่จะแชร์"</string>
-    <string name="menu_search" msgid="1241802591112035764">"ค้นหา"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"ค้นหารายชื่อติดต่อ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"รายการโปรด"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"ไม่มีรายชื่อติดต่อ"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"ไม่มีรายชื่อติดต่อที่แสดงไว้"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"ไม่มีรายการโปรด"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"ไม่มีรายชื่อติดต่อใน <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"ล้างรายชื่อที่ติดต่อบ่อย"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"เลือกซิมการ์ด"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"จัดการบัญชี"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"นำเข้า/ส่งออก"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"ผ่านทาง <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> ผ่านทาง <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"หยุดการค้นหา"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"ล้างการค้นหา"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"ตัวเลือกการแสดงรายชื่อผู้ติดต่อ"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"บัญชี"</string>
     <string name="set_default_account" msgid="7966099951006467572">"ใช้ในการโทรทุกครั้ง"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"โทรด้วย"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"พิมพ์โน้ตเพื่อส่งพร้อมการโทร ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ส่งและโทร"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"แท็บ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> แท็บ <xliff:g id="TITLE_2">%1$s</xliff:g> ยังไม่อ่าน <xliff:g id="COUNT_3">%2$d</xliff:g> รายการ </item>
       <item quantity="one"> แท็บ <xliff:g id="TITLE_0">%1$s</xliff:g> ยังไม่อ่าน <xliff:g id="COUNT_1">%2$d</xliff:g> รายการ </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"เวอร์ชันบิวด์"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"ใบอนุญาตโอเพนซอร์ส"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"รายละเอียดสัญญาอนุญาตสำหรับซอฟต์แวร์โอเพนซอร์ส"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"นโยบายความเป็นส่วนตัว"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"ข้อกำหนดในการให้บริการ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"ใบอนุญาตโอเพนซอร์ส"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"เปิด URL ไม่สำเร็จ"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"แฮงเอาท์วิดีโอ"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"แชร์และโทร"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-tl/strings.xml b/java/com/android/contacts/common/res/values-tl/strings.xml
index 62caef8..07696b7 100644
--- a/java/com/android/contacts/common/res/values-tl/strings.xml
+++ b/java/com/android/contacts/common/res/values-tl/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Kinopya ang teksto"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopyahin sa clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Tawagan sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Tawagan sa bahay"</string>
     <string name="call_mobile" msgid="967589404494150813">"Tawagan sa mobile"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Tawagan sa pager sa trabaho"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Tawagan sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Tawagan sa MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tawagan)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"I-text sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"I-text sa bahay"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"I-text sa mobile"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"I-text sa pager sa trabaho"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"I-text sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"I-text sa MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Imensahe)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"I-clear ang madalas na kinontak"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Iki-clear mo ang listahan ng mga madalas na nakakaugnay sa mga app ng Mga Contact at Telepono at pupuwersahin mo ang mga app ng email na matutunan ang iyong mga kagustuhan sa pag-a-address mula sa simula."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Kini-clear madalas na inuugnayan…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Wala"</string>
     <string name="status_busy" msgid="5990832098713248503">"Abala"</string>
     <string name="contactsList" msgid="8806067891419291513">"Mga Contact"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Mga Madalas Imungkahi"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Iba pa"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoryo"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Directory sa trabaho"</string>
     <string name="local_search_label" msgid="907622822323119235">"Lahat ng mga contact"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mga Mungkahi"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ako"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Naghahanap…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Higit sa <xliff:g id="COUNT">%d</xliff:g> ang nakita."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Walang mga contact"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ang nahanap</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ang nahanap</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Mabilisang contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Walang pangalan)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Madalas na tinatawagan"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Madalas na kino-contact"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Tingnan ang contact"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Lahat ng contact na may mga numero ng telepono"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Mga contact ng profile sa trabaho"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Mag-email sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Mag-email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Kalye"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Kapitbahayan"</string>
     <string name="postal_city" msgid="8674569121430005628">"Lungsod"</string>
     <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ZIP code"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Makipag-chat gamit ang ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Makipag-chat gamit ang Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"tanggalin"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Palawakin o tiklupin ang mga field ng pangalan"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Palakihin o i-collapse ang mga field ng phonetic na pangalan"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Lahat ng contact"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Tapos na"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Kanselahin"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Mga contact sa <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Mga contact sa custom na view"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Iisang contact"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"I-save ang mga ii-import na contact sa:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"I-import mula sa SIM card"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"I-import mula sa SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"I-import mula sa SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Mag-import mula sa .vcf file"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Kanselahin ang pag-import ng <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Kanselahin ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Di makansela pag-import/pag-export vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Hindi alam na error."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Hindi mabuksan ang \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Hindi masimulan ang exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Walang na-e-export na contact."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Na-disable mo ang isang kinakailangang pahintulot."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"May naganap na error habang nag-e-export: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Masyadong mahaba ang kinakailangang filename (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O na error"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Walang sapat na memory. Maaaring masyadong malaki ang file."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Hindi ma-parse ang vCard dahil sa isang hindi inaasahang dahilan."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Hindi sinusuportahan ang format."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Hindi makakolekta ng impormasyon ng meta ng ibinigay na (mga) vCard file."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Hindi ma-import ang isa o higit pang mga file (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Tapos na ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Tapos nang i-export ang mga contact."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Tapos nang ma-export ang mga contact, i-click ang notification upang ibahagi ang mga contact."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"I-tap upang ibahagi ang mga contact."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Kinansela ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Ine-export ang data ng contact"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Ine-export ang data ng contact."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Hindi makuha ang impormasyon ng database."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Walang mga na-e-export na contact. Kung mayroon kang mga contact sa iyong device, maaaring hindi payagan ng ilang provider ng data na i-export mula sa device ang mga contact."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Hindi nagsimula nang maayos ang composer ng vCard."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Hindi ma-export"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Hindi na-export ang data ng contact.\nDahilan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Ini-import ang <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Hindi mabasa ang data ng vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Kinansela ang pagbabasa ng data ng vCard"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Tapos na ang pag-import ng vCard na <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Kinansela ang pag-import ng <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Ii-import ang <xliff:g id="FILENAME">%s</xliff:g> sa ilang sandali."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Ii-import ang file sa ilang sandali."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Tinanggihan ang kahilingan sa pag-import ng vCard. Subukang muli sa ibang pagkakataon."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"I-e-export ang <xliff:g id="FILENAME">%s</xliff:g> sa ilang sandali."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Ie-export ang file sa ilang sandali."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Ie-export ang mga contact sa ilang sandali."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Tinanggihan ang kahilingan sa pag-export ng vCard. Subukang muli sa ibang pagkakataon."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"contact"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Kina-cache ang (mga) vCard sa lokal na pansamantalang storage. Magsisimula sa lalong madaling panahon ang aktwal na pag-import."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Hindi ma-import ang vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Natanggap contact sa NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"I-export ang mga contact?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Nagka-cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Ini-import ang <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"I-export sa .vcf file"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Uriin ayon sa"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Pangalan"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelyido"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Format ng pangalan"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Pangalan muna"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apelyido muna"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Default na account para sa mga bagong contact"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"I-sync ang metadata ng contact"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Tungkol sa Mga Contact"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Mga Setting"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Magbahagi ng mga nakikitang contact"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Hindi naibahagi ang mga nakikitang contact."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Ibahagi ang mga paboritong contact"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Ibahagi ang lahat ng contact"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Hindi naibahagi ang mga contact."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Mag-import/mag-export ng mga contact"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Mag-import ng mga contact"</string>
-    <string name="share_error" msgid="5642622973966851784">"Hindi maibabahagi ang contact na ito."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Walang ibabahaging mga contact."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Maghanap"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Maghanap ng mga contact"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Mga Paborito"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Walang mga contact."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Walang mga nakikitang contact."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Walang mga paborito"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Walang mga contact sa <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"I-clear ang mga frequent"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Pumili ng SIM card"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Pamahalaan ang mga account"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Mag-import/mag-export"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"sa pamamagitan ng <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> sa pamamagitan ng <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ihinto ang paghahanap"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"I-clear ang paghahanap"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Mga opsyon ng display ng contact"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Gamitin ito palagi sa mga tawag"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Tumawag gamit ang"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Mag-type ng isang tala na ipadadala kasama ng tawag ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"IPADALA AT TAWAGAN"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tab ng <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Tab ng <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> hindi pa nababasang item. </item>
       <item quantity="other"> Tab ng <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> na hindi pa nababasang item. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Bersyon ng build"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Mga open source na lisensya"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Mga detalye ng lisensya para sa open source na software"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Patakaran sa privacy"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Tuntunin ng serbisyo"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Mga open source na lisensya"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Nabigong buksan ang url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Mag-video call"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Ibahagi at tumawag"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-tr/strings.xml b/java/com/android/contacts/common/res/values-tr/strings.xml
index ce3c109..6a11159 100644
--- a/java/com/android/contacts/common/res/values-tr/strings.xml
+++ b/java/com/android/contacts/common/res/values-tr/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Metin kopyalandı"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Panoya kopyala"</string>
     <string name="call_custom" msgid="3041673234638990874">"Ara (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="call_home" msgid="125893483593803791">"Ara (ev)"</string>
     <string name="call_mobile" msgid="967589404494150813">"Ara (mobil)"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ara (iş çağrı cihazı)"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Ara (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
     <string name="call_mms" msgid="4958811711741872901">"Ara (MMS)"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefon et)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS gönder (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS gönder (ev)"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS gönder (mobil)"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS gönder (iş çağrı cihazı)"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS gönder (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS gönder (MMS)"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesaj gönder)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sık iletişim kurulanlar silinsin mi?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kişiler ve Telefon uygulamalarındaki sık iletişim kurulanlar listesini temizleyecek ve e-posta uygulamalarını adres tercihlerinizi en baştan öğrenmeye zorlayacaksınız."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Sık iletişim kurulanlar siliniyor…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Dışarıda"</string>
     <string name="status_busy" msgid="5990832098713248503">"Meşgul"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kişiler"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"En Çok Önerilenler"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Diğer"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Dizin"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"İş dizini"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tüm kişiler"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Öneriler"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ben"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Aranıyor..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> kişiden fazla bulundu."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Hiç kişi yok"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> kişi bulundu</item>
-      <item quantity="one">1 kişi bulundu</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> için hızlı kişi"</string>
     <string name="missing_name" msgid="978606963362745020">"(Adsız)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Sık arananlar"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Sık iletişim kurulanlar"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Kişiyi görüntüle"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Telefon numarası olan tüm kişiler"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"İş profili kişileri"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"E-posta gönder (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="email" msgid="2807318537887091606">"E-posta gönder"</string>
     <string name="postal_street" msgid="6918171741240802474">"Cadde"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Posta kutusu"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Mahalle"</string>
     <string name="postal_city" msgid="8674569121430005628">"Şehir"</string>
     <string name="postal_region" msgid="1730369286225469192">"Eyalet"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Posta kodu"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ kullanarak sohbet et"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber kullanarak sohbet et"</string>
     <string name="chat" msgid="1020428260359370236">"Sohbet"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"sil"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Ad alanlarını genişlet veya daralt"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Fonetik ad alanlarını genişlet veya daralt"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tüm kişiler"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Bitti"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"İptal"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> hesabındaki kişiler"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Özel görünümdeki kişiler"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Tek kişi"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"İçe aktarılan kişilerin kaydedileceği yer:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM karttan içe aktar"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"SIM\'den (<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>) içe aktar"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"SIM\'den (<xliff:g id="SIM_NAME">%1$s</xliff:g>) içe aktar"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">".vcf dosyasından aktar"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> dosyasının içe aktarılması iptal edilsin mi?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> dosyasının dışa aktarılması iptal edilsin mi?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"İçe/dışa aktarma işlemi iptal edilemedi"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Bilinmeyen hata."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" açılamadı: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Dışa aktarıcı başlatılamadı: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Dışa aktarabilecek kişi yok."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Gerekli bir izni devre dışı bıraktınız."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Dışa aktarma sırasında bir hata oluştu: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Gereken dosya adı çok uzun (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"G/Ç Hatası"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Bellek yetersiz. Dosya çok büyük olabilir."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Beklenmeyen bir nedenden dolayı vCard ayrıştırılamadı."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Biçim desteklenmiyor."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Belirtilen vCard dosyalarının meta bilgileri toplanamadı."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Bir veya daha fazla dosya içe aktarılamadı (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını dışa aktarma tamamlandı."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kişileri dışa aktarma işlemi tamamlandı."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kişileri dışa aktarma işlemi tamamlandı. Dışa aktarılan kişileri paylaşmak için bildirimi tıklayın."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Kişileri paylaşmak için dokunun."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını dışa aktarma iptal edildi."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kişi verileri dışa aktarılıyor"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kişi verileri dışa aktarılıyor."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Veritabanı bilgileri alınamadı."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Dışa aktarılabilecek kişi yok. Cihazınızda kişileriniz varsa, bazı veri sağlayıcılar kişilerin telefondan dışa aktarılmasına izin vermeyebilir."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard oluşturucu düzgün başlamadı."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Dışa aktarılamadı"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kişi verileri dışa aktarılamadı.\nNedeni: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> içe aktarılıyor"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"vCard verileri okunamadı"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"vCard verilerini okuma işlemi iptal edildi"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"vCard <xliff:g id="FILENAME">%s</xliff:g> dosyasının içe aktarılması tamamlandı"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını içe aktarma iptal edildi"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> kısa bir süre içinde içe aktarılacak."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Dosya kısa bir süre sonra içe aktarılacak."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard\'ı içe aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> kısa bir süre içinde dışa aktarılacak."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Dosya kısa bir süre sonra dışa aktarılacak."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kişiler kısa bir süre içinde dışa aktarılacak."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard\'ı dışa aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kişi"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"vCard\'lar geçici bir yerel depolama alanında önbelleğe alınıyor. Asıl içe aktarma işlemi kısa süre içinde başlayacak."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"vCard içe aktarılamadı."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kişi NFC ile alındı"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Kişiler dışa aktarılsın mı?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Önbelleğe alınıyor"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"İçe aktarılıyor <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">".vcf dosyasına aktar"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sıralama ölçütü"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ad"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Soyadı"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ad biçimi"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Önce ad"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Önce soyadı"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Yeni kişiler için varsayılan hesap"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Kişi meta verilerini senkronize et"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Kişiler Hakkında"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Ayarlar"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Görülebilir kişileri paylaş"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Görünür kişiler paylaşılamadı."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Favori kişileri paylaş"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Tüm kişileri paylaş"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kişiler paylaşılamadı."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kişileri içe/dışa aktar"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Kişileri içe aktar"</string>
-    <string name="share_error" msgid="5642622973966851784">"Bu kişi paylaşılamıyor."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Paylaşılacak kişi yok."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Ara"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Kişileri bul"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Sık Kullanılanlar"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Kişi listesi boş."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Görülebilir kişi yok."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Favori yok"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> içinde kişi yok"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Sık iletişim kurulanları sil"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM kart seçin"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Hesapları yönet"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"İçe/Dışa aktar"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> üzerinden"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> üzerinden şu zamanda: <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"aramayı durdur"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Aramayı temizle"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kişi görüntüleme seçenekleri"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Hesap"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Çağrıyı şununla yap:"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Çağrıyla göndermek için bir not yazın..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"GÖNDER VE ARA"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> sekmesi."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> sekmesi. <xliff:g id="COUNT_3">%2$d</xliff:g> okunmamış öğe. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> sekmesi. <xliff:g id="COUNT_1">%2$d</xliff:g> okunmamış öğe. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Derleme sürümü"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Açık kaynak lisansları"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Açık kaynak yazılımlar için lisans ayrıntıları"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Gizlilik politikası"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Hizmet şartları"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Açık kaynak lisansları"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URL açılamadı."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Görüntülü görüşme"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Paylaşır ve telefon eder"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-uk/strings.xml b/java/com/android/contacts/common/res/values-uk/strings.xml
index f6d1e47..81dda39 100644
--- a/java/com/android/contacts/common/res/values-uk/strings.xml
+++ b/java/com/android/contacts/common/res/values-uk/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Текст скопійовано"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Копіювати в буфер обміну"</string>
     <string name="call_custom" msgid="3041673234638990874">"Набрати <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Набрати домашній номер телефону"</string>
     <string name="call_mobile" msgid="967589404494150813">"Набрати номер мобільного телефону"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Набрати робочий номер пейджера"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Набрати <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Набрати номер MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (зателефонувати)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"SMS на домашній номер телефону"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS на номер мобільного телефону"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"SMS на робочий номер пейджера"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"SMS на номер MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (надіслати повідомлення)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Очистити список частих контактів?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Буде видалено список користувачів, з якими ви часто спілкуєтеся, з додатків Контакти та Телефон і скинуто налаштування адрес у додатках для електронної пошти."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Очищення списку частих контактів…"</string>
@@ -70,24 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Не на місці"</string>
     <string name="status_busy" msgid="5990832098713248503">"Не турбувати"</string>
     <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Найкращі пропозиції"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Інші"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Робочі контакти"</string>
     <string name="local_search_label" msgid="907622822323119235">"Усі контакти"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Пропозиції"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Пошук…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Знайдено понад <xliff:g id="COUNT">%d</xliff:g>."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Контактів немає"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one">Знайдено <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="few">Знайдено <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="many">Знайдено <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="other">Знайдено <xliff:g id="COUNT">%d</xliff:g></item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Швидкий зв’язок, контакт <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Без імені)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Часті виклики"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Часті контакти"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Переглянути контакт"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Усі контакти з номерами телефону"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти в робочому профілі"</string>
@@ -127,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Написати на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Написати"</string>
     <string name="postal_street" msgid="6918171741240802474">"Вулиця"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Поштова скринька"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"У районі"</string>
     <string name="postal_city" msgid="8674569121430005628">"Місто"</string>
     <string name="postal_region" msgid="1730369286225469192">"Штат/регіон"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Поштовий індекс"</string>
@@ -146,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Чат через ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Чат через Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"видалити"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Розгорнути або згорнути поля імен"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Розгорнути або згорнути поля вимови імен"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Усі контакти"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Готово"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Скасувати"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти в обліковому записі <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Користувацький фільтр"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Один контакт"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Зберегти імпортовані контакти в обліковий запис:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Імпорт із SIM-карти"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Імпортувати із SIM-карти \"<xliff:g id="SIM_NAME">^1</xliff:g>\" – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Імпортувати із SIM-карти \"<xliff:g id="SIM_NAME">%1$s</xliff:g>\""</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Імпортувати з файлу .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Скасувати імпорт файлу <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Скасувати експорт файлу <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Не вдалося скасув. імпорт/експорт vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Невідома помилка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Не вдалося відкрити файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Не вдалося запустити експортер: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Немає контактів, які можна експортувати."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Ви вимкнули обов’язковий дозвіл."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Під час експорту сталася помилка: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Потрібна назва файлу задовга (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Помилка вводу/виводу"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Недостатньо пам’яті. Можливо, файл завеликий."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Не вдалося проаналізувати vCard через неочікувану причину."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Формат не підтримується."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Не вдалося зібрати мета-інформацію файлів цієї vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Не вдалось імпортувати один або декілька файлів (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Експорт файлу <xliff:g id="FILENAME">%s</xliff:g> завершено."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Контакти експортовано."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Контакти експортовано. Натисніть сповіщення, щоб надати доступ до контактів."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Торкніться, щоб надати доступ до контактів."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Експорт файлу <xliff:g id="FILENAME">%s</xliff:g> скасовано."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Експортувати контактні дані"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Контакти експортуються."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Не вдалось отримати інформацію бази даних."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Немає контактів, які можна експортувати. Якщо на вашому пристрої є контакти, можливо, постачальник даних заборонив їх експорт."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Майстер vCard не запущено належним чином."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Помилка експорту"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Контактні дані не експортовано.\nПричина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Імпорт контакта <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Не вдалося прочитати дані vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Читання даних vCard скасовано"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Імпорт файлу <xliff:g id="FILENAME">%s</xliff:g> vCard завершено"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Імпорт файлу <xliff:g id="FILENAME">%s</xliff:g> скасовано"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"Файл <xliff:g id="FILENAME">%s</xliff:g> незабаром буде імпортовано."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Файл незабаром буде імпортовано."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Запит на імпорт файлу vCard відхилено. Повторіть спробу пізніше."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"Файл <xliff:g id="FILENAME">%s</xliff:g> незабаром буде експортовано."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Невдовзі файл буде експортовано."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Контакти невдовзі буде експортовано."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Запит на експорт файлу vCard відхилено. Повторіть спробу пізніше."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"контакт"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Кешування файлів vCard у локальну тимчасову пам’ять. Імпорт почнеться незабаром."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Не вдалось імпортувати файл vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Контакт через NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Експортувати контакти?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Кешування"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Імпорт <xliff:g id="CURRENT_NUMBER">%s</xliff:g> з <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Експортувати у файл .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Параметри сортування"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ім’я"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Прізвище"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат імені"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ім’я спочатку"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прізвище спочатку"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Обліковий запис за умовчанням для нових контактів"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Синхронізувати метадані контактів"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Про додаток Контакти"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Налаштування"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Надіслати видимі контакти"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Не вдалося поділитись видимими контактами."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Поділитися вибраними контактами"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Поділитися всіма контактами"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Не вдалося поділитися контактами."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Імпорт/експорт контактів"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Імпортувати контакти"</string>
-    <string name="share_error" msgid="5642622973966851784">"Цей контакт неможливо надіслати."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Немає контактів, якими можна поділитися."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Пошук"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Пошук контактів"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Вибране"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Контактів немає."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Видимих контактів немає."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Немає вибраних контактів"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> – контактів немає"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Очистити часті контакти"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Вибрати SIM-карту"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Керувати обліковими записами"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Імпорт або експорт"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"через <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> через <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"припинити пошук"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Очистити поле пошуку"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Параметри відображення контактів"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Обліковий запис"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Завжди використовувати для дзвінків"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Телефонувати за допомогою"</string>
@@ -250,7 +151,7 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Введіть нотатку, яку хочете надіслати під час дзвінка…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"ЗАТЕЛЕФОНУВАТИ Й НАДІСЛАТИ"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Вкладка \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаний елемент. </item>
@@ -258,13 +159,6 @@
       <item quantity="many"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаних елементів. </item>
       <item quantity="other"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаного елемента. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Версія складання"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Ліцензії відкритого коду"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Деталі ліцензії для програмного забезпечення з відкритим кодом"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Політика конфіденційності"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Умови використання"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Ліцензії на ПЗ з відкритим кодом"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Не вдалося відкрити посилання."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Відеодзвінок"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Надіслати й зателефонувати"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ur/strings.xml b/java/com/android/contacts/common/res/values-ur/strings.xml
index b34c78d..eb9c888 100644
--- a/java/com/android/contacts/common/res/values-ur/strings.xml
+++ b/java/com/android/contacts/common/res/values-ur/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"متن کاپی ہوگیا"</string>
-    <string name="copy_text" msgid="5890820280087874642">"کلپ بورڈ میں کاپی کریں"</string>
     <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> کو کال کریں"</string>
     <string name="call_home" msgid="125893483593803791">"گھر پر کال کریں"</string>
     <string name="call_mobile" msgid="967589404494150813">"موبائل پر کال کریں"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"دفتر کے پیجر پر کال کریں"</string>
     <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> کو کال کریں"</string>
     <string name="call_mms" msgid="4958811711741872901">"‏MMS نمبر پر کال کریں"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (کال کریں)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> پر متن بھیجیں"</string>
     <string name="sms_home" msgid="3527719551060295243">"گھر کے نمبر پر متن بھیجیں"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"موبائل پر متن بھیجیں"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"دفتر کے پیجر پر متن بھیجیں"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> پر متن بھیجیں"</string>
     <string name="sms_mms" msgid="5187888900503248542">"‏MMS نمبر پر متن بھیجیں"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیغام بھیجیں)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"اکثر رابطہ کردہ کو صاف کریں؟"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"آپ رابطے اور فون ایپس میں اکثر رابطہ کردہ فہرست کو صاف کر دیں گے اور ای میل ایپس کو از سر نو اپنے پتے کی ترجیحات جاننے پر مجبور کریں گے۔"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"اکثر رابطہ کردہ کو صاف کر رہا ہے…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"دور"</string>
     <string name="status_busy" msgid="5990832098713248503">"مصروف"</string>
     <string name="contactsList" msgid="8806067891419291513">"رابطے"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"سرفہرست تجویز کردہ"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"دیگر"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"ڈائریکٹری"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"دفتری ڈائرکٹری"</string>
     <string name="local_search_label" msgid="907622822323119235">"سبھی رابطے"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"تجاویز"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"میں"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"تلاش کر رہا ہے…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g> سے زیادہ ملے۔"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"کوئی رابطے نہیں ہیں"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ملے</item>
-      <item quantity="one">1 ملا</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> کیلئے فوری رابطہ"</string>
     <string name="missing_name" msgid="978606963362745020">"(کوئی نام نہیں)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"اکثر کال کردہ"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"اکثر رابطہ کردہ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"رابطہ دیکھیں"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"فون نمبرز کے ساتھ سبھی رابطے"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"دفتری پروفائل رابطے"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"ای میل کریں <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"ای میل کریں"</string>
     <string name="postal_street" msgid="6918171741240802474">"اسٹریٹ"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"‏PO باکس"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"مضافات"</string>
     <string name="postal_city" msgid="8674569121430005628">"شہر"</string>
     <string name="postal_region" msgid="1730369286225469192">"ریاست"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"زپ کوڈ"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"‏ICQ کے ذریعے چیٹ کریں"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"‏Jabber کے ذریعے چیٹ کریں"</string>
     <string name="chat" msgid="1020428260359370236">"چیٹ کریں"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"حذف کریں"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"نام کی فیلڈز کو پھیلائیں یا چھوٹا کریں"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"فونیٹک نام کی فیلڈز کو پھیلائیں یا سکیڑیں"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"سبھی رابطے"</string>
-    <string name="menu_done" msgid="1817505539263889535">"ہوگیا"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"منسوخ کریں"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> میں رابطے"</string>
     <string name="listCustomView" msgid="5306282632413086731">"حسب ضرورت منظر میں رابطے"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"واحد رابطہ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"درآمد کردہ رابطے اس میں محفوظ کریں:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"‏SIM کارڈ سے درآمد کریں"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"‏SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>‎ سے درآمد کریں"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"‏SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>‎ سے درآمد کریں"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"‏‎.vcf فائل سے درآمد کریں"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g> کی درآمد منسوخ کریں؟"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد منسوخ کریں؟"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"وی کارڈ کی درآمد/برآمد کو منسوخ نہیں کرسکا"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"نامعلوم خرابی۔"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" نہیں کھولی جا سکی: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"۔"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"برآمد کنندہ شروع نہیں ہو سکا: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"۔"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"کوئی قابل برآمد رابطہ نہیں ہے۔"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"آپ نے ایک درکار اجازت غیر فعال کر دی ہے۔"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"برآمد کرنے کے دوران ایک غلطی ہوگئی: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"۔"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"مطلوبہ فائل کا نام کافی لمبا (\"<xliff:g id="FILENAME">%s</xliff:g>\") ہے۔"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"‏I/O غلطی"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"کافی میموری نہیں ہے۔ فائل کافی بڑی ہو سکتی ہے۔"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"ایک غیر متوقع وجہ سے وی کارڈ کو پارس نہیں کرسکا۔"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"فارمیٹ تعاون یافتہ نہیں ہے۔"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"مقررہ وی کارڈ فائل (فائلوں) کی میٹا معلومات اکٹھا نہیں کرسکا۔"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"‏ایک یا مزید فائلیں درآمد نہیں ہوسکیں (%s)۔"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد پوری ہوگئی۔"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"رابطوں کی برآمدگی مکمل ہو گئی۔"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"رابطوں کی برآمدگی مکمل ہو گئی، رابطوں کا اشتراک کرنے کیلئے اطلاع پر کلک کریں۔"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"رابطوں کا اشتراک کرنے کے لئے تھپتھپائیں۔"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد منسوخ ہوگئی۔"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"رابطہ کا ڈیٹا برآمد کر رہا ہے"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"رابطہ ڈیٹا برآمد ہو رہا ہے۔"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"ڈیٹابیس کی معلومات حاصل نہیں ہو سکی۔"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"برآمد کرنے لائق کوئی رابطے نہیں ہیں۔ اگر آپ کے آلہ پر واقعی رابطے ہیں تو ممکن ہے کچھ ڈیٹا فراہم کنندگان رابطوں کو آلہ سے برآمد کیے جانے کی اجازت نہ دیتے ہوں۔"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"وی کارڈ کمپوزر مناسب طریقے سے شروع نہیں ہوا۔"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"برآمد نہیں کیا جاسکا"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"رابطہ کا ڈیٹا برآمد نہیں ہوا۔\nوجہ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> کو درآمد کر رہا ہے"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"وی کارڈ کا ڈیٹا نہیں پڑھ سکا"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"وی کارڈ کا ڈیٹا پڑھنا منسوخ ہوگیا"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"وی کارڈ <xliff:g id="FILENAME">%s</xliff:g> کی درآمد پوری ہوگئی"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g> کی درآمد منسوخ ہوگئی"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> جلد ہی درآمد کی جائے گی۔"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"فائل جلد ہی درآمد کی جائے گی۔"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"وی کارڈ درآمد کرنے کی درخواست مسترد ہوگئی تھی۔ بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> جلد ہی برآمد کی جائے گی۔"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"فائل تھوڑی دیر میں برآمد کر دی جائے گی۔"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"رابطے جلد ہی برآمد ہو جائیں گے۔"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"وی کارڈ برآمد کرنے کی درخواست مسترد ہوگئی تھی۔ بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"رابطہ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"وی کارڈ (کارڈز) کو مقامی عارضی اسٹوریج میں ذخیرہ کر رہا ہے۔ اصل درآمد جلد ہی شروع ہوگی۔"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"وی کارڈ درآمد نہیں کرسکا۔"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"‏NFC پر موصولہ رابطہ"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"رابطے برآمد کریں؟"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"ذخیرہ کر رہا ہے"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> درآمد کر رہا ہے"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"‏‎.vcf فائل میں برآمد کریں"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"ترتیب دیں بلحاظ"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"پہلا نام"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"آخری نام"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"نام کا فارمیٹ"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"پہلا نام پہلے"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"آخری نام پہلے"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"نئے رابطوں کیلئے ڈیفالٹ اکاؤنٹ"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"رابطہ میٹا ڈیٹا مطابقت پذیر بنائیں"</string>
-    <string name="setting_about" msgid="5253319937596745755">"رابطے کے بارے میں"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"ترتیبات"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"مرئی رابطوں کا اشتراک کریں"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"مرئی رابطوں کا اشتراک کرنے میں ناکام ہو گیا۔"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"پسندیدہ رابطوں کا اشتراک کریں"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"سارے رابطوں کا اشتراک کریں"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"رابطوں کا اشتراک کرنے میں ناکام۔"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"رابطے درآمد/برآمد کریں"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"رابطے درآمد کریں"</string>
-    <string name="share_error" msgid="5642622973966851784">"اس رابطہ کا اشتراک نہیں کیا جا سکتا۔"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"اشتراک کرنے کے لئے کوئی رابطے نہیں ہیں۔"</string>
-    <string name="menu_search" msgid="1241802591112035764">"تلاش کریں"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"رابطے تلاش کریں"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"پسندیدہ"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"کوئی رابطے نہیں ہیں۔"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"کوئی مرئی رابطے نہیں ہیں۔"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"کوئی پسندیدہ نہیں"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> میں کوئی رابطے نہیں ہیں"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"اکثر و بیشتر کو صاف کریں"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"‏SIM کارڈ منتخب کریں"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"اکاؤنٹس کا نظم کریں"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"درآمد/برآمد کریں"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"معرفت <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> معرفت <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"تلاش کرنا بند کریں"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"تلاش صاف کریں"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"رابطہ کے ڈسپلے کے اختیارات"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"اکاؤنٹ"</string>
     <string name="set_default_account" msgid="7966099951006467572">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"کال کریں مع"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"کال کے ساتھ بھیجنے کیلئے ایک نوٹ ٹائپ کریں…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"بھیجیں اور کال کریں"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ٹیب۔"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ٹیب۔ <xliff:g id="COUNT_3">%2$d</xliff:g> بغیر پڑھی ہوئی آئٹمز۔ </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ٹیب۔ <xliff:g id="COUNT_1">%2$d</xliff:g> بغیر پڑھی ہوئی آئٹم۔ </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"بلڈ ورژن"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"اوپن سورس لائسنسز"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"اوپن سورس سافٹ ویئر کیلئے لائسنس کی تفصیلات"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"رازداری کی پالیسی"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"سروس کی شرائط"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"اوپن سورس لائسنسز"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"‏URL کھولنے میں ناکامی۔"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"ویڈیو کال"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"اشتراک کریں اور کال کریں"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-uz/strings.xml b/java/com/android/contacts/common/res/values-uz/strings.xml
index 44bfd99..2da34cd 100644
--- a/java/com/android/contacts/common/res/values-uz/strings.xml
+++ b/java/com/android/contacts/common/res/values-uz/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Matndan nuxsa olindi"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Vaqtinchalik xotiraga nusxalash"</string>
     <string name="call_custom" msgid="3041673234638990874">"Qo‘ng‘iroq: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Uy telefoniga qo‘ng‘iroq qilish"</string>
     <string name="call_mobile" msgid="967589404494150813">"Mobil"</string>
@@ -26,7 +25,7 @@
     <string name="call_fax_work" msgid="5260192771364592922">"Ish faks raqamiga qo‘ng‘iroq qilish"</string>
     <string name="call_fax_home" msgid="5174311195081144124">"Uy faks raqamiga qo‘ng‘iroq qilish"</string>
     <string name="call_pager" msgid="6814149227741274161">"Peyjerga qo‘ng‘iroq qilish"</string>
-    <string name="call_other" msgid="5536385588712587235">"Qo‘ng‘iroq qilish"</string>
+    <string name="call_other" msgid="5536385588712587235">"Chaqiruv"</string>
     <string name="call_callback" msgid="6314019862718112786">"Qayta qo‘ng‘iroq raqamiga qo‘ng‘iroq qilish"</string>
     <string name="call_car" msgid="3197417098027764954">"Mashina telefon raqamiga qo‘ng‘iroq qilish"</string>
     <string name="call_company_main" msgid="2557663310028446397">"Kompaniya asosiy raqamiga qo‘ng‘iroq qilish"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Ish peyjeriga qo‘ng‘iroq qilish"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Qo‘ng‘iroq: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"MMS raqamga qo‘ng‘iroq qilish"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Qo‘ng‘iroq qilish)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>ga sms jo‘natish"</string>
     <string name="sms_home" msgid="3527719551060295243">"Uy telefoniga sms jo‘natish"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"SMS: mobil"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Ish peyjeriga sms jo‘natish"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> telefoniga qo‘ng‘iroq qilish"</string>
     <string name="sms_mms" msgid="5187888900503248542">"MMS telefonga sms jo‘natish"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Xabar yozish)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Bu ro‘yxat tozalansinmi?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi hamda e-pochta ilovalari manzillarni eslab qolishni qaytadan boshlaydi."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Ko‘p gaplashilganlar tozalanmoqda…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Tashqarida"</string>
     <string name="status_busy" msgid="5990832098713248503">"Band"</string>
     <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Eng faol"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Boshqa"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Direktoriya"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Ishchi katalogi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Barcha kontaktlar"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Takliflar"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Men"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Qidirilmoqda…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"<xliff:g id="COUNT">%d</xliff:g>dan ko‘proq topildi."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Hech qanday kontakt yo‘q"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ta kontakt topildi</item>
-      <item quantity="one">1 ta kontakt topildi</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> uchun tez kontakt"</string>
     <string name="missing_name" msgid="978606963362745020">"(Ismi yo‘q)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Ko‘p qo‘ng‘iroq qilingan kontaktlar"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Ko‘p gaplashilgan kontaktlar"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontaktni ko‘rish"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Telefon raqamli kontaktlar"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Ishchi profili kontaktlari"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>ga xat jo‘natish"</string>
     <string name="email" msgid="2807318537887091606">"Boshqa e-pochtalarga xat jo‘natish"</string>
     <string name="postal_street" msgid="6918171741240802474">"Ko‘cha"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Pochta qutisi"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Mahalla"</string>
     <string name="postal_city" msgid="8674569121430005628">"Shahar"</string>
     <string name="postal_region" msgid="1730369286225469192">"Shahar"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"ZIP kodi"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"ICQ’da suhbatlashish"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Jabber’da suhbatlashish"</string>
     <string name="chat" msgid="1020428260359370236">"Suhbatlashish"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"o‘chirib tashlash"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Qo‘shimcha maydonlarni ko‘rsatish va berkitish"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Fonetik ism maydonlarni ko‘rsatish va berkitish"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Barcha kontaktlar"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Tayyor"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Bekor qilish"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>dagi kontaktlar"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Filtrlangan kontaktlar"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Bitta kontakt"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Import qilingan kontaktlarni saqlash joyi:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"SIM-kartadan import qilish"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Quyidagi SIM-kartadan import qilish: <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Quyidagi SIM-kartadan import qilish: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"VCF fayldan import qilish"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"<xliff:g id="FILENAME">%s</xliff:g>ni import qilish bekor qilinsinmi?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish bekor qilinsinmi?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Tashrifnomani import/eksport qilishni bekor qilib bo‘lmadi"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Noma’lum xato."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"<xliff:g id="FILE_NAME">%s</xliff:g> faylini ochib bo‘lmadi. <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Eksport qiluvchini ishga tushirib bo‘lmaydi: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Eksport qilsa bo‘ladigan kontakt mavjud emas."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Siz zarur ruxsatni o‘chirib qo‘ygansiz."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Eksport jarayonida xato yuz berdi: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"So‘ralgan fayl nomi juda uzun (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O xato"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Xotira yetarli emas. Fayl juda katta bo‘lishi mumkin."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Tashrifnomani kutilmagan sabab tufayli tahlil qilib bo‘lmadi."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Ushbu formatda ishlamaydi."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Berilgan tashrifnoma(lar) meta ma’lumotini yig‘ib bo‘lmadi."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Bir yoki bir necha fayllarni import qilib bo‘lmadi (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish tugadi."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Kontaktlar eksport qilindi."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Kontaktlar eksport qilindi. Ularni baham ko‘rish uchun bildirishnoma ustiga bosing."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Kontaktlarni baham ko‘rish uchun bosing."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish bekor qilindi."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kontakt ma’lumoti eksport qilinmoqda"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Kontakt ma’lumotlari eksport qilinmoqda."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Ma’lumotlar bazasining ma’lumoti olinmadi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Eksport qilish uchun kontaktlar yo‘q. Ba’zi tarmoq operatorlari kontaktlarni qurilmadan eksport qilishga ruxsat bermagan bo‘lishi mumkin."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Tashrifnoma yaratgich to‘g‘ri ishga tushmagan."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Eksport qilinmadi"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Kontakt ma’lumoti eksport qilinmadi.\nSababi: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"<xliff:g id="NAME">%s</xliff:g> import qilinmoqda"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Tashrifnoma ma’lumotlari o‘qilmadi"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Tashrifnomani o‘qish bekor qilindi"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"<xliff:g id="FILENAME">%s</xliff:g> tashrifnomani import qilish tugadi"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"<xliff:g id="FILENAME">%s</xliff:g>ni import qilish bekor qilindi"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> tezda import qilinadi."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Fayl tezda import qilinadi."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Tashrifnomani import qilish so‘rovi rad qilindi. Keyinroq urinib ko‘ring."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> tezda eksport qilinadi."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Fayl tez orada eksport qilinadi."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Kontaktlar tez orada eksport qilinadi."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Tashrifnomani eksport qilish rad qilindi. Keyinroq urinib ko‘ring."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"kontakt"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Tashrifnoma(lar) telefondagi vaqtinchalik xotira keshiga yuklanmoqda. Import qilish jarayoni tezda boshlanadi."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Tashrifnoma import qilinmadi."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Kontakt NFC orqali olindi"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Kontaktlar eksport qilinsinmi?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Keshga yuklanmoqda"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> – <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"VCF faylga eksport qilish"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Saralash tartibi"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ismi asosida"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Familiyasi asosida"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ism formati"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Avval ismi"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Avval familiyasi"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Yangi kontaktlar uchun birlamchi hisob"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Kontakt meta-ma’lumotlarini sinxronlash"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Kontaktlar ilovasi haqida"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Sozlamalar"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Ko‘rinadigan kontaktlarni yuborish"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Ko‘rinadigan kontaktlarni yuborib bo‘lmadi."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Sevimli kontaktlarni yuborish"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Barcha kontaktlarni yuborish"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Kontaktlarni yuborib bo‘lmadi."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Kontaktlarni import/eksport qilish"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Kontaktlarni import qilish"</string>
-    <string name="share_error" msgid="5642622973966851784">"Kontaktni yuborib bo‘lmadi."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Yuborish uchun hech qanday kontakt yo‘q."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Qidirish"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Kontaktlar ichidan qidirish"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Sevimlilar"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Hech qanday kontakt yo‘q."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Ko‘rinadigan kontaktlar yo‘q."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Hech narsa yo‘q"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g> guruhida hech qanday kontakt yo‘q"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Faol kontaktlarni tozalash"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"SIM kartani tanlang"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Hisoblarni boshqarish"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Import/eksport"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"<xliff:g id="SOURCE">%1$s</xliff:g> orqali"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="SOURCE">%2$s</xliff:g> orqali <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"qidiruvni to‘xtatish"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Izlashni tozalash"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Kontaktlarni ko‘rsatish"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Hisob"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Har doim qo‘ng‘iroqlar u-n foyd-sin"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ushbu bilan qo‘ng‘iroq qilish"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Qo‘ng‘iroqqa qo‘shib yuborish uchun izoh yozing ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"YUBORISH va QO‘NG‘IROQ QILISH"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ichki oynasi."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ichki oynasi. <xliff:g id="COUNT_3">%2$d</xliff:g> ta o‘qilmagan narsa. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ichki oynasi. <xliff:g id="COUNT_1">%2$d</xliff:g> ta o‘qilmagan narsa. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Versiyasi"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Ochiq kodli DT litsenziyalari"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Ochiq kodli DT litsenziyalari haqida ma’lumot"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Maxfiylik siyosati"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Foydalanish shartlari"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Ochiq kodli dasturiy ta’minot litsenziyalari"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"URLni ochishda xatolik yuz berdi."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Video suhbat"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Ulashish va chaqirish"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-vi/strings.xml b/java/com/android/contacts/common/res/values-vi/strings.xml
index dadb78a..31fe86a 100644
--- a/java/com/android/contacts/common/res/values-vi/strings.xml
+++ b/java/com/android/contacts/common/res/values-vi/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Đã sao chép văn bản"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Sao chép vào khay nhớ tạm"</string>
     <string name="call_custom" msgid="3041673234638990874">"Gọi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Gọi số điện thoại nhà riêng"</string>
     <string name="call_mobile" msgid="967589404494150813">"Gọi số điện thoại di động"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Gọi số máy nhắn tin cơ quan"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Gọi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Gọi MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Gọi)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Nhắn tin tới <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Nhắn tin tới số điện thoại nhà riêng"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Nhắn tin tới số điện thoại di động"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Nhắn tin tới số máy nhắn tin cơ quan"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Nhắn tin tới <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Nhắn tin tới số điện thoại MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tin nhắn)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Xóa danh sách liên hệ thường xuyên?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Bạn sẽ xóa danh sách liên hệ thường xuyên trong ứng dụng Danh bạ và điện thoại cũng như buộc các ứng dụng email phải tìm hiểu các tùy chọn gửi của bạn lại từ đầu."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Đang xóa DS liên hệ thường xuyên…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Đã ra ngoài"</string>
     <string name="status_busy" msgid="5990832098713248503">"Bận"</string>
     <string name="contactsList" msgid="8806067891419291513">"Danh bạ"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Đề xuất hàng đầu"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Khác"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Thư mục"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Thư mục công việc"</string>
     <string name="local_search_label" msgid="907622822323119235">"Tất cả liên hệ"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Đề xuất"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Tôi"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Đang tìm kiếm…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Đã tìm thấy hơn <xliff:g id="COUNT">%d</xliff:g> người liên hệ."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Không có liên hệ nào"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">Đã tìm thấy <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Đã tìm thấy 1</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Liên hệ nhanh của <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Không có tên)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Thường xuyên được gọi"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Thường xuyên được liên hệ"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Xem liên hệ"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Tất cả người liên hệ có số điện thoại"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Liên hệ trên hồ sơ công việc"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"Gửi email cho <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"Gửi email"</string>
     <string name="postal_street" msgid="6918171741240802474">"Đường phố"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"Hòm thư bưu điện"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Vùng lân cận"</string>
     <string name="postal_city" msgid="8674569121430005628">"Thành phố"</string>
     <string name="postal_region" msgid="1730369286225469192">"Tiểu bang"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Mã ZIP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Trò chuyện sử dụng ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Trò chuyện sử dụng Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Trò chuyện"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"xóa"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Mở rộng hoặc thu gọn trường tên"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Mở rộng hoặc thu gọn trường tên theo phiên âm"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Tất cả liên hệ"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Xong"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Hủy"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Danh bạ trong <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Danh bạ ở chế độ xem tùy chỉnh"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Một liên hệ"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Lưu danh bạ đã nhập vào:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Nhập từ thẻ SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Nhập từ SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Nhập từ SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Nhập từ tệp .vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Hủy nhập <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Hủy xuất <xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Không thể nhập/xuất vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Lỗi không xác định."</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Không thể mở \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Không thể chạy trình xuất: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Không thể xuất liên hệ nào."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Bạn đã tắt quyền được yêu cầu."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Đã xảy ra lỗi khi xuất: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Tên tệp yêu cầu quá dài (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Lỗi I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Không đủ bộ nhớ. Tệp có thể quá lớn."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Không thể phân tích cú pháp vCard vì lý do không mong muốn."</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Định dạng không được hỗ trợ."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Không thể thu thập thông tin meta của (các) tệp vCard cụ thể."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Không thể nhập một hoặc nhiều tệp (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Đã xuất xong <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Đã xuất xong danh bạ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Đã xuất xong liên hệ. Nhấp vào thông báo để chia sẻ liên hệ."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Nhấp để chia sẻ liên hệ."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Quá trình xuất <xliff:g id="FILENAME">%s</xliff:g> bị hủy."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Đang xuất dữ liệu liên hệ"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Dữ liệu liên hệ đang được xuất."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Không thể nhận thông tin cơ sở dữ liệu."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Không thể xuất liên hệ nào. Nếu bạn có danh bạ trên thiết bị của mình, một số nhà cung cấp dữ liệu không cho phép xuất danh bạ từ thiết bị."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Trình soạn vCard không khởi động đúng."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Không thể xuất"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Không xuất được dữ liệu liên hệ.\nLý do: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Đang nhập <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Không thể đọc dữ liệu vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Thao tác đọc dữ liệu vCard bị hủy"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Đã nhập xong vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Quá trình nhập <xliff:g id="FILENAME">%s</xliff:g> bị hủy"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> sẽ sớm được nhập."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Tệp sẽ sớm được nhập."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Yêu cầu nhập vCard bị từ chối. Hãy thử lại sau."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> sẽ sớm được xuất."</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Tệp sẽ sớm được xuất."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Danh bạ sẽ được xuất ngay."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Yêu cầu xuất vCard bị từ chối. Hãy thử lại sau."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"liên hệ"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Đang lưu vào bộ nhớ cache các tệp vCard sẽ được nhập vào bộ nhớ cục bộ tạm thời. Thao tác nhập thực sự sẽ sớm bắt đầu."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Không thể nhập vCard."</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"L.h nhận qua NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Xuất danh bạ?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Đang lưu vào bộ nhớ cache"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Đang nhập <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Xuất sang tệp .vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sắp xếp theo"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Tên"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Họ"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Định dạng tên"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Tên trước"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Họ trước"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"Tài khoản mặc định cho các liên hệ mới"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Đồng bộ hóa siêu dữ liệu liên hệ"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Giới thiệu về Danh bạ"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Cài đặt"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Chia sẻ liên hệ hiển thị"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Không chia sẻ được liên hệ được hiển thị."</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Chia sẻ liên hệ yêu thích"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Chia sẻ tất cả các liên hệ"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Không chia sẻ được liên hệ."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Nhập/xuất danh bạ"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Nhập danh bạ"</string>
-    <string name="share_error" msgid="5642622973966851784">"Không thể chia sẻ liên hệ này."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Không có liên hệ nào để chia sẻ."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Tìm kiếm"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Tìm liên hệ"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Liên hệ ưa thích"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Không có liên hệ nào."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Không có địa chỉ liên hệ nào hiển thị."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Không có liên hệ yêu thích nào"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Không có địa chỉ liên hệ nào trong <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Xóa DS liên hệ thường xuyên"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Chọn thẻ SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Quản lý tài khoản"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Nhập/xuất"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"qua <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> qua <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"ngừng tìm kiếm"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Xóa tìm kiếm"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Tùy chọn hiển thị liên hệ"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"Tài khoản"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Luôn sử dụng SIM này để gọi"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Gọi bằng"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Nhập ghi chú để gửi kèm cuộc gọi..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"GỬI và GỌI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> mục chưa đọc. </item>
       <item quantity="one"> Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> mục chưa đọc. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Phiên bản đóng gói"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Giấy phép nguồn mở"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Chi tiết giấy phép cho phần mềm nguồn mở"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Chính sách bảo mật"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Điều khoản dịch vụ"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Giấy phép nguồn mở"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Không mở được url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Gọi điện video"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Chia sẻ và gọi"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
index 161638e..a83d460 100644
--- a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"文本已复制"</string>
-    <string name="copy_text" msgid="5890820280087874642">"复制到剪贴板"</string>
     <string name="call_custom" msgid="3041673234638990874">"拨打<xliff:g id="CUSTOM">%s</xliff:g>电话号码"</string>
     <string name="call_home" msgid="125893483593803791">"拨打住宅电话号码"</string>
     <string name="call_mobile" msgid="967589404494150813">"拨打手机号码"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"拨打公司寻呼机号码"</string>
     <string name="call_assistant" msgid="4177478845473789294">"拨打<xliff:g id="ASSISTANT">%s</xliff:g>的电话"</string>
     <string name="call_mms" msgid="4958811711741872901">"拨打彩信电话号码"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g>（拨打电话）"</string>
     <string name="sms_custom" msgid="8785368968605026317">"向<xliff:g id="CUSTOM">%s</xliff:g>电话号码发短信"</string>
     <string name="sms_home" msgid="3527719551060295243">"向住宅电话号码发短信"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"向手机发短信"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"向公司寻呼机号码发短信"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"向<xliff:g id="ASSISTANT">%s</xliff:g>发短信"</string>
     <string name="sms_mms" msgid="5187888900503248542">"向彩信电话号码发短信"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g>（发送短信）"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"是否清除常用联系人？"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"此操作会清除“通讯录”和“电话”应用中的常用联系人列表，并强制电子邮件应用重新获取您最常使用的联系地址。"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用联系人…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"离开"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"通讯录"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"常用联系人推荐"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"目录"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"工作目录"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有联系人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建议"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"正在搜索..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"找到超过 <xliff:g id="COUNT">%d</xliff:g> 位联系人。"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"没有联系人"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">找到 <xliff:g id="COUNT">%d</xliff:g> 位联系人</item>
-      <item quantity="one">找到 1 位联系人</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g>的快捷联系方式"</string>
     <string name="missing_name" msgid="978606963362745020">"（无姓名）"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"经常呼叫的联系人"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"常用联系人"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"查看联系人"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"所有拥有电话号码的联系人"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"工作资料联系人"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"向<xliff:g id="CUSTOM">%s</xliff:g>邮箱发送电子邮件"</string>
     <string name="email" msgid="2807318537887091606">"发送电子邮件"</string>
     <string name="postal_street" msgid="6918171741240802474">"街道"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"邮政信箱"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"社区"</string>
     <string name="postal_city" msgid="8674569121430005628">"城市"</string>
     <string name="postal_region" msgid="1730369286225469192">"省/自治区/直辖市"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"邮编"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 聊天"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 聊天"</string>
     <string name="chat" msgid="1020428260359370236">"聊天"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"删除"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"展开或收起姓名字段"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"展开或收起姓名拼音字段"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"所有联系人"</string>
-    <string name="menu_done" msgid="1817505539263889535">"完成"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"取消"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的联系人"</string>
     <string name="listCustomView" msgid="5306282632413086731">"自定义视图中的联系人"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"单个联系人"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"将导入的联系人保存到："</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"从 SIM 卡导入"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"从 SIM 卡“<xliff:g id="SIM_NAME">^1</xliff:g>” - <xliff:g id="SIM_NUMBER">^2</xliff:g> 导入"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"从 SIM 卡“<xliff:g id="SIM_NAME">%1$s</xliff:g>”导入"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"从 .vcf 文件导入"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"要取消导入“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"要取消导出“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"无法取消导入/导出 vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"未知错误。"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"无法打开“<xliff:g id="FILE_NAME">%s</xliff:g>”：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"无法启动导出程序：“<xliff:g id="EXACT_REASON">%s</xliff:g>”。"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"没有可导出的联系人。"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"您已停用某项必需权限。"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"导出时出错：“<xliff:g id="EXACT_REASON">%s</xliff:g>”。"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"指定的文件名过长（“<xliff:g id="FILENAME">%s</xliff:g>”）。"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O 错误"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"内存不足。该文件可能过大。"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"由于意外原因而无法解析 vCard。"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"不支持此格式。"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"无法收集指定 vCard 文件的元信息。"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"一个或多个文件无法导入 (%s)。"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"已顺利导出“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"已成功导出联系人。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"联系人数据导出已完成，点击通知即可分享联系人数据。"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"点按即可分享联系人数据。"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"已取消导出“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"正在导出联系人数据"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"正在导出联系人数据。"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"无法获取数据库信息。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"没有可导出的联系人。如果您的设备上确实存有联系人，可能是某些数据源不允许从设备中导出联系人。"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard 制作程序未正确启动。"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"无法导出"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"未导出联系人数据。\n原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"正在导入<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"无法读取 vCard 数据"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"已取消读取 vCard 数据"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"已顺利导入 vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"已取消导入“<xliff:g id="FILENAME">%s</xliff:g>”"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"“<xliff:g id="FILENAME">%s</xliff:g>”将在稍后导入。"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"该文件将在稍后导入。"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard 导入请求遭拒，请稍后重试。"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"“<xliff:g id="FILENAME">%s</xliff:g>”将在稍后导出。"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"即将导出文件。"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"即将导出联系人数据。"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard 导出请求遭拒，请稍后重试。"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"联系人"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"正在将 vCard 缓存到本地临时存储空间。实际导入操作即将开始。"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"无法导入 vCard。"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"通过NFC收到的联系人"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"要导出联系人吗？"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"正在缓存"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"正在导入第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> 位联系人：<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"导出为 .vcf 文件"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序方式"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"用于保存新联系人的默认帐号"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"同步联系人元数据"</string>
-    <string name="setting_about" msgid="5253319937596745755">"关于通讯录"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"设置"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"分享所显示的联系人"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"无法分享所显示的联系人。"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"分享收藏的联系人"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"分享所有联系人"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"无法分享联系人。"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"导入/导出联系人"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"导入联系人"</string>
-    <string name="share_error" msgid="5642622973966851784">"无法分享此联系人。"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"没有可供分享的联系人。"</string>
-    <string name="menu_search" msgid="1241802591112035764">"搜索"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"查找联系人"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"收藏"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"没有联系人。"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"没有可显示的联系人。"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"没有收藏的联系人"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"<xliff:g id="NAME">%s</xliff:g>中没有联系人"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用联系人"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"选择SIM卡"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"管理帐号"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"导入/导出"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"来源：<xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g>，来源：<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜索"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"清除搜索内容"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"联系人显示选项"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"帐号"</string>
     <string name="set_default_account" msgid="7966099951006467572">"一律使用这张卡进行通话"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"用于外拨电话的帐号"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"输入要在拨打电话时发送的备注…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"发送并拨打电话"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>：<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>标签。"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>标签。<xliff:g id="COUNT_3">%2$d</xliff:g> 项未读内容。</item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>标签。<xliff:g id="COUNT_1">%2$d</xliff:g> 项未读内容。</item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"版本号"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"开放源代码许可"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"开放源代码软件的许可详情"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"隐私权政策"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"服务条款"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"开放源代码许可"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"无法打开网址。"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"视频通话"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"分享并拨打电话"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
index 9952ab6..dfa6613 100644
--- a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"文字已複製"</string>
-    <string name="copy_text" msgid="5890820280087874642">"複製到剪貼簿"</string>
     <string name="call_custom" msgid="3041673234638990874">"撥打<xliff:g id="CUSTOM">%s</xliff:g>電話號碼"</string>
     <string name="call_home" msgid="125893483593803791">"撥打住家電話號碼"</string>
     <string name="call_mobile" msgid="967589404494150813">"撥打手機號碼"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"撥打公司傳呼機號碼"</string>
     <string name="call_assistant" msgid="4177478845473789294">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>的電話號碼"</string>
     <string name="call_mms" msgid="4958811711741872901">"撥打 MMS 電話號碼"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (通話)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"傳送短訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
     <string name="sms_home" msgid="3527719551060295243">"傳送短訊至住家電話"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"傳送短訊至手機"</string>
@@ -62,30 +60,21 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"傳送短訊至公司傳呼機"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"傳送短訊至<xliff:g id="ASSISTANT">%s</xliff:g>的電話"</string>
     <string name="sms_mms" msgid="5187888900503248542">"傳送短訊至 MMS 電話號碼"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (訊息)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"清除常用聯絡人？"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件喜好設定。"</string>
+    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件偏好設定。"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用聯絡人…"</string>
     <string name="status_available" msgid="2648156525685472626">"在線"</string>
     <string name="status_away" msgid="2298688367552893953">"離開"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"通訊錄"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"熱門建議"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"名錄"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"工作目錄"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"正在搜尋..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"找到超過 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人。"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"沒有聯絡人"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">找到 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">找到 1 位聯絡人</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"快速聯絡<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(沒有名稱)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"經常通話的聯絡人"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"常用聯絡人"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"查看聯絡人"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"所有附有電話號碼的聯絡人"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"工作設定檔通訊錄"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"傳送電郵至<xliff:g id="CUSTOM">%s</xliff:g>的信箱"</string>
     <string name="email" msgid="2807318537887091606">"傳送電郵"</string>
     <string name="postal_street" msgid="6918171741240802474">"街道"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"郵政信箱"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"社區"</string>
     <string name="postal_city" msgid="8674569121430005628">"城市"</string>
     <string name="postal_region" msgid="1730369286225469192">"州/省"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"郵遞區號"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 進行即時通訊"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 進行即時通訊"</string>
     <string name="chat" msgid="1020428260359370236">"即時通訊"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"刪除"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"展開或收合名稱欄位"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"展開或收合姓名拼音欄位"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"所有聯絡人"</string>
-    <string name="menu_done" msgid="1817505539263889535">"完成"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"取消"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的聯絡人"</string>
     <string name="listCustomView" msgid="5306282632413086731">"聯絡人自訂檢視"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"單一聯絡人"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"儲存匯入的聯絡人至以下帳戶："</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"從 SIM 卡匯入"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"從 SIM 卡匯入 <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"從 SIM 卡匯入 <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"匯入 .vcf 檔案"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"要取消匯入 <xliff:g id="FILENAME">%s</xliff:g> 嗎？"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"要取消匯出 <xliff:g id="FILENAME">%s</xliff:g> 嗎？"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"無法取消匯入/匯出 vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"不明錯誤。"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"無法開啟「<xliff:g id="FILE_NAME">%s</xliff:g>」：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"無法啟動匯出程式：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"沒有聯絡人資料可以匯出。"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"您已停用所需權限。"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"匯出時發生錯誤：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"要求的檔案名稱過長 (「<xliff:g id="FILENAME">%s</xliff:g>」)。"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O 錯誤"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"記憶體不足，檔案可能過大。"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"由於未預期的原因，無法剖析 vCard。"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"不支援此格式。"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"無法從指定的 vCard 檔案收集中繼資料。"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"無法匯入一個或多個檔案 (%s)。"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"已完成匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"已匯出聯絡人。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"已完成匯出通訊錄，按一下通知即可共用通訊錄。"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"輕按即可共用通訊錄。"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"正在匯出聯絡人資料"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"正在匯出聯絡人資料。"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"無法取得資料庫資訊。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"沒有聯絡人可以匯出。如果您的裝置確實有聯絡人，可能部分資料提供者不允許您將聯絡人從裝置匯出。"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard 編輯器並未正確啟動。"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"無法匯出"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"聯絡人資料未匯出。\n原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"正在匯入 <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"無法讀取 vCard 資料"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"已取消讀取 vCard 資料的操作"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"已完成匯入 vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"已取消匯入 <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯入。"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"稍後即將匯入檔案。"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard 匯入要求已被拒，請稍後再試。"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯出。"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"檔案即將匯出。"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"系統即將匯出通訊錄。"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard 匯出要求已被拒，請稍後再試。"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"聯絡人"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"正在將 vCard 資料快取至本機暫存空間，隨即將開始實際的匯入操作。"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"無法匯入 vCard。"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"已透過 NFC 收到聯絡人資料"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"要匯出聯絡人資料嗎？"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"快取中"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"正在匯入第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 位：<xliff:g id="NAME">%s</xliff:g>，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 位"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"匯出至 .vcf 檔案"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序方式"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"新聯絡人的預設帳戶"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"同步處理聯絡人元數據"</string>
-    <string name="setting_about" msgid="5253319937596745755">"有關通訊錄"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"設定"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"分享正常顯示的聯絡人"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"無法分享顯示的聯絡人"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"分享常用聯絡人資料"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"分享所有聯絡人資料"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"無法分享聯絡人資料。"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"匯入/匯出聯絡人資料"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"匯入通訊錄"</string>
-    <string name="share_error" msgid="5642622973966851784">"無法分享這位聯絡人的資料。"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"沒有聯絡人可供分享。"</string>
-    <string name="menu_search" msgid="1241802591112035764">"搜尋"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"尋找聯絡人"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"我的最愛"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"沒有聯絡人。"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"沒有可顯示的聯絡人。"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"沒有最愛聯絡人"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"「<xliff:g id="NAME">%s</xliff:g>」中沒有聯絡人"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用聯絡人"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"選取 SIM 卡"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"管理帳戶"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"匯入/匯出"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"透過 <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> (透過 <xliff:g id="SOURCE">%2$s</xliff:g>)"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜尋"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"清除搜尋"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"聯絡人顯示選項"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"帳戶"</string>
     <string name="set_default_account" msgid="7966099951006467572">"永遠使用這張 SIM 卡通話"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"選取用於撥號的 SIM 卡："</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"撥號時可以書寫和傳送筆記…"</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"傳送和撥號"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"「<xliff:g id="TITLE">%1$s</xliff:g>」標籤。"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other">「<xliff:g id="TITLE_2">%1$s</xliff:g>」標籤 (<xliff:g id="COUNT_3">%2$d</xliff:g> 個未讀取項目)。</item>
       <item quantity="one">「<xliff:g id="TITLE_0">%1$s</xliff:g>」標籤 (<xliff:g id="COUNT_1">%2$d</xliff:g> 個未讀取項目)。</item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"版本"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"開放原始碼授權"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"開放原始碼軟件的授權詳情"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"私隱權政策"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"服務條款"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"開放原始碼授權"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"無法開啟網址。"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"視像通話"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"分享並通話"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
index e5ad61f..fca680b 100644
--- a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"文字已複製"</string>
-    <string name="copy_text" msgid="5890820280087874642">"複製到剪貼簿"</string>
     <string name="call_custom" msgid="3041673234638990874">"撥打<xliff:g id="CUSTOM">%s</xliff:g>電話號碼"</string>
     <string name="call_home" msgid="125893483593803791">"撥打住家電話號碼"</string>
     <string name="call_mobile" msgid="967589404494150813">"撥打手機號碼"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"撥打公司呼叫器號碼"</string>
     <string name="call_assistant" msgid="4177478845473789294">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>電話號碼"</string>
     <string name="call_mms" msgid="4958811711741872901">"撥打 MMS 電話號碼"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (撥號)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"傳送簡訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
     <string name="sms_home" msgid="3527719551060295243">"傳送簡訊至住家電話"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"傳送簡訊至手機"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"傳送簡訊至公司呼叫器"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"傳送簡訊至<xliff:g id="ASSISTANT">%s</xliff:g>電話"</string>
     <string name="sms_mms" msgid="5187888900503248542">"傳送簡訊至 MMS 電話"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (傳送簡訊)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"清除常用聯絡人？"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您即將清除「聯絡人」應用程式和「電話」應用程式中的常用聯絡人清單，並設定讓電子郵件應用程式重新熟悉您的寄件偏好設定。"</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用聯絡人…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"離開"</string>
     <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
     <string name="contactsList" msgid="8806067891419291513">"聯絡人"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"常用聯絡人建議"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"目錄"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Work 聯絡人目錄"</string>
     <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"搜尋中…"</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"找到 <xliff:g id="COUNT">%d</xliff:g> 位以上的聯絡人。"</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"沒有聯絡人"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="other">找到 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">找到 1 位聯絡人</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"<xliff:g id="NAME">%1$s</xliff:g> 的快速聯絡人相片"</string>
     <string name="missing_name" msgid="978606963362745020">"(無姓名)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"經常通話"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"經常聯絡"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"查看聯絡人"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"所有包含電話號碼的聯絡人資訊"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Work 設定檔聯絡人"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"傳送電子郵件至「<xliff:g id="CUSTOM">%s</xliff:g>」"</string>
     <string name="email" msgid="2807318537887091606">"電子郵件"</string>
     <string name="postal_street" msgid="6918171741240802474">"街"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"郵政信箱"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"鄰"</string>
     <string name="postal_city" msgid="8674569121430005628">"縣市鄉鎮"</string>
     <string name="postal_region" msgid="1730369286225469192">"州"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"郵遞區號"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 進行即時通訊"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 進行即時通訊"</string>
     <string name="chat" msgid="1020428260359370236">"即時通訊"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"刪除"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"展開或收合名稱欄位"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"展開或收合姓名拼音欄位"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"所有聯絡人"</string>
-    <string name="menu_done" msgid="1817505539263889535">"完成"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"取消"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的聯絡人"</string>
     <string name="listCustomView" msgid="5306282632413086731">"聯絡人自訂檢視"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"單一聯絡人"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"將匯入的聯絡人儲存到："</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"從 SIM 卡匯入"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"從 SIM 卡 <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> 匯入"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"從 SIM 卡 <xliff:g id="SIM_NAME">%1$s</xliff:g> 匯入"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"從 .vcf 檔案匯入"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"確定要取消匯入 <xliff:g id="FILENAME">%s</xliff:g>？"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"確定要取消匯出 <xliff:g id="FILENAME">%s</xliff:g>？"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"無法取消匯入/匯出 vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"未知的錯誤。"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"無法開啟「<xliff:g id="FILE_NAME">%s</xliff:g>」：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"無法啟動匯出程式：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"沒有可匯出的聯絡人。"</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"必要權限已停用。"</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"匯出時發生錯誤：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"要求的檔案名稱過長 (「<xliff:g id="FILENAME">%s</xliff:g>」)。"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"I/O 錯誤"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"記憶體不足，檔案可能過大。"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"由於意外因素，導致無法剖析 vCard。"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"不支援此格式。"</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"無法從指定的 vCard 檔案收集中繼資料。"</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"無法匯入一或多個檔案 (%s)。"</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"已完成 <xliff:g id="FILENAME">%s</xliff:g> 匯出作業。"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"匯出聯絡人完成。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"聯絡人資料匯出完成，按一下通知即可分享聯絡人資料。"</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"輕觸即可分享聯絡人資料。"</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"正在匯出聯絡人資料"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"正在匯出聯絡人資料。"</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"無法取得資料庫資訊。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"沒有可匯出的聯絡人。如果你的裝置中確實有聯絡人資料，那麼可能是部分資料提供者不允許你從裝置匯出聯絡人資料。"</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"vCard 編輯器並未正確啟動。"</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"無法匯出"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"聯絡人資料未匯出。\n原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"正在匯入 <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"無法讀取 vCard 資料"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"已取消讀取 vCard 資料"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"已完成匯入 vCard 的 <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"已取消匯入 <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯入。"</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"稍後即將匯入該檔案。"</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"vCard 匯入要求遭到拒絕，請稍後再試。"</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯出。"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"稍後即將匯出該檔案。"</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"即將匯出聯絡人資料。"</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"vCard 匯出要求遭到拒絕，請稍後再試。"</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"聯絡人"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"正在將 vCard 資料快取至本機暫存空間，隨即將啟動實際的匯入作業。"</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"無法匯入 vCard。"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"已透過 NFC 收到聯絡人資訊"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"確定要匯出聯絡人？"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"快取中"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"匯入中：<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>，<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"匯出成 .vcf 檔案"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序依據"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"新聯絡人的預設帳戶"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"同步處理聯絡人中繼資料"</string>
-    <string name="setting_about" msgid="5253319937596745755">"關於聯絡人"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"設定"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"分享正常顯示的聯絡人"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"無法分享目前顯示的聯絡人資料。"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"分享常用聯絡人資料"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"分享所有聯絡人資料"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"無法分享聯絡人資料。"</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"匯入/匯出聯絡人"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"匯入聯絡人"</string>
-    <string name="share_error" msgid="5642622973966851784">"無法分享這位聯絡人的資料。"</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"沒有任何聯絡人資料可供分享。"</string>
-    <string name="menu_search" msgid="1241802591112035764">"搜尋"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"尋找聯絡人"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"我的收藏"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"沒有聯絡人。"</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"沒有可顯示的聯絡人。"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"沒有常用聯絡人"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"「<xliff:g id="NAME">%s</xliff:g>」中沒有聯絡人"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用聯絡人"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"選取 SIM 卡"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"管理帳戶"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"匯入/匯出"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"透過 <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> (透過 <xliff:g id="SOURCE">%2$s</xliff:g>)"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜尋"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"清除搜尋"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"聯絡人顯示選項"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"帳戶"</string>
     <string name="set_default_account" msgid="7966099951006467572">"一律使用這張 SIM 卡通話"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"選擇通話帳戶"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"輸入可在撥號時傳送的備註..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"傳送並撥打"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>分頁。"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>分頁。<xliff:g id="COUNT_3">%2$d</xliff:g> 個未讀項目。</item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>分頁。<xliff:g id="COUNT_1">%2$d</xliff:g> 個未讀項目。</item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"版本"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"開放原始碼授權"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"開放原始碼軟體的授權詳細資料"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"隱私權政策"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"服務條款"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"開放原始碼授權"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"無法開啟網址。"</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"視訊通話"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"分享及撥號"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zu/strings.xml b/java/com/android/contacts/common/res/values-zu/strings.xml
index adca139..e3cbc96 100644
--- a/java/com/android/contacts/common/res/values-zu/strings.xml
+++ b/java/com/android/contacts/common/res/values-zu/strings.xml
@@ -18,7 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8979281391599667362">"Umbhalo okopishiwe"</string>
-    <string name="copy_text" msgid="5890820280087874642">"Kopisha ku-clipboard"</string>
     <string name="call_custom" msgid="3041673234638990874">"Fonela ku-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="125893483593803791">"Fonela ekhaya"</string>
     <string name="call_mobile" msgid="967589404494150813">"Fonela iselula"</string>
@@ -40,7 +39,6 @@
     <string name="call_work_pager" msgid="3791778749827366574">"Fonela isicingo sasemsebenzini"</string>
     <string name="call_assistant" msgid="4177478845473789294">"Fonela <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="4958811711741872901">"Fonela i-MMS"</string>
-    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Ikholi)"</string>
     <string name="sms_custom" msgid="8785368968605026317">"Bhalela ku-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="3527719551060295243">"Bhalela ekhaya"</string>
     <string name="sms_mobile" msgid="8883045857887736518">"Bhalela iselula"</string>
@@ -62,7 +60,6 @@
     <string name="sms_work_pager" msgid="8500140274906830742">"Bhalela isicingo sasemsebenzini"</string>
     <string name="sms_assistant" msgid="8513548482745330818">"Bhalela ku-<xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="5187888900503248542">"Bhala i-MMS"</string>
-    <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Umlayezo)"</string>
     <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sula oxhumana nabo njalo?"</string>
     <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Uzosula uhlu loxhumana nabo kakhulu kuzinhelo zokusebenza zokuxhumana noma zefoni, futhi uphoqelele izinhlelo zokusebenza ze-imeyili ukufunda izintandokazi zakho zekheli kusuka ekuqaleni."</string>
     <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Isula oxhumana nabo njalo…"</string>
@@ -70,22 +67,14 @@
     <string name="status_away" msgid="2298688367552893953">"Ngiphumile"</string>
     <string name="status_busy" msgid="5990832098713248503">"Ngimatasa"</string>
     <string name="contactsList" msgid="8806067891419291513">"Othi tana nabo"</string>
+    <string name="contact_suggestions" msgid="3324166754807120006">"Okuphezulu okuphakanyisiwe"</string>
     <string name="local_invisible_directory" msgid="4723238462733650090">"Okunye"</string>
     <string name="directory_search_label" msgid="4621215895484025229">"Uhla lwemibhalo"</string>
     <string name="directory_search_label_work" msgid="7679326282707414897">"Uhla lwemibhalo lomsebenzi"</string>
     <string name="local_search_label" msgid="907622822323119235">"Bonke othintana nabo"</string>
+    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iziphakamiso"</string>
     <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
-    <string name="search_results_searching" msgid="3710866752172327451">"Iyasesha..."</string>
-    <string name="foundTooManyContacts" msgid="3685002426663730799">"Abangaphezu kuka-<xliff:g id="COUNT">%d</xliff:g> abatholakele."</string>
-    <string name="listFoundAllContactsZero" msgid="1151813986040671916">"Abekho othintana nabo"</string>
-    <plurals name="searchFoundContacts" formatted="false" msgid="3733009742282085433">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> okutholakele</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> okutholakele</item>
-    </plurals>
-    <string name="description_quick_contact_for" msgid="6327207399167819147">"Oxhumene naye ngokushesha ku-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="978606963362745020">"(Alikho igama)"</string>
-    <string name="favoritesFrequentCalled" msgid="4646019087163449555">"Abashayelwa njalo"</string>
-    <string name="favoritesFrequentContacted" msgid="946588736701567509">"Abathintwa njalo"</string>
     <string name="description_view_contact_detail" msgid="2428742401208561136">"Buka oxhumana naye"</string>
     <string name="list_filter_phones" msgid="8763316061763437182">"Bonke othintana nabo kanye nezinombolo zabo zefoni"</string>
     <string name="list_filter_phones_work" msgid="7083575404573422965">"Oxhumana nabo bephrofayela yomsebenzi"</string>
@@ -125,8 +114,6 @@
     <string name="email_custom" msgid="7246580894327511013">"I-imeyili <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="2807318537887091606">"I-imeyili"</string>
     <string name="postal_street" msgid="6918171741240802474">"Umgwaqo"</string>
-    <string name="postal_pobox" msgid="2962203483168878561">"PO box"</string>
-    <string name="postal_neighborhood" msgid="5275280978237639716">"Indawo yasekhaya"</string>
     <string name="postal_city" msgid="8674569121430005628">"Idolobha"</string>
     <string name="postal_region" msgid="1730369286225469192">"Isifunda"</string>
     <string name="postal_postcode" msgid="4450700741261990439">"Ikhodi ye-ZIP"</string>
@@ -144,103 +131,19 @@
     <string name="chat_icq" msgid="3292934726414765801">"Xoxa usebenzisa i-ICQ"</string>
     <string name="chat_jabber" msgid="6701542313597880204">"Xoxa usebenzisa i-Jabber"</string>
     <string name="chat" msgid="1020428260359370236">"Xoxa"</string>
-    <string name="description_minus_button" msgid="2659092981396583806">"susa"</string>
-    <string name="expand_collapse_name_fields_description" msgid="9005732230091761802">"Nweba noma goqa izinkambu zegama"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="3450645489720595412">"Nweba noma goqa izinkambu zegama lefonotiki"</string>
     <string name="list_filter_all_accounts" msgid="473782314881473992">"Bonke oxhumana nabo"</string>
-    <string name="menu_done" msgid="1817505539263889535">"Kwenziwe"</string>
-    <string name="menu_doNotSave" msgid="4174389775790094548">"Khansela"</string>
     <string name="listAllContactsInAccount" msgid="3486378621592995630">"Oxhumana nabo ku-<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="listCustomView" msgid="5306282632413086731">"Oxhumana nabo ekubukweni okwenziwe ngendlela oyifisayo"</string>
     <string name="listSingleContact" msgid="8620818791932382627">"Oyedwa oxhumana naye"</string>
-    <string name="dialog_new_contact_account" msgid="3089718960461539156">"Londoloza oxhumana nabo abangenisiwe ku-:"</string>
-    <string name="import_from_sim" msgid="4025122666048801234">"Landa kusuka kwikhadi le-SIM"</string>
-    <string name="import_from_sim_summary" msgid="7347530878981811858">"Ngenisa kusuka ku-SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="2311025421424473798">"Ngenisa kusuka ku-SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="2755992524137862594">"Ngenisa kusukela kufayela le-.vcf"</string>
-    <string name="cancel_import_confirmation_message" msgid="1112854508504355394">"Khansela ukulandwa kwe-<xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_export_confirmation_message" msgid="8507822905973961704">"Khansela ukuthunyelwa kwe-<xliff:g id="FILENAME">%s</xliff:g>?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3633975947527306665">"Yehlulekile ukukhansela ukulanda/ukuthumela i-vCard"</string>
-    <string name="fail_reason_unknown" msgid="4526834573707737085">"Iphutha elingaziwa"</string>
-    <string name="fail_reason_could_not_open_file" msgid="2564113989228646444">"Ayikwazi ukuvula i-\"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="1391801997398257839">"Ayikwazanga ukuqalisa isithumeli: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="5905140440417594395">"Abekho oxhumana nabo abathumelekayo."</string>
-    <string name="missing_required_permission" msgid="3977319568919699902">"Ukhubaze imvume edingekayo."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="4022425018935814242">"Kube khona iphutha ngesikhathi kuthunyelwa: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_too_long_filename" msgid="1782388695897859448">"Igama lefayela elidingekayo lide kakhulu (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5610192449460803752">"Iphutha le-I/O"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="5383581106403466715">"Imemori enganele. Ifayela kungenzeka likhulu kakhulu."</string>
-    <string name="fail_reason_vcard_parse_error" msgid="7166381747317969497">"Yehlulekile ukunqunta i-vCard ngokwesizathu esingalindelekile"</string>
-    <string name="fail_reason_not_supported" msgid="6529299412185608834">"Ifomethi ayisekelwe."</string>
-    <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="2071371622333685552">"Yehlulekile ukuqoqa ulwazi lwemetha noma amafayela we-vCard."</string>
-    <string name="fail_reason_failed_to_read_files" msgid="7364342120566067558">"Ifayela elilodwa noma amafayela angaphezulu ehlulekile ukulandwa (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="6969111823207538096">"Iqedile ukuthumela i-<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="3456404588243153606">"Iqedile ukukhipha oxhumana nabo."</string>
-    <string name="exporting_vcard_finished_toast" msgid="864313687240614505">"Iqedile ukuthumela oxhumana nabo, chofoza isaziso ukuze wabelane ngoxhumana nabo."</string>
-    <string name="touch_to_share_contacts" msgid="8684610418619975866">"Thepha ukuze wabelane ngoxhumana nabo."</string>
-    <string name="exporting_vcard_canceled_title" msgid="4160930279977285925">"Ukulandwa kwe-<xliff:g id="FILENAME">%s</xliff:g> kukhanseliwe."</string>
-    <string name="exporting_contact_list_title" msgid="874590947793345632">"Kuthunyelwa idatha yoxhumana naye"</string>
-    <string name="exporting_contact_list_message" msgid="3263011604569444133">"Idatha yoxhumana nabo iyathunyelwa."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="443743100925218813">"Yehlulekile ukuthola ulwazi lwemininingo egciniwe."</string>
-    <string name="composer_has_no_exportable_contact" msgid="1492572045460138455">"Abekho oxhuana nabo abangathumeleka. Uma unabo oxhumana nabo kudivayisi yakho yakho, abanye abahlinzeki be-data kungenzeka bangavumi ukuthi oxhumana nabo bthuyelwe besuka kudivayisi yakho."</string>
-    <string name="composer_not_initialized" msgid="7126008930727708362">"Umqambi we-Vcard akazange aqale ngendlela efanele."</string>
-    <string name="exporting_contact_failed_title" msgid="5400878429352404258">"Yehlulekile ukuthumela"</string>
-    <string name="exporting_contact_failed_message" msgid="1453772164161663415">"Idatha yoxhumana naye ayizange ithunyelwe.\nIsizathu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="1206078719084863234">"Ilanda i-<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="4759080957711586257">"Yehlulekile ukufunda idatha ye-vCard"</string>
-    <string name="reading_vcard_canceled_title" msgid="3650078934530953275">"Ukufundwa kwe-vCard kukhanseliwe"</string>
-    <string name="importing_vcard_finished_title" msgid="1543368028741535966">"Iqedile ukulanda i-vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="importing_vcard_canceled_title" msgid="2454436016819017436">"Ukulanda i-<xliff:g id="FILENAME">%s</xliff:g> kukhanseliwe"</string>
-    <string name="vcard_import_will_start_message" msgid="6013286576133592154">"<xliff:g id="FILENAME">%s</xliff:g> izothunyelwa maduzane."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="3172538521736189687">"Ifayela lizothunyelwa maduzane."</string>
-    <string name="vcard_import_request_rejected_message" msgid="7620870852106507620">"Isicelo sokungenisa i-vCard sinqatshelwe. Zama futhi emuva kwesikhathi."</string>
-    <string name="vcard_export_will_start_message" msgid="4480722586633503615">"<xliff:g id="FILENAME">%s</xliff:g> izothunyelwa maduzane"</string>
-    <string name="vcard_export_will_start_message_fallback" msgid="8746087280091814150">"Ifayela lizokhishwa maduze."</string>
-    <string name="contacts_export_will_start_message" msgid="5950262391638837408">"Oxhumana nabo bazothunyelwa maduze."</string>
-    <string name="vcard_export_request_rejected_message" msgid="4132430982367686579">"Isicelo sokuthumela i-vCard sinqatshelwe. Sicela uzame futhi emuva kwesikhathi."</string>
-    <string name="vcard_unknown_filename" msgid="7576066884501578965">"oxhumana naye"</string>
-    <string name="caching_vcard_message" msgid="7778832851741500256">"Ifaka kunqolobane ama-vCard kusitoreji sesikhashana. Ukulandwa kwangempela kuzoqala khona maduze."</string>
-    <string name="vcard_import_failed" msgid="4135012206186446511">"Yehlulekile ukulanda i-vCard"</string>
-    <string name="nfc_vcard_file_name" msgid="7174382505002702431">"Othintana naye utholakale nge-NFC"</string>
-    <string name="confirm_export_title" msgid="9164673124925342242">"Thumela oxhumana nabo?"</string>
-    <string name="caching_vcard_title" msgid="8092335276785174935">"Ukulondoloza isikhashana"</string>
-    <string name="progress_notifier_message" msgid="2778542784808529164">"Ingenisa i-<xliff:g id="CURRENT_NUMBER">%s</xliff:g><xliff:g id="TOTAL_NUMBER">%s</xliff:g><xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="export_to_vcf_file" product="default" msgid="6148360234812424446">"Thumela kufayela le-.vcf"</string>
     <string name="display_options_sort_list_by" msgid="3541875948367831228">"Hlunga nge-"</string>
     <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Igama lokuqala"</string>
     <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Isibongo"</string>
     <string name="display_options_view_names_as" msgid="4204204205736735618">"Ifomethi yegama"</string>
     <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Igama lokuqala kuqala"</string>
     <string name="display_options_view_family_name_first" msgid="987430497292428242">"Isibongo kuqala"</string>
-    <string name="default_editor_account" msgid="1826578934497338822">"I-akhawunti ezenzakalelayo yoxhumana nabo abasha"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="7839882899954930421">"Vumelanisa imethadatha"</string>
-    <string name="setting_about" msgid="5253319937596745755">"Mayelana noxhumana nabo"</string>
-    <string name="activity_title_settings" msgid="2398428034981372932">"Izilungiselelo"</string>
-    <string name="share_visible_contacts" msgid="6775120441469077620">"Yabelana noxhumana nabo ababonakalayo"</string>
-    <string name="share_visible_contacts_failure" msgid="1365755167786055470">"Yehlulekile ukwabelana ngoxhumana nabo ababonakalayo"</string>
-    <string name="share_favorite_contacts" msgid="9138011836074034817">"Yabelana ngoxhumana nabo obathandayo"</string>
-    <string name="share_contacts" msgid="6505699963814423437">"Yabelana bonke oxhumana nabo"</string>
-    <string name="share_contacts_failure" msgid="6027174424732204424">"Yehlulekile ukwabelana ngoxhumana nabo."</string>
-    <string name="dialog_import_export" msgid="3052335055728876529">"Landa/thumela oxhumana nabo"</string>
-    <string name="dialog_import" msgid="8508508044485808554">"Ngenisa othintana nabo"</string>
-    <string name="share_error" msgid="5642622973966851784">"Lona oxhumana naye ngeke ukwazi ukwabelana ngaye."</string>
-    <string name="no_contact_to_share" msgid="9115223064368461904">"Abekho oxhumana nabo ongabelana nabo."</string>
-    <string name="menu_search" msgid="1241802591112035764">"Sesha"</string>
-    <string name="hint_findContacts" msgid="1913556676649442295">"Thola othintana nabo"</string>
-    <string name="contactsFavoritesLabel" msgid="5198982253222486561">"Izintandokazi"</string>
-    <string name="listTotalAllContactsZero" msgid="8436822729781033537">"Abekho oxhumana nabo."</string>
-    <string name="listTotalAllContactsZeroCustom" msgid="6072173682342248964">"Abekho othintana nabo ababonakalayo."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="5008410556001744528">"Azikho izintandokazi"</string>
-    <string name="listTotalAllContactsZeroGroup" msgid="6782377127075025237">"Abekho othintana nabo ku-<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="5358271535047496120">"Sula oxhumana nabo njalo"</string>
-    <string name="menu_select_sim" msgid="3960197724339200637">"Khetha ikhadi le-SIM"</string>
-    <string name="menu_accounts" msgid="8092083497106343280">"Phatha ama-akhawunti"</string>
-    <string name="menu_import_export" msgid="8834601882032781755">"Ngenisa/ thekelisa"</string>
-    <string name="contact_status_update_attribution" msgid="6042601531361543253">"nge-<xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="3448746388181727251">"<xliff:g id="DATE">%1$s</xliff:g> nge-<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="3550669942742167644">"misa ukusesha"</string>
     <string name="description_clear_search" msgid="2347258825265600782">"Sula usesho"</string>
-    <string name="settings_contact_display_options_title" msgid="5535295687646503547">"Izinketho zokubonisa oxhumana naye"</string>
     <string name="select_account_dialog_title" msgid="2673504582803359239">"I-Akhawunti"</string>
     <string name="set_default_account" msgid="7966099951006467572">"Njalo sebenzisa lokhu kumakholi"</string>
     <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Shaya nge"</string>
@@ -248,19 +151,12 @@
     <string name="call_subject_hint" msgid="7233138753650420800">"Thayipha inothi ukuthumela nekholi ..."</string>
     <string name="send_and_call_button" msgid="4735168294120154013">"THUMELA FUTHI YENZA IKHOLI"</string>
     <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="8726132674272173486">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ithebhu."</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
       <item quantity="one"><xliff:g id="TITLE_2">%1$s</xliff:g> ithebhu. <xliff:g id="COUNT_3">%2$d</xliff:g> izinto ezingafundiwe. </item>
       <item quantity="other"><xliff:g id="TITLE_2">%1$s</xliff:g> ithebhu. <xliff:g id="COUNT_3">%2$d</xliff:g> izinto ezingafundiwe. </item>
     </plurals>
-    <string name="about_build_version" msgid="6809677213570116689">"Yakha inguqulo"</string>
-    <string name="about_open_source_licenses" msgid="9071344335180981674">"Amalayisensi womthombo ovulekile"</string>
-    <string name="about_open_source_licenses_summary" msgid="4662018242345608420">"Iminingwane yelayisensi yesofthiwe yomthombo ovulelekile"</string>
-    <string name="about_privacy_policy" msgid="120921692215934837">"Inqubomgomo yobumfihlo"</string>
-    <string name="about_terms_of_service" msgid="9004506174858804172">"Imigomo yesevisi"</string>
-    <string name="activity_title_licenses" msgid="2416018204229261875">"Amalayisense womthombo ovulekile"</string>
-    <string name="url_open_error_toast" msgid="3814442157861318482">"Yehlulekile ukuvula i-url."</string>
     <string name="description_search_video_call" msgid="4337369876888024909">"Ikholi yevidiyo"</string>
     <string name="description_search_call_and_share" msgid="4912772842755050467">"Yabelana uphinde ushaye"</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml
index 434d193..1f46233 100644
--- a/java/com/android/contacts/common/res/values/colors.xml
+++ b/java/com/android/contacts/common/res/values/colors.xml
@@ -15,13 +15,6 @@
   -->
 
 <resources>
-  <!-- Background color corresponding to the holo list 9-patch. -->
-  <color name="holo_list_background_color">#eeeeee</color>
-
-  <color name="focus_color">#44ff0000</color>
-
-  <color name="spam_contact_background">#A52714</color>
-
   <!-- Color of ripples used for views with dark backgrounds -->
   <color name="dialer_ripple_material_dark">#a0ffffff</color>
 
@@ -36,47 +29,9 @@
   <!-- Text color for section header. -->
   <color name="section_header_text_color">#2A56C6</color>
 
-  <!-- Divider color for header separator -->
-  <color name="main_header_separator_color">#AAAAAA</color>
-
-  <!-- Divider color for header separator -->
-  <color name="secondary_header_separator_color">#D0D0D0</color>
-
   <!-- Color of the theme of the People app -->
   <color name="people_app_theme_color">#363636</color>
 
-  <!-- Color of image view placeholder. -->
-  <color name="image_placeholder">#DDDDDD</color>
-
-  <!--  Color of the semi-transparent shadow box on contact tiles -->
-  <color name="contact_tile_shadow_box_color">#7F000000</color>
-
-  <!--  Color of the status message for starred contacts in the People app -->
-  <color name="people_contact_tile_status_color">#CCCCCC</color>
-
-  <color name="shortcut_overlay_text_background">#7f000000</color>
-
-  <color name="textColorIconOverlay">#fff</color>
-  <color name="textColorIconOverlayShadow">#000</color>
-
-
-  <array name="letter_tile_colors">
-    <item>#DB4437</item>
-    <item>#E91E63</item>
-    <item>#9C27B0</item>
-    <item>#673AB7</item>
-    <item>#3F51B5</item>
-    <item>#4285F4</item>
-    <item>#039BE5</item>
-    <item>#0097A7</item>
-    <item>#009688</item>
-    <item>#0F9D58</item>
-    <item>#689F38</item>
-    <item>#EF6C00</item>
-    <item>#FF5722</item>
-    <item>#757575</item>
-  </array>
-
   <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
       for settings secondary activity colors. -->
   <array name="letter_tile_colors_dark">
@@ -96,23 +51,7 @@
     <item>#424242</item>
   </array>
 
-  <!-- The default color used for tinting photos when no color can be extracted via Palette,
-          this is Blue Grey 500 -->
-  <color name="quickcontact_default_photo_tint_color">#607D8B</color>
-  <!-- The default secondary color when no color can be extracted via Palette,
-          this is Blue Grey 700 -->
-  <color name="quickcontact_default_photo_tint_color_dark">#455A64</color>
-
-
-  <color name="letter_tile_default_color">#cccccc</color>
-
-  <color name="letter_tile_font_color">#ffffff</color>
-
   <color name="contactscommon_actionbar_background_color">@color/dialer_theme_color</color>
-  <!-- Color for icons in the actionbar -->
-  <color name="actionbar_icon_color">#ffffff</color>
-  <!-- Darker version of the actionbar color. Used for the status bar and navigation bar colors. -->
-  <color name="actionbar_background_color_dark">#008aa1</color>
 
   <color name="tab_ripple_color">#ffffff</color>
   <color name="tab_accent_color">@color/tab_ripple_color</color>
diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/contacts/common/res/values/dimens.xml
index 642eb31..19b27b8 100644
--- a/java/com/android/contacts/common/res/values/dimens.xml
+++ b/java/com/android/contacts/common/res/values/dimens.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
   <!-- Padding between the action bar's bottom edge and the first header
        in contacts/group lists. -->
@@ -28,24 +28,6 @@
   <dimen name="directory_header_extra_top_padding">18dp</dimen>
   <dimen name="directory_header_extra_bottom_padding">8dp</dimen>
 
-  <!--  Horizontal padding in between contact tiles -->
-  <dimen name="contact_tile_divider_padding">23dip</dimen>
-  <!--  Horizontal whitespace (both padding and margin) before the first tile and after the last tile -->
-  <dimen name="contact_tile_start_end_whitespace">16dip</dimen>
-
-  <!-- Left and right padding for a contact detail item -->
-  <dimen name="detail_item_side_margin">16dip</dimen>
-
-  <!-- ContactTile Layouts -->
-  <!--
-    Use sp instead of dip so that the shadowbox heights can all scale uniformly
-    when the font size is scaled for accessibility purposes
-  -->
-  <dimen name="contact_tile_shadowbox_height">48sp</dimen>
-
-  <!-- Top padding of the ListView in the contact tile list -->
-  <dimen name="contact_tile_list_padding_top">0dip</dimen>
-
   <!-- Padding to be used between a visible scrollbar and the contact list -->
   <dimen name="list_visible_scrollbar_padding">32dip</dimen>
 
@@ -56,38 +38,10 @@
   <!-- Width of a contact list item section header. -->
   <dimen name="contact_list_section_header_width">56dp</dimen>
 
-  <!-- Size of the shortcut icon. 0dip means: use the system default -->
-  <dimen name="shortcut_icon_size">0dip</dimen>
-
-  <!-- Text size of shortcut icon overlay text -->
-  <dimen name="shortcut_overlay_text_size">12dp</dimen>
-
-  <!-- Extra vertical padding for darkened background behind shortcut icon overlay text -->
-  <dimen name="shortcut_overlay_text_background_padding">1dp</dimen>
-
-  <!-- Width of height of an icon from a third-party app in the networks section of the contact card. -->
-  <dimen name="detail_network_icon_size">32dip</dimen>
-
-  <!-- Empty message margins -->
-  <dimen name="empty_message_top_margin">48dip</dimen>
-
   <!-- contact browser list margins -->
   <dimen name="contact_browser_list_item_text_size">16sp</dimen>
   <dimen name="contact_browser_list_item_photo_size">40dp</dimen>
   <dimen name="contact_browser_list_item_gap_between_image_and_text">15dp</dimen>
-  <dimen name="contact_browser_list_top_margin">12dp</dimen>
-
-  <!-- Dimensions for "No contacts" string in PhoneFavoriteFragment for the All contacts
-       with phone numbers section
-  -->
-  <dimen name="contact_phone_list_empty_description_size">20sp</dimen>
-  <dimen name="contact_phone_list_empty_description_padding">10dip</dimen>
-
-  <!-- Dimensions for contact letter tiles -->
-  <dimen name="tile_letter_font_size">40dp</dimen>
-  <dimen name="tile_letter_font_size_small">20dp</dimen>
-  <dimen name="tile_divider_width">1dp</dimen>
-  <item name="letter_to_tile_ratio" type="dimen">67%</item>
 
   <!-- Height of the floating action button -->
   <dimen name="floating_action_button_height">56dp</dimen>
@@ -107,7 +61,7 @@
   <dimen name="tab_selected_underline_height">2dp</dimen>
   <!-- Size of text in tabs. -->
   <dimen name="tab_text_size">14sp</dimen>
-  <dimen name="tab_elevation">2dp</dimen>
+  <dimen name="tab_elevation">0dp</dimen>
   <dimen name="tab_unread_count_background_size">16dp</dimen>
   <dimen name="tab_unread_count_background_radius">2dp</dimen>
   <dimen name="tab_unread_count_margin_left">0dp</dimen>
@@ -115,8 +69,6 @@
   <dimen name="tab_unread_count_text_size">12sp</dimen>
   <dimen name="tab_unread_count_text_padding">2dp</dimen>
 
-  <!-- Padding around the icon in the search box. -->
-  <dimen name="search_box_icon_margin">4dp</dimen>
   <!-- Size of the icon (voice search, back arrow) in the search box. -->
   <dimen name="search_box_icon_size">48dp</dimen>
   <!-- Size of the close icon.-->
@@ -130,17 +82,6 @@
   <!-- Search box text size -->
   <dimen name="search_text_size">20sp</dimen>
 
-  <!-- Top margin for the Frequently Contacted section title -->
-  <dimen name="frequently_contacted_title_top_margin_when_first_row">16dp</dimen>
-  <!-- Top margin for the Frequently Contacted section title, when the title is the first
-       item in the list -->
-  <dimen name="frequently_contacted_title_top_margin">57dp</dimen>
-
-  <dimen name="frequently_contacted_title_text_size">24sp</dimen>
-
-  <!-- Size of icon for contacts number shortcuts -->
-  <dimen name="search_shortcut_radius">40dp</dimen>
-
   <dimen name="contact_list_card_elevation">2dp</dimen>
 
   <!-- Padding used around the periphery of the call subject dialog, as well as in between the
diff --git a/java/com/android/contacts/common/res/values/donottranslate_config.xml b/java/com/android/contacts/common/res/values/donottranslate_config.xml
index 3244379..f37e0b8 100644
--- a/java/com/android/contacts/common/res/values/donottranslate_config.xml
+++ b/java/com/android/contacts/common/res/values/donottranslate_config.xml
@@ -15,9 +15,6 @@
   -->
 
 <resources>
-  <!-- Flag indicating whether Contacts app is allowed to import contacts -->
-  <bool name="config_allow_import_from_vcf_file">true</bool>
-
   <!-- If true, an option is shown in Display Options UI to choose a sort order -->
   <bool name="config_sort_order_user_changeable">true</bool>
 
@@ -41,55 +38,4 @@
 
   <!-- Contacts preferences key for contact editor anything saved -->
   <string name="contact_editor_anything_saved_key">ContactEditorUtils_anything_saved</string>
-
-  <!-- The type of VCard for export. If you want to let the app emit vCard which is
-  specific to some vendor (like DoCoMo), specify this type (e.g. "docomo") -->
-  <string name="config_export_vcard_type" translatable="false">default</string>
-
-  <!-- The type of vcard for improt. If the vcard importer cannot guess the exact type
-  of a vCard type, the improter uses this type. -->
-  <string name="config_import_vcard_type" translatable="false">default</string>
-
-  <!-- Prefix of exported VCard file -->
-  <string name="config_export_file_prefix" translatable="false"></string>
-
-  <!-- Suffix of exported VCard file. Attached before an extension -->
-  <string name="config_export_file_suffix" translatable="false"></string>
-
-  <!-- Extension for exported VCard files -->
-  <string name="config_export_file_extension">vcf</string>
-
-  <!-- The filename that is suggested that users use when exporting vCards. Should include the .vcf extension. -->
-  <string name="exporting_vcard_filename" translatable="false">contacts.vcf</string>
-
-  <!-- Minimum number of exported VCard file index -->
-  <integer name="config_export_file_min_index">1</integer>
-
-  <!-- Maximum number of exported VCard file index -->
-  <integer name="config_export_file_max_index">99999</integer>
-
-  <!-- The list (separated by ',') of extensions should be checked in addition to
-   config_export_extension. e.g. If "aaa" is added to here and 00001.vcf and 00002.aaa
-   exist in a target directory, 00003.vcf becomes a next file name candidate.
-   Without this configuration, 00002.vcf becomes the candidate.-->
-  <string name="config_export_extensions_to_consider" translatable="false"></string>
-
-  <!-- If true, enable the "import contacts from SIM" feature if the device
-       has an appropriate SIM or ICC card.
-       Setting this flag to false in a resource overlay allows you to
-       entirely disable SIM import on a per-product basis. -->
-  <bool name="config_allow_sim_import">true</bool>
-
-  <!-- Flag indicating whether Contacts app is allowed to export contacts -->
-  <bool name="config_allow_export">true</bool>
-
-  <!-- Flag indicating whether Contacts app is allowed to share contacts with devices outside -->
-  <bool name="config_allow_share_contacts">true</bool>
-
-  <string name="pref_build_version_key">pref_build_version</string>
-  <string name="pref_open_source_licenses_key">pref_open_source_licenses</string>
-  <string name="pref_privacy_policy_key">pref_privacy_policy</string>
-  <string name="pref_terms_of_service_key">pref_terms_of_service</string>
-
-  <string name="star_sign">★</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/ids.xml b/java/com/android/contacts/common/res/values/ids.xml
index 871f5a6..65969c4 100644
--- a/java/com/android/contacts/common/res/values/ids.xml
+++ b/java/com/android/contacts/common/res/values/ids.xml
@@ -27,4 +27,5 @@
 
   <item name="contact_tile_image" type="id"/>
   <item name="contact_tile_name" type="id"/>
+  <item name="call_to_action" type="id"/>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/integers.xml b/java/com/android/contacts/common/res/values/integers.xml
index d38ad1d..f4ed5c2 100644
--- a/java/com/android/contacts/common/res/values/integers.xml
+++ b/java/com/android/contacts/common/res/values/integers.xml
@@ -19,7 +19,6 @@
 
   <!--  Determines the number of columns in a ContactTileRow in the favorites tab -->
   <integer name="contact_tile_column_count_in_favorites">2</integer>
-  <integer name="contact_tile_column_count_in_favorites_new">3</integer>
 
   <!-- The number of characters in the snippet before we need to tokenize and ellipse. -->
   <integer name="snippet_length_before_tokenize">30</integer>
@@ -33,7 +32,4 @@
 
   <!-- Duration of the animations on the call subject dialog. -->
   <integer name="call_subject_animation_duration">250</integer>
-
-  <!-- A big number to make sure "About contacts" always showing at the bottom of Settings.-->
-  <integer name="about_contacts_order_number">100</integer>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml
index 9ac9fef..df8d70f 100644
--- a/java/com/android/contacts/common/res/values/strings.xml
+++ b/java/com/android/contacts/common/res/values/strings.xml
@@ -18,8 +18,6 @@
 
   <!-- Toast shown when text is copied to the clipboard [CHAR LIMIT=64] -->
   <string name="toast_text_copied">Text copied</string>
-  <!-- Option displayed in context menu to copy long pressed item to clipboard [CHAR LIMIT=64] -->
-  <string name="copy_text">Copy to clipboard</string>
 
   <!-- Action string for calling a custom phone number -->
     <string name="call_custom">Call
@@ -67,8 +65,6 @@
     </string>
   <!-- Action string for calling a MMS phone number -->
   <string name="call_mms">Call MMS</string>
-  <!-- Action string for calling a contact by shortcut -->
-  <string name="call_by_shortcut"><xliff:g id="contact_name">%s</xliff:g> (Call)</string>
 
   <!-- Action string for sending an SMS to a custom phone number -->
     <string name="sms_custom">Text
@@ -116,8 +112,6 @@
     </string>
   <!-- Action string for sending an SMS to a MMS phone number -->
   <string name="sms_mms">Text MMS</string>
-  <!-- Action string for sending an SMS to a contact by shortcut -->
-  <string name="sms_by_shortcut"><xliff:g id="contact_name">%s</xliff:g> (Message)</string>
 
   <!-- Title of the confirmation dialog for clearing frequents. [CHAR LIMIT=37] -->
   <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
@@ -143,6 +137,9 @@
   <!-- Directory partition name (also exists in contacts) -->
   <string name="contactsList">Contacts</string>
 
+  <!-- Directory partition name for p13n suggestions -->
+  <string name="contact_suggestions">Top Suggested</string>
+
   <!-- The name of the invisible local contact directory -->
   <string name="local_invisible_directory">Other</string>
 
@@ -155,43 +152,16 @@
   <!-- The label in section header in the contact list for a local contacts [CHAR LIMIT=128] -->
   <string name="local_search_label">All contacts</string>
 
+  <!-- The label in section header in the contact list for a local suggested contacts [CHAR LIMIT=128] -->
+  <string name="local_suggestions_search_label">Suggestions</string>
+
   <!-- String describing the text on the header of the profile contact in the contacts list
        This may be programatically capitalized. [CHAR LIMIT=20] -->
   <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
 
-  <!-- Title shown in the search result activity of contacts app while searching.  [CHAR LIMIT=20]
-       (also in contacts) -->
-  <string name="search_results_searching">Searching\u2026</string>
-
-  <!-- Displayed at the top of search results indicating that more contacts were found than shown [CHAR LIMIT=64] -->
-  <string name="foundTooManyContacts">More than <xliff:g id="count">%d</xliff:g> found.</string>
-
-  <!-- Displayed at the top of the contacts showing the zero total number of contacts found when "Only contacts with phones" not selected. [CHAR LIMIT=30]
-       (also in contacts) -->
-  <string name="listFoundAllContactsZero">No contacts</string>
-
-  <!-- Displayed at the top of the contacts showing the total number of contacts found when typing search query -->
-  <plurals name="searchFoundContacts">
-    <item quantity="one">1 found</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> found</item>
-  </plurals>
-
-  <!-- String describing the text for photo of a contact in a contacts list.
-
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-  -->
-  <string name="description_quick_contact_for">Quick contact for <xliff:g id="name">%1$s</xliff:g></string>
-
   <!-- Shown as the display name for a person when the name is missing or unknown. [CHAR LIMIT=18]-->
   <string name="missing_name">(No name)</string>
 
-  <!-- The text displayed on the divider for the Favorites tab in Phone app indicating that items below it are frequently called as opposed to starred contacts [CHAR LIMIT = 39] -->
-  <string name="favoritesFrequentCalled">Frequently called</string>
-
-  <!-- The text displayed on the divider for the Favorites tab in People app indicating that items below it are frequently contacted [CHAR LIMIT = 39] -->
-  <string name="favoritesFrequentContacted">Frequently contacted</string>
-
   <!-- String describing a contact picture that introduces users to the contact detail screen.
 
      Used by AccessibilityService to announce the purpose of the button.
@@ -315,10 +285,6 @@
 
   <!-- Field title for the street of a structured postal address of a contact -->
   <string name="postal_street">Street</string>
-  <!-- Field title for the PO box of a structured postal address of a contact -->
-  <string name="postal_pobox">PO box</string>
-  <!-- Field title for the neighborhood of a structured postal address of a contact -->
-  <string name="postal_neighborhood">Neighborhood</string>
   <!-- Field title for the city of a structured postal address of a contact -->
   <string name="postal_city">City</string>
   <!-- Field title for the region, or state, of a structured postal address of a contact -->
@@ -357,35 +323,9 @@
   <!-- Generic action string for starting an IM chat -->
   <string name="chat">Chat</string>
 
-  <!-- String describing the Contact Editor Minus button
-
-       Used by AccessibilityService to announce the purpose of the button.
-
-       [CHAR LIMIT=NONE]
-  -->
-  <string name="description_minus_button">delete</string>
-
-  <!-- Content description for the expand or collapse name fields button.
-       Clicking this button causes the name editor to toggle between showing
-       a single field where the entire name is edited at once, or multiple
-       fields corresponding to each part of the name (Name Prefix, First Name,
-       Middle Name, Last Name, Name Suffix).
-       [CHAR LIMIT=NONE] -->
-  <string name="expand_collapse_name_fields_description">Expand or collapse name fields</string>
-
-  <!-- Content description for the expand or collapse phonetic name fields button. [CHAR LIMIT=100] -->
-    <string name="expand_collapse_phonetic_name_fields_description">Expand or collapse phonetic
-        name fields</string>
-
   <!-- Contact list filter label indicating that the list is showing all available accounts [CHAR LIMIT=64] -->
   <string name="list_filter_all_accounts">All contacts</string>
 
-  <!-- Menu item to indicate you are done editing a contact and want to save the changes you've made -->
-  <string name="menu_done">Done</string>
-
-  <!-- Menu item to indicate you want to cancel the current editing process and NOT save the changes you've made [CHAR LIMIT=12] -->
-  <string name="menu_doNotSave">Cancel</string>
-
   <!-- Displayed at the top of the contacts showing the account filter selected  [CHAR LIMIT=64] -->
   <string name="listAllContactsInAccount">Contacts in <xliff:g example="abc@gmail.com" id="name">%s</xliff:g></string>
 
@@ -395,208 +335,6 @@
   <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
   <string name="listSingleContact">Single contact</string>
 
-  <!-- Message asking user to select an account to save contacts imported from vcard or SIM card [CHAR LIMIT=64] -->
-  <string name="dialog_new_contact_account">Save imported contacts to:</string>
-
-  <!-- Action string for selecting SIM for importing contacts -->
-  <string name="import_from_sim">Import from SIM card</string>
-
-  <!-- Action string for selecting a SIM subscription for importing contacts -->
-  <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string>
-
-  <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number -->
-  <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
-
-  <!-- Action string for selecting a .vcf file to import contacts from [CHAR LIMIT=30] -->
-  <string name="import_from_vcf_file" product="default">Import from .vcf file</string>
-
-  <!-- Message shown in a Dialog confirming a user's cancel request toward existing vCard import.
-       The argument is file name for the vCard import the user wants to cancel.
-       [CHAR LIMIT=128] -->
-  <string name="cancel_import_confirmation_message">Cancel import of <xliff:g example="import.vcf" id="filename">%s</xliff:g>?</string>
-
-  <!-- Message shown in a Dialog confirming a user's cancel request toward existing vCard export.
-       The argument is file name for the vCard export the user wants to cancel.
-       [CHAR LIMIT=128] -->
-  <string name="cancel_export_confirmation_message">Cancel export of <xliff:g example="export.vcf" id="filename">%s</xliff:g>?</string>
-
-  <!-- Title shown in a Dialog telling users cancel vCard import/export operation is failed. [CHAR LIMIT=40] -->
-  <string name="cancel_vcard_import_or_export_failed">Couldn\'t cancel vCard import/export</string>
-
-  <!-- The failed reason which should not be shown but it may in some buggy condition. [CHAR LIMIT=40] -->
-  <string name="fail_reason_unknown">Unknown error.</string>
-
-  <!-- The failed reason shown when vCard importer/exporter could not open the file
-       specified by a user. The file name should be in the message. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_could_not_open_file">Couldn\'t open \"<xliff:g id="file_name">%s</xliff:g>\": <xliff:g id="exact_reason">%s</xliff:g>.</string>
-
-  <!-- The failed reason shown when contacts exporter fails to be initialized.
-       Some exact reason must follow this. [CHAR LIMIT=NONE]-->
-  <string name="fail_reason_could_not_initialize_exporter">Couldn\'t start the exporter: \"<xliff:g id="exact_reason">%s</xliff:g>\".</string>
-
-  <!-- The failed reason shown when there's no contact which is allowed to be exported.
-       Note that user may have contacts data but all of them are probably not allowed to be
-       exported because of security/permission reasons. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_no_exportable_contact">There is no exportable contact.</string>
-
-  <!-- The user doesn't have all permissions required to use the current screen. So
-       close the current screen and show the user this message. -->
-  <string name="missing_required_permission">You have disabled a required permission.</string>
-
-  <!-- The failed reason shown when some error happend during contacts export.
-       Some exact reason must follow this. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_error_occurred_during_export">An error occurred during export: \"<xliff:g id="exact_reason">%s</xliff:g>\".</string>
-
-  <!-- The failed reason shown when the given file name is too long for the system.
-       The length limit of each file is different in each Android device, so we don't need to
-       mention it here. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_too_long_filename">Required filename is too long (\"<xliff:g id="filename">%s</xliff:g>\").</string>
-
-  <!-- The failed reason shown when Contacts app (especially vCard importer/exporter)
-       emitted some I/O error. Exact reason will be appended by the system. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_io_error">I/O error</string>
-
-  <!-- Failure reason show when Contacts app (especially vCard importer) encountered
-       low memory problem and could not proceed its import procedure. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_low_memory_during_import">Not enough memory. The file may be too large.</string>
-
-  <!-- The failed reason shown when vCard parser was not able to be parsed by the current vCard
-       implementation. This might happen even when the input vCard is completely valid, though
-       we believe it is rather rare in the actual world. [CHAR LIMIT=NONE] -->
-  <string name="fail_reason_vcard_parse_error">Couldn\'t parse vCard for an unexpected reason.</string>
-
-  <!-- The failed reason shown when vCard importer doesn't support the format.
-       This may be shown when the vCard is corrupted [CHAR LIMIT=40] -->
-  <string name="fail_reason_not_supported">The format isn\'t supported.</string>
-
-  <!-- Fail reason shown when vCard importer failed to look over meta information stored in vCard file(s). -->
-  <string name="fail_reason_failed_to_collect_vcard_meta_info">Couldn\'t collect meta information of given vCard file(s).</string>
-
-  <!-- The failed reason shown when the import of some of vCard files failed during multiple vCard
-       files import. It includes the case where all files were failed to be imported. -->
-  <string name="fail_reason_failed_to_read_files">One or more files couldn\'t be imported (%s).</string>
-
-  <!-- The title shown when exporting vCard is successfuly finished [CHAR LIMIT=40] -->
-  <string name="exporting_vcard_finished_title">Finished exporting <xliff:g example="export.vcf" id="filename">%s</xliff:g>.</string>
-
-  <!-- The title shown when exporting vCard has finished successfully but the destination filename could not be resolved. [CHAR LIMIT=NONE] -->
-  <string name="exporting_vcard_finished_title_fallback">Finished exporting contacts.</string>
-
-  <!-- The toast message shown when exporting vCard has finished and vCards are ready to be shared [CHAR LIMIT=150]-->
-  <string name="exporting_vcard_finished_toast">Finished exporting contacts, click the notification to share contacts.</string>
-
-  <!-- The message on notification shown when exporting vCard has finished and vCards are ready to be shared [CHAR LIMIT=60]-->
-  <string name="touch_to_share_contacts">Tap to share contacts.</string>
-
-  <!-- The title shown when exporting vCard is canceled (probably by a user)
-       The argument is file name the user canceled importing.
-       [CHAR LIMIT=40] -->
-  <string name="exporting_vcard_canceled_title">Exporting <xliff:g example="export.vcf" id="filename">%s</xliff:g> canceled.</string>
-
-  <!-- Dialog title shown when the application is exporting contact data outside. [CHAR LIMIT=NONE] -->
-  <string name="exporting_contact_list_title">Exporting contact data</string>
-
-  <!-- Message shown when the application is exporting contact data outside -->
-  <string name="exporting_contact_list_message">Contact data is being exported.</string>
-
-  <!-- The error reason the vCard composer "may" emit when database is corrupted or
-       something is going wrong. Usually users should not see this text. [CHAR LIMIT=NONE] -->
-  <string name="composer_failed_to_get_database_infomation">Couldn\'t get database information.</string>
-
-  <!-- This error message shown when the user actually have no contact
-       (e.g. just after data-wiping), or, data providers of the contact list prohibits their
-       contacts from being exported to outside world via vcard exporter, etc. [CHAR LIMIT=NONE] -->
-  <string name="composer_has_no_exportable_contact">There are no exportable contacts. If you do have contacts on your device, some data providers may not allow the contacts to be exported from the device.</string>
-
-  <!-- The error reason the vCard composer may emit when vCard composer is not initialized
-       even when needed.
-       Users should not usually see this error message. [CHAR LIMIT=NONE] -->
-  <string name="composer_not_initialized">The vCard composer didn\'t start properly.</string>
-
-  <!-- Dialog title shown when exporting Contact data failed. [CHAR LIMIT=20] -->
-  <string name="exporting_contact_failed_title">Couldn\'t export</string>
-
-  <!-- Dialog message shown when exporting Contact data failed. [CHAR LIMIT=NONE] -->
-  <string name="exporting_contact_failed_message">The contact data wasn\'t exported.\nReason: \"<xliff:g id="fail_reason">%s</xliff:g>\"</string>
-
-  <!-- Description shown when importing vCard data.
-       The argument is the name of a contact which is being read.
-       [CHAR LIMIT=20] -->
-  <string name="importing_vcard_description">Importing <xliff:g example="Joe Due" id="name">%s</xliff:g></string>
-
-  <!-- Dialog title shown when reading vCard data failed [CHAR LIMIT=40] -->
-  <string name="reading_vcard_failed_title">Couldn\'t read vCard data</string>
-
-  <!-- The title shown when reading vCard is canceled (probably by a user)
-       [CHAR LIMIT=40] -->
-  <string name="reading_vcard_canceled_title">Reading vCard data canceled</string>
-
-  <!-- The title shown when reading vCard finished
-       The argument is file name the user imported.
-       [CHAR LIMIT=40] -->
-  <string name="importing_vcard_finished_title">Finished importing vCard <xliff:g example="import.vcf" id="filename">%s</xliff:g></string>
-
-  <!-- The title shown when importing vCard is canceled (probably by a user)
-       The argument is file name the user canceled importing.
-       [CHAR LIMIT=40] -->
-  <string name="importing_vcard_canceled_title">Importing <xliff:g example="import.vcf" id="filename">%s</xliff:g> canceled</string>
-
-  <!-- The message shown when vCard import request is accepted. The system may start that work soon, or do it later
-       when there are already other import/export requests.
-       The argument is file name the user imported.
-       [CHAR LIMIT=40] -->
-  <string name="vcard_import_will_start_message"><xliff:g example="import.vcf" id="filename">%s</xliff:g> will be imported shortly.</string>
-  <!-- The message shown when vCard import request is accepted. The system may start that work soon, or do it later when there are already other import/export requests.
-       "The file" is what a user selected for importing.
-       [CHAR LIMIT=40] -->
-  <string name="vcard_import_will_start_message_with_default_name">The file will be imported shortly.</string>
-  <!-- The message shown when a given vCard import request is rejected by the system. [CHAR LIMIT=NONE] -->
-  <string name="vcard_import_request_rejected_message">vCard import request was rejected. Try again later.</string>
-  <!-- The message shown when vCard export request is accepted. The system may start that work soon, or do it later
-       when there are already other import/export requests.
-       The argument is file name the user exported.
-       [CHAR LIMIT=40] -->
-  <string name="vcard_export_will_start_message"><xliff:g example="import.vcf" id="filename">%s</xliff:g> will be exported shortly.</string>
-
-  <!-- The message shown when a vCard export request is accepted but the destination filename could not be resolved. [CHAR LIMIT=NONE] -->
-  <string name="vcard_export_will_start_message_fallback">The file will be exported shortly.</string>
-
-  <!-- The message shown when a vCard export request is accepted and contacts will be exported shortly. [CHAR LIMIT=70]-->
-  <string name="contacts_export_will_start_message">Contacts will be exported shortly.</string>
-
-  <!-- The message shown when a given vCard export request is rejected by the system. [CHAR LIMIT=NONE] -->
-  <string name="vcard_export_request_rejected_message">vCard export request was rejected. Try again later.</string>
-  <!-- Used when file name is unknown in vCard processing. It typically happens
-       when the file is given outside the Contacts app. [CHAR LIMIT=30] -->
-  <string name="vcard_unknown_filename">contact</string>
-
-  <!-- The message shown when vCard importer is caching files to be imported into local temporary
-       data storage. [CHAR LIMIT=NONE] -->
-  <string name="caching_vcard_message">Caching vCard(s) to local temporary storage. The actual import will start soon.</string>
-
-  <!-- Message used when vCard import has failed. [CHAR LIMIT=40] -->
-  <string name="vcard_import_failed">Couldn\'t import vCard.</string>
-
-  <!-- The "file name" displayed for vCards received directly via NFC [CHAR LIMIT=16] -->
-  <string name="nfc_vcard_file_name">Contact received over NFC</string>
-
-  <!-- Dialog title shown when a user confirms whether he/she export Contact data. [CHAR LIMIT=32] -->
-  <string name="confirm_export_title">Export contacts?</string>
-
-  <!-- The title shown when vCard importer is caching files to be imported into local temporary
-       data storage.  [CHAR LIMIT=40] -->
-  <string name="caching_vcard_title">Caching</string>
-
-  <!-- The message shown while importing vCard(s).
-       First argument is current index of contacts to be imported.
-       Second argument is the total number of contacts.
-       Third argument is the name of a contact which is being read.
-       [CHAR LIMIT=20] -->
-  <string name="progress_notifier_message">Importing <xliff:g id="current_number">%s</xliff:g>/<xliff:g id="total_number">%s</xliff:g>: <xliff:g example="Joe Due" id="name">%s</xliff:g></string>
-
-  <!-- Action that exports all contacts to a user selected destination. [CHAR LIMIT=25] -->
-  <string name="export_to_vcf_file" product="default">Export to .vcf file</string>
-
   <!-- Contact preferences related strings -->
 
   <!-- Label of the "sort by" display option -->
@@ -617,95 +355,9 @@
   <!-- An allowable value for the "view names as" contact display option  -->
   <string name="display_options_view_family_name_first">Last name first</string>
 
-  <!--Label of the "default account" setting option to set default editor account. [CHAR LIMIT=80]-->
-  <string name="default_editor_account">Default account for new contacts</string>
-
-  <!--Label of the "Sync contact metadata" setting dialog to set sync account for Lychee. [CHAR LIMIT=80]-->
-  <string name="sync_contact_metadata_dialog_title">Sync contact metadata</string>
-
-  <!-- Label of the "About" setting -->
-  <string name="setting_about">About Contacts</string>
-
-  <!-- Title of the settings activity [CHAR LIMIT=64] -->
-  <string name="activity_title_settings">Settings</string>
-
-  <!-- Action that shares visible contacts -->
-  <string name="share_visible_contacts">Share visible contacts</string>
-
-  <!-- A framework exception (ie, transaction too large) can be thrown while attempting to share all visible contacts. If so, show this toast. -->
-  <string name="share_visible_contacts_failure">Failed to share visible contacts.</string>
-
-  <!-- Action that shares favorite contacts [CHAR LIMIT=40]-->
-  <string name="share_favorite_contacts">Share favorite contacts</string>
-
-  <!-- Action that shares contacts [CHAR LIMIT=30]-->
-  <string name="share_contacts">Share all contacts</string>
-
-  <!-- A framework exception can be thrown while attempting to share all contacts. If so, show this toast. [CHAR LIMIT=40]-->
-  <string name="share_contacts_failure">Failed to share contacts.</string>
-
-  <!-- Dialog title when selecting the bulk operation to perform from a list. [CHAR LIMIT=36] -->
-  <string name="dialog_import_export">Import/export contacts</string>
-
-  <!-- Dialog title when importing contacts from an external source. [CHAR LIMIT=36] -->
-  <string name="dialog_import">Import contacts</string>
-
-  <!-- Toast indicating that sharing a contact has failed. [CHAR LIMIT=NONE]  -->
-  <string name="share_error">This contact can\'t be shared.</string>
-
-  <!-- Toast indicating that no visible contact to share [CHAR LIMIT=NONE]  -->
-  <string name="no_contact_to_share">There are no contacts to share.</string>
-
-  <!-- Menu item to search contacts -->
-  <string name="menu_search">Search</string>
-
-  <!-- Query hint displayed inside the search field [CHAR LIMIT=64] -->
-  <string name="hint_findContacts">Find contacts</string>
-
-  <!-- The description text for the favorites tab.
-
-       Note: AccessibilityServices use this attribute to announce what the view represents.
-       This is especially valuable for views without textual representation like ImageView.
-
-       [CHAR LIMIT=NONE] -->
-  <string name="contactsFavoritesLabel">Favorites</string>
-
-  <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "All contacts" is selected  [CHAR LIMIT=64]-->
-  <string name="listTotalAllContactsZero">No contacts.</string>
-
-  <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "Custom" is selected  [CHAR LIMIT=64]-->
-  <string name="listTotalAllContactsZeroCustom">No visible contacts.</string>
-
-  <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when starred contact list is selected  [CHAR LIMIT=64]-->
-  <string name="listTotalAllContactsZeroStarred">No favorites</string>
-
-  <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when a group or account is selected  [CHAR LIMIT=64]-->
-  <string name="listTotalAllContactsZeroGroup">No contacts in <xliff:g example="Friends" id="name">%s</xliff:g></string>
-
   <!--  The menu item to clear frequents [CHAR LIMIT=30] -->
   <string name="menu_clear_frequents">Clear frequents</string>
 
-  <!-- Menu item to select SIM card -->
-  <string name="menu_select_sim">Select SIM card</string>
-
-  <!-- The menu item to open the list of accounts. [CHAR LIMIT=60]-->
-  <string name="menu_accounts">Manage accounts</string>
-
-  <!-- The menu item to bulk import or bulk export contacts from SIM card or SD card.  [CHAR LIMIT=30]-->
-  <string name="menu_import_export">Import/export</string>
-
-  <!-- The font-family to use for tab text. -->
-  <string name="tab_font_family" translatable="false">sans-serif</string>
-
-  <!-- Attribution of a contact status update, when the time of update is unknown -->
-  <string name="contact_status_update_attribution">via <xliff:g example="Google Talk" id="source">%1$s</xliff:g></string>
-
-  <!-- Attribution of a contact status update, when the time of update is known -->
-  <string name="contact_status_update_attribution_with_date"><xliff:g example="3 hours ago" id="date">%1$s</xliff:g> via <xliff:g example="Google Talk" id="source">%2$s</xliff:g></string>
-
-  <!-- Font family used when drawing letters for letter tile avatars. -->
-  <string name="letter_tile_letter_font_family" translatable="false">sans-serif-medium</string>
-
   <!-- Content description for the fake action menu up button as used
    inside search. [CHAR LIMIT=NONE] -->
   <string name="action_menu_back_from_search">stop searching</string>
@@ -716,10 +368,6 @@
   <!-- The font-family to use for the text inside the searchbox. -->
   <string name="search_font_family" translatable="false">sans-serif</string>
 
-  <!-- The title of the preference section that allows users to configure how they want their
-       contacts to be displayed. [CHAR LIMIT=128] -->
-  <string name="settings_contact_display_options_title">Contact display options</string>
-
   <!-- Title for Select Account Dialog [CHAR LIMIT=30] -->
   <string name="select_account_dialog_title">Account</string>
 
@@ -744,9 +392,9 @@
        compared to the character limit.  Example: 2 / 64 -->
   <string name="call_subject_limit"><xliff:g example="4" id="count">%1$s</xliff:g> / <xliff:g example="64" id="limit">%2$s</xliff:g></string>
 
-  <!-- String used to build a phone number bype and phone number string.
-       Example: Mobile • 650-555-1212  -->
-  <string name="call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> • <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string>
+  <!-- String used to build a phone number type and phone number string.
+       Example: Mobile 650-555-1212  -->
+  <string name="call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string>
 
   <!-- String format to describe a tab e.g.call history tab. -->
   <string name="tab_title"><xliff:g id="title">%1$s</xliff:g> tab.</string>
@@ -765,27 +413,6 @@
         </item>
   </plurals>
 
-  <!-- Build version title in About preference. [CHAR LIMIT=40]-->
-  <string name="about_build_version">Build version</string>
-
-  <!-- Open source licenses title in About preference. [CHAR LIMIT=60] -->
-  <string name="about_open_source_licenses">Open source licenses</string>
-
-  <!-- Open source licenses summary in About preference. [CHAR LIMIT=NONE] -->
-  <string name="about_open_source_licenses_summary">License details for open source software</string>
-
-  <!-- Privacy policy title in About preference. [CHAR LIMIT=40]-->
-  <string name="about_privacy_policy">Privacy policy</string>
-
-  <!-- Terms of service title in about preference. [CHAR LIMIT=60]-->
-  <string name="about_terms_of_service">Terms of service</string>
-
-  <!-- Title for the activity that displays licenses for open source libraries. [CHAR LIMIT=100]-->
-  <string name="activity_title_licenses">Open source licenses</string>
-
-  <!-- Toast message showing when failed to open the url. [CHAR LIMIT=100]-->
-  <string name="url_open_error_toast">Failed to open the url.</string>
-
   <!-- Description string for an action button to initiate a video call from search results.
        Note: AccessibilityServices use this attribute to announce what the view represents.
        This is especially valuable for views without textual representation like ImageView.
diff --git a/java/com/android/contacts/common/res/values/styles.xml b/java/com/android/contacts/common/res/values/styles.xml
index 07d4a02..bb19afe 100644
--- a/java/com/android/contacts/common/res/values/styles.xml
+++ b/java/com/android/contacts/common/res/values/styles.xml
@@ -43,7 +43,6 @@
     <item name="android:layout_height">wrap_content</item>
     <!-- See comments for @dimen/list_section_divider_min_height -->
     <item name="android:minHeight">@dimen/list_section_divider_min_height</item>
-    <item name="android:background">@drawable/list_section_divider_holo_custom</item>
     <item name="android:textAppearance">@style/DirectoryHeaderStyle</item>
     <item name="android:gravity">center_vertical</item>
     <item name="android:paddingLeft">8dip</item>
diff --git a/java/com/android/contacts/common/util/AccountFilterUtil.java b/java/com/android/contacts/common/util/AccountFilterUtil.java
index 18743c6..25f937c 100644
--- a/java/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/java/com/android/contacts/common/util/AccountFilterUtil.java
@@ -16,35 +16,15 @@
 
 package com.android.contacts.common.util;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import com.android.contacts.common.R;
 import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
 
 /** Utility class for account filter manipulation. */
 public class AccountFilterUtil {
 
-  public static final String EXTRA_CONTACT_LIST_FILTER = "contactListFilter";
-  private static final String TAG = AccountFilterUtil.class.getSimpleName();
-
-  /**
-   * Find TextView with the id "account_filter_header" and set correct text for the account filter
-   * header.
-   *
-   * @param filterContainer View containing TextView with id "account_filter_header"
-   * @return true when header text is set in the call. You may use this for conditionally showing or
-   *     hiding this entire view.
-   */
-  public static boolean updateAccountFilterTitleForPeople(
-      View filterContainer, ContactListFilter filter, boolean showTitleForAllAccounts) {
-    return updateAccountFilterTitle(filterContainer, filter, showTitleForAllAccounts, false);
-  }
-
   /**
    * Similar to {@link #updateAccountFilterTitleForPeople(View, ContactListFilter, boolean,
    * boolean)}, but for Phone UI.
@@ -78,8 +58,6 @@
         } else if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {
           headerTextView.setText(R.string.listCustomView);
           textWasSet = true;
-        } else {
-          Log.w(TAG, "Filter type \"" + filter.filterType + "\" isn't expected.");
         }
       } else {
         if (filter.filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS) {
@@ -97,29 +75,9 @@
         } else if (filter.filterType == ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
           headerTextView.setText(R.string.listSingleContact);
           textWasSet = true;
-        } else {
-          Log.w(TAG, "Filter type \"" + filter.filterType + "\" isn't expected.");
         }
       }
-    } else {
-      Log.w(TAG, "Filter is null.");
     }
     return textWasSet;
   }
-
-  /** This will update filter via a given ContactListFilterController. */
-  public static void handleAccountFilterResult(
-      ContactListFilterController filterController, int resultCode, Intent data) {
-    if (resultCode == Activity.RESULT_OK) {
-      final ContactListFilter filter = data.getParcelableExtra(EXTRA_CONTACT_LIST_FILTER);
-      if (filter == null) {
-        return;
-      }
-      if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {
-        filterController.selectCustomFilter();
-      } else {
-        filterController.setContactListFilter(filter, true);
-      }
-    }
-  }
 }
diff --git a/java/com/android/contacts/common/util/BitmapUtil.java b/java/com/android/contacts/common/util/BitmapUtil.java
deleted file mode 100644
index 20f916a..0000000
--- a/java/com/android/contacts/common/util/BitmapUtil.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2012 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.contacts.common.util;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-
-/** Provides static functions to decode bitmaps at the optimal size */
-public class BitmapUtil {
-
-  private BitmapUtil() {}
-
-  /**
-   * Returns Width or Height of the picture, depending on which size is smaller. Doesn't actually
-   * decode the picture, so it is pretty efficient to run.
-   */
-  public static int getSmallerExtentFromBytes(byte[] bytes) {
-    final BitmapFactory.Options options = new BitmapFactory.Options();
-
-    // don't actually decode the picture, just return its bounds
-    options.inJustDecodeBounds = true;
-    BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
-
-    // test what the best sample size is
-    return Math.min(options.outWidth, options.outHeight);
-  }
-
-  /**
-   * Finds the optimal sampleSize for loading the picture
-   *
-   * @param originalSmallerExtent Width or height of the picture, whichever is smaller
-   * @param targetExtent Width or height of the target view, whichever is bigger.
-   *     <p>If either one of the parameters is 0 or smaller, no sampling is applied
-   */
-  public static int findOptimalSampleSize(int originalSmallerExtent, int targetExtent) {
-    // If we don't know sizes, we can't do sampling.
-    if (targetExtent < 1) {
-      return 1;
-    }
-    if (originalSmallerExtent < 1) {
-      return 1;
-    }
-
-    // Test what the best sample size is. To do that, we find the sample size that gives us
-    // the best trade-off between resulting image size and memory requirement. We allow
-    // the down-sampled image to be 20% smaller than the target size. That way we can get around
-    // unfortunate cases where e.g. a 720 picture is requested for 362 and not down-sampled at
-    // all. Why 20%? Why not. Prove me wrong.
-    int extent = originalSmallerExtent;
-    int sampleSize = 1;
-    while ((extent >> 1) >= targetExtent * 0.8f) {
-      sampleSize <<= 1;
-      extent >>= 1;
-    }
-
-    return sampleSize;
-  }
-
-  /** Decodes the bitmap with the given sample size */
-  public static Bitmap decodeBitmapFromBytes(byte[] bytes, int sampleSize) {
-    final BitmapFactory.Options options;
-    if (sampleSize <= 1) {
-      options = null;
-    } else {
-      options = new BitmapFactory.Options();
-      options.inSampleSize = sampleSize;
-    }
-    return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
-  }
-
-  /**
-   * Retrieves a copy of the specified drawable resource, rotated by a specified angle.
-   *
-   * @param resources The current resources.
-   * @param resourceId The resource ID of the drawable to rotate.
-   * @param angle The angle of rotation.
-   * @return Rotated drawable.
-   */
-  public static Drawable getRotatedDrawable(
-      android.content.res.Resources resources, int resourceId, float angle) {
-
-    // Get the original drawable and make a copy which will be rotated.
-    Bitmap original = BitmapFactory.decodeResource(resources, resourceId);
-    Bitmap rotated =
-        Bitmap.createBitmap(original.getWidth(), original.getHeight(), Bitmap.Config.ARGB_8888);
-
-    // Perform the rotation.
-    Canvas tempCanvas = new Canvas(rotated);
-    tempCanvas.rotate(angle, original.getWidth() / 2, original.getHeight() / 2);
-    tempCanvas.drawBitmap(original, 0, 0, null);
-
-    return new BitmapDrawable(resources, rotated);
-  }
-
-  /**
-   * Given an input bitmap, scales it to the given width/height and makes it round.
-   *
-   * @param input {@link Bitmap} to scale and crop
-   * @param targetWidth desired output width
-   * @param targetHeight desired output height
-   * @return output bitmap scaled to the target width/height and cropped to an oval. The cropping
-   *     algorithm will try to fit as much of the input into the output as possible, while
-   *     preserving the target width/height ratio.
-   */
-  public static Bitmap getRoundedBitmap(Bitmap input, int targetWidth, int targetHeight) {
-    if (input == null) {
-      return null;
-    }
-    final Bitmap.Config inputConfig = input.getConfig();
-    final Bitmap result =
-        Bitmap.createBitmap(
-            targetWidth, targetHeight, inputConfig != null ? inputConfig : Bitmap.Config.ARGB_8888);
-    final Canvas canvas = new Canvas(result);
-    final Paint paint = new Paint();
-    canvas.drawARGB(0, 0, 0, 0);
-    paint.setAntiAlias(true);
-    final RectF dst = new RectF(0, 0, targetWidth, targetHeight);
-    canvas.drawOval(dst, paint);
-
-    // Specifies that only pixels present in the destination (i.e. the drawn oval) should
-    // be overwritten with pixels from the input bitmap.
-    paint.setXfermode(new PorterDuffXfermode(Mode.SRC_IN));
-
-    final int inputWidth = input.getWidth();
-    final int inputHeight = input.getHeight();
-
-    // Choose the largest scale factor that will fit inside the dimensions of the
-    // input bitmap.
-    final float scaleBy =
-        Math.min((float) inputWidth / targetWidth, (float) inputHeight / targetHeight);
-
-    final int xCropAmountHalved = (int) (scaleBy * targetWidth / 2);
-    final int yCropAmountHalved = (int) (scaleBy * targetHeight / 2);
-
-    final Rect src =
-        new Rect(
-            inputWidth / 2 - xCropAmountHalved,
-            inputHeight / 2 - yCropAmountHalved,
-            inputWidth / 2 + xCropAmountHalved,
-            inputHeight / 2 + yCropAmountHalved);
-
-    canvas.drawBitmap(input, src, dst, paint);
-    return result;
-  }
-}
diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index 1586784..ff22f28 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -16,21 +16,20 @@
 
 package com.android.contacts.common.util;
 
-import static android.provider.ContactsContract.CommonDataKinds.Phone;
-
 import android.content.Context;
 import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.TtsSpan;
-import android.util.Log;
 import android.util.Patterns;
 import com.android.contacts.common.R;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.dialer.common.LogUtil;
 import java.util.Objects;
 
 /** Methods for handling various contact data labels. */
@@ -38,7 +37,6 @@
 
   public static final int INTERACTION_CALL = 1;
   public static final int INTERACTION_SMS = 2;
-  private static final String TAG = ContactDisplayUtils.class.getSimpleName();
 
   /**
    * Checks if the given data type is a custom type.
@@ -74,9 +72,9 @@
       } else {
         resId = getPhoneLabelResourceId(type);
         if (interactionType != INTERACTION_CALL) {
-          Log.e(
-              TAG,
-              "Un-recognized interaction type: "
+          LogUtil.e(
+              "ContactDisplayUtils.getLabelForCallOrSms",
+              "un-recognized interaction type: "
                   + interactionType
                   + ". Defaulting to ContactDisplayUtils.INTERACTION_CALL.");
         }
diff --git a/java/com/android/contacts/common/util/DateUtils.java b/java/com/android/contacts/common/util/DateUtils.java
index 1935d72..09d52bc 100644
--- a/java/com/android/contacts/common/util/DateUtils.java
+++ b/java/com/android/contacts/common/util/DateUtils.java
@@ -16,252 +16,11 @@
 
 package com.android.contacts.common.util;
 
-import android.content.Context;
-import android.text.format.DateFormat;
 import android.text.format.Time;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
 
 /** Utility methods for processing dates. */
 public class DateUtils {
 
-  public static final TimeZone UTC_TIMEZONE = TimeZone.getTimeZone("UTC");
-
-  /**
-   * When parsing a date without a year, the system assumes 1970, which wasn't a leap-year. Let's
-   * add a one-off hack for that day of the year
-   */
-  public static final String NO_YEAR_DATE_FEB29TH = "--02-29";
-
-  // Variations of ISO 8601 date format.  Do not change the order - it does affect the
-  // result in ambiguous cases.
-  private static final SimpleDateFormat[] DATE_FORMATS = {
-    CommonDateUtils.FULL_DATE_FORMAT,
-    CommonDateUtils.DATE_AND_TIME_FORMAT,
-    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'", Locale.US),
-    new SimpleDateFormat("yyyyMMdd", Locale.US),
-    new SimpleDateFormat("yyyyMMdd'T'HHmmssSSS'Z'", Locale.US),
-    new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.US),
-    new SimpleDateFormat("yyyyMMdd'T'HHmm'Z'", Locale.US),
-  };
-
-  static {
-    for (SimpleDateFormat format : DATE_FORMATS) {
-      format.setLenient(true);
-      format.setTimeZone(UTC_TIMEZONE);
-    }
-    CommonDateUtils.NO_YEAR_DATE_FORMAT.setTimeZone(UTC_TIMEZONE);
-  }
-
-  /**
-   * Parses the supplied string to see if it looks like a date.
-   *
-   * @param string The string representation of the provided date
-   * @param mustContainYear If true, the string is parsed as a date containing a year. If false, the
-   *     string is parsed into a valid date even if the year field is missing.
-   * @return A Calendar object corresponding to the date if the string is successfully parsed. If
-   *     not, null is returned.
-   */
-  public static Calendar parseDate(String string, boolean mustContainYear) {
-    ParsePosition parsePosition = new ParsePosition(0);
-    Date date;
-    if (!mustContainYear) {
-      final boolean noYearParsed;
-      // Unfortunately, we can't parse Feb 29th correctly, so let's handle this day seperately
-      if (NO_YEAR_DATE_FEB29TH.equals(string)) {
-        return getUtcDate(0, Calendar.FEBRUARY, 29);
-      } else {
-        synchronized (CommonDateUtils.NO_YEAR_DATE_FORMAT) {
-          date = CommonDateUtils.NO_YEAR_DATE_FORMAT.parse(string, parsePosition);
-        }
-        noYearParsed = parsePosition.getIndex() == string.length();
-      }
-
-      if (noYearParsed) {
-        return getUtcDate(date, true);
-      }
-    }
-    for (int i = 0; i < DATE_FORMATS.length; i++) {
-      SimpleDateFormat f = DATE_FORMATS[i];
-      synchronized (f) {
-        parsePosition.setIndex(0);
-        date = f.parse(string, parsePosition);
-        if (parsePosition.getIndex() == string.length()) {
-          return getUtcDate(date, false);
-        }
-      }
-    }
-    return null;
-  }
-
-  private static final Calendar getUtcDate(Date date, boolean noYear) {
-    final Calendar calendar = Calendar.getInstance(UTC_TIMEZONE, Locale.US);
-    calendar.setTime(date);
-    if (noYear) {
-      calendar.set(Calendar.YEAR, 0);
-    }
-    return calendar;
-  }
-
-  private static final Calendar getUtcDate(int year, int month, int dayOfMonth) {
-    final Calendar calendar = Calendar.getInstance(UTC_TIMEZONE, Locale.US);
-    calendar.clear();
-    calendar.set(Calendar.YEAR, year);
-    calendar.set(Calendar.MONTH, month);
-    calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-    return calendar;
-  }
-
-  public static boolean isYearSet(Calendar cal) {
-    // use the Calendar.YEAR field to track whether or not the year is set instead of
-    // Calendar.isSet() because doing Calendar.get() causes Calendar.isSet() to become
-    // true irregardless of what the previous value was
-    return cal.get(Calendar.YEAR) > 1;
-  }
-
-  /**
-   * Same as {@link #formatDate(Context context, String string, boolean longForm)}, with longForm
-   * set to {@code true} by default.
-   *
-   * @param context Valid context
-   * @param string String representation of a date to parse
-   * @return Returns the same date in a cleaned up format. If the supplied string does not look like
-   *     a date, return it unchanged.
-   */
-  public static String formatDate(Context context, String string) {
-    return formatDate(context, string, true);
-  }
-
-  /**
-   * Parses the supplied string to see if it looks like a date.
-   *
-   * @param context Valid context
-   * @param string String representation of a date to parse
-   * @param longForm If true, return the date formatted into its long string representation. If
-   *     false, return the date formatted using its short form representation (i.e. 12/11/2012)
-   * @return Returns the same date in a cleaned up format. If the supplied string does not look like
-   *     a date, return it unchanged.
-   */
-  public static String formatDate(Context context, String string, boolean longForm) {
-    if (string == null) {
-      return null;
-    }
-
-    string = string.trim();
-    if (string.length() == 0) {
-      return string;
-    }
-    final Calendar cal = parseDate(string, false);
-
-    // we weren't able to parse the string successfully so just return it unchanged
-    if (cal == null) {
-      return string;
-    }
-
-    final boolean isYearSet = isYearSet(cal);
-    final java.text.DateFormat outFormat;
-    if (!isYearSet) {
-      outFormat = getLocalizedDateFormatWithoutYear(context);
-    } else {
-      outFormat =
-          longForm ? DateFormat.getLongDateFormat(context) : DateFormat.getDateFormat(context);
-    }
-    synchronized (outFormat) {
-      outFormat.setTimeZone(UTC_TIMEZONE);
-      return outFormat.format(cal.getTime());
-    }
-  }
-
-  public static boolean isMonthBeforeDay(Context context) {
-    char[] dateFormatOrder = DateFormat.getDateFormatOrder(context);
-    for (int i = 0; i < dateFormatOrder.length; i++) {
-      if (dateFormatOrder[i] == 'd') {
-        return false;
-      }
-      if (dateFormatOrder[i] == 'M') {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns a SimpleDateFormat object without the year fields by using a regular expression to
-   * eliminate the year in the string pattern. In the rare occurence that the resulting pattern
-   * cannot be reconverted into a SimpleDateFormat, it uses the provided context to determine
-   * whether the month field should be displayed before the day field, and returns either "MMMM dd"
-   * or "dd MMMM" converted into a SimpleDateFormat.
-   */
-  public static java.text.DateFormat getLocalizedDateFormatWithoutYear(Context context) {
-    final String pattern =
-        ((SimpleDateFormat) SimpleDateFormat.getDateInstance(java.text.DateFormat.LONG))
-            .toPattern();
-    // Determine the correct regex pattern for year.
-    // Special case handling for Spanish locale by checking for "de"
-    final String yearPattern =
-        pattern.contains("de") ? "[^Mm]*[Yy]+[^Mm]*" : "[^DdMm]*[Yy]+[^DdMm]*";
-    try {
-      // Eliminate the substring in pattern that matches the format for that of year
-      return new SimpleDateFormat(pattern.replaceAll(yearPattern, ""));
-    } catch (IllegalArgumentException e) {
-      return new SimpleDateFormat(DateUtils.isMonthBeforeDay(context) ? "MMMM dd" : "dd MMMM");
-    }
-  }
-
-  /**
-   * Given a calendar (possibly containing only a day of the year), returns the earliest possible
-   * anniversary of the date that is equal to or after the current point in time if the date does
-   * not contain a year, or the date converted to the local time zone (if the date contains a year.
-   *
-   * @param target The date we wish to convert(in the UTC time zone).
-   * @return If date does not contain a year (year < 1900), returns the next earliest anniversary
-   *     that is after the current point in time (in the local time zone). Otherwise, returns the
-   *     adjusted Date in the local time zone.
-   */
-  public static Date getNextAnnualDate(Calendar target) {
-    final Calendar today = Calendar.getInstance();
-    today.setTime(new Date());
-
-    // Round the current time to the exact start of today so that when we compare
-    // today against the target date, both dates are set to exactly 0000H.
-    today.set(Calendar.HOUR_OF_DAY, 0);
-    today.set(Calendar.MINUTE, 0);
-    today.set(Calendar.SECOND, 0);
-    today.set(Calendar.MILLISECOND, 0);
-
-    final boolean isYearSet = isYearSet(target);
-    final int targetYear = target.get(Calendar.YEAR);
-    final int targetMonth = target.get(Calendar.MONTH);
-    final int targetDay = target.get(Calendar.DAY_OF_MONTH);
-    final boolean isFeb29 = (targetMonth == Calendar.FEBRUARY && targetDay == 29);
-    final GregorianCalendar anniversary = new GregorianCalendar();
-    // Convert from the UTC date to the local date. Set the year to today's year if the
-    // there is no provided year (targetYear < 1900)
-    anniversary.set(!isYearSet ? today.get(Calendar.YEAR) : targetYear, targetMonth, targetDay);
-    // If the anniversary's date is before the start of today and there is no year set,
-    // increment the year by 1 so that the returned date is always equal to or greater than
-    // today. If the day is a leap year, keep going until we get the next leap year anniversary
-    // Otherwise if there is already a year set, simply return the exact date.
-    if (!isYearSet) {
-      int anniversaryYear = today.get(Calendar.YEAR);
-      if (anniversary.before(today) || (isFeb29 && !anniversary.isLeapYear(anniversaryYear))) {
-        // If the target date is not Feb 29, then set the anniversary to the next year.
-        // Otherwise, keep going until we find the next leap year (this is not guaranteed
-        // to be in 4 years time).
-        do {
-          anniversaryYear += 1;
-        } while (isFeb29 && !anniversary.isLeapYear(anniversaryYear));
-        anniversary.set(anniversaryYear, targetMonth, targetDay);
-      }
-    }
-    return anniversary.getTime();
-  }
-
   /**
    * Determine the difference, in days between two dates. Uses similar logic as the {@link
    * android.text.format.DateUtils.getRelativeTimeSpanString} method.
diff --git a/java/com/android/contacts/common/util/MaterialColorMapUtils.java b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
index a2d9847..bd32faa 100644
--- a/java/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
@@ -21,7 +21,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Trace;
-import com.android.contacts.common.R;
 
 public class MaterialColorMapUtils {
 
@@ -35,13 +34,6 @@
         resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors_dark);
   }
 
-  public static MaterialPalette getDefaultPrimaryAndSecondaryColors(Resources resources) {
-    final int primaryColor = resources.getColor(R.color.quickcontact_default_photo_tint_color);
-    final int secondaryColor =
-        resources.getColor(R.color.quickcontact_default_photo_tint_color_dark);
-    return new MaterialPalette(primaryColor, secondaryColor);
-  }
-
   /**
    * Returns the hue component of a color int.
    *
diff --git a/java/com/android/contacts/common/util/NameConverter.java b/java/com/android/contacts/common/util/NameConverter.java
deleted file mode 100644
index ae3275d..0000000
--- a/java/com/android/contacts/common/util/NameConverter.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2011 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.contacts.common.util;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.text.TextUtils;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Utility class for converting between a display name and structured name (and vice-versa), via
- * calls to the contact provider.
- */
-public class NameConverter {
-
-  /** The array of fields that comprise a structured name. */
-  public static final String[] STRUCTURED_NAME_FIELDS =
-      new String[] {
-        StructuredName.PREFIX,
-        StructuredName.GIVEN_NAME,
-        StructuredName.MIDDLE_NAME,
-        StructuredName.FAMILY_NAME,
-        StructuredName.SUFFIX
-      };
-
-  /**
-   * Converts the given structured name (provided as a map from {@link StructuredName} fields to
-   * corresponding values) into a display name string.
-   *
-   * <p>Note that this operates via a call back to the ContactProvider, but it does not access the
-   * database, so it should be safe to call from the UI thread. See ContactsProvider2.completeName()
-   * for the underlying method call.
-   *
-   * @param context Activity context.
-   * @param structuredName The structured name map to convert.
-   * @return The display name computed from the structured name map.
-   */
-  public static String structuredNameToDisplayName(
-      Context context, Map<String, String> structuredName) {
-    Builder builder = ContactsContract.AUTHORITY_URI.buildUpon().appendPath("complete_name");
-    for (String key : STRUCTURED_NAME_FIELDS) {
-      if (structuredName.containsKey(key)) {
-        appendQueryParameter(builder, key, structuredName.get(key));
-      }
-    }
-    return fetchDisplayName(context, builder.build());
-  }
-
-  /**
-   * Converts the given structured name (provided as ContentValues) into a display name string.
-   *
-   * @param context Activity context.
-   * @param values The content values containing values comprising the structured name.
-   */
-  public static String structuredNameToDisplayName(Context context, ContentValues values) {
-    Builder builder = ContactsContract.AUTHORITY_URI.buildUpon().appendPath("complete_name");
-    for (String key : STRUCTURED_NAME_FIELDS) {
-      if (values.containsKey(key)) {
-        appendQueryParameter(builder, key, values.getAsString(key));
-      }
-    }
-    return fetchDisplayName(context, builder.build());
-  }
-
-  /** Helper method for fetching the display name via the given URI. */
-  private static String fetchDisplayName(Context context, Uri uri) {
-    String displayName = null;
-    Cursor cursor =
-        context
-            .getContentResolver()
-            .query(
-                uri,
-                new String[] {
-                  StructuredName.DISPLAY_NAME,
-                },
-                null,
-                null,
-                null);
-
-    if (cursor != null) {
-      try {
-        if (cursor.moveToFirst()) {
-          displayName = cursor.getString(0);
-        }
-      } finally {
-        cursor.close();
-      }
-    }
-    return displayName;
-  }
-
-  /**
-   * Converts the given display name string into a structured name (as a map from {@link
-   * StructuredName} fields to corresponding values).
-   *
-   * <p>Note that this operates via a call back to the ContactProvider, but it does not access the
-   * database, so it should be safe to call from the UI thread.
-   *
-   * @param context Activity context.
-   * @param displayName The display name to convert.
-   * @return The structured name map computed from the display name.
-   */
-  public static Map<String, String> displayNameToStructuredName(
-      Context context, String displayName) {
-    Map<String, String> structuredName = new TreeMap<String, String>();
-    Builder builder = ContactsContract.AUTHORITY_URI.buildUpon().appendPath("complete_name");
-
-    appendQueryParameter(builder, StructuredName.DISPLAY_NAME, displayName);
-    Cursor cursor =
-        context
-            .getContentResolver()
-            .query(builder.build(), STRUCTURED_NAME_FIELDS, null, null, null);
-
-    if (cursor != null) {
-      try {
-        if (cursor.moveToFirst()) {
-          for (int i = 0; i < STRUCTURED_NAME_FIELDS.length; i++) {
-            structuredName.put(STRUCTURED_NAME_FIELDS[i], cursor.getString(i));
-          }
-        }
-      } finally {
-        cursor.close();
-      }
-    }
-    return structuredName;
-  }
-
-  /**
-   * Converts the given display name string into a structured name (inserting the structured values
-   * into a new or existing ContentValues object).
-   *
-   * <p>Note that this operates via a call back to the ContactProvider, but it does not access the
-   * database, so it should be safe to call from the UI thread.
-   *
-   * @param context Activity context.
-   * @param displayName The display name to convert.
-   * @param contentValues The content values object to place the structured name values into. If
-   *     null, a new one will be created and returned.
-   * @return The ContentValues object containing the structured name fields derived from the display
-   *     name.
-   */
-  public static ContentValues displayNameToStructuredName(
-      Context context, String displayName, ContentValues contentValues) {
-    if (contentValues == null) {
-      contentValues = new ContentValues();
-    }
-    Map<String, String> mapValues = displayNameToStructuredName(context, displayName);
-    for (String key : mapValues.keySet()) {
-      contentValues.put(key, mapValues.get(key));
-    }
-    return contentValues;
-  }
-
-  private static void appendQueryParameter(Builder builder, String field, String value) {
-    if (!TextUtils.isEmpty(value)) {
-      builder.appendQueryParameter(field, value);
-    }
-  }
-
-  /**
-   * Parses phonetic name and returns parsed data (family, middle, given) as ContentValues. Parsed
-   * data should be {@link StructuredName#PHONETIC_FAMILY_NAME}, {@link
-   * StructuredName#PHONETIC_MIDDLE_NAME}, and {@link StructuredName#PHONETIC_GIVEN_NAME}. If this
-   * method cannot parse given phoneticName, null values will be stored.
-   *
-   * @param phoneticName Phonetic name to be parsed
-   * @param values ContentValues to be used for storing data. If null, new instance will be created.
-   * @return ContentValues with parsed data. Those data can be null.
-   */
-  public static StructuredNameDataItem parsePhoneticName(
-      String phoneticName, StructuredNameDataItem item) {
-    String family = null;
-    String middle = null;
-    String given = null;
-
-    if (!TextUtils.isEmpty(phoneticName)) {
-      String[] strings = phoneticName.split(" ", 3);
-      switch (strings.length) {
-        case 1:
-          family = strings[0];
-          break;
-        case 2:
-          family = strings[0];
-          given = strings[1];
-          break;
-        case 3:
-          family = strings[0];
-          middle = strings[1];
-          given = strings[2];
-          break;
-      }
-    }
-
-    if (item == null) {
-      item = new StructuredNameDataItem();
-    }
-    item.setPhoneticFamilyName(family);
-    item.setPhoneticMiddleName(middle);
-    item.setPhoneticGivenName(given);
-    return item;
-  }
-
-  /** Constructs and returns a phonetic full name from given parts. */
-  public static String buildPhoneticName(String family, String middle, String given) {
-    if (!TextUtils.isEmpty(family) || !TextUtils.isEmpty(middle) || !TextUtils.isEmpty(given)) {
-      StringBuilder sb = new StringBuilder();
-      if (!TextUtils.isEmpty(family)) {
-        sb.append(family.trim()).append(' ');
-      }
-      if (!TextUtils.isEmpty(middle)) {
-        sb.append(middle.trim()).append(' ');
-      }
-      if (!TextUtils.isEmpty(given)) {
-        sb.append(given.trim()).append(' ');
-      }
-      sb.setLength(sb.length() - 1); // Yank the last space
-      return sb.toString();
-    } else {
-      return null;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/util/StopWatch.java b/java/com/android/contacts/common/util/StopWatch.java
index b944b98..7986d10 100644
--- a/java/com/android/contacts/common/util/StopWatch.java
+++ b/java/com/android/contacts/common/util/StopWatch.java
@@ -16,7 +16,7 @@
 
 package com.android.contacts.common.util;
 
-import android.util.Log;
+import com.android.dialer.common.LogUtil;
 import java.util.ArrayList;
 
 /** A {@link StopWatch} records start, laps and stop, and print them to logcat. */
@@ -37,11 +37,6 @@
     return new StopWatch(label);
   }
 
-  /** Return a dummy instance that does no operations. */
-  public static StopWatch getNullStopWatch() {
-    return NullStopWatch.INSTANCE;
-  }
-
   /** Record a lap. */
   public void lap(String lapLabel) {
     mTimes.add(System.currentTimeMillis());
@@ -76,25 +71,6 @@
       sb.append(" ");
       last = current;
     }
-    Log.v(TAG, sb.toString());
-  }
-
-  private static class NullStopWatch extends StopWatch {
-
-    public static final NullStopWatch INSTANCE = new NullStopWatch();
-
-    public NullStopWatch() {
-      super(null);
-    }
-
-    @Override
-    public void lap(String lapLabel) {
-      // noop
-    }
-
-    @Override
-    public void stopAndLog(String TAG, int timeThresholdToLog) {
-      // noop
-    }
+    LogUtil.v(TAG, sb.toString());
   }
 }
diff --git a/java/com/android/contacts/common/util/TelephonyManagerUtils.java b/java/com/android/contacts/common/util/TelephonyManagerUtils.java
index b664268..e4c2c63 100644
--- a/java/com/android/contacts/common/util/TelephonyManagerUtils.java
+++ b/java/com/android/contacts/common/util/TelephonyManagerUtils.java
@@ -33,13 +33,4 @@
     final String voiceMailLabel = telephonyManager.getVoiceMailAlphaTag();
     return voiceMailLabel;
   }
-
-  /**
-   * @param context Current application context.
-   * @return True if there is a subscription which supports video calls. False otherwise.
-   */
-  public static boolean hasVideoCallSubscription(Context context) {
-    // TODO: Check the telephony manager's subscriptions to see if any support video calls.
-    return true;
-  }
 }
diff --git a/java/com/android/contacts/common/util/TrafficStatsTags.java b/java/com/android/contacts/common/util/TrafficStatsTags.java
deleted file mode 100644
index b0e7fb5..0000000
--- a/java/com/android/contacts/common/util/TrafficStatsTags.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2015 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.contacts.common.util;
-
-public class TrafficStatsTags {
-
-  public static final int CONTACT_PHOTO_DOWNLOAD_TAG = 0x0001;
-  public static final int TAG_MAX = 0x9999;
-}
diff --git a/java/com/android/contacts/common/util/UriUtils.java b/java/com/android/contacts/common/util/UriUtils.java
deleted file mode 100644
index 4690942..0000000
--- a/java/com/android/contacts/common/util/UriUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2011 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.contacts.common.util;
-
-import android.net.Uri;
-import android.provider.ContactsContract;
-import java.util.List;
-
-/** Utility methods for dealing with URIs. */
-public class UriUtils {
-
-  /** Static helper, not instantiable. */
-  private UriUtils() {}
-
-  /** Checks whether two URI are equal, taking care of the case where either is null. */
-  public static boolean areEqual(Uri uri1, Uri uri2) {
-    if (uri1 == null && uri2 == null) {
-      return true;
-    }
-    if (uri1 == null || uri2 == null) {
-      return false;
-    }
-    return uri1.equals(uri2);
-  }
-
-  /** Parses a string into a URI and returns null if the given string is null. */
-  public static Uri parseUriOrNull(String uriString) {
-    if (uriString == null) {
-      return null;
-    }
-    return Uri.parse(uriString);
-  }
-
-  /** Converts a URI into a string, returns null if the given URI is null. */
-  public static String uriToString(Uri uri) {
-    return uri == null ? null : uri.toString();
-  }
-
-  public static boolean isEncodedContactUri(Uri uri) {
-    if (uri == null) {
-      return false;
-    }
-    final String lastPathSegment = uri.getLastPathSegment();
-    if (lastPathSegment == null) {
-      return false;
-    }
-    return lastPathSegment.equals(Constants.LOOKUP_URI_ENCODED);
-  }
-
-  /**
-   * @return {@code uri} as-is if the authority is of contacts provider. Otherwise or {@code uri} is
-   *     null, return null otherwise
-   */
-  public static Uri nullForNonContactsUri(Uri uri) {
-    if (uri == null) {
-      return null;
-    }
-    return ContactsContract.AUTHORITY.equals(uri.getAuthority()) ? uri : null;
-  }
-
-  /** Parses the given URI to determine the original lookup key of the contact. */
-  public static String getLookupKeyFromUri(Uri lookupUri) {
-    // Would be nice to be able to persist the lookup key somehow to avoid having to parse
-    // the uri entirely just to retrieve the lookup key, but every uri is already parsed
-    // once anyway to check if it is an encoded JSON uri, so this has negligible effect
-    // on performance.
-    if (lookupUri != null && !UriUtils.isEncodedContactUri(lookupUri)) {
-      final List<String> segments = lookupUri.getPathSegments();
-      // This returns the third path segment of the uri, where the lookup key is located.
-      // See {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}.
-      return (segments.size() < 3) ? null : Uri.encode(segments.get(2));
-    } else {
-      return null;
-    }
-  }
-}
diff --git a/java/com/android/dialer/about/AndroidManifest.xml b/java/com/android/dialer/about/AndroidManifest.xml
index e9489ce..85c7508 100644
--- a/java/com/android/dialer/about/AndroidManifest.xml
+++ b/java/com/android/dialer/about/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.about">
-  <application>
+  <application android:theme="@style/Theme.AppCompat">
     <activity
         android:name="com.android.dialer.about.LicenseMenuActivity"
         android:label="@string/licenseActivityLabel"
diff --git a/java/com/android/dialer/about/Licenses.java b/java/com/android/dialer/about/Licenses.java
index d90c282..bd3d0ce 100644
--- a/java/com/android/dialer/about/Licenses.java
+++ b/java/com/android/dialer/about/Licenses.java
@@ -73,7 +73,7 @@
     // When aapt is called with --rename-manifest-package, the package name is changed for the
     // application, but not for the resources. This is to find the package name of a known
     // resource to know what package to lookup the license files in.
-    String packageName = resources.getResourcePackageName(R.id.dummy_placeholder);
+    String packageName = resources.getResourcePackageName(R.id.license);
     InputStream stream =
         resources.openRawResource(resources.getIdentifier(filename, "raw", packageName));
     return getTextFromInputStream(stream, offset, length);
diff --git a/java/com/android/dialer/about/res/layout/dummy_placeholder.xml b/java/com/android/dialer/about/res/layout/dummy_placeholder.xml
deleted file mode 100644
index 6d867ef..0000000
--- a/java/com/android/dialer/about/res/layout/dummy_placeholder.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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
-  -->
-<!-- See Licenses.java for why this exists. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/dummy_placeholder"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
diff --git a/java/com/android/dialer/about/res/raw/keep.xml b/java/com/android/dialer/about/res/raw/keep.xml
index e41b8b8..9215627 100644
--- a/java/com/android/dialer/about/res/raw/keep.xml
+++ b/java/com/android/dialer/about/res/raw/keep.xml
@@ -16,4 +16,3 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools"
     tools:keep="@raw/*"/>
-
diff --git a/java/com/android/dialer/about/res/raw/third_party_license_metadata b/java/com/android/dialer/about/res/raw/third_party_license_metadata
old mode 100644
new mode 100755
index 1acf348..10ed4a2
--- a/java/com/android/dialer/about/res/raw/third_party_license_metadata
+++ b/java/com/android/dialer/about/res/raw/third_party_license_metadata
@@ -1,34 +1,38 @@
 40:10695 Android Annotations Support Library
-10770:10695 Android Compat Support Library
-21501:10695 Android Core UI Support Library
-32235:10691 Android Core Utils Support Library
-42961:10695 Android Design Support Library
-53694:10695 Android Fragments Support Library
-64426:10695 Android Graphics Support Library
-75162:10691 Android Media Compat Support Library
-85892:10691 Android Transition Support Library
-96621:10695 Android Compatibility Library v13
-107353:10695 Android Compatibility Library v4
-118085:10695 Android Compatibility Library v7
-128796:16013 Android SDK
-144828:11358 Android Common
-156196:4771 Glide
-160982:11358 Guava JDK5
-172358:12847 jibercsclient
-185224:10173 libphonenumber
-195416:10699 shortcutbadger
-206126:11358 Volley
-217495:18982 mime4j
-236493:11358 Google Auto
-247862:11358 Dagger
-259236:11357 Error Prone
-270604:11358 J2ObjC
-281984:11359 Apache Commons IO
-293355:11358 JSR 250
-304725:1602 JSR 305
-306339:11365 JSR 330
-317738:12847 carrierservices
-317738:12847 rcsclientlib
-330614:11358 material_components
-330614:11358 lib
-341987:11362 Guava JDK7
+10754:11358 Android Common
+22147:10695 Android Compat Support Library
+32880:10695 Android Compatibility Library v13
+43612:10695 Android Compatibility Library v4
+54344:10695 Android Compatibility Library v7
+65075:10695 Android Core UI Support Library
+75809:10691 Android Core Utils Support Library
+86535:10695 Android Design Support Library
+97276:10695 Android Dynamic Animation Support Library
+108009:10695 Android Fragments Support Library
+118741:10695 Android Graphics Support Library
+129477:10691 Android Media Compat Support Library
+140207:10691 Android Transition Support Library
+150920:11359 Apache Commons IO
+162290:11358 Dagger
+173664:11357 Error Prone
+185037:11358 Google Auto
+196410:11358 Guava JDK5
+207783:11362 Guava JDK7
+219156:11358 J2ObjC
+230526:11358 JSR 250
+241896:11365 JSR 330
+253297:11358 Material Components for Android
+264666:11358 OkHttp
+276033:11358 Okio
+287402:11358 Volley
+298780:12847 carrierservices
+311636:10402 gRPC
+322058:11358 instrumentation
+333434:12847 jibercsclient
+346300:10173 libphonenumber
+356484:18982 mime4j
+375485:10699 shortcutbadger
+386200:16013 Android SDK
+402232:1096 Animal Sniffer
+403338:4771 Glide
+408121:1602 JSR 305
diff --git a/java/com/android/dialer/about/res/raw/third_party_licenses b/java/com/android/dialer/about/res/raw/third_party_licenses
old mode 100644
new mode 100755
index c56f8a4..51f5482
--- a/java/com/android/dialer/about/res/raw/third_party_licenses
+++ b/java/com/android/dialer/about/res/raw/third_party_licenses
@@ -194,6 +194,212 @@
 
 
 
+Android Common:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
 Android Compat Support Library:
 
 
@@ -388,6 +594,588 @@
 
 
 
+Android Compatibility Library v13:
+
+
+   Copyright (c) 2005-2011, 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.
+
+   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.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+
+Android Compatibility Library v4:
+
+
+   Copyright (c) 2005-2011, 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.
+
+   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.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+
+Android Compatibility Library v7:
+
+
+   Copyright (c) 2005-2011, 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.
+
+   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.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+
 Android Core UI Support Library:
 
 
@@ -968,6 +1756,200 @@
 
 
 
+Android Dynamic Animation Support Library:
+
+
+   Copyright (c) 2005-2011, 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.
+
+   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.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+
 Android Fragments Support Library:
 
 
@@ -1740,860 +2722,7 @@
 
    END OF TERMS AND CONDITIONS
 
-Android Compatibility Library v13:
-
-
-   Copyright (c) 2005-2011, 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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
-
-Android Compatibility Library v4:
-
-
-   Copyright (c) 2005-2011, 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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
-
-Android Compatibility Library v7:
-
-
-   Copyright (c) 2005-2011, 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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
-
-Android SDK:
-
-ANDROID SOFTWARE DEVELOPMENT KIT
-
-Terms and Conditions
-
-This is the Android Software Development Kit License Agreement.
-
-1. Introduction
-
-1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and
-specifically including the Android system files, packaged APIs, and Google APIs add-ons) is
-licensed to you subject to the terms of this License Agreement. This License Agreement forms a
-legally binding contract between you and Google in relation to your use of the SDK.
-
-1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600
-Amphitheatre Parkway, Mountain View, CA 94043, United States.
-
-2. Accepting this License Agreement
-
-2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the
-SDK if you do not accept this License Agreement.
-
-2.2 You can accept this License Agreement by:
-
-(A) clicking to accept or agree to this License Agreement, where this option is made available to
-you; or
-
-(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of
-the Licensing Agreement from that point onwards.
-
-2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred
-from receiving the SDK under the laws of the United States or other countries including the country
-in which you are resident or from which you use the SDK.
-
-2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other
-entity, you represent and warrant that you have full legal authority to bind your employer or such
-entity to this License Agreement. If you do not have the requisite authority, you may not accept
-the Licensing Agreement or use the SDK on behalf of your employer or other entity.
-
-3. SDK License from Google
-
-3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide,
-royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop
-applications to run on the Android platform.
-
-3.2 You agree that Google or third parties own all legal right, title and interest in and to the
-SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property
-Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law,
-and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-
-3.3 Except to the extent required by applicable third party licenses, you may not copy (except for
-backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create
-derivative works of the SDK or any part of the SDK. Except to the extent required by applicable
-third party licenses, you may not load any part of the SDK onto a mobile handset or any other
-hardware device except a personal computer, combine any part of the SDK with other software, or
-distribute any software or device incorporating a part of the SDK.
-
-3.4 Use, reproduction and distribution of components of the SDK licensed under an open source
-software license are governed solely by the terms of that open source software license and not
-this License Agreement.
-
-3.5 You agree that the form and nature of the SDK that Google provides may change without prior
-notice to you and that future versions of the SDK may be incompatible with applications developed
-on previous versions of the SDK. You agree that Google may stop (permanently or temporarily)
-providing the SDK (or any features within the SDK) to you or to users generally at Google's sole
-discretion, without prior notice to you.
-
-3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names,
-trademarks, service marks, logos, domain names, or other distinctive brand features.
-
-3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including
-copyright and trademark notices) that may be affixed to or contained within the SDK.
-
-4. Use of the SDK by You
-
-4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under
-this License Agreement in or to any software applications that you develop using the SDK, including
-any intellectual property rights that subsist in those applications.
-
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this
-License Agreement and (b) any applicable law, regulation or generally accepted practices or
-guidelines in the relevant jurisdictions (including any laws regarding the export of data or
-software to and from the United States or other relevant countries).
-
-4.3 You agree that if you use the SDK to develop applications for general public users, you will
-protect the privacy and legal rights of those users. If the users provide you with user names,
-passwords, or other login information or personal information, your must make the users aware that
-the information will be available to your application, and you must provide legally adequate privacy
-notice and protection for those users. If your application stores personal or sensitive information
-provided by users, it must do so securely. If the user provides your application with Google Account
-information, your application may only use that information to access the user's Google Account
-when, and for the limited purposes for which, the user has given you permission to do so.
-
-4.4 You agree that you will not engage in any activity with the SDK, including the development or
-distribution of an application, that interferes with, disrupts, damages, or accesses in an
-unauthorized manner the servers, networks, or other properties or services of any third party
-including, but not limited to, Google or any mobile communications carrier.
-
-4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or
-to any third party for) any data, content, or resources that you create, transmit or display through
-the Android platform and/or applications for the Android platform, and for the consequences of your
-actions (including any loss or damage which Google may suffer) by doing so.
-
-4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or
-to any third party for) any breach of your obligations under this License Agreement, any applicable
-third party contract or Terms of Service, or any applicable law or regulation, and for the
-consequences (including any loss or damage which Google or any third party may suffer) of any such
-breach.
-
-5. Your Developer Credentials
-
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer
-credentials that may be issued to you by Google or which you may choose yourself and that you will
-be solely responsible for all applications that are developed under your developer credentials.
-
-6. Privacy and Information
-
-6.1 In order to continually innovate and improve the SDK, Google may collect certain usage
-statistics from the software including but not limited to a unique identifier, associated IP
-address, version number of the software, and information on which tools and/or services in the SDK
-are being used and how they are being used. Before any of this information is collected, the SDK
-will notify you and seek your consent. If you withhold consent, the information will not be
-collected.
-
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in
-accordance with Google's Privacy Policy.
-
-7. Third Party Applications for the Android Platform
-
-7.1 If you use the SDK to run applications developed by a third party or that access data, content
-or resources provided by a third party, you agree that Google is not responsible for those
-applications, data, content, or resources. You understand that all data, content or resources which
-you may access through such third party applications are the sole responsibility of the person from
-which they originated and that Google is not liable for any loss or damage that you may experience
-as a result of the use or access of any of those third party applications, data, content, or
-resources.
-
-7.2 You should be aware the data, content, and resources presented to you through such a third party
-application may be protected by intellectual property rights which are owned by the providers (or by
-other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute
-or create derivative works based on these data, content, or resources (either in whole or in part)
-unless you have been specifically given permission to do so by the relevant owners.
-
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may
-be subject to separate terms between you and the relevant third party. In that case, this License
-Agreement does not affect your legal relationship with these third parties.
-
-8. Using Android APIs
-
-8.1 Google Data APIs
-
-8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be
-protected by intellectual property rights which are owned by Google or those parties that provide
-the data (or by other persons or companies on their behalf). Your use of any such API may be subject
-to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create
-derivative works based on this data (either in whole or in part) unless allowed by the relevant
-Terms of Service.
-
-8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you
-shall retrieve data only with the user's explicit consent and only when, and for the limited
-purposes for which, the user has given you permission to do so.
-
-9. Terminating this License Agreement
-
-9.1 This License Agreement will continue to apply until terminated by either you or Google as set
-out below.
-
-9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK
-and any relevant developer credentials.
-
-9.3 Google may at any time, terminate this License Agreement with you if:
-
-(A) you have breached any provision of this License Agreement; or
-
-(B) Google is required to do so by law; or
-
-(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated
-its relationship with Google or ceased to offer certain parts of the SDK to you; or
-
-(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the
-country in which you are resident or from which you use the service, or the provision of the SDK or
-certain SDK services to you by Google is, in Google's sole discretion, no longer commercially
-viable.
-
-9.4 When this License Agreement comes to an end, all of the legal rights, obligations and
-liabilities that you and Google have benefited from, been subject to (or which have accrued over
-time whilst this License Agreement has been in force) or which are expressed to continue
-indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall
-continue to apply to such rights, obligations and liabilities indefinitely.
-
-10. DISCLAIMER OF WARRANTIES
-
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE
-SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
-
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE
-SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR
-COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-
-10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-11. LIMITATION OF LIABILITY
-
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS
-LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY
-LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN
-AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-
-12. Indemnification
-
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless
-Google, its affiliates and their respective directors, officers, employees and agents from and
-against any and all claims, actions, suits or proceedings, as well as any and all losses,
-liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or
-accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any
-copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any
-person or defames any person or violates their rights of publicity or privacy, and (c) any
-non-compliance by you with this License Agreement.
-
-13. Changes to the License Agreement
-
-13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK.
-When these changes are made, Google will make a new version of the License Agreement available on
-the website where the SDK is made available.
-
-14. General Legal Terms
-
-14.1 This License Agreement constitute the whole legal agreement between you and Google and govern
-your use of the SDK (excluding any services which Google may provide to you under a separate written
-agreement), and completely replace any prior agreements between you and Google in relation to the
-SDK.
-
-14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is
-contained in this License Agreement (or which Google has the benefit of under any applicable law),
-this will not be taken to be a formal waiver of Google's rights and that those rights or remedies
-will still be available to Google.
-
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision
-of this License Agreement is invalid, then that provision will be removed from this License
-Agreement without affecting the rest of this License Agreement. The remaining provisions of this
-License Agreement will continue to be valid and enforceable.
-
-14.4 You acknowledge and agree that each member of the group of companies of which Google is the
-parent shall be third party beneficiaries to this License Agreement and that such other companies
-shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that
-confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall
-be third party beneficiaries to this License Agreement.
-
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST
-COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE
-LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-
-14.6 The rights granted in this License Agreement may not be assigned or transferred by either you
-or Google without the prior written approval of the other party. Neither you nor Google shall be
-permitted to delegate their responsibilities or obligations under this License Agreement without the
-prior written approval of the other party.
-
-14.7 This License Agreement, and your relationship with Google under this License Agreement, shall
-be governed by the laws of the State of California without regard to its conflict of laws
-provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located
-within the county of Santa Clara, California to resolve any legal matter arising from this License
-Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for
-injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-
-April 10, 2009
-
-
-Android Common:
+Apache Commons IO:
 
 
                                  Apache License
@@ -2799,107 +2928,2909 @@
    limitations under the License.
 
 
-Glide:
 
-Covers library/
+Dagger:
 
-Copyright 2014 Google, Inc. All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-   1. Redistributions of source code must retain the above copyright notice, this list of
-         conditions and the following disclaimer.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-         of conditions and the following disclaimer in the documentation and/or other materials
-         provided with the distribution.
+   1. Definitions.
 
-THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-The views and conclusions contained in the software and documentation are those of the
-authors and should not be interpreted as representing official policies, either expressed
-or implied, of Google, Inc.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
---------------------------------------------------------------------------
-Covers third_party/gif_decoder
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-Copyright (c) 2013 Xcellent Creations, Inc.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
---------------------------------------------------------------------------
-Covers third_party/disklrucache
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-Copyright 2012 Jake Wharton
-Copyright 2011 The Android Open Source Project
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Error Prone:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Google Auto:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Guava JDK5:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Guava JDK7:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+   
+
+
+J2ObjC:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+JSR 250:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+JSR 330:
+
+JSR-330
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Material Components for Android:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+OkHttp:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Okio:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+Volley:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+carrierservices:
+
+These components
+  com.google.android.rcs.core,
+  com.google.android.rcs.core.utils.CaseInsensitiveMap,
+  com.google.android.rcs.core.utils.DateTime,
+  com.google.android.rcs.core.utils.InetAddresses,
+  com.google.android.rcs.core.network.ConnectivityMonitor,
+  com.google.android.rcs.client.PrivateDataStorage,
+  com.google.android.rcs.client.utils.FastXmlSerializer,
+  com.google.android.rcs.client.utils.XmlUtils,
+  com.google.android.rcs.client.utils.QueuedWork
+are licensed under Apache v2.
 
 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
+    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.
---------------------------------------------------------------------------
-Covers third_party/gif_encoder/AnimatedGifEncoder.java and 
-third_party/gif_encoder/LZWEncoder.java:
-
-No copyright asserted on the source code of this class. May be used for any
-purpose, however, refer to the Unisys LZW patent for restrictions on use of
-the associated LZWEncoder class. Please forward any corrections to
-kweiner@fmsware.com.
-
------------------------------------------------------------------------------
-Covers third_party/gif_encoder/NeuQuant.java
-
-Copyright (c) 1994 Anthony Dekker
-
-NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
-"Kohonen neural networks for optimal colour quantization" in "Network:
-Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
-the algorithm.
-
-Any party obtaining a copy of these files from the author, directly or
-indirectly, is granted, free of charge, a full and unrestricted irrevocable,
-world-wide, paid up, royalty-free, nonexclusive right and license to deal in
-this software and documentation files (the "Software"), including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons who
-receive copies from any such party to do so, with the only requirement being
-that this copyright notice remain intact.
 
 
-Guava JDK5:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+===============================================================================
+
+These components
+  com.google.android.rcs.core.utils.FastBase64,
+  com.google.android.rcs.core.utils.LibraryLoaderHelper
+are licensed under BSD.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+gRPC:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for any such Derivative Works as a whole, provided Your use,
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2015-2017 gRPC authors.
+
+   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
+
+       https://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.
+
+
+instrumentation:
 
 
                                  Apache License
@@ -3524,405 +6455,6 @@
    END OF TERMS AND CONDITIONS
 
 
-shortcutbadger:
-
-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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
-Volley:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
 mime4j:
 
                                  Apache License
@@ -4288,1493 +6820,7 @@
     
     
 
-Google Auto:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-Dagger:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-Error Prone:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-J2ObjC:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-Apache Commons IO:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-
-JSR 250:
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-JSR 305:
-
-Copyright (c) 2007-2009, JSR305 expert group
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of the JSR305 expert group nor the names of its 
-      contributors may be used to endorse or promote products derived from 
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
-
-JSR 330:
-
-JSR-330
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
-
-carrierservices, rcsclientlib:
-
-These components
-  com.google.android.rcs.core,
-  com.google.android.rcs.core.utils.CaseInsensitiveMap,
-  com.google.android.rcs.core.utils.DateTime,
-  com.google.android.rcs.core.utils.InetAddresses,
-  com.google.android.rcs.core.network.ConnectivityMonitor,
-  com.google.android.rcs.client.PrivateDataStorage,
-  com.google.android.rcs.client.utils.FastXmlSerializer,
-  com.google.android.rcs.client.utils.XmlUtils,
-  com.google.android.rcs.client.utils.QueuedWork
-are licensed under Apache v2.
+shortcutbadger:
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -5966,449 +7012,430 @@
 
    END OF TERMS AND CONDITIONS
 
-===============================================================================
 
-These components
-  com.google.android.rcs.core.utils.FastBase64,
-  com.google.android.rcs.core.utils.LibraryLoaderHelper
-are licensed under BSD.
+Android SDK:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+ANDROID SOFTWARE DEVELOPMENT KIT
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+Terms and Conditions
 
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+This is the Android Software Development Kit License Agreement.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+1. Introduction
 
+1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and
+specifically including the Android system files, packaged APIs, and Google APIs add-ons) is
+licensed to you subject to the terms of this License Agreement. This License Agreement forms a
+legally binding contract between you and Google in relation to your use of the SDK.
 
-material_components, lib:
+1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600
+Amphitheatre Parkway, Mountain View, CA 94043, United States.
 
+2. Accepting this License Agreement
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the
+SDK if you do not accept this License Agreement.
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+2.2 You can accept this License Agreement by:
 
-   1. Definitions.
+(A) clicking to accept or agree to this License Agreement, where this option is made available to
+you; or
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of
+the Licensing Agreement from that point onwards.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred
+from receiving the SDK under the laws of the United States or other countries including the country
+in which you are resident or from which you use the SDK.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other
+entity, you represent and warrant that you have full legal authority to bind your employer or such
+entity to this License Agreement. If you do not have the requisite authority, you may not accept
+the Licensing Agreement or use the SDK on behalf of your employer or other entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+3. SDK License from Google
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide,
+royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop
+applications to run on the Android platform.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the
+SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property
+Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law,
+and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+3.3 Except to the extent required by applicable third party licenses, you may not copy (except for
+backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create
+derivative works of the SDK or any part of the SDK. Except to the extent required by applicable
+third party licenses, you may not load any part of the SDK onto a mobile handset or any other
+hardware device except a personal computer, combine any part of the SDK with other software, or
+distribute any software or device incorporating a part of the SDK.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+3.4 Use, reproduction and distribution of components of the SDK licensed under an open source
+software license are governed solely by the terms of that open source software license and not
+this License Agreement.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+3.5 You agree that the form and nature of the SDK that Google provides may change without prior
+notice to you and that future versions of the SDK may be incompatible with applications developed
+on previous versions of the SDK. You agree that Google may stop (permanently or temporarily)
+providing the SDK (or any features within the SDK) to you or to users generally at Google's sole
+discretion, without prior notice to you.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names,
+trademarks, service marks, logos, domain names, or other distinctive brand features.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including
+copyright and trademark notices) that may be affixed to or contained within the SDK.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+4. Use of the SDK by You
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under
+this License Agreement in or to any software applications that you develop using the SDK, including
+any intellectual property rights that subsist in those applications.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this
+License Agreement and (b) any applicable law, regulation or generally accepted practices or
+guidelines in the relevant jurisdictions (including any laws regarding the export of data or
+software to and from the United States or other relevant countries).
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+4.3 You agree that if you use the SDK to develop applications for general public users, you will
+protect the privacy and legal rights of those users. If the users provide you with user names,
+passwords, or other login information or personal information, your must make the users aware that
+the information will be available to your application, and you must provide legally adequate privacy
+notice and protection for those users. If your application stores personal or sensitive information
+provided by users, it must do so securely. If the user provides your application with Google Account
+information, your application may only use that information to access the user's Google Account
+when, and for the limited purposes for which, the user has given you permission to do so.
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+4.4 You agree that you will not engage in any activity with the SDK, including the development or
+distribution of an application, that interferes with, disrupts, damages, or accesses in an
+unauthorized manner the servers, networks, or other properties or services of any third party
+including, but not limited to, Google or any mobile communications carrier.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or
+to any third party for) any data, content, or resources that you create, transmit or display through
+the Android platform and/or applications for the Android platform, and for the consequences of your
+actions (including any loss or damage which Google may suffer) by doing so.
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or
+to any third party for) any breach of your obligations under this License Agreement, any applicable
+third party contract or Terms of Service, or any applicable law or regulation, and for the
+consequences (including any loss or damage which Google or any third party may suffer) of any such
+breach.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+5. Your Developer Credentials
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer
+credentials that may be issued to you by Google or which you may choose yourself and that you will
+be solely responsible for all applications that are developed under your developer credentials.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage
+statistics from the software including but not limited to a unique identifier, associated IP
+address, version number of the software, and information on which tools and/or services in the SDK
+are being used and how they are being used. Before any of this information is collected, the SDK
+will notify you and seek your consent. If you withhold consent, the information will not be
+collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in
+accordance with Google's Privacy Policy.
+
+7. Third Party Applications for the Android Platform
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content
+or resources provided by a third party, you agree that Google is not responsible for those
+applications, data, content, or resources. You understand that all data, content or resources which
+you may access through such third party applications are the sole responsibility of the person from
+which they originated and that Google is not liable for any loss or damage that you may experience
+as a result of the use or access of any of those third party applications, data, content, or
+resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party
+application may be protected by intellectual property rights which are owned by the providers (or by
+other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute
+or create derivative works based on these data, content, or resources (either in whole or in part)
+unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may
+be subject to separate terms between you and the relevant third party. In that case, this License
+Agreement does not affect your legal relationship with these third parties.
+
+8. Using Android APIs
+
+8.1 Google Data APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be
+protected by intellectual property rights which are owned by Google or those parties that provide
+the data (or by other persons or companies on their behalf). Your use of any such API may be subject
+to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create
+derivative works based on this data (either in whole or in part) unless allowed by the relevant
+Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you
+shall retrieve data only with the user's explicit consent and only when, and for the limited
+purposes for which, the user has given you permission to do so.
+
+9. Terminating this License Agreement
+
+9.1 This License Agreement will continue to apply until terminated by either you or Google as set
+out below.
+
+9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK
+and any relevant developer credentials.
+
+9.3 Google may at any time, terminate this License Agreement with you if:
+
+(A) you have breached any provision of this License Agreement; or
+
+(B) Google is required to do so by law; or
+
+(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated
+its relationship with Google or ceased to offer certain parts of the SDK to you; or
+
+(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the
+country in which you are resident or from which you use the service, or the provision of the SDK or
+certain SDK services to you by Google is, in Google's sole discretion, no longer commercially
+viable.
+
+9.4 When this License Agreement comes to an end, all of the legal rights, obligations and
+liabilities that you and Google have benefited from, been subject to (or which have accrued over
+time whilst this License Agreement has been in force) or which are expressed to continue
+indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall
+continue to apply to such rights, obligations and liabilities indefinitely.
+
+10. DISCLAIMER OF WARRANTIES
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE
+SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE
+SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR
+COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS
+LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY
+LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN
+AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless
+Google, its affiliates and their respective directors, officers, employees and agents from and
+against any and all claims, actions, suits or proceedings, as well as any and all losses,
+liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or
+accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any
+copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any
+person or defames any person or violates their rights of publicity or privacy, and (c) any
+non-compliance by you with this License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK.
+When these changes are made, Google will make a new version of the License Agreement available on
+the website where the SDK is made available.
+
+14. General Legal Terms
+
+14.1 This License Agreement constitute the whole legal agreement between you and Google and govern
+your use of the SDK (excluding any services which Google may provide to you under a separate written
+agreement), and completely replace any prior agreements between you and Google in relation to the
+SDK.
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is
+contained in this License Agreement (or which Google has the benefit of under any applicable law),
+this will not be taken to be a formal waiver of Google's rights and that those rights or remedies
+will still be available to Google.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision
+of this License Agreement is invalid, then that provision will be removed from this License
+Agreement without affecting the rest of this License Agreement. The remaining provisions of this
+License Agreement will continue to be valid and enforceable.
 
-   END OF TERMS AND CONDITIONS
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the
+parent shall be third party beneficiaries to this License Agreement and that such other companies
+shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that
+confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall
+be third party beneficiaries to this License Agreement.
 
-   APPENDIX: How to apply the Apache License to your work.
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST
+COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE
+LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+14.6 The rights granted in this License Agreement may not be assigned or transferred by either you
+or Google without the prior written approval of the other party. Neither you nor Google shall be
+permitted to delegate their responsibilities or obligations under this License Agreement without the
+prior written approval of the other party.
 
-   Copyright [yyyy] [name of copyright owner]
+14.7 This License Agreement, and your relationship with Google under this License Agreement, shall
+be governed by the laws of the State of California without regard to its conflict of laws
+provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located
+within the county of Santa Clara, California to resolve any legal matter arising from this License
+Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for
+injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
-   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
+April 10, 2009
 
-       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.
+Animal Sniffer:
 
+The MIT License
 
-Guava JDK7:
+Copyright (c) 2008 Kohsuke Kawaguchi and codehaus.org.
 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
-   1. Definitions.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+Glide:
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+Covers library/
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+Copyright 2014 Google, Inc. All rights reserved.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+   1. Redistributions of source code must retain the above copyright notice, this list of
+         conditions and the following disclaimer.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+         of conditions and the following disclaimer in the documentation and/or other materials
+         provided with the distribution.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of Google, Inc.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+--------------------------------------------------------------------------
+Covers third_party/gif_decoder
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+Copyright (c) 2013 Xcellent Creations, Inc.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+--------------------------------------------------------------------------
+Covers third_party/disklrucache
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+Copyright 2012 Jake Wharton
+Copyright 2011 The Android Open Source Project
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+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
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+   http://www.apache.org/licenses/LICENSE-2.0
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+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.
+--------------------------------------------------------------------------
+Covers third_party/gif_encoder/AnimatedGifEncoder.java and 
+third_party/gif_encoder/LZWEncoder.java:
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+No copyright asserted on the source code of this class. May be used for any
+purpose, however, refer to the Unisys LZW patent for restrictions on use of
+the associated LZWEncoder class. Please forward any corrections to
+kweiner@fmsware.com.
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+-----------------------------------------------------------------------------
+Covers third_party/gif_encoder/NeuQuant.java
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+Copyright (c) 1994 Anthony Dekker
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
+"Kohonen neural networks for optimal colour quantization" in "Network:
+Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
+the algorithm.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+Any party obtaining a copy of these files from the author, directly or
+indirectly, is granted, free of charge, a full and unrestricted irrevocable,
+world-wide, paid up, royalty-free, nonexclusive right and license to deal in
+this software and documentation files (the "Software"), including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons who
+receive copies from any such party to do so, with the only requirement being
+that this copyright notice remain intact.
 
-   END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
+JSR 305:
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+Copyright (c) 2007-2009, JSR305 expert group
+All rights reserved.
 
-   Copyright [yyyy] [name of copyright owner]
+http://www.opensource.org/licenses/bsd-license.php
 
-   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
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
 
-       http://www.apache.org/licenses/LICENSE-2.0
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * Neither the name of the JSR305 expert group nor the names of its 
+      contributors may be used to endorse or promote products derived from 
+      this software without specific prior written permission.
 
-   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.
-   
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml
index de4b48c..4200082 100644
--- a/java/com/android/dialer/app/AndroidManifest.xml
+++ b/java/com/android/dialer/app/AndroidManifest.xml
@@ -39,6 +39,7 @@
   <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
   <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
   <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>
diff --git a/java/com/android/dialer/app/Bindings.java b/java/com/android/dialer/app/Bindings.java
index 2beb401..c8cf27e 100644
--- a/java/com/android/dialer/app/Bindings.java
+++ b/java/com/android/dialer/app/Bindings.java
@@ -17,9 +17,6 @@
 package com.android.dialer.app;
 
 import android.content.Context;
-import com.android.dialer.app.bindings.DialerBindings;
-import com.android.dialer.app.bindings.DialerBindingsFactory;
-import com.android.dialer.app.bindings.DialerBindingsStub;
 import com.android.dialer.app.legacybindings.DialerLegacyBindings;
 import com.android.dialer.app.legacybindings.DialerLegacyBindingsFactory;
 import com.android.dialer.app.legacybindings.DialerLegacyBindingsStub;
@@ -28,28 +25,10 @@
 /** Accessor for the in call UI bindings. */
 public class Bindings {
 
-  private static DialerBindings instance;
   private static DialerLegacyBindings legacyInstance;
 
   private Bindings() {}
 
-  public static DialerBindings get(Context context) {
-    Objects.requireNonNull(context);
-    if (instance != null) {
-      return instance;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof DialerBindingsFactory) {
-      instance = ((DialerBindingsFactory) application).newDialerBindings();
-    }
-
-    if (instance == null) {
-      instance = new DialerBindingsStub();
-    }
-    return instance;
-  }
-
   public static DialerLegacyBindings getLegacy(Context context) {
     Objects.requireNonNull(context);
     if (legacyInstance != null) {
@@ -67,11 +46,4 @@
     return legacyInstance;
   }
 
-  public static void setForTesting(DialerBindings testInstance) {
-    instance = testInstance;
-  }
-
-  public static void setLegacyBindingForTesting(DialerLegacyBindings testLegacyInstance) {
-    legacyInstance = testLegacyInstance;
-  }
 }
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 6e2c6be..01bdfc2 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -43,6 +43,7 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -71,10 +72,13 @@
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.animation.AnimationListenerAdapter;
 import com.android.dialer.app.calllog.CallLogActivity;
+import com.android.dialer.app.calllog.CallLogAdapter;
+import com.android.dialer.app.calllog.CallLogAsync;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.CallLogNotificationsService;
-import com.android.dialer.app.dialpad.DialpadFragment;
+import com.android.dialer.app.calllog.IntentProvider;
 import com.android.dialer.app.list.DialtactsPagerAdapter;
+import com.android.dialer.app.list.DialtactsPagerAdapter.TabIndex;
 import com.android.dialer.app.list.DragDropController;
 import com.android.dialer.app.list.ListsFragment;
 import com.android.dialer.app.list.OldSpeedDialFragment;
@@ -88,31 +92,43 @@
 import com.android.dialer.app.widget.ActionBarController;
 import com.android.dialer.app.widget.SearchEditTextLayout;
 import com.android.dialer.callcomposer.CallComposerActivity;
+import com.android.dialer.calldetails.CallDetailsActivity;
+import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.database.Database;
 import com.android.dialer.database.DialerDatabaseHelper;
+import com.android.dialer.dialpadview.DialpadFragment;
+import com.android.dialer.dialpadview.DialpadFragment.DialpadListener;
+import com.android.dialer.dialpadview.DialpadFragment.LastOutgoingCallCallback;
 import com.android.dialer.interactions.PhoneNumberInteraction;
 import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.main.Main;
+import com.android.dialer.main.MainComponent;
 import com.android.dialer.p13n.inference.P13nRanking;
 import com.android.dialer.p13n.inference.protocol.P13nRanker;
 import com.android.dialer.p13n.inference.protocol.P13nRanker.P13nRefreshCompleteListener;
 import com.android.dialer.p13n.logging.P13nLogger;
 import com.android.dialer.p13n.logging.P13nLogging;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.proguard.UsedByReflection;
+import com.android.dialer.searchfragment.list.NewSearchFragment;
 import com.android.dialer.simulator.Simulator;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.dialer.smartdial.SmartDialNameMatcher;
 import com.android.dialer.smartdial.SmartDialPrefix;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.DialerUtils;
-import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.TouchPointManager;
 import com.android.dialer.util.TransactionSafeActivity;
@@ -130,6 +146,7 @@
         DialpadFragment.OnDialpadQueryChangedListener,
         OnListFragmentScrolledListener,
         CallLogFragment.HostInterface,
+        CallLogAdapter.OnActionModeStateChangedListener,
         DialpadFragment.HostInterface,
         OldSpeedDialFragment.HostInterface,
         SearchFragment.HostInterface,
@@ -140,13 +157,15 @@
         ActionBarController.ActivityUi,
         PhoneNumberInteraction.InteractionErrorListener,
         PhoneNumberInteraction.DisambigDialogDismissedListener,
-        ActivityCompat.OnRequestPermissionsResultCallback {
+        ActivityCompat.OnRequestPermissionsResultCallback,
+        DialpadListener {
 
   public static final boolean DEBUG = false;
   @VisibleForTesting public static final String TAG_DIALPAD_FRAGMENT = "dialpad";
   private static final String ACTION_SHOW_TAB = "ACTION_SHOW_TAB";
   @VisibleForTesting public static final String EXTRA_SHOW_TAB = "EXTRA_SHOW_TAB";
   public static final String EXTRA_CLEAR_NEW_VOICEMAILS = "EXTRA_CLEAR_NEW_VOICEMAILS";
+  private static final String KEY_LAST_TAB = "last_tab";
   private static final String TAG = "DialtactsActivity";
   private static final String KEY_IN_REGULAR_SEARCH_UI = "in_regular_search_ui";
   private static final String KEY_IN_DIALPAD_SEARCH_UI = "in_dialpad_search_ui";
@@ -154,15 +173,13 @@
   private static final String KEY_FIRST_LAUNCH = "first_launch";
   private static final String KEY_WAS_CONFIGURATION_CHANGE = "was_configuration_change";
   private static final String KEY_IS_DIALPAD_SHOWN = "is_dialpad_shown";
+  private static final String TAG_NEW_SEARCH_FRAGMENT = "new_search";
   private static final String TAG_REGULAR_SEARCH_FRAGMENT = "search";
   private static final String TAG_SMARTDIAL_SEARCH_FRAGMENT = "smartdial";
   private static final String TAG_FAVORITES_FRAGMENT = "favorites";
   /** Just for backward compatibility. Should behave as same as {@link Intent#ACTION_DIAL}. */
   private static final String ACTION_TOUCH_DIALER = "com.android.phone.action.TOUCH_DIALER";
 
-  private static final int ACTIVITY_REQUEST_CODE_VOICE_SEARCH = 1;
-  public static final int ACTIVITY_REQUEST_CODE_CALL_COMPOSE = 2;
-
   private static final int FAB_SCALE_IN_DELAY_MS = 300;
 
   /**
@@ -180,6 +197,9 @@
   /** Fragment for searching phone numbers using the dialpad. */
   private SmartDialSearchFragment mSmartDialSearchFragment;
 
+  /** new Fragment for search phone numbers using the keyboard and the dialpad. */
+  private NewSearchFragment mNewSearchFragment;
+
   /** Animation that slides in. */
   private Animation mSlideIn;
 
@@ -225,6 +245,9 @@
 
   private P13nLogger mP13nLogger;
   private P13nRanker mP13nRanker;
+  public boolean isMultiSelectModeEnabled;
+
+  private boolean isLastTabEnabled;
 
   AnimationListenerAdapter mSlideInListener =
       new AnimationListenerAdapter() {
@@ -256,12 +279,18 @@
             // no need to do anything here.
             return;
           }
+
+          if (count != 0) {
+            PerformanceReport.recordClick(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+          }
+
           if (DEBUG) {
             LogUtil.v("DialtactsActivity.onTextChanged", "called with new query: " + newText);
             LogUtil.v("DialtactsActivity.onTextChanged", "previous query: " + mSearchQuery);
           }
           mSearchQuery = newText;
 
+          // TODO(calderwoodra): show p13n when newText is empty.
           // Show search fragment only when the query string is changed to non-empty text.
           if (!TextUtils.isEmpty(newText)) {
             // Call enterSearchUi only if we are switching search modes, or showing a search
@@ -277,6 +306,11 @@
             mSmartDialSearchFragment.setQueryString(mSearchQuery);
           } else if (mRegularSearchFragment != null && mRegularSearchFragment.isVisible()) {
             mRegularSearchFragment.setQueryString(mSearchQuery);
+          } else if (mNewSearchFragment != null && mNewSearchFragment.isVisible()) {
+            mNewSearchFragment.setQuery(mSearchQuery);
+            // When the user switches between dialpad and the serachbar, we need to reset the
+            // call initiation type.
+            mNewSearchFragment.setCallInitiationType(getCallInitiationType());
           }
         }
 
@@ -289,6 +323,7 @@
         @Override
         public void onClick(View v) {
           if (!isInSearchUi()) {
+            PerformanceReport.recordClick(UiAction.Type.OPEN_SEARCH);
             mActionBarController.onSearchBoxTapped();
             enterSearchUi(
                 false /* smartDialSearch */, mSearchView.getText().toString(), true /* animate */);
@@ -306,15 +341,20 @@
           if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
             if (TextUtils.isEmpty(mSearchView.getText().toString())) {
               // If the search term is empty, close the search UI.
+              PerformanceReport.recordClick(UiAction.Type.CLOSE_SEARCH_WITH_HIDE_BUTTON);
               maybeExitSearchUi();
             } else {
               // If the search term is not empty, show the dialpad fab.
+              if (!mFloatingActionButtonController.isVisible()) {
+                PerformanceReport.recordClick(UiAction.Type.HIDE_KEYBOARD_IN_SEARCH);
+              }
               showFabInSearchUi();
             }
           }
           return false;
         }
       };
+
   /**
    * The text returned from a voice search query. Set in {@link #onActivityResult} and used in
    * {@link #onResume()} to populate the search box.
@@ -355,6 +395,7 @@
     super.onCreate(savedInstanceState);
 
     mFirstLaunch = true;
+    isLastTabEnabled = ConfigProviderBindings.get(this).getBoolean("last_tab_enabled", false);
 
     final Resources resources = getResources();
     mActionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height_large);
@@ -371,12 +412,12 @@
     actionBar.setBackgroundDrawable(null);
 
     SearchEditTextLayout searchEditTextLayout =
-        (SearchEditTextLayout) actionBar.getCustomView().findViewById(R.id.search_view_container);
+        actionBar.getCustomView().findViewById(R.id.search_view_container);
     searchEditTextLayout.setPreImeKeyListener(mSearchEditTextLayoutListener);
 
     mActionBarController = new ActionBarController(this, searchEditTextLayout);
 
-    mSearchView = (EditText) searchEditTextLayout.findViewById(R.id.search_view);
+    mSearchView = searchEditTextLayout.findViewById(R.id.search_view);
     mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener);
     mVoiceSearchButton = searchEditTextLayout.findViewById(R.id.voice_search_button);
     searchEditTextLayout
@@ -399,14 +440,13 @@
     mIsLandscape =
         getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
     mPreviouslySelectedTabIndex = DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL;
-    FloatingActionButton floatingActionButton =
-        (FloatingActionButton) findViewById(R.id.floating_action_button);
+    FloatingActionButton floatingActionButton = findViewById(R.id.floating_action_button);
     floatingActionButton.setOnClickListener(this);
     mFloatingActionButtonController =
         new FloatingActionButtonController(this, floatingActionButton);
 
     ImageButton optionsMenuButton =
-        (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
+        searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
     optionsMenuButton.setOnClickListener(this);
     mOverflowMenu = buildOptionsMenu(optionsMenuButton);
     optionsMenuButton.setOnTouchListener(mOverflowMenu.getDragToOpenListener());
@@ -480,6 +520,13 @@
     Trace.beginSection(TAG + " onResume");
     super.onResume();
 
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
     mStateSaved = false;
     if (mFirstLaunch) {
       displayFragment(getIntent());
@@ -542,7 +589,8 @@
       }
 
       if (getIntent().getBooleanExtra(EXTRA_CLEAR_NEW_VOICEMAILS, false)) {
-        CallLogNotificationsService.markNewVoicemailsAsOld(this, null);
+        LogUtil.i("DialtactsActivity.onResume", "clearing all new voicemails");
+        CallLogNotificationsService.markAllNewVoicemailsAsOld(this);
       }
     }
 
@@ -556,7 +604,7 @@
         new P13nRefreshCompleteListener() {
           @Override
           public void onP13nRefreshComplete() {
-            // TODO: make zero-query search results visible
+            // TODO(strongarm): make zero-query search results visible
           }
         });
     Trace.endSection();
@@ -593,6 +641,10 @@
         && !getSystemService(KeyguardManager.class).isKeyguardLocked()) {
       mListsFragment.markMissedCallsAsReadAndRemoveNotifications();
     }
+    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this)
+        .edit()
+        .putInt(KEY_LAST_TAB, mListsFragment.getCurrentTabIndex())
+        .apply();
   }
 
   @Override
@@ -630,6 +682,9 @@
     } else if (fragment instanceof ListsFragment) {
       mListsFragment = (ListsFragment) fragment;
       mListsFragment.addOnPageChangeListener(this);
+    } else if (fragment instanceof NewSearchFragment) {
+      mNewSearchFragment = (NewSearchFragment) fragment;
+      updateSearchFragmentPosition();
     }
     if (fragment instanceof SearchFragment) {
       final SearchFragment searchFragment = (SearchFragment) fragment;
@@ -664,13 +719,8 @@
   public void onClick(View view) {
     int resId = view.getId();
     if (resId == R.id.floating_action_button) {
-      if (mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS
-          && !mInRegularSearch
-          && !mInDialpadSearch) {
-        DialerUtils.startActivityWithErrorToast(
-            this, IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
-        Logger.get(this).logImpression(DialerImpression.Type.NEW_CONTACT_FAB);
-      } else if (!mIsDialpadShown) {
+      if (!mIsDialpadShown) {
+        PerformanceReport.recordClick(UiAction.Type.OPEN_DIALPAD);
         mInCallDialpadUp = false;
         showDialpadFragment(true);
         PostCall.closePrompt();
@@ -679,7 +729,7 @@
       try {
         startActivityForResult(
             new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH),
-            ACTIVITY_REQUEST_CODE_VOICE_SEARCH);
+            ActivityRequestCodes.DIALTACTS_VOICE_SEARCH);
       } catch (ActivityNotFoundException e) {
         Toast.makeText(
                 DialtactsActivity.this, R.string.voice_search_not_available, Toast.LENGTH_SHORT)
@@ -700,6 +750,7 @@
 
     int resId = item.getItemId();
     if (resId == R.id.menu_history) {
+      PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_HISTORY);
       final Intent intent = new Intent(this, CallLogActivity.class);
       startActivity(intent);
     } else if (resId == R.id.menu_clear_frequents) {
@@ -710,6 +761,9 @@
       handleMenuSettings();
       Logger.get(this).logScreenView(ScreenEvent.Type.SETTINGS, this);
       return true;
+    } else if (resId == R.id.menu_new_ui_launcher_shortcut) {
+      MainComponent.get(this).getMain().createNewUiLauncherShortcut(this);
+      return true;
     }
     return false;
   }
@@ -721,7 +775,7 @@
         "requestCode:%d, resultCode:%d",
         requestCode,
         resultCode);
-    if (requestCode == ACTIVITY_REQUEST_CODE_VOICE_SEARCH) {
+    if (requestCode == ActivityRequestCodes.DIALTACTS_VOICE_SEARCH) {
       if (resultCode == RESULT_OK) {
         final ArrayList<String> matches =
             data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS);
@@ -733,7 +787,7 @@
       } else {
         LogUtil.e("DialtactsActivity.onActivityResult", "voice search failed");
       }
-    } else if (requestCode == ACTIVITY_REQUEST_CODE_CALL_COMPOSE) {
+    } else if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_COMPOSER) {
       if (resultCode == RESULT_FIRST_USER) {
         LogUtil.i(
             "DialtactsActivity.onActivityResult", "returned from call composer, error occurred");
@@ -745,6 +799,19 @@
       } else {
         LogUtil.i("DialtactsActivity.onActivityResult", "returned from call composer, no error");
       }
+    } else if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {
+      if (resultCode == RESULT_OK
+          && data != null
+          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
+        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);
+        int snackbarDurationMillis = 5_000;
+        Snackbar.make(mParentLayout, getString(R.string.ec_data_deleted), snackbarDurationMillis)
+            .setAction(
+                R.string.view_conversation,
+                v -> startActivity(IntentProvider.getSendSmsIntentProvider(number).getIntent(this)))
+            .setActionTextColor(getResources().getColor(R.color.dialer_snackbar_action_text_color))
+            .show();
+      }
     }
     super.onActivityResult(requestCode, resultCode, data);
   }
@@ -785,6 +852,7 @@
 
     if (animate) {
       mFloatingActionButtonController.scaleOut();
+      maybeEnterSearchUi();
     } else {
       mFloatingActionButtonController.setVisible(false);
       maybeEnterSearchUi();
@@ -793,11 +861,19 @@
 
     Assert.isNotNull(mListsFragment.getView()).animate().alpha(0).withLayer();
 
-    //adjust the title, so the user will know where we're at when the activity start/resumes.
+    // adjust the title, so the user will know where we're at when the activity start/resumes.
     setTitle(R.string.launcherDialpadActivityLabel);
   }
 
+  @Override
+  public void getLastOutgoingCall(LastOutgoingCallCallback callback) {
+    new CallLogAsync()
+        .getLastOutgoingCall(
+            new CallLogAsync.GetLastOutgoingCallArgs(this, callback::lastOutgoingCall));
+  }
+
   /** Callback from child DialpadFragment when the dialpad is shown. */
+  @Override
   public void onDialpadShown() {
     LogUtil.d("DialtactsActivity.onDialpadShown", "");
     Assert.isNotNull(mDialpadFragment);
@@ -816,6 +892,7 @@
    *
    * @see #commitDialpadFragmentHide
    */
+  @Override
   public void hideDialpadFragment(boolean animate, boolean clearDialpad) {
     if (mDialpadFragment == null || mDialpadFragment.getView() == null) {
       return;
@@ -855,7 +932,7 @@
         exitSearchUi();
       }
     }
-    //reset the title to normal.
+    // reset the title to normal.
     setTitle(R.string.launcherActivityLabel);
   }
 
@@ -890,6 +967,13 @@
       // available immediately which is required to update position. By forcing an animation,
       // position will be updated after a delay by when the dialpad height would be available.
       fragment.updatePosition(true /* animate */);
+    } else if (mNewSearchFragment != null) {
+      int animationDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration);
+      int actionbarHeight = getResources().getDimensionPixelSize(R.dimen.action_bar_height_large);
+      int shadowHeight = getResources().getDrawable(R.drawable.search_shadow).getIntrinsicHeight();
+      int start = isDialpadShown() ? actionbarHeight - shadowHeight : 0;
+      int end = isDialpadShown() ? 0 : actionbarHeight - shadowHeight;
+      mNewSearchFragment.animatePosition(start, end, animationDuration);
     }
   }
 
@@ -1007,6 +1091,19 @@
       if (showDialpadChooser && !mDialpadFragment.isVisible()) {
         mInCallDialpadUp = true;
       }
+    } else if (isLastTabEnabled) {
+      @TabIndex
+      int tabIndex =
+          DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this)
+              .getInt(KEY_LAST_TAB, DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL);
+      // If voicemail tab is saved and its availability changes, we still move to the voicemail tab
+      // but it is quickly removed and shown the contacts tab.
+      if (mListsFragment != null) {
+        mListsFragment.showTab(tabIndex);
+        PerformanceReport.setStartingTabIndex(tabIndex);
+      } else {
+        PerformanceReport.setStartingTabIndex(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL);
+      }
     }
   }
 
@@ -1057,7 +1154,11 @@
     }
 
     final String tag;
-    if (smartDialSearch) {
+    boolean useNewSearch =
+        ConfigProviderBindings.get(this).getBoolean("enable_new_search_fragment", false);
+    if (useNewSearch) {
+      tag = TAG_NEW_SEARCH_FRAGMENT;
+    } else if (smartDialSearch) {
       tag = TAG_SMARTDIAL_SEARCH_FRAGMENT;
     } else {
       tag = TAG_REGULAR_SEARCH_FRAGMENT;
@@ -1067,40 +1168,53 @@
 
     mFloatingActionButtonController.scaleOut();
 
-    SearchFragment fragment = (SearchFragment) getFragmentManager().findFragmentByTag(tag);
     if (animate) {
       transaction.setCustomAnimations(android.R.animator.fade_in, 0);
     } else {
       transaction.setTransition(FragmentTransaction.TRANSIT_NONE);
     }
+
+    Fragment fragment = getFragmentManager().findFragmentByTag(tag);
     if (fragment == null) {
-      if (smartDialSearch) {
+      if (useNewSearch) {
+        fragment = new NewSearchFragment();
+      } else if (smartDialSearch) {
         fragment = new SmartDialSearchFragment();
       } else {
         fragment = Bindings.getLegacy(this).newRegularSearchFragment();
-        fragment.setOnTouchListener(
-            new View.OnTouchListener() {
-              @Override
-              public boolean onTouch(View v, MotionEvent event) {
-                // Show the FAB when the user touches the lists fragment and the soft
-                // keyboard is hidden.
-                hideDialpadFragment(true, false);
-                showFabInSearchUi();
-                v.performClick();
-                return false;
-              }
-            });
+        ((SearchFragment) fragment)
+            .setOnTouchListener(
+                (v, event) -> {
+                  // Show the FAB when the user touches the lists fragment and the soft
+                  // keyboard is hidden.
+                  hideDialpadFragment(true, false);
+                  v.performClick();
+                  return false;
+                });
       }
       transaction.add(R.id.dialtacts_frame, fragment, tag);
     } else {
+      // TODO(calderwoodra): if this is a transition from dialpad to searchbar, animate fragment
+      // down, and vice versa. Perhaps just add a coordinator behavior with the search bar.
       transaction.show(fragment);
     }
+
     // DialtactsActivity will provide the options menu
     fragment.setHasOptionsMenu(false);
+
     // Will show empty list if P13nRanker is not enabled. Else, re-ranked list by the ranker.
-    fragment.setShowEmptyListForNullQuery(mP13nRanker.shouldShowEmptyListForNullQuery());
-    if (!smartDialSearch) {
-      fragment.setQueryString(query);
+    if (!useNewSearch) {
+      ((SearchFragment) fragment)
+          .setShowEmptyListForNullQuery(mP13nRanker.shouldShowEmptyListForNullQuery());
+    } else {
+      // TODO(calderwoodra): add p13n ranker to new search.
+    }
+
+    if (!smartDialSearch && !useNewSearch) {
+      ((SearchFragment) fragment).setQueryString(query);
+    } else if (useNewSearch) {
+      ((NewSearchFragment) fragment).setQuery(query);
+      ((NewSearchFragment) fragment).setCallInitiationType(getCallInitiationType());
     }
     transaction.commit();
 
@@ -1146,6 +1260,9 @@
     if (mRegularSearchFragment != null) {
       transaction.remove(mRegularSearchFragment);
     }
+    if (mNewSearchFragment != null) {
+      transaction.remove(mNewSearchFragment);
+    }
     transaction.commit();
 
     Assert.isNotNull(mListsFragment.getView()).animate().alpha(1).withLayer();
@@ -1163,6 +1280,8 @@
 
   @Override
   public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+
     if (mStateSaved) {
       return;
     }
@@ -1247,6 +1366,7 @@
     if (mInDialpadSearch
         && mSmartDialSearchFragment != null
         && !mSmartDialSearchFragment.isShowingPermissionRequest()) {
+      PerformanceReport.recordClick(UiAction.Type.CLOSE_DIALPAD);
       hideDialpadFragment(true /* animate */, true /* clearDialpad */);
       return true;
     }
@@ -1255,6 +1375,7 @@
 
   @Override
   public void onListFragmentScrollStateChange(int scrollState) {
+    PerformanceReport.recordScrollStateChange(scrollState);
     if (scrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
       hideDialpadFragment(true, false);
       DialerUtils.hideInputMethod(mParentLayout);
@@ -1349,6 +1470,12 @@
     Intent intent =
         new CallIntentBuilder(phoneNumber, callSpecificAppData).setIsVideoCall(isVideoCall).build();
 
+    if (callSpecificAppData.getAllowAssistedDialing()) {
+      Bundle extras = new Bundle();
+      extras.putBoolean(TelephonyManagerCompat.ALLOW_ASSISTED_DIAL, true);
+      intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, extras);
+    }
+
     DialerUtils.startActivityWithErrorToast(this, intent);
     mClearSearchOnPause = true;
   }
@@ -1381,18 +1508,6 @@
     int tabIndex = mListsFragment.getCurrentTabIndex();
     mPreviouslySelectedTabIndex = tabIndex;
     mFloatingActionButtonController.setVisible(true);
-    if (tabIndex == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS
-        && !mInRegularSearch
-        && !mInDialpadSearch) {
-      mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_person_add_white_24, null),
-          getResources().getString(R.string.search_shortcut_create_new_contact));
-    } else {
-      mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
-          getResources().getString(R.string.action_menu_dialpad_button));
-    }
-
     timeTabSelected = SystemClock.elapsedRealtime();
   }
 
@@ -1477,6 +1592,23 @@
             Arrays.toString(grantResults)));
   }
 
+  @Override
+  public void onActionModeStateChanged(boolean isEnabled) {
+    isMultiSelectModeEnabled = isEnabled;
+  }
+
+  @Override
+  public boolean isActionModeStateEnabled() {
+    return isMultiSelectModeEnabled;
+  }
+
+  private CallInitiationType.Type getCallInitiationType() {
+    return mIsDialpadShown
+        ? CallInitiationType.Type.DIALPAD
+        : CallInitiationType.Type.REGULAR_SEARCH;
+  }
+
+  /** Popup menu accessible from the search bar */
   protected class OptionsPopupMenu extends PopupMenu {
 
     public OptionsPopupMenu(Context context, View anchor) {
@@ -1505,6 +1637,10 @@
         simulatorMenuItem.setVisible(false);
       }
 
+      Main dialtacts = MainComponent.get(context).getMain();
+      menu.findItem(R.id.menu_new_ui_launcher_shortcut)
+          .setVisible(dialtacts.isNewUiEnabled(context));
+
       super.show();
     }
   }
diff --git a/java/com/android/dialer/app/SpecialCharSequenceMgr.java b/java/com/android/dialer/app/SpecialCharSequenceMgr.java
deleted file mode 100644
index 85c2ea6..0000000
--- a/java/com/android/dialer/app/SpecialCharSequenceMgr.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright (C) 2006 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.app;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.DialogFragment;
-import android.app.KeyguardManager;
-import android.app.ProgressDialog;
-import android.content.ActivityNotFoundException;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.Toast;
-import com.android.common.io.MoreCloseables;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
-import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.oem.MotorolaUtils;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Helper class to listen for some magic character sequences that are handled specially by the
- * dialer.
- *
- * <p>Note the Phone app also handles these sequences too (in a couple of relatively obscure places
- * in the UI), so there's a separate version of this class under apps/Phone.
- *
- * <p>TODO: there's lots of duplicated code between this class and the corresponding class under
- * apps/Phone. Let's figure out a way to unify these two classes (in the framework? in a common
- * shared library?)
- */
-public class SpecialCharSequenceMgr {
-
-  private static final String TAG = "SpecialCharSequenceMgr";
-
-  private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment";
-
-  private static final String MMI_IMEI_DISPLAY = "*#06#";
-  private static final String MMI_REGULATORY_INFO_DISPLAY = "*#07#";
-  /** ***** This code is used to handle SIM Contact queries ***** */
-  private static final String ADN_PHONE_NUMBER_COLUMN_NAME = "number";
-
-  private static final String ADN_NAME_COLUMN_NAME = "name";
-  private static final int ADN_QUERY_TOKEN = -1;
-  /**
-   * Remembers the previous {@link QueryHandler} and cancel the operation when needed, to prevent
-   * possible crash.
-   *
-   * <p>QueryHandler may call {@link ProgressDialog#dismiss()} when the screen is already gone,
-   * which will cause the app crash. This variable enables the class to prevent the crash on {@link
-   * #cleanup()}.
-   *
-   * <p>TODO: Remove this and replace it (and {@link #cleanup()}) with better implementation. One
-   * complication is that we have SpecialCharSequenceMgr in Phone package too, which has *slightly*
-   * different implementation. Note that Phone package doesn't have this problem, so the class on
-   * Phone side doesn't have this functionality. Fundamental fix would be to have one shared
-   * implementation and resolve this corner case more gracefully.
-   */
-  private static QueryHandler sPreviousAdnQueryHandler;
-
-  /** This class is never instantiated. */
-  private SpecialCharSequenceMgr() {}
-
-  public static boolean handleChars(Context context, String input, EditText textField) {
-    //get rid of the separators so that the string gets parsed correctly
-    String dialString = PhoneNumberUtils.stripSeparators(input);
-
-    if (handleDeviceIdDisplay(context, dialString)
-        || handleRegulatoryInfoDisplay(context, dialString)
-        || handlePinEntry(context, dialString)
-        || handleAdnEntry(context, dialString, textField)
-        || handleSecretCode(context, dialString)) {
-      return true;
-    }
-
-    if (MotorolaUtils.handleSpecialCharSequence(context, input)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Cleanup everything around this class. Must be run inside the main thread.
-   *
-   * <p>This should be called when the screen becomes background.
-   */
-  public static void cleanup() {
-    Assert.isMainThread();
-
-    if (sPreviousAdnQueryHandler != null) {
-      sPreviousAdnQueryHandler.cancel();
-      sPreviousAdnQueryHandler = null;
-    }
-  }
-
-  /**
-   * Handles secret codes to launch arbitrary activities in the form of *#*#<code>#*#*.
-   *
-   * @param context the context to use
-   * @param input the text to check for a secret code in
-   * @return true if a secret code was encountered and handled
-   */
-  static boolean handleSecretCode(Context context, String input) {
-    // Secret codes are accessed by dialing *#*#<code>#*#*
-
-    int len = input.length();
-    if (len <= 8 || !input.startsWith("*#*#") || !input.endsWith("#*#*")) {
-      return false;
-    }
-    String secretCode = input.substring(4, len - 4);
-    TelephonyManagerCompat.handleSecretCode(context, secretCode);
-    return true;
-  }
-
-  /**
-   * Handle ADN requests by filling in the SIM contact number into the requested EditText.
-   *
-   * <p>This code works alongside the Asynchronous query handler {@link QueryHandler} and query
-   * cancel handler implemented in {@link SimContactQueryCookie}.
-   */
-  static boolean handleAdnEntry(Context context, String input, EditText textField) {
-    /* ADN entries are of the form "N(N)(N)#" */
-    TelephonyManager telephonyManager =
-        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-    if (telephonyManager == null
-        || telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) {
-      return false;
-    }
-
-    // if the phone is keyguard-restricted, then just ignore this
-    // input.  We want to make sure that sim card contacts are NOT
-    // exposed unless the phone is unlocked, and this code can be
-    // accessed from the emergency dialer.
-    KeyguardManager keyguardManager =
-        (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-    if (keyguardManager.inKeyguardRestrictedInputMode()) {
-      return false;
-    }
-
-    int len = input.length();
-    if ((len > 1) && (len < 5) && (input.endsWith("#"))) {
-      try {
-        // get the ordinal number of the sim contact
-        final int index = Integer.parseInt(input.substring(0, len - 1));
-
-        // The original code that navigated to a SIM Contacts list view did not
-        // highlight the requested contact correctly, a requirement for PTCRB
-        // certification.  This behaviour is consistent with the UI paradigm
-        // for touch-enabled lists, so it does not make sense to try to work
-        // around it.  Instead we fill in the the requested phone number into
-        // the dialer text field.
-
-        // create the async query handler
-        final QueryHandler handler = new QueryHandler(context.getContentResolver());
-
-        // create the cookie object
-        final SimContactQueryCookie sc =
-            new SimContactQueryCookie(index - 1, handler, ADN_QUERY_TOKEN);
-
-        // setup the cookie fields
-        sc.contactNum = index - 1;
-        sc.setTextField(textField);
-
-        // create the progress dialog
-        sc.progressDialog = new ProgressDialog(context);
-        sc.progressDialog.setTitle(R.string.simContacts_title);
-        sc.progressDialog.setMessage(context.getText(R.string.simContacts_emptyLoading));
-        sc.progressDialog.setIndeterminate(true);
-        sc.progressDialog.setCancelable(true);
-        sc.progressDialog.setOnCancelListener(sc);
-        sc.progressDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
-
-        List<PhoneAccountHandle> subscriptionAccountHandles =
-            PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
-        Context applicationContext = context.getApplicationContext();
-        boolean hasUserSelectedDefault =
-            subscriptionAccountHandles.contains(
-                TelecomUtil.getDefaultOutgoingPhoneAccount(
-                    applicationContext, PhoneAccount.SCHEME_TEL));
-
-        if (subscriptionAccountHandles.size() <= 1 || hasUserSelectedDefault) {
-          Uri uri = TelecomUtil.getAdnUriForPhoneAccount(applicationContext, null);
-          handleAdnQuery(handler, sc, uri);
-        } else {
-          SelectPhoneAccountListener callback =
-              new HandleAdnEntryAccountSelectedCallback(applicationContext, handler, sc);
-
-          DialogFragment dialogFragment =
-              SelectPhoneAccountDialogFragment.newInstance(
-                  subscriptionAccountHandles, callback, null);
-          dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
-        }
-
-        return true;
-      } catch (NumberFormatException ex) {
-        // Ignore
-      }
-    }
-    return false;
-  }
-
-  private static void handleAdnQuery(QueryHandler handler, SimContactQueryCookie cookie, Uri uri) {
-    if (handler == null || cookie == null || uri == null) {
-      LogUtil.w("SpecialCharSequenceMgr.handleAdnQuery", "queryAdn parameters incorrect");
-      return;
-    }
-
-    // display the progress dialog
-    cookie.progressDialog.show();
-
-    // run the query.
-    handler.startQuery(
-        ADN_QUERY_TOKEN,
-        cookie,
-        uri,
-        new String[] {ADN_PHONE_NUMBER_COLUMN_NAME},
-        null,
-        null,
-        null);
-
-    if (sPreviousAdnQueryHandler != null) {
-      // It is harmless to call cancel() even after the handler's gone.
-      sPreviousAdnQueryHandler.cancel();
-    }
-    sPreviousAdnQueryHandler = handler;
-  }
-
-  static boolean handlePinEntry(final Context context, final String input) {
-    if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {
-      List<PhoneAccountHandle> subscriptionAccountHandles =
-          PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
-      boolean hasUserSelectedDefault =
-          subscriptionAccountHandles.contains(
-              TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL));
-
-      if (subscriptionAccountHandles.size() <= 1 || hasUserSelectedDefault) {
-        // Don't bring up the dialog for single-SIM or if the default outgoing account is
-        // a subscription account.
-        return TelecomUtil.handleMmi(context, input, null);
-      } else {
-        SelectPhoneAccountListener listener = new HandleMmiAccountSelectedCallback(context, input);
-
-        DialogFragment dialogFragment =
-            SelectPhoneAccountDialogFragment.newInstance(
-                subscriptionAccountHandles, listener, null);
-        dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  // TODO: Use TelephonyCapabilities.getDeviceIdLabel() to get the device id label instead of a
-  // hard-coded string.
-  static boolean handleDeviceIdDisplay(Context context, String input) {
-    TelephonyManager telephonyManager =
-        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-
-    if (telephonyManager != null && input.equals(MMI_IMEI_DISPLAY)) {
-      int labelResId =
-          (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM)
-              ? R.string.imei
-              : R.string.meid;
-
-      List<String> deviceIds = new ArrayList<String>();
-      if (TelephonyManagerCompat.getPhoneCount(telephonyManager) > 1
-          && CompatUtils.isMethodAvailable(
-              TelephonyManagerCompat.TELEPHONY_MANAGER_CLASS, "getDeviceId", Integer.TYPE)) {
-        for (int slot = 0; slot < telephonyManager.getPhoneCount(); slot++) {
-          String deviceId = telephonyManager.getDeviceId(slot);
-          if (!TextUtils.isEmpty(deviceId)) {
-            deviceIds.add(deviceId);
-          }
-        }
-      } else {
-        deviceIds.add(telephonyManager.getDeviceId());
-      }
-
-      new AlertDialog.Builder(context)
-          .setTitle(labelResId)
-          .setItems(deviceIds.toArray(new String[deviceIds.size()]), null)
-          .setPositiveButton(android.R.string.ok, null)
-          .setCancelable(false)
-          .show();
-      return true;
-    }
-    return false;
-  }
-
-  private static boolean handleRegulatoryInfoDisplay(Context context, String input) {
-    if (input.equals(MMI_REGULATORY_INFO_DISPLAY)) {
-      LogUtil.i(
-          "SpecialCharSequenceMgr.handleRegulatoryInfoDisplay", "sending intent to settings app");
-      Intent showRegInfoIntent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
-      try {
-        context.startActivity(showRegInfoIntent);
-      } catch (ActivityNotFoundException e) {
-        LogUtil.e(
-            "SpecialCharSequenceMgr.handleRegulatoryInfoDisplay", "startActivity() failed: ", e);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  public static class HandleAdnEntryAccountSelectedCallback extends SelectPhoneAccountListener {
-
-    private final Context mContext;
-    private final QueryHandler mQueryHandler;
-    private final SimContactQueryCookie mCookie;
-
-    public HandleAdnEntryAccountSelectedCallback(
-        Context context, QueryHandler queryHandler, SimContactQueryCookie cookie) {
-      mContext = context;
-      mQueryHandler = queryHandler;
-      mCookie = cookie;
-    }
-
-    @Override
-    public void onPhoneAccountSelected(
-        PhoneAccountHandle selectedAccountHandle, boolean setDefault, @Nullable String callId) {
-      Uri uri = TelecomUtil.getAdnUriForPhoneAccount(mContext, selectedAccountHandle);
-      handleAdnQuery(mQueryHandler, mCookie, uri);
-      // TODO: Show error dialog if result isn't valid.
-    }
-  }
-
-  public static class HandleMmiAccountSelectedCallback extends SelectPhoneAccountListener {
-
-    private final Context mContext;
-    private final String mInput;
-
-    public HandleMmiAccountSelectedCallback(Context context, String input) {
-      mContext = context.getApplicationContext();
-      mInput = input;
-    }
-
-    @Override
-    public void onPhoneAccountSelected(
-        PhoneAccountHandle selectedAccountHandle, boolean setDefault, @Nullable String callId) {
-      TelecomUtil.handleMmi(mContext, mInput, selectedAccountHandle);
-    }
-  }
-
-  /**
-   * Cookie object that contains everything we need to communicate to the handler's onQuery
-   * Complete, as well as what we need in order to cancel the query (if requested).
-   *
-   * <p>Note, access to the textField field is going to be synchronized, because the user can
-   * request a cancel at any time through the UI.
-   */
-  private static class SimContactQueryCookie implements DialogInterface.OnCancelListener {
-
-    public ProgressDialog progressDialog;
-    public int contactNum;
-
-    // Used to identify the query request.
-    private int mToken;
-    private QueryHandler mHandler;
-
-    // The text field we're going to update
-    private EditText textField;
-
-    public SimContactQueryCookie(int number, QueryHandler handler, int token) {
-      contactNum = number;
-      mHandler = handler;
-      mToken = token;
-    }
-
-    /** Synchronized getter for the EditText. */
-    public synchronized EditText getTextField() {
-      return textField;
-    }
-
-    /** Synchronized setter for the EditText. */
-    public synchronized void setTextField(EditText text) {
-      textField = text;
-    }
-
-    /**
-     * Cancel the ADN query by stopping the operation and signaling the cookie that a cancel request
-     * is made.
-     */
-    @Override
-    public synchronized void onCancel(DialogInterface dialog) {
-      // close the progress dialog
-      if (progressDialog != null) {
-        progressDialog.dismiss();
-      }
-
-      // setting the textfield to null ensures that the UI does NOT get
-      // updated.
-      textField = null;
-
-      // Cancel the operation if possible.
-      mHandler.cancelOperation(mToken);
-    }
-  }
-
-  /**
-   * Asynchronous query handler that services requests to look up ADNs
-   *
-   * <p>Queries originate from {@link #handleAdnEntry}.
-   */
-  private static class QueryHandler extends NoNullCursorAsyncQueryHandler {
-
-    private boolean mCanceled;
-
-    public QueryHandler(ContentResolver cr) {
-      super(cr);
-    }
-
-    /** Override basic onQueryComplete to fill in the textfield when we're handed the ADN cursor. */
-    @Override
-    protected void onNotNullableQueryComplete(int token, Object cookie, Cursor c) {
-      try {
-        sPreviousAdnQueryHandler = null;
-        if (mCanceled) {
-          return;
-        }
-
-        SimContactQueryCookie sc = (SimContactQueryCookie) cookie;
-
-        // close the progress dialog.
-        sc.progressDialog.dismiss();
-
-        // get the EditText to update or see if the request was cancelled.
-        EditText text = sc.getTextField();
-
-        // if the TextView is valid, and the cursor is valid and positionable on the
-        // Nth number, then we update the text field and display a toast indicating the
-        // caller name.
-        if ((c != null) && (text != null) && (c.moveToPosition(sc.contactNum))) {
-          String name = c.getString(c.getColumnIndexOrThrow(ADN_NAME_COLUMN_NAME));
-          String number = c.getString(c.getColumnIndexOrThrow(ADN_PHONE_NUMBER_COLUMN_NAME));
-
-          // fill the text in.
-          text.getText().replace(0, 0, number);
-
-          // display the name as a toast
-          Context context = sc.progressDialog.getContext();
-          CharSequence msg =
-              ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                  context.getResources(), R.string.menu_callNumber, name);
-          Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
-        }
-      } finally {
-        MoreCloseables.closeQuietly(c);
-      }
-    }
-
-    public void cancel() {
-      mCanceled = true;
-      // Ask AsyncQueryHandler to cancel the whole request. This will fail when the query is
-      // already started.
-      cancelOperation(ADN_QUERY_TOKEN);
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/bindings/DialerBindings.java b/java/com/android/dialer/app/bindings/DialerBindings.java
deleted file mode 100644
index e1f5178..0000000
--- a/java/com/android/dialer/app/bindings/DialerBindings.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016 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.app.bindings;
-
-import com.android.dialer.common.ConfigProvider;
-
-/** This interface allows the container application to customize the dialer. */
-public interface DialerBindings {
-
-  ConfigProvider getConfigProvider();
-}
diff --git a/java/com/android/dialer/app/bindings/DialerBindingsFactory.java b/java/com/android/dialer/app/bindings/DialerBindingsFactory.java
deleted file mode 100644
index 9f209f9..0000000
--- a/java/com/android/dialer/app/bindings/DialerBindingsFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2016 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.app.bindings;
-
-/**
- * This interface should be implementated by the Application subclass. It allows the dialer module
- * to get references to the DialerBindings.
- */
-public interface DialerBindingsFactory {
-
-  DialerBindings newDialerBindings();
-}
diff --git a/java/com/android/dialer/app/bindings/DialerBindingsStub.java b/java/com/android/dialer/app/bindings/DialerBindingsStub.java
deleted file mode 100644
index f56743f..0000000
--- a/java/com/android/dialer/app/bindings/DialerBindingsStub.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2016 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.app.bindings;
-
-import com.android.dialer.common.ConfigProvider;
-
-/** Default implementation for dialer bindings. */
-public class DialerBindingsStub implements DialerBindings {
-  private ConfigProvider configProvider;
-
-  @Override
-  public ConfigProvider getConfigProvider() {
-    if (configProvider == null) {
-      configProvider =
-          new ConfigProvider() {
-            @Override
-            public String getString(String key, String defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public long getLong(String key, long defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public boolean getBoolean(String key, boolean defaultValue) {
-              return defaultValue;
-            }
-          };
-    }
-    return configProvider;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/CallLogActivity.java b/java/com/android/dialer/app/calllog/CallLogActivity.java
index 443171d..1bb894c 100644
--- a/java/com/android/dialer/app/calllog/CallLogActivity.java
+++ b/java/com/android/dialer/app/calllog/CallLogActivity.java
@@ -21,6 +21,7 @@
 import android.os.Bundle;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
+import android.support.design.widget.Snackbar;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
@@ -31,9 +32,14 @@
 import com.android.contacts.common.list.ViewPagerTabs;
 import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
+import com.android.dialer.calldetails.CallDetailsActivity;
+import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.postcall.PostCall;
 import com.android.dialer.util.TransactionSafeActivity;
 import com.android.dialer.util.ViewUtil;
 
@@ -48,7 +54,6 @@
   private ViewPagerTabs mViewPagerTabs;
   private ViewPagerAdapter mViewPagerAdapter;
   private CallLogFragment mAllCallsFragment;
-  private CallLogFragment mMissedCallsFragment;
   private String[] mTabTitles;
   private boolean mIsResumed;
 
@@ -93,9 +98,16 @@
 
   @Override
   protected void onResume() {
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
     mIsResumed = true;
     super.onResume();
-    sendScreenViewForChildFragment(mViewPager.getCurrentItem());
+    sendScreenViewForChildFragment();
   }
 
   @Override
@@ -129,6 +141,7 @@
     }
 
     if (item.getItemId() == android.R.id.home) {
+      PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON);
       final Intent intent = new Intent(this, DialtactsActivity.class);
       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
       startActivity(intent);
@@ -148,7 +161,7 @@
   @Override
   public void onPageSelected(int position) {
     if (mIsResumed) {
-      sendScreenViewForChildFragment(position);
+      sendScreenViewForChildFragment();
     }
     mViewPagerTabs.onPageSelected(position);
   }
@@ -158,7 +171,7 @@
     mViewPagerTabs.onPageScrollStateChanged(state);
   }
 
-  private void sendScreenViewForChildFragment(int position) {
+  private void sendScreenViewForChildFragment() {
     Logger.get(this).logScreenView(ScreenEvent.Type.CALL_LOG_FILTER, this);
   }
 
@@ -169,6 +182,12 @@
     return position;
   }
 
+  @Override
+  public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+    super.onBackPressed();
+  }
+
   /** Adapter for the view pager. */
   public class ViewPagerAdapter extends FragmentPagerAdapter {
 
@@ -189,20 +208,16 @@
               CallLogQueryHandler.CALL_TYPE_ALL, true /* isCallLogActivity */);
         case TAB_INDEX_MISSED:
           return new CallLogFragment(Calls.MISSED_TYPE, true /* isCallLogActivity */);
+        default:
+          throw new IllegalStateException("No fragment at position " + position);
       }
-      throw new IllegalStateException("No fragment at position " + position);
     }
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
       final CallLogFragment fragment = (CallLogFragment) super.instantiateItem(container, position);
-      switch (position) {
-        case TAB_INDEX_ALL:
+      if (position == TAB_INDEX_ALL) {
           mAllCallsFragment = fragment;
-          break;
-        case TAB_INDEX_MISSED:
-          mMissedCallsFragment = fragment;
-          break;
       }
       return fragment;
     }
@@ -217,4 +232,22 @@
       return TAB_INDEX_COUNT;
     }
   }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {
+      if (resultCode == RESULT_OK
+          && data != null
+          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
+        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);
+        Snackbar.make(findViewById(R.id.calllog_frame), getString(R.string.ec_data_deleted), 5_000)
+            .setAction(
+                R.string.view_conversation,
+                v -> startActivity(IntentProvider.getSendSmsIntentProvider(number).getIntent(this)))
+            .setActionTextColor(getResources().getColor(R.color.dialer_snackbar_action_text_color))
+            .show();
+      }
+    }
+    super.onActivityResult(requestCode, resultCode, data);
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 2f8a58c..61129a7 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.ContentUris;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
@@ -52,7 +53,6 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.dialer.app.Bindings;
 import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogGroupBuilder.GroupCreator;
@@ -63,31 +63,32 @@
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.calldetails.CallDetailsEntries;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
+import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.calllogutils.PhoneCallDetails;
 import com.android.dialer.common.Assert;
-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.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.lightbringer.LightbringerListener;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.CallLogQuery;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.spam.Spam;
 import com.android.dialer.util.PermissionsUtil;
-import java.util.Collections;
-import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Set;
 
@@ -105,11 +106,12 @@
 
   private static final String KEY_EXPANDED_POSITION = "expanded_position";
   private static final String KEY_EXPANDED_ROW_ID = "expanded_row_id";
+  private static final String KEY_ACTION_MODE = "action_mode_selected_items";
 
   public static final String LOAD_DATA_TASK_IDENTIFIER = "load_data";
 
   public static final String ENABLE_CALL_LOG_MULTI_SELECT = "enable_call_log_multiselect";
-  public static final boolean ENABLE_CALL_LOG_MULTI_SELECT_FLAG = false;
+  public static final boolean ENABLE_CALL_LOG_MULTI_SELECT_FLAG = true;
 
   protected final Activity mActivity;
   protected final VoicemailPlaybackPresenter mVoicemailPlaybackPresenter;
@@ -117,6 +119,8 @@
   protected final CallLogCache mCallLogCache;
 
   private final CallFetcher mCallFetcher;
+  private final OnActionModeStateChangedListener mActionModeStateChangedListener;
+  private final MultiSelectRemoveView mMultiSelectRemoveView;
   @NonNull private final FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler;
   private final int mActivityType;
 
@@ -136,6 +140,8 @@
   private final CallLogAlertManager mCallLogAlertManager;
 
   public ActionMode mActionMode = null;
+  public boolean selectAllMode = false;
+  public boolean deselectAllMode = false;
   private final SparseArray<String> selectedItems = new SparseArray<>();
 
   private final ActionMode.Callback mActionModeCallback =
@@ -144,10 +150,17 @@
         // Called when the action mode is created; startActionMode() was called
         @Override
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+          if (mActivity != null) {
+            announceforAccessibility(
+                mActivity.getCurrentFocus(),
+                mActivity.getString(R.string.description_entering_bulk_action_mode));
+          }
           mActionMode = mode;
           // Inflate a menu resource providing context menu items
           MenuInflater inflater = mode.getMenuInflater();
           inflater.inflate(R.menu.actionbar_delete, menu);
+          mMultiSelectRemoveView.showMultiSelectRemoveView(true);
+          mActionModeStateChangedListener.onActionModeStateChanged(true);
           return true;
         }
 
@@ -162,10 +175,10 @@
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
           if (item.getItemId() == R.id.action_bar_delete_menu_item) {
+            Logger.get(mActivity).logImpression(DialerImpression.Type.MULTISELECT_TAP_DELETE_ICON);
             if (selectedItems.size() > 0) {
               showDeleteSelectedItemsDialog();
             }
-            mode.finish();
             return true;
           } else {
             return false;
@@ -175,53 +188,78 @@
         // Called when the user exits the action mode
         @Override
         public void onDestroyActionMode(ActionMode mode) {
+          if (mActivity != null) {
+            announceforAccessibility(
+                mActivity.getCurrentFocus(),
+                mActivity.getString(R.string.description_leaving_bulk_action_mode));
+          }
           selectedItems.clear();
           mActionMode = null;
+          selectAllMode = false;
+          deselectAllMode = false;
+          mMultiSelectRemoveView.showMultiSelectRemoveView(false);
+          mActionModeStateChangedListener.onActionModeStateChanged(false);
           notifyDataSetChanged();
         }
       };
 
-  // Todo (uabdullah): Use plurals http://b/37751831
   private void showDeleteSelectedItemsDialog() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
-    Assert.checkArgument(selectedItems.size() > 0);
-    String voicemailString =
-        selectedItems.size() == 1
-            ? mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemail)
-            : mActivity.getResources().getString(R.string.voicemailMultiSelectVoicemails);
-    String deleteVoicemailTitle =
-        mActivity
-            .getResources()
-            .getString(R.string.voicemailMultiSelectDialogTitle, voicemailString);
     SparseArray<String> voicemailsToDeleteOnConfirmation = selectedItems.clone();
-    builder.setTitle(deleteVoicemailTitle);
-
-    builder.setPositiveButton(
-        mActivity.getResources().getString(R.string.voicemailMultiSelectDeleteConfirm),
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int id) {
-            deleteSelectedItems(voicemailsToDeleteOnConfirmation);
-            dialog.cancel();
-          }
-        });
-
-    builder.setNegativeButton(
-        mActivity.getResources().getString(R.string.voicemailMultiSelectDeleteCancel),
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int id) {
-            dialog.cancel();
-          }
-        });
-
-    AlertDialog dialog = builder.create();
-    dialog.show();
+    new AlertDialog.Builder(mActivity, R.style.AlertDialogCustom)
+        .setCancelable(true)
+        .setTitle(
+            mActivity
+                .getResources()
+                .getQuantityString(
+                    R.plurals.delete_voicemails_confirmation_dialog_title, selectedItems.size()))
+        .setPositiveButton(
+            R.string.voicemailMultiSelectDeleteConfirm,
+            new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(final DialogInterface dialog, final int button) {
+                LogUtil.i(
+                    "CallLogAdapter.showDeleteSelectedItemsDialog",
+                    "onClick, these items to delete " + voicemailsToDeleteOnConfirmation);
+                deleteSelectedItems(voicemailsToDeleteOnConfirmation);
+                mActionMode.finish();
+                dialog.cancel();
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type.MULTISELECT_DELETE_ENTRY_VIA_CONFIRMATION_DIALOG);
+              }
+            })
+        .setOnCancelListener(
+            new OnCancelListener() {
+              @Override
+              public void onCancel(DialogInterface dialogInterface) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type
+                            .MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_TOUCH);
+                dialogInterface.cancel();
+              }
+            })
+        .setNegativeButton(
+            R.string.voicemailMultiSelectDeleteCancel,
+            new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(final DialogInterface dialog, final int button) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type
+                            .MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_BUTTON);
+                dialog.cancel();
+              }
+            })
+        .show();
+    Logger.get(mActivity)
+        .logImpression(DialerImpression.Type.MULTISELECT_DISPLAY_DELETE_CONFIRMATION_DIALOG);
   }
 
   private void deleteSelectedItems(SparseArray<String> voicemailsToDelete) {
     for (int i = 0; i < voicemailsToDelete.size(); i++) {
       String voicemailUri = voicemailsToDelete.get(voicemailsToDelete.keyAt(i));
+      LogUtil.i("CallLogAdapter.deleteSelectedItems", "deleting uri:" + voicemailUri);
       CallLogAsyncTaskUtil.deleteVoicemail(mActivity, Uri.parse(voicemailUri), null);
     }
   }
@@ -235,8 +273,13 @@
               && mVoicemailPlaybackPresenter != null) {
             if (v.getId() == R.id.primary_action_view || v.getId() == R.id.quick_contact_photo) {
               if (mActionMode == null) {
+                Logger.get(mActivity)
+                    .logImpression(
+                        DialerImpression.Type.MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE);
                 mActionMode = v.startActionMode(mActionModeCallback);
               }
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_LONG_PRESS_TAP_ENTRY);
               CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) v.getTag();
               viewHolder.quickContactView.setVisibility(View.GONE);
               viewHolder.checkBoxView.setVisibility(View.VISIBLE);
@@ -248,32 +291,45 @@
         }
       };
 
+  @VisibleForTesting
+  public View.OnClickListener getExpandCollapseListener() {
+    return mExpandCollapseListener;
+  }
+
   /** The OnClickListener used to expand or collapse the action buttons of a call log entry. */
   private final View.OnClickListener mExpandCollapseListener =
       new View.OnClickListener() {
         @Override
         public void onClick(View v) {
+          PerformanceReport.recordClick(UiAction.Type.CLICK_CALL_LOG_ITEM);
+
           CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) v.getTag();
           if (viewHolder == null) {
             return;
           }
           if (mActionMode != null && viewHolder.voicemailUri != null) {
+            selectAllMode = false;
+            deselectAllMode = false;
+            mMultiSelectRemoveView.setSelectAllModeToFalse();
             int id = getVoicemailId(viewHolder.voicemailUri);
             if (selectedItems.get(id) != null) {
-              selectedItems.delete(id);
-              viewHolder.checkBoxView.setVisibility(View.GONE);
-              viewHolder.quickContactView.setVisibility(View.VISIBLE);
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_UNSELECT_ENTRY);
+              uncheckMarkCallLogEntry(viewHolder, id);
             } else {
-              viewHolder.quickContactView.setVisibility(View.GONE);
-              viewHolder.checkBoxView.setVisibility(View.VISIBLE);
-              selectedItems.put(getVoicemailId(viewHolder.voicemailUri), viewHolder.voicemailUri);
+              Logger.get(mActivity)
+                  .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_SELECT_ENTRY);
+              checkMarkCallLogEntry(viewHolder);
+              // select all check box logic
+              if (getItemCount() == selectedItems.size()) {
+                LogUtil.i(
+                    "mExpandCollapseListener.onClick",
+                    "getitem count %d is equal to items select count %d, check select all box",
+                    getItemCount(),
+                    selectedItems.size());
+                mMultiSelectRemoveView.tapSelectAll();
+              }
             }
-
-            if (selectedItems.size() == 0) {
-              mActionMode.finish();
-              return;
-            }
-            mActionMode.setTitle(Integer.toString(selectedItems.size()));
             return;
           }
 
@@ -285,14 +341,29 @@
           // If enriched call capabilities were unknown on the initial load,
           // viewHolder.isCallComposerCapable may be unset. Check here if we have the capabilities
           // as a last attempt at getting them before showing the expanded view to the user
-          EnrichedCallCapabilities capabilities =
-              getEnrichedCallManager().getCapabilities(viewHolder.number);
-          viewHolder.isCallComposerCapable =
-              capabilities != null && capabilities.supportsCallComposer();
-          generateAndMapNewCallDetailsEntriesHistoryResults(
-              viewHolder.number,
-              viewHolder.getDetailedPhoneDetails(),
-              getAllHistoricalData(viewHolder.number, viewHolder.getDetailedPhoneDetails()));
+          EnrichedCallCapabilities capabilities = null;
+
+          if (viewHolder.number != null) {
+            capabilities = getEnrichedCallManager().getCapabilities(viewHolder.number);
+          }
+
+          if (capabilities == null) {
+            capabilities = EnrichedCallCapabilities.NO_CAPABILITIES;
+          }
+
+          viewHolder.isCallComposerCapable = capabilities.isCallComposerCapable();
+
+          if (capabilities.isTemporarilyUnavailable()) {
+            LogUtil.i(
+                "mExpandCollapseListener.onClick",
+                "%s is temporarily unavailable, requesting capabilities",
+                LogUtil.sanitizePhoneNumber(viewHolder.number));
+            // Refresh the capabilities when temporarily unavailable, see go/ec-temp-unavailable.
+            // Similarly to when we request capabilities the first time, the 'Share and call' button
+            // won't pop in with the new capabilities. Instead the row needs to be collapsed and
+            // expanded again.
+            getEnrichedCallManager().requestCapabilities(viewHolder.number);
+          }
 
           if (viewHolder.rowId == mCurrentlyExpandedRowId) {
             // Hide actions, if the clicked item is the expanded item.
@@ -308,10 +379,77 @@
               }
             }
             expandViewHolderActions(viewHolder);
+
+            if (isLightbringerCallButtonVisible(viewHolder.videoCallButtonView)) {
+              CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
+            }
           }
         }
+
+        private boolean isLightbringerCallButtonVisible(View videoCallButtonView) {
+          if (videoCallButtonView == null) {
+            return false;
+          }
+          if (videoCallButtonView.getVisibility() != View.VISIBLE) {
+            return false;
+          }
+          IntentProvider intentProvider = (IntentProvider) videoCallButtonView.getTag();
+          if (intentProvider == null) {
+            return false;
+          }
+          String packageName =
+              LightbringerComponent.get(mActivity).getLightbringer().getPackageName();
+          if (packageName == null) {
+            return false;
+          }
+          return packageName.equals(intentProvider.getIntent(mActivity).getPackage());
+        }
       };
 
+  private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) {
+    announceforAccessibility(
+        mActivity.getCurrentFocus(),
+        mActivity.getString(
+            R.string.description_selecting_bulk_action_mode, viewHolder.nameOrNumber));
+    viewHolder.quickContactView.setVisibility(View.GONE);
+    viewHolder.checkBoxView.setVisibility(View.VISIBLE);
+    selectedItems.put(getVoicemailId(viewHolder.voicemailUri), viewHolder.voicemailUri);
+    updateActionBar();
+  }
+
+  private void announceforAccessibility(View view, String announcement) {
+    if (view != null) {
+      view.announceForAccessibility(announcement);
+    }
+  }
+
+  private void updateActionBar() {
+    if (mActionMode == null && selectedItems.size() > 0) {
+      Logger.get(mActivity)
+          .logImpression(DialerImpression.Type.MULTISELECT_ROTATE_AND_SHOW_ACTION_MODE);
+      mActivity.startActionMode(mActionModeCallback);
+    }
+    if (mActionMode != null) {
+      mActionMode.setTitle(
+          mActivity
+              .getResources()
+              .getString(
+                  R.string.voicemailMultiSelectActionBarTitle,
+                  Integer.toString(selectedItems.size())));
+    }
+  }
+
+  private void uncheckMarkCallLogEntry(CallLogListItemViewHolder viewHolder, int id) {
+    announceforAccessibility(
+        mActivity.getCurrentFocus(),
+        mActivity.getString(
+            R.string.description_unselecting_bulk_action_mode, viewHolder.nameOrNumber));
+    selectedItems.delete(id);
+    viewHolder.checkBoxView.setVisibility(View.GONE);
+    viewHolder.quickContactView.setVisibility(View.VISIBLE);
+    updateActionBar();
+  }
+
   private static int getVoicemailId(String voicemailUri) {
     Assert.checkArgument(voicemailUri != null);
     Assert.checkArgument(voicemailUri.length() > 0);
@@ -328,7 +466,7 @@
    * Holds a list of URIs that are pending deletion or undo. If the activity ends before the undo
    * timeout, all of the pending URIs will be deleted.
    *
-   * <p>TODO: move this and OnVoicemailDeletedListener to somewhere like {@link
+   * <p>TODO(twyen): move this and OnVoicemailDeletedListener to somewhere like {@link
    * VisualVoicemailCallLogFragment}. The CallLogAdapter does not need to know about what to do with
    * hidden item or what to hide.
    */
@@ -358,6 +496,8 @@
       Activity activity,
       ViewGroup alertContainer,
       CallFetcher callFetcher,
+      MultiSelectRemoveView multiSelectRemoveView,
+      OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
@@ -367,6 +507,8 @@
 
     mActivity = activity;
     mCallFetcher = callFetcher;
+    mActionModeStateChangedListener = actionModeStateChangedListener;
+    mMultiSelectRemoveView = multiSelectRemoveView;
     mVoicemailPlaybackPresenter = voicemailPlaybackPresenter;
     if (mVoicemailPlaybackPresenter != null) {
       mVoicemailPlaybackPresenter.setOnVoicemailDeletedListener(this);
@@ -426,6 +568,25 @@
   public void onSaveInstanceState(Bundle outState) {
     outState.putInt(KEY_EXPANDED_POSITION, mCurrentlyExpandedPosition);
     outState.putLong(KEY_EXPANDED_ROW_ID, mCurrentlyExpandedRowId);
+
+    ArrayList<String> listOfSelectedItems = new ArrayList<>();
+
+    if (selectedItems.size() > 0) {
+      for (int i = 0; i < selectedItems.size(); i++) {
+        int id = selectedItems.keyAt(i);
+        String voicemailUri = selectedItems.valueAt(i);
+        LogUtil.i(
+            "CallLogAdapter.onSaveInstanceState", "index %d, id=%d, uri=%s ", i, id, voicemailUri);
+        listOfSelectedItems.add(voicemailUri);
+      }
+    }
+    outState.putStringArrayList(KEY_ACTION_MODE, listOfSelectedItems);
+
+    LogUtil.i(
+        "CallLogAdapter.onSaveInstanceState",
+        "saved: %d, selectedItemsSize:%d",
+        listOfSelectedItems.size(),
+        selectedItems.size());
   }
 
   public void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -434,6 +595,33 @@
           savedInstanceState.getInt(KEY_EXPANDED_POSITION, RecyclerView.NO_POSITION);
       mCurrentlyExpandedRowId =
           savedInstanceState.getLong(KEY_EXPANDED_ROW_ID, NO_EXPANDED_LIST_ITEM);
+      // Restoring multi selected entries
+      ArrayList<String> listOfSelectedItems =
+          savedInstanceState.getStringArrayList(KEY_ACTION_MODE);
+      LogUtil.i(
+          "CallLogAdapter.onRestoreInstanceState",
+          "restored selectedItemsList:%d",
+          listOfSelectedItems.size());
+
+      if (!listOfSelectedItems.isEmpty()) {
+        for (int i = 0; i < listOfSelectedItems.size(); i++) {
+          String voicemailUri = listOfSelectedItems.get(i);
+          int id = getVoicemailId(voicemailUri);
+          LogUtil.i(
+              "CallLogAdapter.onRestoreInstanceState",
+              "restoring selected index %d, id=%d, uri=%s ",
+              i,
+              id,
+              voicemailUri);
+          selectedItems.put(id, voicemailUri);
+        }
+
+        LogUtil.i(
+            "CallLogAdapter.onRestoreInstance",
+            "restored selectedItems %s",
+            selectedItems.toString());
+        updateActionBar();
+      }
     }
   }
 
@@ -521,6 +709,7 @@
             mBlockReportSpamListener,
             mExpandCollapseListener,
             mLongPressListener,
+            mActionModeStateChangedListener,
             mCallLogCache,
             mCallLogListItemHelper,
             mVoicemailPlaybackPresenter);
@@ -546,7 +735,7 @@
     Trace.beginSection("onBindViewHolder: " + position);
     switch (getItemViewType(position)) {
       case VIEW_TYPE_ALERT:
-        //Do nothing
+        // Do nothing
         break;
       default:
         bindCallLogListViewHolder(viewHolder, position);
@@ -559,6 +748,8 @@
   public void onViewRecycled(ViewHolder viewHolder) {
     if (viewHolder.getItemViewType() == VIEW_TYPE_CALLLOG) {
       CallLogListItemViewHolder views = (CallLogListItemViewHolder) viewHolder;
+      updateCheckMarkedStatusOfEntry(views);
+
       if (views.asyncTask != null) {
         views.asyncTask.cancel(true);
       }
@@ -591,6 +782,8 @@
       return;
     }
     CallLogListItemViewHolder views = (CallLogListItemViewHolder) viewHolder;
+    updateCheckMarkedStatusOfEntry(views);
+
     views.isLoaded = false;
     int groupSize = getGroupSize(position);
     CallDetailsEntries callDetailsEntries = createCallDetailsEntries(c, groupSize);
@@ -609,6 +802,17 @@
     loadAndRender(views, views.rowId, details, callDetailsEntries);
   }
 
+  private void updateCheckMarkedStatusOfEntry(CallLogListItemViewHolder views) {
+    if (selectedItems.size() > 0 && views.voicemailUri != null) {
+      int id = getVoicemailId(views.voicemailUri);
+      if (selectedItems.get(id) != null) {
+        checkMarkCallLogEntry(views);
+      } else {
+        uncheckMarkCallLogEntry(views, id);
+      }
+    }
+  }
+
   private void loadAndRender(
       final CallLogListItemViewHolder views,
       final long rowId,
@@ -625,12 +829,7 @@
     // the value will be false while capabilities are requested. mExpandCollapseListener will
     // attempt to set the field properly in that case
     views.isCallComposerCapable = isCallComposerCapable(views.number);
-    CallDetailsEntries updatedCallDetailsEntries =
-        generateAndMapNewCallDetailsEntriesHistoryResults(
-            views.number,
-            callDetailsEntries,
-            getAllHistoricalData(views.number, callDetailsEntries));
-    views.setDetailedPhoneDetails(updatedCallDetailsEntries);
+    views.setDetailedPhoneDetails(callDetailsEntries);
     views.lightbringerReady = getLightbringer().isReachable(mActivity, views.number);
     final AsyncTask<Void, Void, Boolean> loadDataTask =
         new AsyncTask<Void, Void, Boolean>() {
@@ -687,46 +886,7 @@
       getEnrichedCallManager().requestCapabilities(number);
       return false;
     }
-    return capabilities.supportsCallComposer();
-  }
-
-  @NonNull
-  private Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData(
-      @Nullable String number, @NonNull CallDetailsEntries entries) {
-    if (number == null) {
-      return Collections.emptyMap();
-    }
-
-    Map<CallDetailsEntry, List<HistoryResult>> historicalData =
-        getEnrichedCallManager().getAllHistoricalData(number, entries);
-    if (historicalData == null) {
-      getEnrichedCallManager().requestAllHistoricalData(number, entries);
-      return Collections.emptyMap();
-    }
-    return historicalData;
-  }
-
-  private static CallDetailsEntries generateAndMapNewCallDetailsEntriesHistoryResults(
-      @Nullable String number,
-      @NonNull CallDetailsEntries callDetailsEntries,
-      @NonNull Map<CallDetailsEntry, List<HistoryResult>> mappedResults) {
-    if (number == null) {
-      return callDetailsEntries;
-    }
-    CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();
-    for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
-      CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);
-      List<HistoryResult> results = mappedResults.get(entry);
-      if (results != null) {
-        newEntry.addAllHistoryResults(mappedResults.get(entry));
-        LogUtil.v(
-            "CallLogAdapter.generateAndMapNewCallDetailsEntriesHistoryResults",
-            "mapped %d results",
-            newEntry.getHistoryResultsList().size());
-      }
-      mutableCallDetailsEntries.addEntries(newEntry.build());
-    }
-    return mutableCallDetailsEntries.build();
+    return capabilities.isCallComposerCapable();
   }
 
   /**
@@ -744,6 +904,10 @@
         (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : "";
     final int numberPresentation = cursor.getInt(CallLogQuery.NUMBER_PRESENTATION);
     final ContactInfo cachedContactInfo = ContactInfoHelper.getContactInfo(cursor);
+    final int transcriptionState =
+        (VERSION.SDK_INT >= VERSION_CODES.O)
+            ? cursor.getInt(CallLogQuery.TRANSCRIPTION_STATE)
+            : PhoneCallDetailsHelper.TRANSCRIPTION_NOT_STARTED;
     final PhoneCallDetails details =
         new PhoneCallDetails(number, numberPresentation, postDialDigits);
     details.viaNumber = viaNumber;
@@ -753,6 +917,7 @@
     details.features = getCallFeatures(cursor, count);
     details.geocode = cursor.getString(CallLogQuery.GEOCODED_LOCATION);
     details.transcription = cursor.getString(CallLogQuery.TRANSCRIPTION);
+    details.transcriptionState = transcriptionState;
     details.callTypes = getCallTypes(cursor, count);
 
     details.accountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
@@ -785,7 +950,7 @@
   }
 
   @MainThread
-  private static CallDetailsEntries createCallDetailsEntries(Cursor cursor, int count) {
+  private CallDetailsEntries createCallDetailsEntries(Cursor cursor, int count) {
     Assert.isMainThread();
     int position = cursor.getPosition();
     CallDetailsEntries.Builder entries = CallDetailsEntries.newBuilder();
@@ -798,6 +963,16 @@
               .setDate(cursor.getLong(CallLogQuery.DATE))
               .setDuration(cursor.getLong(CallLogQuery.DURATION))
               .setFeatures(cursor.getInt(CallLogQuery.FEATURES));
+
+      String phoneAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
+      if (getLightbringer().getPhoneAccountComponentName() != null
+          && getLightbringer()
+              .getPhoneAccountComponentName()
+              .flattenToString()
+              .equals(phoneAccountComponentName)) {
+        entry.setIsLightbringerCall(true);
+      }
+
       entries.addEntries(entry.build());
       cursor.moveToNext();
     }
@@ -840,8 +1015,7 @@
               details.countryIso,
               details.cachedContactInfo,
               position
-                  < Bindings.get(mActivity)
-                      .getConfigProvider()
+                  < ConfigProviderBindings.get(mActivity)
                       .getLong("number_of_call_to_do_remote_lookup", 5L));
     }
     CharSequence formattedNumber =
@@ -917,6 +1091,12 @@
     views.workIconView.setVisibility(
         details.contactUserType == ContactsUtils.USER_TYPE_WORK ? View.VISIBLE : View.GONE);
 
+    if (selectAllMode && views.voicemailUri != null) {
+      selectedItems.put(getVoicemailId(views.voicemailUri), views.voicemailUri);
+    }
+    if (deselectAllMode && views.voicemailUri != null) {
+      selectedItems.delete(getVoicemailId(views.voicemailUri));
+    }
     if (views.voicemailUri != null
         && selectedItems.get(getVoicemailId(views.voicemailUri)) != null) {
       views.checkBoxView.setVisibility(View.VISIBLE);
@@ -925,7 +1105,6 @@
       views.checkBoxView.setVisibility(View.GONE);
       views.quickContactView.setVisibility(View.VISIBLE);
     }
-
     mCallLogListItemHelper.setPhoneCallDetails(views, details);
     if (mCurrentlyExpandedRowId == views.rowId) {
       // In case ViewHolders were added/removed, update the expanded position if the rowIds
@@ -1192,9 +1371,51 @@
     notifyDataSetChanged();
   }
 
+  public void onAllSelected() {
+    selectAllMode = true;
+    deselectAllMode = false;
+    selectedItems.clear();
+    for (int i = 0; i < getItemCount(); i++) {
+      Cursor c = (Cursor) getItem(i);
+      if (c != null) {
+        Assert.checkArgument(CallLogQuery.VOICEMAIL_URI == c.getColumnIndex("voicemail_uri"));
+        String voicemailUri = c.getString(CallLogQuery.VOICEMAIL_URI);
+        selectedItems.put(getVoicemailId(voicemailUri), voicemailUri);
+      }
+    }
+    updateActionBar();
+    notifyDataSetChanged();
+  }
+
+  public void onAllDeselected() {
+    selectAllMode = false;
+    deselectAllMode = true;
+    selectedItems.clear();
+    updateActionBar();
+    notifyDataSetChanged();
+  }
+
   /** Interface used to initiate a refresh of the content. */
   public interface CallFetcher {
 
     void fetchCalls();
   }
+
+  /** Interface used to allow single tap multi select for contact photos. */
+  public interface OnActionModeStateChangedListener {
+
+    void onActionModeStateChanged(boolean isEnabled);
+
+    boolean isActionModeStateEnabled();
+  }
+
+  /** Interface used to hide the fragments. */
+  public interface MultiSelectRemoveView {
+
+    void showMultiSelectRemoveView(boolean show);
+
+    void setSelectAllModeToFalse();
+
+    void tapSelectAll();
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
index a5553d1..78ec7a6 100644
--- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
+++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
@@ -28,6 +28,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.util.PermissionsUtil;
@@ -45,6 +46,7 @@
 
   public static void markVoicemailAsRead(
       @NonNull final Context context, @NonNull final Uri voicemailUri) {
+    LogUtil.enterBlock("CallLogAsyncTaskUtil.markVoicemailAsRead, voicemailUri: " + voicemailUri);
     if (sAsyncTaskExecutor == null) {
       initTaskExecutor();
     }
@@ -64,11 +66,8 @@
                     .update(voicemailUri, values, Voicemails.IS_READ + " = 0", null)
                 > 0) {
               uploadVoicemailLocalChangesToServer(context);
+              CallLogNotificationsService.markAllNewVoicemailsAsOld(context);
             }
-
-            Intent intent = new Intent(context, CallLogNotificationsService.class);
-            intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
-            context.startService(intent);
             return null;
           }
         });
@@ -110,7 +109,8 @@
   }
 
   public static void markCallAsRead(@NonNull final Context context, @NonNull final long[] callIds) {
-    if (!PermissionsUtil.hasPhonePermissions(context)) {
+    if (!PermissionsUtil.hasPhonePermissions(context)
+        || !PermissionsUtil.hasCallLogWritePermissions(context)) {
       return;
     }
     if (sAsyncTaskExecutor == null) {
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 6e4b23f..6d4aea9 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -20,7 +20,6 @@
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.KeyguardManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -35,53 +34,68 @@
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import android.support.v13.app.FragmentCompat;
+import android.support.v13.app.FragmentCompat.OnRequestPermissionsResultCallback;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
 import com.android.dialer.app.Bindings;
 import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogAdapter.CallFetcher;
+import com.android.dialer.app.calllog.CallLogAdapter.MultiSelectRemoveView;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache.OnContactInfoChangedListener;
 import com.android.dialer.app.contactinfo.ExpirableCacheHeadlessFragment;
 import com.android.dialer.app.list.ListsFragment;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
-import com.android.dialer.app.widget.EmptyContentView;
-import com.android.dialer.app.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
+import com.android.dialer.database.CallLogQueryHandler.Listener;
 import com.android.dialer.location.GeoUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.oem.CequintCallerIdManager;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 /**
  * Displays a list of call log entries. To filter for a particular kind of call (all, missed or
  * voicemails), specify it in the constructor.
  */
 public class CallLogFragment extends Fragment
-    implements CallLogQueryHandler.Listener,
-        CallLogAdapter.CallFetcher,
+    implements Listener,
+        CallFetcher,
+        MultiSelectRemoveView,
         OnEmptyViewActionButtonClickedListener,
-        FragmentCompat.OnRequestPermissionsResultCallback,
-        CallLogModalAlertManager.Listener {
+        OnRequestPermissionsResultCallback,
+        CallLogModalAlertManager.Listener,
+        OnClickListener {
   private static final String KEY_FILTER_TYPE = "filter_type";
   private static final String KEY_LOG_LIMIT = "log_limit";
   private static final String KEY_DATE_LIMIT = "date_limit";
   private static final String KEY_IS_CALL_LOG_ACTIVITY = "is_call_log_activity";
   private static final String KEY_HAS_READ_CALL_LOG_PERMISSION = "has_read_call_log_permission";
   private static final String KEY_REFRESH_DATA_REQUIRED = "refresh_data_required";
+  private static final String KEY_SELECT_ALL_MODE = "select_all_mode_checked";
 
   // No limit specified for the number of logs to show; use the CallLogQueryHandler's default.
   private static final int NO_LOG_LIMIT = -1;
   // No date-based filtering.
   private static final int NO_DATE_LIMIT = 0;
 
-  private static final int READ_CALL_LOG_PERMISSION_REQUEST_CODE = 1;
+  private static final int PHONE_PERMISSIONS_REQUEST_CODE = 1;
 
   private static final int EVENT_UPDATE_DISPLAY = 1;
 
@@ -90,13 +104,15 @@
   // See issue 6363009
   private final ContentObserver mCallLogObserver = new CustomContentObserver();
   private final ContentObserver mContactsObserver = new CustomContentObserver();
+  private View mMultiSelectUnSelectAllViewContent;
+  private TextView mSelectUnselectAllViewText;
+  private ImageView mSelectUnselectAllIcon;
   private RecyclerView mRecyclerView;
   private LinearLayoutManager mLayoutManager;
   private CallLogAdapter mAdapter;
   private CallLogQueryHandler mCallLogQueryHandler;
   private boolean mScrollToTop;
   private EmptyContentView mEmptyListView;
-  private KeyguardManager mKeyguardManager;
   private ContactInfoCache mContactInfoCache;
   private final OnContactInfoChangedListener mOnContactInfoChangedListener =
       new OnContactInfoChangedListener() {
@@ -123,6 +139,7 @@
    * True if this instance of the CallLogFragment shown in the CallLogActivity.
    */
   private boolean mIsCallLogActivity = false;
+  private boolean selectAllMode;
   private final Handler mDisplayUpdateHandler =
       new Handler() {
         @Override
@@ -194,12 +211,12 @@
       mIsCallLogActivity = state.getBoolean(KEY_IS_CALL_LOG_ACTIVITY, mIsCallLogActivity);
       mHasReadCallLogPermission = state.getBoolean(KEY_HAS_READ_CALL_LOG_PERMISSION, false);
       mRefreshDataRequired = state.getBoolean(KEY_REFRESH_DATA_REQUIRED, mRefreshDataRequired);
+      selectAllMode = state.getBoolean(KEY_SELECT_ALL_MODE, false);
     }
 
     final Activity activity = getActivity();
     final ContentResolver resolver = activity.getContentResolver();
     mCallLogQueryHandler = new CallLogQueryHandler(activity, resolver, this, mLogLimit);
-    mKeyguardManager = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE);
 
     if (PermissionsUtil.hasCallLogReadPermissions(getContext())) {
       resolver.registerContentObserver(CallLog.CONTENT_URI, true, mCallLogObserver);
@@ -290,12 +307,20 @@
     mRecyclerView.setHasFixedSize(true);
     mLayoutManager = new LinearLayoutManager(getActivity());
     mRecyclerView.setLayoutManager(mLayoutManager);
+    PerformanceReport.logOnScrollStateChange(mRecyclerView);
     mEmptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
     mEmptyListView.setImage(R.drawable.empty_call_log);
     mEmptyListView.setActionClickedListener(this);
     mModalAlertView = (ViewGroup) view.findViewById(R.id.modal_message_container);
     mModalAlertManager =
         new CallLogModalAlertManager(LayoutInflater.from(getContext()), mModalAlertView, this);
+    mMultiSelectUnSelectAllViewContent =
+        view.findViewById(R.id.multi_select_select_all_view_content);
+    mSelectUnselectAllViewText = (TextView) view.findViewById(R.id.select_all_view_text);
+    mSelectUnselectAllIcon = (ImageView) view.findViewById(R.id.select_all_view_icon);
+    mMultiSelectUnSelectAllViewContent.setOnClickListener(null);
+    mSelectUnselectAllIcon.setOnClickListener(this);
+    mSelectUnselectAllViewText.setOnClickListener(this);
   }
 
   protected void setupData() {
@@ -317,7 +342,11 @@
                 getActivity(),
                 mRecyclerView,
                 this,
-                CallLogCache.getCallLogCache(getActivity()),
+                this,
+                activityType == CallLogAdapter.ACTIVITY_TYPE_DIALTACTS
+                    ? (CallLogAdapter.OnActionModeStateChangedListener) getActivity()
+                    : null,
+                new CallLogCache(getActivity()),
                 mContactInfoCache,
                 getVoicemailPlaybackPresenter(),
                 new FilteredNumberAsyncQueryHandler(getActivity()),
@@ -335,9 +364,18 @@
   public void onActivityCreated(Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
     setupData();
+    updateSelectAllState(savedInstanceState);
     mAdapter.onRestoreInstanceState(savedInstanceState);
   }
 
+  private void updateSelectAllState(Bundle savedInstanceState) {
+    if (savedInstanceState != null) {
+      if (savedInstanceState.getBoolean(KEY_SELECT_ALL_MODE, false)) {
+        updateSelectAllIcon();
+      }
+    }
+  }
+
   @Override
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
@@ -380,9 +418,17 @@
   }
 
   @Override
-  public void onStop() {
-    updateOnTransition();
+  public void onStart() {
+    super.onStart();
+    CequintCallerIdManager cequintCallerIdManager = null;
+    if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) {
+      cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog();
+    }
+    mContactInfoCache.setCequintCallerIdManager(cequintCallerIdManager);
+  }
 
+  @Override
+  public void onStop() {
     super.onStop();
     mAdapter.onStop();
     mContactInfoCache.stop();
@@ -407,7 +453,7 @@
     outState.putBoolean(KEY_IS_CALL_LOG_ACTIVITY, mIsCallLogActivity);
     outState.putBoolean(KEY_HAS_READ_CALL_LOG_PERMISSION, mHasReadCallLogPermission);
     outState.putBoolean(KEY_REFRESH_DATA_REQUIRED, mRefreshDataRequired);
-
+    outState.putBoolean(KEY_SELECT_ALL_MODE, selectAllMode);
     mAdapter.onSaveInstanceState(outState);
   }
 
@@ -451,6 +497,8 @@
       mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL);
     } else if (filterType == CallLogQueryHandler.CALL_TYPE_ALL) {
       mEmptyListView.setActionLabel(R.string.call_log_all_empty_action);
+    } else {
+      mEmptyListView.setActionLabel(EmptyContentView.NO_LABEL);
     }
   }
 
@@ -463,9 +511,7 @@
     super.setMenuVisibility(menuVisible);
     if (mMenuVisible != menuVisible) {
       mMenuVisible = menuVisible;
-      if (!menuVisible) {
-        updateOnTransition();
-      } else if (isResumed()) {
+      if (menuVisible && isResumed()) {
         refreshData();
       }
     }
@@ -483,7 +529,6 @@
       fetchCalls();
       mCallLogQueryHandler.fetchVoicemailStatus();
       mCallLogQueryHandler.fetchMissedCallsUnreadCount();
-      updateOnTransition();
       mRefreshDataRequired = false;
     } else {
       // Refresh the display of the existing data to update the timestamp text descriptions.
@@ -491,22 +536,6 @@
     }
   }
 
-  /**
-   * Updates the voicemail notification state.
-   *
-   * <p>TODO: Move to CallLogActivity
-   */
-  private void updateOnTransition() {
-    // We don't want to update any call data when keyguard is on because the user has likely not
-    // seen the new calls yet.
-    // This might be called before onCreate() and thus we need to check null explicitly.
-    if (mKeyguardManager != null
-        && !mKeyguardManager.inKeyguardRestrictedInputMode()
-        && mCallTypeFilter == Calls.VOICEMAIL_TYPE) {
-      CallLogNotificationsService.markNewVoicemailsAsOld(getActivity(), null);
-    }
-  }
-
   @Override
   public void onEmptyViewActionButtonClicked() {
     final Activity activity = getActivity();
@@ -514,9 +543,14 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CALL_LOG)) {
-      FragmentCompat.requestPermissions(
-          this, new String[] {READ_CALL_LOG}, READ_CALL_LOG_PERMISSION_REQUEST_CODE);
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "CallLogFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      FragmentCompat.requestPermissions(this, deniedPermissions, PHONE_PERMISSIONS_REQUEST_CODE);
     } else if (!mIsCallLogActivity) {
       // Show dialpad if we are not in the call log activity.
       ((HostInterface) activity).showDialpad();
@@ -526,7 +560,7 @@
   @Override
   public void onRequestPermissionsResult(
       int requestCode, String[] permissions, int[] grantResults) {
-    if (requestCode == READ_CALL_LOG_PERMISSION_REQUEST_CODE) {
+    if (requestCode == PHONE_PERMISSIONS_REQUEST_CODE) {
       if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
         // Force a refresh of the data since we were missing the permission before this.
         mRefreshDataRequired = true;
@@ -589,6 +623,51 @@
     }
   }
 
+  @Override
+  public void showMultiSelectRemoveView(boolean show) {
+    mMultiSelectUnSelectAllViewContent.setVisibility(show ? View.VISIBLE : View.GONE);
+    mMultiSelectUnSelectAllViewContent.setAlpha(show ? 0 : 1);
+    mMultiSelectUnSelectAllViewContent.animate().alpha(show ? 1 : 0).start();
+    ((ListsFragment) getParentFragment()).showMultiSelectRemoveView(show);
+  }
+
+  @Override
+  public void setSelectAllModeToFalse() {
+    selectAllMode = false;
+    mSelectUnselectAllIcon.setImageDrawable(
+        getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
+  }
+
+  @Override
+  public void tapSelectAll() {
+    LogUtil.i("CallLogFragment.tapSelectAll", "imitating select all");
+    selectAllMode = true;
+    updateSelectAllIcon();
+  }
+
+  @Override
+  public void onClick(View v) {
+    selectAllMode = !selectAllMode;
+    if (selectAllMode) {
+      Logger.get(v.getContext()).logImpression(DialerImpression.Type.MULTISELECT_SELECT_ALL);
+    } else {
+      Logger.get(v.getContext()).logImpression(DialerImpression.Type.MULTISELECT_UNSELECT_ALL);
+    }
+    updateSelectAllIcon();
+  }
+
+  private void updateSelectAllIcon() {
+    if (selectAllMode) {
+      mSelectUnselectAllIcon.setImageDrawable(
+          getContext().getDrawable(R.drawable.ic_check_mark_blue_24dp));
+      getAdapter().onAllSelected();
+    } else {
+      mSelectUnselectAllIcon.setImageDrawable(
+          getContext().getDrawable(R.drawable.ic_empty_check_mark_white_24dp));
+      getAdapter().onAllDeselected();
+    }
+  }
+
   public interface HostInterface {
 
     void showDialpad();
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index 1daccd1..60ed7dd 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -17,40 +17,45 @@
 package com.android.dialer.app.calllog;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
+import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.ContextMenu;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
+import android.widget.Toast;
 import com.android.contacts.common.ClipboardUtils;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.dialog.CallSubjectDialog;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.voicemail.VoicemailPlaybackLayout;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
@@ -58,23 +63,39 @@
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callcomposer.CallComposerActivity;
-import com.android.dialer.callcomposer.CallComposerContact;
+import com.android.dialer.calldetails.CallDetailsActivity;
 import com.android.dialer.calldetails.CallDetailsEntries;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.constants.ActivityRequestCodes;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.dialercontact.SimDetails;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.lettertile.LetterTileDrawable.ContactType;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.UriUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * This is an object containing references to views contained by the call log list item. This
@@ -90,7 +111,7 @@
   /** The root view of the call log list item */
   public final View rootView;
   /** The quick contact badge for the contact. */
-  public final QuickContactBadge quickContactView;
+  public final DialerQuickContactBadge quickContactView;
   /** The primary action view of the entry. */
   public final View primaryActionView;
   /** The details of the phone call. */
@@ -103,11 +124,13 @@
   public final ImageView primaryActionButtonView;
 
   private final Context mContext;
+  @Nullable private final PhoneAccountHandle mDefaultPhoneAccountHandle;
   private final CallLogCache mCallLogCache;
   private final CallLogListItemHelper mCallLogListItemHelper;
   private final CachedNumberLookupService mCachedNumberLookupService;
   private final VoicemailPlaybackPresenter mVoicemailPlaybackPresenter;
   private final OnClickListener mBlockReportListener;
+  @HostUi private final int hostUi;
   /** Whether the data fields are populated by the worker thread, ready to be shown. */
   public boolean isLoaded;
   /** The view containing call log item actions. Null until the ViewStub is inflated. */
@@ -144,7 +167,7 @@
    * The callable phone number for the current call log entry. Cached here as the call back intent
    * is set only when the actions ViewStub is inflated.
    */
-  public String number;
+  @Nullable public String number;
   /** The post-dial numbers that are dialed following the phone number. */
   public String postDialDigits;
   /** The formatted phone number to display. */
@@ -201,6 +224,7 @@
   public boolean lightbringerReady;
 
   private View.OnClickListener mExpandCollapseListener;
+  private final OnActionModeStateChangedListener onActionModeStateChangedListener;
   private final View.OnLongClickListener longPressListener;
   private boolean mVoicemailPrimaryActionButtonClicked;
 
@@ -216,11 +240,12 @@
       OnClickListener blockReportListener,
       View.OnClickListener expandCollapseListener,
       View.OnLongClickListener longClickListener,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       CallLogListItemHelper callLogListItemHelper,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
       View rootView,
-      QuickContactBadge quickContactView,
+      DialerQuickContactBadge dialerQuickContactView,
       View primaryActionView,
       PhoneCallDetailsViews phoneCallDetailsViews,
       CardView callLogEntryView,
@@ -230,6 +255,7 @@
 
     mContext = context;
     mExpandCollapseListener = expandCollapseListener;
+    onActionModeStateChangedListener = actionModeStateChangedListener;
     longPressListener = longClickListener;
     mCallLogCache = callLogCache;
     mCallLogListItemHelper = callLogListItemHelper;
@@ -237,8 +263,12 @@
     mBlockReportListener = blockReportListener;
     mCachedNumberLookupService = PhoneNumberCache.get(mContext).getCachedNumberLookupService();
 
+    // Cache this to avoid having to look it up each time we bind to a call log entry
+    mDefaultPhoneAccountHandle =
+        TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
+
     this.rootView = rootView;
-    this.quickContactView = quickContactView;
+    this.quickContactView = dialerQuickContactView;
     this.primaryActionView = primaryActionView;
     this.phoneCallDetailsViews = phoneCallDetailsViews;
     this.callLogEntryView = callLogEntryView;
@@ -251,6 +281,23 @@
     phoneCallDetailsViews.nameView.setElegantTextHeight(false);
     phoneCallDetailsViews.callLocationAndDate.setElegantTextHeight(false);
 
+    if (mContext instanceof CallLogActivity) {
+      hostUi = HostUi.CALL_HISTORY;
+      Logger.get(mContext)
+          .logQuickContactOnTouch(
+              quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_HISTORY, true);
+    } else if (mVoicemailPlaybackPresenter == null) {
+      hostUi = HostUi.CALL_LOG;
+      Logger.get(mContext)
+          .logQuickContactOnTouch(
+              quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_LOG, true);
+    } else {
+      hostUi = HostUi.VOICEMAIL;
+      Logger.get(mContext)
+          .logQuickContactOnTouch(
+              quickContactView, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_VOICEMAIL, false);
+    }
+
     quickContactView.setOverlay(null);
     if (CompatUtils.hasPrioritizedMimeType()) {
       quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
@@ -264,6 +311,8 @@
                 CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT_FLAG)) {
       primaryActionView.setOnLongClickListener(longPressListener);
       quickContactView.setOnLongClickListener(longPressListener);
+      quickContactView.setMulitSelectListeners(
+          mExpandCollapseListener, onActionModeStateChangedListener);
     } else {
       primaryActionView.setOnCreateContextMenuListener(this);
     }
@@ -275,6 +324,7 @@
       OnClickListener blockReportListener,
       View.OnClickListener expandCollapseListener,
       View.OnLongClickListener longClickListener,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangeListener,
       CallLogCache callLogCache,
       CallLogListItemHelper callLogListItemHelper,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter) {
@@ -284,11 +334,12 @@
         blockReportListener,
         expandCollapseListener,
         longClickListener,
+        actionModeStateChangeListener,
         callLogCache,
         callLogListItemHelper,
         voicemailPlaybackPresenter,
         view,
-        (QuickContactBadge) view.findViewById(R.id.quick_contact_photo),
+        (DialerQuickContactBadge) view.findViewById(R.id.quick_contact_photo),
         view.findViewById(R.id.primary_action_view),
         PhoneCallDetailsViews.fromView(view),
         (CardView) view.findViewById(R.id.call_log_row),
@@ -297,8 +348,15 @@
   }
 
   public static CallLogListItemViewHolder createForTest(Context context) {
+    return createForTest(context, null, null);
+  }
+
+  public static CallLogListItemViewHolder createForTest(
+      Context context,
+      View.OnClickListener expandCollapseListener,
+      VoicemailPlaybackPresenter voicemailPlaybackPresenter) {
     Resources resources = context.getResources();
-    CallLogCache callLogCache = CallLogCache.getCallLogCache(context);
+    CallLogCache callLogCache = new CallLogCache(context);
     PhoneCallDetailsHelper phoneCallDetailsHelper =
         new PhoneCallDetailsHelper(context, resources, callLogCache);
 
@@ -306,13 +364,14 @@
         new CallLogListItemViewHolder(
             context,
             null,
-            null /* expandCollapseListener */,
+            expandCollapseListener /* expandCollapseListener */,
+            null,
             null,
             callLogCache,
             new CallLogListItemHelper(phoneCallDetailsHelper, resources, callLogCache),
-            null /* voicemailPlaybackPresenter */,
-            new View(context),
-            new QuickContactBadge(context),
+            voicemailPlaybackPresenter,
+            LayoutInflater.from(context).inflate(R.layout.call_log_list_item, null),
+            new DialerQuickContactBadge(context),
             new View(context),
             PhoneCallDetailsViews.createForTest(context),
             new CardView(context),
@@ -456,6 +515,18 @@
       // Treat as normal list item; show call button, if possible.
       if (PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation)) {
         boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);
+
+        if (!isVoicemailNumber && showLightbringerPrimaryButton()) {
+          CallIntentBuilder.increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount();
+          primaryActionButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
+          primaryActionButtonView.setContentDescription(
+              TextUtils.expandTemplate(
+                  mContext.getString(R.string.description_video_call_action), validNameOrNumber));
+          primaryActionButtonView.setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24);
+          primaryActionButtonView.setVisibility(View.VISIBLE);
+          return;
+        }
+
         if (isVoicemailNumber) {
           // Call to generic voicemail number, in case there are multiple accounts.
           primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider());
@@ -467,7 +538,7 @@
         primaryActionButtonView.setContentDescription(
             TextUtils.expandTemplate(
                 mContext.getString(R.string.description_call_action), validNameOrNumber));
-        primaryActionButtonView.setImageResource(R.drawable.quantum_ic_call_white_24);
+        primaryActionButtonView.setImageResource(R.drawable.quantum_ic_call_vd_theme_24);
         primaryActionButtonView.setVisibility(View.VISIBLE);
       } else {
         primaryActionButtonView.setTag(null);
@@ -483,12 +554,15 @@
   private void bindActionButtons() {
     boolean canPlaceCallToNumber = PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation);
 
+    // Hide the call buttons by default. We then set it to be visible when appropriate below.
+    // This saves us having to remember to set it to GONE in multiple places.
+    callButtonView.setVisibility(View.GONE);
+    videoCallButtonView.setVisibility(View.GONE);
+
     if (isFullyUndialableVoicemail()) {
       // Sometimes the voicemail server will report the message is from some non phone number
       // source. If the number does not contains any dialable digit treat it as it is from a unknown
       // number, remove all action buttons but still show the voicemail playback layout.
-      callButtonView.setVisibility(View.GONE);
-      videoCallButtonView.setVisibility(View.GONE);
       detailsButtonView.setVisibility(View.GONE);
       createNewContactButtonView.setVisibility(View.GONE);
       addToExistingContactButtonView.setVisibility(View.GONE);
@@ -513,34 +587,40 @@
       return;
     }
 
-    if (!TextUtils.isEmpty(voicemailUri) && canPlaceCallToNumber) {
+    TextView callTypeOrLocationView =
+        ((TextView) callButtonView.findViewById(R.id.call_type_or_location_text));
+
+    if (canPlaceCallToNumber) {
       callButtonView.setTag(IntentProvider.getReturnCallIntentProvider(number));
+      callTypeOrLocationView.setVisibility(View.GONE);
+    }
+
+    if (!TextUtils.isEmpty(voicemailUri) && canPlaceCallToNumber) {
       ((TextView) callButtonView.findViewById(R.id.call_action_text))
           .setText(
               TextUtils.expandTemplate(
                   mContext.getString(R.string.call_log_action_call),
                   nameOrNumber == null ? "" : nameOrNumber));
-      TextView callTypeOrLocationView =
-          ((TextView) callButtonView.findViewById(R.id.call_type_or_location_text));
+
       if (callType == Calls.VOICEMAIL_TYPE && !TextUtils.isEmpty(callTypeOrLocation)) {
         callTypeOrLocationView.setText(callTypeOrLocation);
         callTypeOrLocationView.setVisibility(View.VISIBLE);
-      } else {
-        callTypeOrLocationView.setVisibility(View.GONE);
       }
       callButtonView.setVisibility(View.VISIBLE);
-    } else {
-      callButtonView.setVisibility(View.GONE);
     }
 
-    if (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall()) {
+    // We need to check if we are showing the Lightbringer primary button. If we are, then we should
+    // show the "Call" button here regardless of IMS availability.
+    if (showLightbringerPrimaryButton()) {
+      callButtonView.setVisibility(View.VISIBLE);
+      videoCallButtonView.setVisibility(View.GONE);
+    } else if (CallUtil.isVideoEnabled(mContext)
+        && (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall())) {
       videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));
       videoCallButtonView.setVisibility(View.VISIBLE);
     } else if (lightbringerReady) {
       videoCallButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
       videoCallButtonView.setVisibility(View.VISIBLE);
-    } else {
-      videoCallButtonView.setVisibility(View.GONE);
     }
 
     // For voicemail calls, show the voicemail playback layout; hide otherwise.
@@ -567,8 +647,12 @@
       detailsButtonView.setVisibility(View.GONE);
     } else {
       detailsButtonView.setVisibility(View.VISIBLE);
+      boolean canReportCallerId =
+          mCachedNumberLookupService != null
+              && mCachedNumberLookupService.canReportAsInvalid(info.sourceType, info.objectId);
       detailsButtonView.setTag(
-          IntentProvider.getCallDetailIntentProvider(callDetailsEntries, buildContact()));
+          IntentProvider.getCallDetailIntentProvider(
+              callDetailsEntries, buildContact(), canReportCallerId));
     }
 
     boolean isBlockedOrSpam = blockId != null || (isSpamFeatureEnabled && isSpam);
@@ -616,6 +700,12 @@
     return false;
   }
 
+  private boolean showLightbringerPrimaryButton() {
+    return accountHandle != null
+        && accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())
+        && lightbringerReady;
+  }
+
   private static boolean hasDialableChar(CharSequence number) {
     if (TextUtils.isEmpty(number)) {
       return false;
@@ -635,12 +725,10 @@
     if (accountHandle == null) {
       return false;
     }
-    if (accountHandle
-        .getComponentName()
-        .equals(getLightbringer().getPhoneAccountComponentName(mContext))) {
+    if (mDefaultPhoneAccountHandle == null) {
       return false;
     }
-    return true;
+    return accountHandle.getComponentName().equals(mDefaultPhoneAccountHandle.getComponentName());
   }
 
   private boolean canSupportCarrierVideoCall() {
@@ -690,12 +778,23 @@
       return;
     }
 
-    final TextView view = phoneCallDetailsViews.voicemailTranscriptionView;
-    if (!isExpanded || TextUtils.isEmpty(view.getText())) {
-      view.setVisibility(View.GONE);
+    View transcriptContainerView = phoneCallDetailsViews.transcriptionView;
+    TextView transcriptView = phoneCallDetailsViews.voicemailTranscriptionView;
+    TextView transcriptBrandingView = phoneCallDetailsViews.voicemailTranscriptionBrandingView;
+    if (TextUtils.isEmpty(transcriptView.getText())) {
+      Assert.checkArgument(TextUtils.isEmpty(transcriptBrandingView.getText()));
+    }
+    if (!isExpanded || TextUtils.isEmpty(transcriptView.getText())) {
+      transcriptContainerView.setVisibility(View.GONE);
       return;
     }
-    view.setVisibility(View.VISIBLE);
+    transcriptContainerView.setVisibility(View.VISIBLE);
+    transcriptView.setVisibility(View.VISIBLE);
+    if (TextUtils.isEmpty(transcriptBrandingView.getText())) {
+      phoneCallDetailsViews.voicemailTranscriptionBrandingView.setVisibility(View.GONE);
+    } else {
+      phoneCallDetailsViews.voicemailTranscriptionBrandingView.setVisibility(View.VISIBLE);
+    }
   }
 
   public void updatePhoto() {
@@ -717,19 +816,14 @@
             getContactType());
   }
 
-  private int getContactType() {
-    int contactType = ContactPhotoManager.TYPE_DEFAULT;
-    if (mCallLogCache.isVoicemailNumber(accountHandle, number)) {
-      contactType = ContactPhotoManager.TYPE_VOICEMAIL;
-    } else if (isSpam) {
-      contactType = ContactPhotoManager.TYPE_SPAM;
-    } else if (mCachedNumberLookupService != null
-        && mCachedNumberLookupService.isBusiness(info.sourceType)) {
-      contactType = ContactPhotoManager.TYPE_BUSINESS;
-    } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
-      contactType = ContactPhotoManager.TYPE_GENERIC_AVATAR;
-    }
-    return contactType;
+  private @ContactType int getContactType() {
+    return LetterTileDrawable.getContactTypeFromPrimitives(
+        mCallLogCache.isVoicemailNumber(accountHandle, number),
+        isSpam,
+        mCachedNumberLookupService != null
+            && mCachedNumberLookupService.isBusiness(info.sourceType),
+        numberPresentation,
+        false);
   }
 
   @Override
@@ -789,25 +883,67 @@
       Activity activity = (Activity) mContext;
       activity.startActivityForResult(
           CallComposerActivity.newIntent(activity, buildContact()),
-          DialtactsActivity.ACTIVITY_REQUEST_CODE_CALL_COMPOSE);
+          ActivityRequestCodes.DIALTACTS_CALL_COMPOSER);
     } else if (view.getId() == R.id.share_voicemail) {
       Logger.get(mContext).logImpression(DialerImpression.Type.VVM_SHARE_PRESSED);
       mVoicemailPlaybackPresenter.shareVoicemail();
     } else {
       logCallLogAction(view.getId());
+
       final IntentProvider intentProvider = (IntentProvider) view.getTag();
-      if (intentProvider != null) {
-        final Intent intent = intentProvider.getIntent(mContext);
-        // See IntentProvider.getCallDetailIntentProvider() for why this may be null.
-        if (intent != null) {
-          DialerUtils.startActivityWithErrorToast(mContext, intent);
+      if (intentProvider == null) {
+        return;
+      }
+
+      final Intent intent = intentProvider.getIntent(mContext);
+      // See IntentProvider.getCallDetailIntentProvider() for why this may be null.
+      if (intent == null) {
+        return;
+      }
+
+      if (info != null && info.lookupKey != null) {
+        Bundle extras = new Bundle();
+        if (intent.hasExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS)) {
+          extras = intent.getParcelableExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS);
         }
+        extras.putBoolean(TelephonyManagerCompat.ALLOW_ASSISTED_DIAL, true);
+        intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, extras);
+      }
+
+      // We check to see if we are starting a Lightbringer intent. The reason is Lightbringer
+      // intents need to be started using startActivityForResult instead of the usual startActivity
+      String packageName = intent.getPackage();
+      if (packageName != null && packageName.equals(getLightbringer().getPackageName())) {
+        Logger.get(mContext)
+            .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
+        startLightbringerActivity(intent);
+      } else if (CallDetailsActivity.isLaunchIntent(intent)) {
+        PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);
+        ((Activity) mContext)
+            .startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_CALL_DETAILS);
+      } else {
+        if (Intent.ACTION_CALL.equals(intent.getAction())
+            && intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1)
+                == VideoProfile.STATE_BIDIRECTIONAL) {
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG);
+        }
+        DialerUtils.startActivityWithErrorToast(mContext, intent);
       }
     }
   }
 
-  private CallComposerContact buildContact() {
-    CallComposerContact.Builder contact = CallComposerContact.newBuilder();
+  private void startLightbringerActivity(Intent intent) {
+    try {
+      Activity activity = (Activity) mContext;
+      activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_LIGHTBRINGER);
+    } catch (ActivityNotFoundException e) {
+      Toast.makeText(mContext, R.string.activity_not_available, Toast.LENGTH_SHORT).show();
+    }
+  }
+
+  private DialerContact buildContact() {
+    DialerContact.Builder contact = DialerContact.newBuilder();
     contact.setPhotoId(info.photoId);
     if (info.photoUri != null) {
       contact.setPhotoUri(info.photoUri.toString());
@@ -819,13 +955,23 @@
       contact.setNameOrNumber((String) nameOrNumber);
     }
     contact.setContactType(getContactType());
-    contact.setNumber(number);
+    if (number != null) {
+      contact.setNumber(number);
+    }
     /* second line of contact view. */
     if (!TextUtils.isEmpty(info.name)) {
       contact.setDisplayNumber(displayNumber);
     }
     /* phone number type (e.g. mobile) in second line of contact view */
     contact.setNumberLabel(numberType);
+
+    /* third line of contact view. */
+    String accountLabel = mCallLogCache.getAccountLabel(accountHandle);
+    if (!TextUtils.isEmpty(accountLabel)) {
+      SimDetails.Builder simDetails = SimDetails.newBuilder().setNetwork(accountLabel);
+      simDetails.setColor(mCallLogCache.getAccountColor(accountHandle));
+      contact.setSimDetails(simDetails.build());
+    }
     return contact.build();
   }
 
@@ -834,8 +980,38 @@
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_SEND_MESSAGE);
     } else if (id == R.id.add_to_existing_contact_action) {
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_ADD_TO_CONTACT);
+      switch (hostUi) {
+        case HostUi.CALL_HISTORY:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_CALL_HISTORY);
+          break;
+        case HostUi.CALL_LOG:
+          Logger.get(mContext).logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_CALL_LOG);
+          break;
+        case HostUi.VOICEMAIL:
+          Logger.get(mContext).logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_VOICEMAIL);
+          break;
+        default:
+          throw Assert.createIllegalStateFailException();
+      }
     } else if (id == R.id.create_new_contact_action) {
       Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_CREATE_NEW_CONTACT);
+      switch (hostUi) {
+        case HostUi.CALL_HISTORY:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_CALL_HISTORY);
+          break;
+        case HostUi.CALL_LOG:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_CALL_LOG);
+          break;
+        case HostUi.VOICEMAIL:
+          Logger.get(mContext)
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_VOICEMAIL);
+          break;
+        default:
+          throw Assert.createIllegalStateFailException();
+      }
     }
   }
 
@@ -987,6 +1163,15 @@
     Logger.get(mContext).logScreenView(ScreenEvent.Type.CALL_LOG_CONTEXT_MENU, (Activity) mContext);
   }
 
+  /** Specifies where the view holder belongs. */
+  @IntDef({HostUi.CALL_LOG, HostUi.CALL_HISTORY, HostUi.VOICEMAIL})
+  @Retention(RetentionPolicy.SOURCE)
+  private @interface HostUi {
+    int CALL_LOG = 0;
+    int CALL_HISTORY = 1;
+    int VOICEMAIL = 2;
+  }
+
   public interface OnClickListener {
 
     void onBlockReportSpam(
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
index e169b8d..43e03e9 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
@@ -18,7 +18,6 @@
 
 import android.Manifest;
 import android.annotation.TargetApi;
-import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -27,6 +26,7 @@
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 import android.provider.CallLog.Calls;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.support.v4.os.UserManagerCompat;
@@ -36,7 +36,6 @@
 import com.android.dialer.calllogutils.PhoneNumberDisplayUtil;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.location.GeoUtil;
-import com.android.dialer.notification.GroupedNotificationUtil;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.PermissionsUtil;
@@ -46,7 +45,6 @@
 /** Helper class operating on call log notifications. */
 public class CallLogNotificationsQueryHelper {
 
-  private static final String TAG = "CallLogNotifHelper";
   private final Context mContext;
   private final NewCallsQuery mNewCallsQuery;
   private final ContactInfoHelper mContactInfoHelper;
@@ -74,44 +72,58 @@
         countryIso);
   }
 
+  public static void markAllMissedCallsInCallLogAsRead(@NonNull Context context) {
+    markMissedCallsInCallLogAsRead(context, null);
+  }
+
+  public static void markSingleMissedCallInCallLogAsRead(
+      @NonNull Context context, @Nullable Uri callUri) {
+    if (callUri == null) {
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead",
+          "call URI is null, unable to mark call as read");
+    } else {
+      markMissedCallsInCallLogAsRead(context, callUri);
+    }
+  }
+
   /**
-   * Removes the missed call notifications and marks calls as read. If a callUri is provided, only
-   * that call is marked as read.
+   * If callUri is null then calls with a matching callUri are marked as read, otherwise all calls
+   * are marked as read.
    */
   @WorkerThread
-  public static void removeMissedCallNotifications(Context context, @Nullable Uri callUri) {
-    // Call log is only accessible when unlocked. If that's the case, clear the list of
-    // new missed calls from the call log.
-    if (UserManagerCompat.isUserUnlocked(context) && PermissionsUtil.hasPhonePermissions(context)) {
-      ContentValues values = new ContentValues();
-      values.put(Calls.NEW, 0);
-      values.put(Calls.IS_READ, 1);
-      StringBuilder where = new StringBuilder();
-      where.append(Calls.NEW);
-      where.append(" = 1 AND ");
-      where.append(Calls.TYPE);
-      where.append(" = ?");
-      try {
-        context
-            .getContentResolver()
-            .update(
-                callUri == null ? Calls.CONTENT_URI : callUri,
-                values,
-                where.toString(),
-                new String[] {Integer.toString(Calls.MISSED_TYPE)});
-      } catch (IllegalArgumentException e) {
-        LogUtil.e(
-            "CallLogNotificationsQueryHelper.removeMissedCallNotifications",
-            "contacts provider update command failed",
-            e);
-      }
+  private static void markMissedCallsInCallLogAsRead(Context context, @Nullable Uri callUri) {
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "locked");
+      return;
+    }
+    if (!PermissionsUtil.hasPhonePermissions(context)) {
+      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no permission");
+      return;
     }
 
-    GroupedNotificationUtil.removeNotification(
-        context.getSystemService(NotificationManager.class),
-        callUri != null ? callUri.toString() : null,
-        R.id.notification_missed_call,
-        MissedCallNotifier.NOTIFICATION_TAG);
+    ContentValues values = new ContentValues();
+    values.put(Calls.NEW, 0);
+    values.put(Calls.IS_READ, 1);
+    StringBuilder where = new StringBuilder();
+    where.append(Calls.NEW);
+    where.append(" = 1 AND ");
+    where.append(Calls.TYPE);
+    where.append(" = ?");
+    try {
+      context
+          .getContentResolver()
+          .update(
+              callUri == null ? Calls.CONTENT_URI : callUri,
+              values,
+              where.toString(),
+              new String[] {Integer.toString(Calls.MISSED_TYPE)});
+    } catch (IllegalArgumentException e) {
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead",
+          "contacts provider update command failed",
+          e);
+    }
   }
 
   /** Create a new instance of {@link NewCallsQuery}. */
@@ -281,7 +293,9 @@
     @TargetApi(VERSION_CODES.M)
     public List<NewCall> query(int type) {
       if (!PermissionsUtil.hasPermission(mContext, Manifest.permission.READ_CALL_LOG)) {
-        LogUtil.w(TAG, "No READ_CALL_LOG permission, returning null for calls lookup.");
+        LogUtil.w(
+            "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+            "no READ_CALL_LOG permission, returning null for calls lookup.");
         return null;
       }
       final String selection = String.format("%s = 1 AND %s = ?", Calls.NEW, Calls.TYPE);
@@ -302,7 +316,9 @@
         }
         return newCalls;
       } catch (RuntimeException e) {
-        LogUtil.w(TAG, "Exception when querying Contacts Provider for calls lookup");
+        LogUtil.w(
+            "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
+            "exception when querying Contacts Provider for calls lookup");
         return null;
       }
     }
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
index 7dfd2cb..0490b99 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
@@ -17,13 +17,20 @@
 package com.android.dialer.app.calllog;
 
 import android.app.IntentService;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
+import android.telecom.PhoneAccountHandle;
+import com.android.dialer.app.voicemail.LegacyVoicemailNotificationReceiver;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
 
@@ -43,28 +50,37 @@
  */
 public class CallLogNotificationsService extends IntentService {
 
-  /** Action to mark all the new voicemails as old. */
-  public static final String ACTION_MARK_NEW_VOICEMAILS_AS_OLD =
-      "com.android.dialer.calllog.ACTION_MARK_NEW_VOICEMAILS_AS_OLD";
+  @VisibleForTesting
+  static final String ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD =
+      "com.android.dialer.calllog.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD";
 
-  /** Action to mark all the new missed calls as old. */
-  public static final String ACTION_MARK_NEW_MISSED_CALLS_AS_OLD =
-      "com.android.dialer.calllog.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD";
+  private static final String ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD =
+      "com.android.dialer.calllog.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD ";
 
-  /** Action to update missed call notifications with a post call note. */
-  public static final String ACTION_INCOMING_POST_CALL =
+  @VisibleForTesting
+  static final String ACTION_CANCEL_ALL_MISSED_CALLS =
+      "com.android.dialer.calllog.ACTION_CANCEL_ALL_MISSED_CALLS";
+
+  private static final String ACTION_CANCEL_SINGLE_MISSED_CALL =
+      "com.android.dialer.calllog.ACTION_CANCEL_SINGLE_MISSED_CALL";
+
+  private static final String ACTION_INCOMING_POST_CALL =
       "com.android.dialer.calllog.INCOMING_POST_CALL";
 
   /** Action to call back a missed call. */
   public static final String ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION =
       "com.android.dialer.calllog.CALL_BACK_FROM_MISSED_CALL_NOTIFICATION";
 
+  /** Action mark legacy voicemail as dismissed. */
+  public static final String ACTION_LEGACY_VOICEMAIL_DISMISSED =
+      "com.android.dialer.calllog.ACTION_LEGACY_VOICEMAIL_DISMISSED";
+
   /**
    * Extra to be included with {@link #ACTION_INCOMING_POST_CALL} to represent a post call note.
    *
    * <p>It must be a {@link String}
    */
-  public static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
+  private static final String EXTRA_POST_CALL_NOTE = "POST_CALL_NOTE";
 
   /**
    * Extra to be included with {@link #ACTION_INCOMING_POST_CALL} to represent the phone number the
@@ -72,10 +88,11 @@
    *
    * <p>It must be a {@link String}
    */
-  public static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
+  private static final String EXTRA_POST_CALL_NUMBER = "POST_CALL_NUMBER";
+
+  private static final String EXTRA_PHONE_ACCOUNT_HANDLE = "PHONE_ACCOUNT_HANDLE";
 
   public static final int UNKNOWN_MISSED_CALL_COUNT = -1;
-  private VoicemailQueryHandler mVoicemailQueryHandler;
 
   public CallLogNotificationsService() {
     super("CallLogNotificationsService");
@@ -89,52 +106,107 @@
     context.startService(serviceIntent);
   }
 
-  public static void markNewVoicemailsAsOld(Context context, @Nullable Uri voicemailUri) {
+  public static void markAllNewVoicemailsAsOld(Context context) {
+    LogUtil.enterBlock("CallLogNotificationsService.markAllNewVoicemailsAsOld");
     Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
-    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
+    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+    context.startService(serviceIntent);
+  }
+
+  public static void markSingleNewVoicemailAsOld(Context context, @Nullable Uri voicemailUri) {
+    LogUtil.enterBlock("CallLogNotificationsService.markSingleNewVoicemailAsOld");
+    Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
+    serviceIntent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
     serviceIntent.setData(voicemailUri);
     context.startService(serviceIntent);
   }
 
-  public static void markNewMissedCallsAsOld(Context context, @Nullable Uri callUri) {
-    Intent serviceIntent = new Intent(context, CallLogNotificationsService.class);
-    serviceIntent.setAction(ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
-    serviceIntent.setData(callUri);
-    context.startService(serviceIntent);
+  public static void cancelAllMissedCalls(Context context) {
+    LogUtil.enterBlock("CallLogNotificationsService.cancelAllMissedCalls");
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new CancelAllMissedCallsWorker())
+        .build()
+        .executeSerial(context);
+  }
+
+  public static PendingIntent createMarkAllNewVoicemailsAsOldIntent(@NonNull Context context) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(CallLogNotificationsService.ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createMarkSingleNewVoicemailAsOldIntent(
+      @NonNull Context context, @Nullable Uri voicemailUri) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(CallLogNotificationsService.ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD);
+    intent.setData(voicemailUri);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createCancelAllMissedCallsPendingIntent(@NonNull Context context) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(ACTION_CANCEL_ALL_MISSED_CALLS);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createCancelSingleMissedCallPendingIntent(
+      @NonNull Context context, @Nullable Uri callUri) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(ACTION_CANCEL_SINGLE_MISSED_CALL);
+    intent.setData(callUri);
+    return PendingIntent.getService(context, 0, intent, 0);
+  }
+
+  public static PendingIntent createLegacyVoicemailDismissedPendingIntent(
+      @NonNull Context context, PhoneAccountHandle phoneAccountHandle) {
+    Intent intent = new Intent(context, CallLogNotificationsService.class);
+    intent.setAction(ACTION_LEGACY_VOICEMAIL_DISMISSED);
+    intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+    return PendingIntent.getService(context, 0, intent, 0);
   }
 
   @Override
   protected void onHandleIntent(Intent intent) {
     if (intent == null) {
-      LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
+      LogUtil.e("CallLogNotificationsService.onHandleIntent", "could not handle null intent");
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)) {
+    if (!PermissionsUtil.hasPermission(this, android.Manifest.permission.READ_CALL_LOG)
+        || !PermissionsUtil.hasPermission(this, android.Manifest.permission.WRITE_CALL_LOG)) {
+      LogUtil.e("CallLogNotificationsService.onHandleIntent", "no READ_CALL_LOG permission");
       return;
     }
 
     String action = intent.getAction();
+    LogUtil.i("CallLogNotificationsService.onHandleIntent", "action: " + action);
     switch (action) {
-      case ACTION_MARK_NEW_VOICEMAILS_AS_OLD:
-        // VoicemailQueryHandler cannot be created on the IntentService worker thread. The completed
-        // callback might happen when the thread is dead.
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(
-            () -> {
-              if (mVoicemailQueryHandler == null) {
-                mVoicemailQueryHandler = new VoicemailQueryHandler(this, getContentResolver());
-              }
-              mVoicemailQueryHandler.markNewVoicemailsAsOld(intent.getData());
-            });
+      case ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD:
+        VoicemailQueryHandler.markAllNewVoicemailsAsRead(this);
+        VisualVoicemailNotifier.cancelAllVoicemailNotifications(this);
+        break;
+      case ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD:
+        Uri voicemailUri = intent.getData();
+        VoicemailQueryHandler.markSingleNewVoicemailAsRead(this, voicemailUri);
+        VisualVoicemailNotifier.cancelSingleVoicemailNotification(this, voicemailUri);
+        break;
+      case ACTION_LEGACY_VOICEMAIL_DISMISSED:
+        LegacyVoicemailNotificationReceiver.setDismissed(
+            this, intent.getParcelableExtra(EXTRA_PHONE_ACCOUNT_HANDLE), true);
         break;
       case ACTION_INCOMING_POST_CALL:
         String note = intent.getStringExtra(EXTRA_POST_CALL_NOTE);
         String phoneNumber = intent.getStringExtra(EXTRA_POST_CALL_NUMBER);
         MissedCallNotifier.getIstance(this).insertPostCallNotification(phoneNumber, note);
         break;
-      case ACTION_MARK_NEW_MISSED_CALLS_AS_OLD:
-        CallLogNotificationsQueryHelper.removeMissedCallNotifications(this, intent.getData());
+      case ACTION_CANCEL_ALL_MISSED_CALLS:
+        cancelAllMissedCalls(this);
+        break;
+      case ACTION_CANCEL_SINGLE_MISSED_CALL:
+        Uri callUri = intent.getData();
+        CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(this, callUri);
+        MissedCallNotifier.cancelSingleMissedCallNotification(this, callUri);
         TelecomUtil.cancelMissedCallsNotification(this);
         break;
       case ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION:
@@ -145,8 +217,30 @@
                 intent.getData());
         break;
       default:
-        LogUtil.d("CallLogNotificationsService.onHandleIntent", "could not handle: " + intent);
+        LogUtil.e("CallLogNotificationsService.onHandleIntent", "no handler for action: " + action);
         break;
     }
   }
+
+  @WorkerThread
+  private static void cancelAllMissedCallsBackground(Context context) {
+    LogUtil.enterBlock("CallLogNotificationsService.cancelAllMissedCallsBackground");
+    Assert.isWorkerThread();
+    CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(context);
+    MissedCallNotifier.cancelAllMissedCallNotifications(context);
+    TelecomUtil.cancelMissedCallsNotification(context);
+  }
+
+  /** Worker that cancels all missed call notifications and updates call log entries. */
+  private static class CancelAllMissedCallsWorker implements Worker<Context, Void> {
+
+    @Nullable
+    @Override
+    public Void doInBackground(@Nullable Context context) throws Throwable {
+      if (context != null) {
+        cancelAllMissedCallsBackground(context);
+      }
+      return null;
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/CallLogReceiver.java b/java/com/android/dialer/app/calllog/CallLogReceiver.java
index 172d001..ce3132d 100644
--- a/java/com/android/dialer/app/calllog/CallLogReceiver.java
+++ b/java/com/android/dialer/app/calllog/CallLogReceiver.java
@@ -39,10 +39,10 @@
     if (VoicemailContract.ACTION_NEW_VOICEMAIL.equals(intent.getAction())) {
       checkVoicemailStatus(context);
       PendingResult pendingResult = goAsync();
-      DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+      VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
     } else if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
       PendingResult pendingResult = goAsync();
-      DefaultVoicemailNotifier.updateVoicemailNotifications(context, pendingResult::finish);
+      VisualVoicemailUpdateTask.scheduleTask(context, pendingResult::finish);
     } else {
       LogUtil.w("CallLogReceiver.onReceive", "could not handle: " + intent);
     }
diff --git a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
index a01b895..b16eb1b 100644
--- a/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
+++ b/java/com/android/dialer/app/calllog/ClearCallLogDialog.java
@@ -22,20 +22,27 @@
 import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.ProgressDialog;
-import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.CallLog.Calls;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
 import com.android.dialer.app.R;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
 
 /** Dialog that clears the call log after confirming with the user */
 public class ClearCallLogDialog extends DialogFragment {
 
+  private DialerExecutor<Void> clearCallLogTask;
+  private ProgressDialog progressDialog;
+
   /** Preferred way to show this dialog */
   public static void show(FragmentManager fragmentManager) {
     ClearCallLogDialog dialog = new ClearCallLogDialog();
@@ -43,49 +50,35 @@
   }
 
   @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    clearCallLogTask =
+        DialerExecutorComponent.get(getContext())
+            .dialerExecutorFactory()
+            .createUiTaskBuilder(
+                getFragmentManager(),
+                "clearCallLogTask",
+                new ClearCallLogWorker(getActivity().getApplicationContext()))
+            .onSuccess(this::onSuccess)
+            .build();
+  }
+
+  @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    final ContentResolver resolver = getActivity().getContentResolver();
-    final Context context = getActivity().getApplicationContext();
-    final OnClickListener okListener =
-        new OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            final ProgressDialog progressDialog =
-                ProgressDialog.show(
-                    getActivity(), getString(R.string.clearCallLogProgress_title), "", true, false);
-            progressDialog.setOwnerActivity(getActivity());
-            CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
-            final AsyncTask<Void, Void, Void> task =
-                new AsyncTask<Void, Void, Void>() {
-                  @Override
-                  protected Void doInBackground(Void... params) {
-                    resolver.delete(Calls.CONTENT_URI, null, null);
-                    CachedNumberLookupService cachedNumberLookupService =
-                        PhoneNumberCache.get(context).getCachedNumberLookupService();
-                    if (cachedNumberLookupService != null) {
-                      cachedNumberLookupService.clearAllCacheEntries(context);
-                    }
-                    return null;
-                  }
+    OnClickListener okListener =
+        (dialog, which) -> {
+          progressDialog =
+              ProgressDialog.show(
+                  getActivity(), getString(R.string.clearCallLogProgress_title), "", true, false);
+          progressDialog.setOwnerActivity(getActivity());
+          CallLogNotificationsService.cancelAllMissedCalls(getContext());
 
-                  @Override
-                  protected void onPostExecute(Void result) {
-                    final Activity activity = progressDialog.getOwnerActivity();
+          // TODO: Once we have the API, we should configure this ProgressDialog
+          // to only show up after a certain time (e.g. 150ms)
+          progressDialog.show();
 
-                    if (activity == null || activity.isDestroyed() || activity.isFinishing()) {
-                      return;
-                    }
-
-                    if (progressDialog != null && progressDialog.isShowing()) {
-                      progressDialog.dismiss();
-                    }
-                  }
-                };
-            // TODO: Once we have the API, we should configure this ProgressDialog
-            // to only show up after a certain time (e.g. 150ms)
-            progressDialog.show();
-            task.execute();
-          }
+          clearCallLogTask.executeSerial(null);
         };
     return new AlertDialog.Builder(getActivity())
         .setTitle(R.string.clearCallLogConfirmation_title)
@@ -96,4 +89,49 @@
         .setCancelable(true)
         .create();
   }
+
+  private static class ClearCallLogWorker implements Worker<Void, Void> {
+    private final Context appContext;
+
+    private ClearCallLogWorker(Context appContext) {
+      this.appContext = appContext;
+    }
+
+    @Nullable
+    @Override
+    public Void doInBackground(@Nullable Void unused) throws Throwable {
+      appContext.getContentResolver().delete(Calls.CONTENT_URI, null, null);
+      CachedNumberLookupService cachedNumberLookupService =
+          PhoneNumberCache.get(appContext).getCachedNumberLookupService();
+      if (cachedNumberLookupService != null) {
+        cachedNumberLookupService.clearAllCacheEntries(appContext);
+      }
+      return null;
+    }
+  }
+
+  private void onSuccess(Void unused) {
+    Assert.isNotNull(progressDialog);
+    Activity activity = progressDialog.getOwnerActivity();
+
+    if (activity == null || activity.isDestroyed() || activity.isFinishing()) {
+      return;
+    }
+
+    maybeShowEnrichedCallSnackbar(activity);
+
+    if (progressDialog != null && progressDialog.isShowing()) {
+      progressDialog.dismiss();
+    }
+  }
+
+  private void maybeShowEnrichedCallSnackbar(Activity activity) {
+    if (EnrichedCallComponent.get(activity).getEnrichedCallManager().hasStoredData()) {
+      Snackbar.make(
+              activity.findViewById(R.id.calllog_frame),
+              getString(R.string.multiple_ec_data_deleted),
+              5_000)
+          .show();
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java b/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
deleted file mode 100644
index 58fe6fa..0000000
--- a/java/com/android/dialer/app/calllog/DefaultVoicemailNotifier.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (C) 2011 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.app.calllog;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.PersistableBundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
-import android.support.v4.os.BuildCompat;
-import android.support.v4.util.Pair;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.DialtactsActivity;
-import com.android.dialer.app.R;
-import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
-import com.android.dialer.app.contactinfo.ContactPhotoLoader;
-import com.android.dialer.app.list.DialtactsPagerAdapter;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.blocking.FilteredNumbersUtil;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
-import com.android.dialer.phonenumbercache.ContactInfo;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/** Shows a voicemail notification in the status bar. */
-public class DefaultVoicemailNotifier implements Worker<Void, Void> {
-
-  public static final String TAG = "VoicemailNotifier";
-
-  /** The tag used to identify notifications from this class. */
-  static final String VISUAL_VOICEMAIL_NOTIFICATION_TAG = "DefaultVoicemailNotifier";
-  /** The identifier of the notification of new voicemails. */
-  private static final int VISUAL_VOICEMAIL_NOTIFICATION_ID = R.id.notification_visual_voicemail;
-
-  private static final int LEGACY_VOICEMAIL_NOTIFICATION_ID = R.id.notification_legacy_voicemail;
-  private static final String LEGACY_VOICEMAIL_NOTIFICATION_TAG = "legacy_voicemail";
-
-  private final Context context;
-  private final CallLogNotificationsQueryHelper queryHelper;
-  private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
-
-  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-  DefaultVoicemailNotifier(
-      Context context,
-      CallLogNotificationsQueryHelper queryHelper,
-      FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) {
-    this.context = context;
-    this.queryHelper = queryHelper;
-    this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler;
-  }
-
-  public DefaultVoicemailNotifier(Context context) {
-    this(
-        context,
-        CallLogNotificationsQueryHelper.getInstance(context),
-        new FilteredNumberAsyncQueryHandler(context));
-  }
-
-  @Nullable
-  @Override
-  public Void doInBackground(@Nullable Void input) throws Throwable {
-    updateNotification();
-    return null;
-  }
-
-  /**
-   * Updates the notification and notifies of the call with the given URI.
-   *
-   * <p>Clears the notification if there are no new voicemails, and notifies if the given URI
-   * corresponds to a new voicemail.
-   *
-   * <p>It is not safe to call this method from the main thread.
-   */
-  @VisibleForTesting
-  @WorkerThread
-  void updateNotification() {
-    Assert.isWorkerThread();
-    // Lookup the list of new voicemails to include in the notification.
-    final List<NewCall> newCalls = queryHelper.getNewVoicemails();
-
-    if (newCalls == null) {
-      // Query failed, just return.
-      return;
-    }
-
-    Resources resources = context.getResources();
-
-    // This represents a list of names to include in the notification.
-    String callers = null;
-
-    // Maps each number into a name: if a number is in the map, it has already left a more
-    // recent voicemail.
-    final Map<String, ContactInfo> contactInfos = new ArrayMap<>();
-
-    // Iterate over the new voicemails to determine all the information above.
-    Iterator<NewCall> itr = newCalls.iterator();
-    while (itr.hasNext()) {
-      NewCall newCall = itr.next();
-
-      // Skip notifying for numbers which are blocked.
-      if (!FilteredNumbersUtil.hasRecentEmergencyCall(context)
-          && filteredNumberAsyncQueryHandler.getBlockedIdSynchronous(
-                  newCall.number, newCall.countryIso)
-              != null) {
-        itr.remove();
-
-        if (newCall.voicemailUri != null) {
-          // Delete the voicemail.
-          CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
-        }
-        continue;
-      }
-
-      // Check if we already know the name associated with this number.
-      ContactInfo contactInfo = contactInfos.get(newCall.number);
-      if (contactInfo == null) {
-        contactInfo =
-            queryHelper.getContactInfo(
-                newCall.number, newCall.numberPresentation, newCall.countryIso);
-        contactInfos.put(newCall.number, contactInfo);
-        // This is a new caller. Add it to the back of the list of callers.
-        if (TextUtils.isEmpty(callers)) {
-          callers = contactInfo.name;
-        } else {
-          callers =
-              resources.getString(
-                  R.string.notification_voicemail_callers_list, callers, contactInfo.name);
-        }
-      }
-    }
-
-    if (newCalls.isEmpty()) {
-      // No voicemails to notify about
-      return;
-    }
-
-    Notification.Builder groupSummary =
-        createNotificationBuilder()
-            .setContentTitle(
-                resources.getQuantityString(
-                    R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size()))
-            .setContentText(callers)
-            .setDeleteIntent(createMarkNewVoicemailsAsOldIntent(null))
-            .setGroupSummary(true)
-            .setContentIntent(newVoicemailIntent(null));
-
-    if (BuildCompat.isAtLeastO()) {
-      groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
-    }
-
-    NotificationChannelManager.applyChannel(
-        groupSummary,
-        context,
-        Channel.VOICEMAIL,
-        PhoneAccountHandles.getAccount(context, newCalls.get(0)));
-
-    LogUtil.i(TAG, "Creating visual voicemail notification");
-    getNotificationManager()
-        .notify(
-            VISUAL_VOICEMAIL_NOTIFICATION_TAG,
-            VISUAL_VOICEMAIL_NOTIFICATION_ID,
-            groupSummary.build());
-
-    for (NewCall voicemail : newCalls) {
-      getNotificationManager()
-          .notify(
-              voicemail.callsUri.toString(),
-              VISUAL_VOICEMAIL_NOTIFICATION_ID,
-              createNotificationForVoicemail(voicemail, contactInfos));
-    }
-  }
-
-  /**
-   * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
-   * notification. The notification will not be stackable because no information is available for
-   * individual voicemails.
-   */
-  @TargetApi(VERSION_CODES.O)
-  public void notifyLegacyVoicemail(
-      @NonNull PhoneAccountHandle phoneAccountHandle,
-      int count,
-      String voicemailNumber,
-      PendingIntent callVoicemailIntent,
-      PendingIntent voicemailSettingIntent) {
-    Assert.isNotNull(phoneAccountHandle);
-    Assert.checkArgument(BuildCompat.isAtLeastO());
-    TelephonyManager telephonyManager =
-        context
-            .getSystemService(TelephonyManager.class)
-            .createForPhoneAccountHandle(phoneAccountHandle);
-    Assert.isNotNull(telephonyManager);
-    LogUtil.i(TAG, "Creating legacy voicemail notification");
-
-    PersistableBundle carrierConfig = telephonyManager.getCarrierConfig();
-
-    String notificationTitle =
-        context
-            .getResources()
-            .getQuantityString(R.plurals.notification_voicemail_title, count, count);
-
-    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
-    PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
-
-    String notificationText;
-    PendingIntent pendingIntent;
-
-    if (voicemailSettingIntent != null) {
-      // If the voicemail number if unknown, instead of calling voicemail, take the user
-      // to the voicemail settings.
-      notificationText = context.getString(R.string.notification_voicemail_no_vm_number);
-      pendingIntent = voicemailSettingIntent;
-    } else {
-      if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
-        notificationText = phoneAccount.getShortDescription().toString();
-      } else {
-        notificationText =
-            String.format(
-                context.getString(R.string.notification_voicemail_text_format),
-                PhoneNumberUtils.formatNumber(voicemailNumber));
-      }
-      pendingIntent = callVoicemailIntent;
-    }
-    Notification.Builder builder = new Notification.Builder(context);
-    builder
-        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-        .setColor(context.getColor(R.color.dialer_theme_color))
-        .setWhen(System.currentTimeMillis())
-        .setContentTitle(notificationTitle)
-        .setContentText(notificationText)
-        .setContentIntent(pendingIntent)
-        .setSound(telephonyManager.getVoicemailRingtoneUri(phoneAccountHandle))
-        .setOngoing(
-            carrierConfig.getBoolean(
-                CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL));
-
-    if (telephonyManager.isVoicemailVibrationEnabled(phoneAccountHandle)) {
-      builder.setDefaults(Notification.DEFAULT_VIBRATE);
-    }
-
-    NotificationChannelManager.applyChannel(
-        builder, context, Channel.VOICEMAIL, phoneAccountHandle);
-    Notification notification = builder.build();
-    getNotificationManager()
-        .notify(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID, notification);
-  }
-
-  public void cancelLegacyNotification() {
-    LogUtil.i(TAG, "Clearing legacy voicemail notification");
-    getNotificationManager()
-        .cancel(LEGACY_VOICEMAIL_NOTIFICATION_TAG, LEGACY_VOICEMAIL_NOTIFICATION_ID);
-  }
-
-  /**
-   * Determines which ringtone Uri and Notification defaults to use when updating the notification
-   * for the given call.
-   */
-  private Pair<Uri, Integer> getNotificationInfo(@Nullable NewCall callToNotify) {
-    LogUtil.v(TAG, "getNotificationInfo");
-    if (callToNotify == null) {
-      LogUtil.i(TAG, "callToNotify == null");
-      return new Pair<>(null, 0);
-    }
-    PhoneAccountHandle accountHandle = PhoneAccountHandles.getAccount(context, callToNotify);
-    if (accountHandle == null) {
-      LogUtil.i(TAG, "No default phone account found, using default notification ringtone");
-      return new Pair<>(null, Notification.DEFAULT_ALL);
-    }
-    return new Pair<>(
-        TelephonyManagerCompat.getVoicemailRingtoneUri(getTelephonyManager(), accountHandle),
-        getNotificationDefaults(accountHandle));
-  }
-
-  private int getNotificationDefaults(PhoneAccountHandle accountHandle) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return TelephonyManagerCompat.isVoicemailVibrationEnabled(
-              getTelephonyManager(), accountHandle)
-          ? Notification.DEFAULT_VIBRATE
-          : 0;
-    }
-    return Notification.DEFAULT_ALL;
-  }
-
-  /** Creates a pending intent that marks all new voicemails as old. */
-  private PendingIntent createMarkNewVoicemailsAsOldIntent(@Nullable Uri voicemailUri) {
-    Intent intent = new Intent(context, CallLogNotificationsService.class);
-    intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_VOICEMAILS_AS_OLD);
-    intent.setData(voicemailUri);
-    return PendingIntent.getService(context, 0, intent, 0);
-  }
-
-  private NotificationManager getNotificationManager() {
-    return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-  }
-
-  private TelephonyManager getTelephonyManager() {
-    return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-  }
-
-  private Notification createNotificationForVoicemail(
-      @NonNull NewCall voicemail, @NonNull Map<String, ContactInfo> contactInfos) {
-    Pair<Uri, Integer> notificationInfo = getNotificationInfo(voicemail);
-    ContactInfo contactInfo = contactInfos.get(voicemail.number);
-
-    Notification.Builder notificationBuilder =
-        createNotificationBuilder()
-            .setContentTitle(
-                context
-                    .getResources()
-                    .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
-            .setContentText(
-                ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                    context.getResources(),
-                    R.string.notification_new_voicemail_ticker,
-                    contactInfo.name))
-            .setWhen(voicemail.dateMs)
-            .setSound(notificationInfo.first)
-            .setDefaults(notificationInfo.second);
-
-    if (voicemail.voicemailUri != null) {
-      notificationBuilder.setDeleteIntent(
-          createMarkNewVoicemailsAsOldIntent(voicemail.voicemailUri));
-    }
-
-    NotificationChannelManager.applyChannel(
-        notificationBuilder,
-        context,
-        Channel.VOICEMAIL,
-        PhoneAccountHandles.getAccount(context, voicemail));
-
-    ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
-    Bitmap photoIcon = loader.loadPhotoIcon();
-    if (photoIcon != null) {
-      notificationBuilder.setLargeIcon(photoIcon);
-    }
-    if (!TextUtils.isEmpty(voicemail.transcription)) {
-      Logger.get(context)
-          .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
-      notificationBuilder.setStyle(
-          new Notification.BigTextStyle().bigText(voicemail.transcription));
-    }
-    notificationBuilder.setContentIntent(newVoicemailIntent(voicemail));
-    Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
-    return notificationBuilder.build();
-  }
-
-  private Notification.Builder createNotificationBuilder() {
-    return new Notification.Builder(context)
-        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-        .setColor(context.getColor(R.color.dialer_theme_color))
-        .setGroup(VISUAL_VOICEMAIL_NOTIFICATION_TAG)
-        .setOnlyAlertOnce(true)
-        .setAutoCancel(true);
-  }
-
-  private PendingIntent newVoicemailIntent(@Nullable NewCall voicemail) {
-    Intent intent =
-        DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
-    // TODO (b/35486204): scroll to this voicemail
-    if (voicemail != null) {
-      intent.setData(voicemail.voicemailUri);
-    }
-    intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
-    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-  }
-
-  /**
-   * Updates the voicemail notifications displayed.
-   *
-   * @param runnable Called when the async update task completes no matter if it succeeds or fails.
-   *     May be null.
-   */
-  static void updateVoicemailNotifications(Context context, Runnable runnable) {
-    if (!TelecomUtil.isDefaultDialer(context)) {
-      LogUtil.i(
-          "DefaultVoicemailNotifier.updateVoicemailNotifications",
-          "not default dialer, not scheduling update to voicemail notifications");
-      return;
-    }
-
-    DialerExecutors.createNonUiTaskBuilder(new DefaultVoicemailNotifier(context))
-        .onSuccess(
-            output -> {
-              LogUtil.i(
-                  "DefaultVoicemailNotifier.updateVoicemailNotifications",
-                  "update voicemail notifications successful");
-              if (runnable != null) {
-                runnable.run();
-              }
-            })
-        .onFailure(
-            throwable -> {
-              LogUtil.i(
-                  "DefaultVoicemailNotifier.updateVoicemailNotifications",
-                  "update voicemail notifications failed");
-              if (runnable != null) {
-                runnable.run();
-              }
-            })
-        .build()
-        .executeParallel(null);
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
new file mode 100644
index 0000000..a3aac41
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/DialerQuickContactBadge.java
@@ -0,0 +1,63 @@
+/*
+ * 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.app.calllog;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+
+/** Allows us to click the contact badge for non multi select mode. */
+class DialerQuickContactBadge extends QuickContactBadge {
+
+  private View.OnClickListener mExtraOnClickListener;
+  private OnActionModeStateChangedListener onActionModeStateChangeListener;
+
+  public DialerQuickContactBadge(Context context) {
+    super(context);
+  }
+
+  public DialerQuickContactBadge(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public DialerQuickContactBadge(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (mExtraOnClickListener != null
+        && onActionModeStateChangeListener.isActionModeStateEnabled()) {
+      Logger.get(v.getContext())
+          .logImpression(DialerImpression.Type.MULTISELECT_SINGLE_PRESS_TAP_VIA_CONTACT_BADGE);
+      mExtraOnClickListener.onClick(v);
+    } else {
+      super.onClick(v);
+    }
+  }
+
+  public void setMulitSelectListeners(
+      View.OnClickListener extraOnClickListener,
+      OnActionModeStateChangedListener actionModeStateChangeListener) {
+    mExtraOnClickListener = extraOnClickListener;
+    onActionModeStateChangeListener = actionModeStateChangeListener;
+  }
+}
diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index a94c678..55fdbba 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -24,11 +24,11 @@
 import android.telecom.PhoneAccountHandle;
 import com.android.contacts.common.model.Contact;
 import com.android.contacts.common.model.ContactLoader;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.calldetails.CallDetailsActivity;
 import com.android.dialer.calldetails.CallDetailsEntries;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.IntentUtil;
@@ -112,11 +112,12 @@
    * @return The call details intent provider.
    */
   public static IntentProvider getCallDetailIntentProvider(
-      CallDetailsEntries callDetailsEntries, CallComposerContact contact) {
+      CallDetailsEntries callDetailsEntries, DialerContact contact, boolean canReportCallerId) {
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return CallDetailsActivity.newInstance(context, callDetailsEntries, contact);
+        return CallDetailsActivity.newInstance(
+            context, callDetailsEntries, contact, canReportCallerId);
       }
     };
   }
diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
new file mode 100644
index 0000000..584f07f
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
@@ -0,0 +1,156 @@
+/*
+ * 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.app.calllog;
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.dialer.app.R;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelManager;
+
+/** Shows a notification in the status bar for legacy vociemail. */
+@TargetApi(VERSION_CODES.O)
+public final class LegacyVoicemailNotifier {
+  private static final String NOTIFICATION_TAG = "LegacyVoicemail";
+  private static final int NOTIFICATION_ID = 1;
+
+  /**
+   * Replicates how packages/services/Telephony/NotificationMgr.java handles legacy voicemail
+   * notification. The notification will not be stackable because no information is available for
+   * individual voicemails.
+   */
+  public static void showNotification(
+      @NonNull Context context,
+      @NonNull PhoneAccountHandle handle,
+      int count,
+      String voicemailNumber,
+      PendingIntent callVoicemailIntent,
+      PendingIntent voicemailSettingsIntent,
+      boolean isRefresh) {
+    LogUtil.enterBlock("LegacyVoicemailNotifier.showNotification");
+    Assert.isNotNull(handle);
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+
+    TelephonyManager pinnedTelephonyManager =
+        context.getSystemService(TelephonyManager.class).createForPhoneAccountHandle(handle);
+    if (pinnedTelephonyManager == null) {
+      LogUtil.e("LegacyVoicemailNotifier.showNotification", "invalid PhoneAccountHandle");
+      return;
+    }
+
+    Notification notification =
+        createNotification(
+            context,
+            pinnedTelephonyManager,
+            handle,
+            count,
+            voicemailNumber,
+            callVoicemailIntent,
+            voicemailSettingsIntent,
+            isRefresh);
+    DialerNotificationManager.notify(context, NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+  }
+
+  @NonNull
+  private static Notification createNotification(
+      @NonNull Context context,
+      @NonNull TelephonyManager pinnedTelephonyManager,
+      @NonNull PhoneAccountHandle handle,
+      int count,
+      String voicemailNumber,
+      PendingIntent callVoicemailIntent,
+      PendingIntent voicemailSettingsIntent,
+      boolean isRefresh) {
+    String notificationTitle =
+        context
+            .getResources()
+            .getQuantityString(R.plurals.notification_voicemail_title, count, count);
+    boolean isOngoing =
+        pinnedTelephonyManager
+            .getCarrierConfig()
+            .getBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL);
+
+    String contentText;
+    PendingIntent contentIntent;
+    if (!TextUtils.isEmpty(voicemailNumber) && callVoicemailIntent != null) {
+      contentText = getNotificationText(context, handle, voicemailNumber);
+      contentIntent = callVoicemailIntent;
+    } else {
+      contentText = context.getString(R.string.notification_voicemail_no_vm_number);
+      contentIntent = voicemailSettingsIntent;
+    }
+
+    Notification.Builder builder =
+        new Notification.Builder(context)
+            .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+            .setColor(context.getColor(R.color.dialer_theme_color))
+            .setWhen(System.currentTimeMillis())
+            .setContentTitle(notificationTitle)
+            .setContentText(contentText)
+            .setContentIntent(contentIntent)
+            .setSound(pinnedTelephonyManager.getVoicemailRingtoneUri(handle))
+            .setOngoing(isOngoing)
+            .setOnlyAlertOnce(isRefresh)
+            .setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle))
+            .setDeleteIntent(
+                CallLogNotificationsService.createLegacyVoicemailDismissedPendingIntent(
+                    context, handle));
+
+    if (pinnedTelephonyManager.isVoicemailVibrationEnabled(handle)) {
+      builder.setDefaults(Notification.DEFAULT_VIBRATE);
+    }
+
+    return builder.build();
+  }
+
+  @NonNull
+  private static String getNotificationText(
+      @NonNull Context context, PhoneAccountHandle handle, String voicemailNumber) {
+    if (PhoneAccountUtils.getSubscriptionPhoneAccounts(context).size() > 1) {
+      TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+      PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);
+      return phoneAccount.getShortDescription().toString();
+    } else {
+      return String.format(
+          context.getString(R.string.notification_voicemail_text_format),
+          PhoneNumberUtils.formatNumber(voicemailNumber));
+    }
+  }
+
+  public static void cancelNotification(@NonNull Context context) {
+    LogUtil.enterBlock("LegacyVoicemailNotifier.cancelNotification");
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    DialerNotificationManager.cancel(context, NOTIFICATION_TAG, NOTIFICATION_ID);
+  }
+
+  private LegacyVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index dd13298..b363b5a 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -17,7 +17,6 @@
 
 import android.app.Notification;
 import android.app.Notification.Builder;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -30,11 +29,13 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
+import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.support.v4.util.Pair;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
+import android.util.ArraySet;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.dialer.app.DialtactsActivity;
@@ -46,23 +47,30 @@
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
+import com.android.dialer.notification.NotificationManagerUtils;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /** Creates a notification for calls that the user missed (neither answered nor rejected). */
 public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
 
-  /** The tag used to identify notifications from this class. */
-  static final String NOTIFICATION_TAG = "MissedCallNotifier";
-  /** The identifier of the notification of new missed calls. */
-  private static final int NOTIFICATION_ID = R.id.notification_missed_call;
+  /** Prefix used to generate a unique tag for each missed call notification. */
+  private static final String NOTIFICATION_TAG_PREFIX = "MissedCall_";
+  /** Common ID for all missed call notifications. */
+  private static final int NOTIFICATION_ID = 1;
+  /** Tag for the group summary notification. */
+  private static final String GROUP_SUMMARY_NOTIFICATION_TAG = "GroupSummary_MissedCall";
+  /**
+   * Key used to associate all missed call notifications and the summary as belonging to a single
+   * group.
+   */
+  private static final String GROUP_KEY = "MissedCallGroup";
 
   private final Context context;
   private final CallLogNotificationsQueryHelper callLogNotificationsQueryHelper;
@@ -104,7 +112,8 @@
 
     if ((newCalls != null && newCalls.isEmpty()) || count == 0) {
       // No calls to notify about: clear the notification.
-      CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, null);
+      CallLogNotificationsQueryHelper.markAllMissedCallsInCallLogAsRead(context);
+      cancelAllMissedCallNotifications(context);
       return;
     }
 
@@ -146,7 +155,7 @@
                   null,
                   System.currentTimeMillis());
 
-      //TODO: look up caller ID that is not in contacts.
+      // TODO: look up caller ID that is not in contacts.
       ContactInfo contactInfo =
           callLogNotificationsQueryHelper.getContactInfo(
               call.number, call.numberPresentation, call.countryIso);
@@ -181,52 +190,84 @@
     publicSummaryBuilder
         .setContentTitle(context.getText(titleResId))
         .setContentIntent(createCallLogPendingIntent())
-        .setDeleteIntent(createClearMissedCallsPendingIntent(null));
+        .setDeleteIntent(
+            CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context));
 
     // Create the notification summary suitable for display when sensitive information is showing.
     groupSummary
         .setContentTitle(context.getText(titleResId))
         .setContentText(expandedText)
         .setContentIntent(createCallLogPendingIntent())
-        .setDeleteIntent(createClearMissedCallsPendingIntent(null))
+        .setDeleteIntent(
+            CallLogNotificationsService.createCancelAllMissedCallsPendingIntent(context))
         .setGroupSummary(useCallList)
         .setOnlyAlertOnce(useCallList)
         .setPublicVersion(publicSummaryBuilder.build());
-
-    NotificationChannelManager.applyChannel(groupSummary, context, Channel.MISSED_CALL, null);
+    if (BuildCompat.isAtLeastO()) {
+      groupSummary.setChannelId(NotificationChannelId.MISSED_CALL);
+    }
 
     Notification notification = groupSummary.build();
     configureLedOnNotification(notification);
 
     LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "adding missed call notification");
-    getNotificationMgr().notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification);
+    DialerNotificationManager.notify(
+        context, GROUP_SUMMARY_NOTIFICATION_TAG, NOTIFICATION_ID, notification);
 
     if (useCallList) {
       // Do not repost active notifications to prevent erasing post call notes.
-      NotificationManager manager = getNotificationMgr();
-      Set<String> activeTags = new HashSet<>();
-      for (StatusBarNotification activeNotification : manager.getActiveNotifications()) {
+      Set<String> activeTags = new ArraySet<>();
+      for (StatusBarNotification activeNotification :
+          DialerNotificationManager.getActiveNotifications(context)) {
         activeTags.add(activeNotification.getTag());
       }
 
       for (NewCall call : newCalls) {
-        String callTag = call.callsUri.toString();
+        String callTag = getNotificationTagForCall(call);
         if (!activeTags.contains(callTag)) {
-          manager.notify(callTag, NOTIFICATION_ID, getNotificationForCall(call, null));
+          DialerNotificationManager.notify(
+              context, callTag, NOTIFICATION_ID, getNotificationForCall(call, null));
         }
       }
     }
   }
 
+  public static void cancelAllMissedCallNotifications(@NonNull Context context) {
+    NotificationManagerUtils.cancelAllInGroup(context, GROUP_KEY);
+  }
+
+  public static void cancelSingleMissedCallNotification(
+      @NonNull Context context, @Nullable Uri callUri) {
+    if (callUri == null) {
+      LogUtil.e(
+          "MissedCallNotifier.cancelSingleMissedCallNotification",
+          "unable to cancel notification, uri is null");
+      return;
+    }
+    // This will also dismiss the group summary if there are no more missed call notifications.
+    DialerNotificationManager.cancel(
+        context, getNotificationTagForCallUri(callUri), NOTIFICATION_ID);
+  }
+
+  private static String getNotificationTagForCall(@NonNull NewCall call) {
+    return getNotificationTagForCallUri(call.callsUri);
+  }
+
+  private static String getNotificationTagForCallUri(@NonNull Uri callUri) {
+    return NOTIFICATION_TAG_PREFIX + callUri;
+  }
+
   public void insertPostCallNotification(@NonNull String number, @NonNull String note) {
     List<NewCall> newCalls = callLogNotificationsQueryHelper.getNewMissedCalls();
     if (newCalls != null && !newCalls.isEmpty()) {
       for (NewCall call : newCalls) {
         if (call.number.equals(number.replace("tel:", ""))) {
           // Update the first notification that matches our post call note sender.
-          getNotificationMgr()
-              .notify(
-                  call.callsUri.toString(), NOTIFICATION_ID, getNotificationForCall(call, note));
+          DialerNotificationManager.notify(
+              context,
+              getNotificationTagForCall(call),
+              NOTIFICATION_ID,
+              getNotificationForCall(call, note));
           break;
         }
       }
@@ -308,7 +349,7 @@
 
   private Notification.Builder createNotificationBuilder() {
     return new Notification.Builder(context)
-        .setGroup(NOTIFICATION_TAG)
+        .setGroup(GROUP_KEY)
         .setSmallIcon(android.R.drawable.stat_notify_missed_call)
         .setColor(context.getResources().getColor(R.color.dialer_theme_color, null))
         .setAutoCancel(true)
@@ -321,10 +362,14 @@
     Builder builder =
         createNotificationBuilder()
             .setWhen(call.dateMs)
-            .setDeleteIntent(createClearMissedCallsPendingIntent(call.callsUri))
+            .setDeleteIntent(
+                CallLogNotificationsService.createCancelSingleMissedCallPendingIntent(
+                    context, call.callsUri))
             .setContentIntent(createCallLogPendingIntent(call.callsUri));
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.MISSED_CALL);
+    }
 
-    NotificationChannelManager.applyChannel(builder, context, Channel.MISSED_CALL, null);
     return builder;
   }
 
@@ -332,7 +377,8 @@
   @WorkerThread
   public void callBackFromMissedCall(String number, Uri callUri) {
     closeSystemDialogs(context);
-    CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+    CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+    cancelSingleMissedCallNotification(context, callUri);
     DialerUtils.startActivityWithErrorToast(
         context,
         new CallIntentBuilder(number, CallInitiationType.Type.MISSED_CALL_NOTIFICATION)
@@ -343,7 +389,8 @@
   /** Trigger an intent to send an sms from a missed call number. */
   public void sendSmsFromMissedCall(String number, Uri callUri) {
     closeSystemDialogs(context);
-    CallLogNotificationsQueryHelper.removeMissedCallNotifications(context, callUri);
+    CallLogNotificationsQueryHelper.markSingleMissedCallInCallLogAsRead(context, callUri);
+    cancelSingleMissedCallNotification(context, callUri);
     DialerUtils.startActivityWithErrorToast(
         context, IntentUtil.getSendSmsIntent(number).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
   }
@@ -371,14 +418,6 @@
     return PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
-  /** Creates a pending intent that marks all new missed calls as old. */
-  private PendingIntent createClearMissedCallsPendingIntent(@Nullable Uri callUri) {
-    Intent intent = new Intent(context, CallLogNotificationsService.class);
-    intent.setAction(CallLogNotificationsService.ACTION_MARK_NEW_MISSED_CALLS_AS_OLD);
-    intent.setData(callUri);
-    return PendingIntent.getService(context, 0, intent, 0);
-  }
-
   private PendingIntent createCallBackPendingIntent(String number, @NonNull Uri callUri) {
     Intent intent = new Intent(context, CallLogNotificationsService.class);
     intent.setAction(CallLogNotificationsService.ACTION_CALL_BACK_FROM_MISSED_CALL_NOTIFICATION);
@@ -410,8 +449,4 @@
   private void closeSystemDialogs(Context context) {
     context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
   }
-
-  private NotificationManager getNotificationMgr() {
-    return (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-  }
 }
diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
deleted file mode 100644
index acffffb..0000000
--- a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.app.calllog;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.telecom.TelecomUtil;
-import java.util.List;
-
-/** Methods to help extract {@link PhoneAccount} information from database and Telecomm sources. */
-class PhoneAccountHandles {
-
-  @Nullable
-  public static PhoneAccountHandle getAccount(@NonNull Context context, @Nullable NewCall call) {
-    PhoneAccountHandle handle;
-    if (call == null || call.accountComponentName == null || call.accountId == null) {
-      LogUtil.v(
-          "PhoneAccountUtils.getAccount",
-          "accountComponentName == null || callToNotify.accountId == null");
-      handle = TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
-      if (handle == null) {
-        List<PhoneAccountHandle> callCapablePhoneAccounts =
-            TelecomUtil.getCallCapablePhoneAccounts(context);
-        if (!callCapablePhoneAccounts.isEmpty()) {
-          return callCapablePhoneAccounts.get(0);
-        }
-        return null;
-      }
-    } else {
-      handle =
-          new PhoneAccountHandle(
-              ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
-    }
-    if (handle.getComponentName() != null) {
-      LogUtil.v(
-          "PhoneAccountUtils.getAccount",
-          "PhoneAccountHandle.ComponentInfo:" + handle.getComponentName());
-    } else {
-      LogUtil.i("PhoneAccountUtils.getAccount", "PhoneAccountHandle.ComponentInfo: null");
-    }
-    return handle;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
index 0c72077..c1a00e5 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
@@ -45,6 +45,13 @@
   /** The maximum number of icons will be shown to represent the call types in a group. */
   private static final int MAX_CALL_TYPE_ICONS = 3;
 
+  // TODO(mdooley): remove when these api's become public
+  // Copied from android.provider.VoicemailContract
+  static final int TRANSCRIPTION_NOT_STARTED = 0;
+  static final int TRANSCRIPTION_IN_PROGRESS = 1;
+  static final int TRANSCRIPTION_FAILED = 2;
+  static final int TRANSCRIPTION_AVAILABLE = 3;
+
   private final Context mContext;
   private final Resources mResources;
   private final CallLogCache mCallLogCache;
@@ -145,14 +152,37 @@
     if (isVoicemail) {
       int relevantLinkTypes = Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | Linkify.WEB_URLS;
       views.voicemailTranscriptionView.setAutoLinkMask(relevantLinkTypes);
-      views.voicemailTranscriptionView.setText(
-          TextUtils.isEmpty(details.transcription) ? null : details.transcription);
+      boolean showTranscriptBranding = false;
+      if (!TextUtils.isEmpty(details.transcription)) {
+        views.voicemailTranscriptionView.setText(details.transcription);
+
+        // Set the branding text if the voicemail was transcribed by google
+        // TODO(mdooley): the transcription state is only set by the google transcription code,
+        // but a better solution would be to check the SOURCE_PACKAGE
+        showTranscriptBranding = details.transcriptionState == TRANSCRIPTION_AVAILABLE;
+      } else {
+        if (details.transcriptionState == TRANSCRIPTION_IN_PROGRESS) {
+          views.voicemailTranscriptionView.setText(
+              mResources.getString(R.string.voicemail_transcription_in_progress));
+        } else if (details.transcriptionState == TRANSCRIPTION_FAILED) {
+          views.voicemailTranscriptionView.setText(
+              mResources.getString(R.string.voicemail_transcription_failed));
+        }
+      }
+
+      if (showTranscriptBranding) {
+        views.voicemailTranscriptionBrandingView.setText(
+            mResources.getString(R.string.voicemail_transcription_branding_text));
+      } else {
+        views.voicemailTranscriptionBrandingView.setText("");
+      }
     }
 
     // Bold if not read
     Typeface typeface = details.isRead ? Typeface.SANS_SERIF : Typeface.DEFAULT_BOLD;
     views.nameView.setTypeface(typeface);
     views.voicemailTranscriptionView.setTypeface(typeface);
+    views.voicemailTranscriptionBrandingView.setTypeface(typeface);
     views.callLocationAndDate.setTypeface(typeface);
     views.callLocationAndDate.setTextColor(
         ContextCompat.getColor(
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
index e2e27a1..40c0894 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
@@ -29,7 +29,9 @@
   public final View callTypeView;
   public final CallTypeIconsView callTypeIcons;
   public final TextView callLocationAndDate;
+  public final View transcriptionView;
   public final TextView voicemailTranscriptionView;
+  public final TextView voicemailTranscriptionBrandingView;
   public final TextView callAccountLabel;
 
   private PhoneCallDetailsViews(
@@ -37,13 +39,17 @@
       View callTypeView,
       CallTypeIconsView callTypeIcons,
       TextView callLocationAndDate,
+      View transcriptionView,
       TextView voicemailTranscriptionView,
+      TextView voicemailTranscriptionBrandingView,
       TextView callAccountLabel) {
     this.nameView = nameView;
     this.callTypeView = callTypeView;
     this.callTypeIcons = callTypeIcons;
     this.callLocationAndDate = callLocationAndDate;
+    this.transcriptionView = transcriptionView;
     this.voicemailTranscriptionView = voicemailTranscriptionView;
+    this.voicemailTranscriptionBrandingView = voicemailTranscriptionBrandingView;
     this.callAccountLabel = callAccountLabel;
   }
 
@@ -60,7 +66,9 @@
         view.findViewById(R.id.call_type),
         (CallTypeIconsView) view.findViewById(R.id.call_type_icons),
         (TextView) view.findViewById(R.id.call_location_and_date),
+        view.findViewById(R.id.transcription),
         (TextView) view.findViewById(R.id.voicemail_transcription),
+        (TextView) view.findViewById(R.id.voicemail_transcription_branding),
         (TextView) view.findViewById(R.id.call_account_label));
   }
 
@@ -70,6 +78,8 @@
         new View(context),
         new CallTypeIconsView(context),
         new TextView(context),
+        new View(context),
+        new TextView(context),
         new TextView(context),
         new TextView(context));
   }
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
index 893d6be..8bfd48b 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.app.calllog;
 
+import android.app.KeyguardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.provider.CallLog;
 import android.provider.VoicemailContract;
+import android.support.annotation.VisibleForTesting;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,15 +33,22 @@
 import com.android.dialer.app.voicemail.VoicemailAudioManager;
 import com.android.dialer.app.voicemail.VoicemailErrorManager;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
+import com.android.dialer.app.voicemail.error.VoicemailErrorMessageCreator;
+import com.android.dialer.app.voicemail.error.VoicemailStatus;
+import com.android.dialer.app.voicemail.error.VoicemailStatusWorker;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.util.PermissionsUtil;
+import java.util.List;
 
 public class VisualVoicemailCallLogFragment extends CallLogFragment {
 
   private final ContentObserver mVoicemailStatusObserver = new CustomContentObserver();
   private VoicemailPlaybackPresenter mVoicemailPlaybackPresenter;
+  private DialerExecutor<Context> mPreSyncVoicemailStatusCheckExecutor;
 
   private VoicemailErrorManager mVoicemailErrorManager;
 
@@ -55,7 +65,6 @@
   public void onActivityCreated(Bundle savedInstanceState) {
     mVoicemailPlaybackPresenter =
         VoicemailPlaybackPresenter.getInstance(getActivity(), savedInstanceState);
-
     if (PermissionsUtil.hasReadVoicemailPermissions(getContext())
         && PermissionsUtil.hasAddVoicemailPermissions(getContext())) {
       getActivity()
@@ -68,6 +77,15 @@
           "read voicemail permission unavailable.");
     }
     super.onActivityCreated(savedInstanceState);
+
+    mPreSyncVoicemailStatusCheckExecutor =
+        DialerExecutors.createUiTaskBuilder(
+                getActivity().getFragmentManager(),
+                "fetchVoicemailStatus",
+                new VoicemailStatusWorker())
+            .onSuccess(this::onPreSyncVoicemailStatusChecked)
+            .build();
+
     mVoicemailErrorManager =
         new VoicemailErrorManager(getContext(), getAdapter().getAlertManager(), mModalAlertManager);
 
@@ -132,23 +150,52 @@
 
   @Override
   public void onVisible() {
-    LogUtil.enterBlock("VisualVoicemailCallLogFragment.onPageSelected");
+    LogUtil.enterBlock("VisualVoicemailCallLogFragment.onVisible");
     super.onVisible();
     if (getActivity() != null) {
-      Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL);
-      intent.setPackage(getActivity().getPackageName());
-      getActivity().sendBroadcast(intent);
+      mPreSyncVoicemailStatusCheckExecutor.executeParallel(getActivity());
       Logger.get(getActivity()).logImpression(DialerImpression.Type.VVM_TAB_VIEWED);
       getActivity().setVolumeControlStream(VoicemailAudioManager.PLAYBACK_STREAM);
     }
   }
 
+  private void onPreSyncVoicemailStatusChecked(List<VoicemailStatus> statuses) {
+    if (!shouldAutoSync(new VoicemailErrorMessageCreator(), statuses)) {
+      return;
+    }
+
+    Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL);
+    intent.setPackage(getActivity().getPackageName());
+    getActivity().sendBroadcast(intent);
+  }
+
+  @VisibleForTesting
+  static boolean shouldAutoSync(
+      VoicemailErrorMessageCreator errorMessageCreator, List<VoicemailStatus> statuses) {
+    for (VoicemailStatus status : statuses) {
+      if (!status.isActive()) {
+        continue;
+      }
+      if (errorMessageCreator.isSyncBlockingError(status)) {
+        LogUtil.i(
+            "VisualVoicemailCallLogFragment.shouldAutoSync", "auto-sync blocked due to " + status);
+        return false;
+      }
+    }
+    return true;
+  }
+
   @Override
   public void onNotVisible() {
-    LogUtil.enterBlock("VisualVoicemailCallLogFragment.onPageUnselected");
+    LogUtil.enterBlock("VisualVoicemailCallLogFragment.onNotVisible");
     super.onNotVisible();
     if (getActivity() != null) {
       getActivity().setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
+      // onNotVisible will be called in the lock screen when the call ends
+      if (!getActivity().getSystemService(KeyguardManager.class).inKeyguardRestrictedInputMode()) {
+        LogUtil.i("VisualVoicemailCallLogFragment.onNotVisible", "clearing all new voicemails");
+        CallLogNotificationsService.markAllNewVoicemailsAsOld(getActivity());
+      }
     }
   }
 }
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
new file mode 100644
index 0000000..cbadfd3
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
@@ -0,0 +1,271 @@
+/*
+ * 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.app.calllog;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.app.DialtactsActivity;
+import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.app.contactinfo.ContactPhotoLoader;
+import com.android.dialer.app.list.DialtactsPagerAdapter;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelManager;
+import com.android.dialer.notification.NotificationManagerUtils;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.List;
+import java.util.Map;
+
+/** Shows a notification in the status bar for visual voicemail. */
+final class VisualVoicemailNotifier {
+  /** Prefix used to generate a unique tag for each voicemail notification. */
+  private static final String NOTIFICATION_TAG_PREFIX = "VisualVoicemail_";
+  /** Common ID for all voicemail notifications. */
+  private static final int NOTIFICATION_ID = 1;
+  /** Tag for the group summary notification. */
+  private static final String GROUP_SUMMARY_NOTIFICATION_TAG = "GroupSummary_VisualVoicemail";
+  /**
+   * Key used to associate all voicemail notifications and the summary as belonging to a single
+   * group.
+   */
+  private static final String GROUP_KEY = "VisualVoicemailGroup";
+
+  public static void showNotifications(
+      @NonNull Context context,
+      @NonNull List<NewCall> newCalls,
+      @NonNull Map<String, ContactInfo> contactInfos,
+      @Nullable String callers) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.showNotifications");
+    PendingIntent deleteIntent =
+        CallLogNotificationsService.createMarkAllNewVoicemailsAsOldIntent(context);
+    String contentTitle =
+        context
+            .getResources()
+            .getQuantityString(
+                R.plurals.notification_voicemail_title, newCalls.size(), newCalls.size());
+    Notification.Builder groupSummary =
+        createNotificationBuilder(context)
+            .setContentTitle(contentTitle)
+            .setContentText(callers)
+            .setDeleteIntent(deleteIntent)
+            .setGroupSummary(true)
+            .setContentIntent(newVoicemailIntent(context, null));
+
+    if (BuildCompat.isAtLeastO()) {
+      groupSummary.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);
+      PhoneAccountHandle handle = getAccountForCall(context, newCalls.get(0));
+      groupSummary.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+    }
+
+    DialerNotificationManager.notify(
+        context, GROUP_SUMMARY_NOTIFICATION_TAG, NOTIFICATION_ID, groupSummary.build());
+
+    for (NewCall voicemail : newCalls) {
+      DialerNotificationManager.notify(
+          context,
+          getNotificationTagForVoicemail(voicemail),
+          NOTIFICATION_ID,
+          createNotificationForVoicemail(context, voicemail, contactInfos));
+    }
+  }
+
+  public static void cancelAllVoicemailNotifications(@NonNull Context context) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.cancelAllVoicemailNotifications");
+    NotificationManagerUtils.cancelAllInGroup(context, GROUP_KEY);
+  }
+
+  public static void cancelSingleVoicemailNotification(
+      @NonNull Context context, @Nullable Uri voicemailUri) {
+    LogUtil.enterBlock("VisualVoicemailNotifier.cancelSingleVoicemailNotification");
+    if (voicemailUri == null) {
+      LogUtil.e("VisualVoicemailNotifier.cancelSingleVoicemailNotification", "uri is null");
+      return;
+    }
+    // This will also dismiss the group summary if there are no more voicemail notifications.
+    DialerNotificationManager.cancel(
+        context, getNotificationTagForUri(voicemailUri), NOTIFICATION_ID);
+  }
+
+  private static String getNotificationTagForVoicemail(@NonNull NewCall voicemail) {
+    return getNotificationTagForUri(voicemail.voicemailUri);
+  }
+
+  private static String getNotificationTagForUri(@NonNull Uri voicemailUri) {
+    return NOTIFICATION_TAG_PREFIX + voicemailUri;
+  }
+
+  private static Notification.Builder createNotificationBuilder(@NonNull Context context) {
+    return new Notification.Builder(context)
+        .setSmallIcon(android.R.drawable.stat_notify_voicemail)
+        .setColor(context.getColor(R.color.dialer_theme_color))
+        .setGroup(GROUP_KEY)
+        .setOnlyAlertOnce(true)
+        .setAutoCancel(true);
+  }
+
+  private static Notification createNotificationForVoicemail(
+      @NonNull Context context,
+      @NonNull NewCall voicemail,
+      @NonNull Map<String, ContactInfo> contactInfos) {
+    PhoneAccountHandle handle = getAccountForCall(context, voicemail);
+    ContactInfo contactInfo = contactInfos.get(voicemail.number);
+
+    Notification.Builder builder =
+        createNotificationBuilder(context)
+            .setContentTitle(
+                context
+                    .getResources()
+                    .getQuantityString(R.plurals.notification_voicemail_title, 1, 1))
+            .setContentText(
+                ContactDisplayUtils.getTtsSpannedPhoneNumber(
+                    context.getResources(),
+                    R.string.notification_new_voicemail_ticker,
+                    contactInfo.name))
+            .setWhen(voicemail.dateMs)
+            .setSound(getVoicemailRingtoneUri(context, handle))
+            .setDefaults(getNotificationDefaultFlags(context, handle));
+
+    if (voicemail.voicemailUri != null) {
+      builder.setDeleteIntent(
+          CallLogNotificationsService.createMarkSingleNewVoicemailAsOldIntent(
+              context, voicemail.voicemailUri));
+    }
+
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelManager.getVoicemailChannelId(context, handle));
+    }
+
+    ContactPhotoLoader loader = new ContactPhotoLoader(context, contactInfo);
+    Bitmap photoIcon = loader.loadPhotoIcon();
+    if (photoIcon != null) {
+      builder.setLargeIcon(photoIcon);
+    }
+    if (!TextUtils.isEmpty(voicemail.transcription)) {
+      Logger.get(context)
+          .logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED_WITH_TRANSCRIPTION);
+      builder.setStyle(new Notification.BigTextStyle().bigText(voicemail.transcription));
+    }
+    builder.setContentIntent(newVoicemailIntent(context, voicemail));
+    Logger.get(context).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CREATED);
+    return builder.build();
+  }
+
+  @Nullable
+  private static Uri getVoicemailRingtoneUri(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return null;
+    }
+    if (handle == null) {
+      LogUtil.i("VisualVoicemailNotifier.getVoicemailRingtoneUri", "null handle, getting fallback");
+      handle = getFallbackAccount(context);
+      if (handle == null) {
+        LogUtil.i(
+            "VisualVoicemailNotifier.getVoicemailRingtoneUri",
+            "no fallback handle, using null (default) ringtone");
+        return null;
+      }
+    }
+    return context.getSystemService(TelephonyManager.class).getVoicemailRingtoneUri(handle);
+  }
+
+  private static int getNotificationDefaultFlags(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return Notification.DEFAULT_ALL;
+    }
+    if (handle == null) {
+      LogUtil.i(
+          "VisualVoicemailNotifier.getNotificationDefaultFlags", "null handle, getting fallback");
+      handle = getFallbackAccount(context);
+      if (handle == null) {
+        LogUtil.i(
+            "VisualVoicemailNotifier.getNotificationDefaultFlags",
+            "no fallback handle, using default vibration");
+        return Notification.DEFAULT_ALL;
+      }
+    }
+    if (context.getSystemService(TelephonyManager.class).isVoicemailVibrationEnabled(handle)) {
+      return Notification.DEFAULT_VIBRATE;
+    }
+    return 0;
+  }
+
+  private static PendingIntent newVoicemailIntent(
+      @NonNull Context context, @Nullable NewCall voicemail) {
+    Intent intent =
+        DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
+    // TODO (b/35486204): scroll to this voicemail
+    if (voicemail != null) {
+      intent.setData(voicemail.voicemailUri);
+    }
+    intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
+    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+  }
+
+  /**
+   * Gets a phone account for the given call entry. This could be null if SIM associated with the
+   * entry is no longer in the device or for other reasons (for example, modem reboot).
+   */
+  @Nullable
+  public static PhoneAccountHandle getAccountForCall(
+      @NonNull Context context, @Nullable NewCall call) {
+    if (call == null || call.accountComponentName == null || call.accountId == null) {
+      return null;
+    }
+    return new PhoneAccountHandle(
+        ComponentName.unflattenFromString(call.accountComponentName), call.accountId);
+  }
+
+  /**
+   * Gets any available phone account that can be used to get sound settings for voicemail. This is
+   * only called if the phone account for the voicemail entry can't be found.
+   */
+  @Nullable
+  public static PhoneAccountHandle getFallbackAccount(@NonNull Context context) {
+    PhoneAccountHandle handle =
+        TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL);
+    if (handle == null) {
+      List<PhoneAccountHandle> handles = TelecomUtil.getCallCapablePhoneAccounts(context);
+      if (!handles.isEmpty()) {
+        handle = handles.get(0);
+      }
+    }
+    return handle;
+  }
+
+  private VisualVoicemailNotifier() {}
+}
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
new file mode 100644
index 0000000..d6601be
--- /dev/null
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2011 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.app.calllog;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import com.android.dialer.app.R;
+import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
+import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.blocking.FilteredNumbersUtil;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** Updates voicemail notifications in the background. */
+class VisualVoicemailUpdateTask implements Worker<VisualVoicemailUpdateTask.Input, Void> {
+  @Nullable
+  @Override
+  public Void doInBackground(@NonNull Input input) throws Throwable {
+    updateNotification(input.context, input.queryHelper, input.queryHandler);
+    return null;
+  }
+
+  /**
+   * Updates the notification and notifies of the call with the given URI.
+   *
+   * <p>Clears the notification if there are no new voicemails, and notifies if the given URI
+   * corresponds to a new voicemail.
+   */
+  @WorkerThread
+  private static void updateNotification(
+      Context context,
+      CallLogNotificationsQueryHelper queryHelper,
+      FilteredNumberAsyncQueryHandler queryHandler) {
+    Assert.isWorkerThread();
+
+    List<NewCall> newCalls = queryHelper.getNewVoicemails();
+    if (newCalls == null) {
+      return;
+    }
+    newCalls = filterBlockedNumbers(context, queryHandler, newCalls);
+    if (newCalls.isEmpty()) {
+      return;
+    }
+
+    // This represents a list of names to include in the notification.
+    String callers = null;
+
+    // Maps each number into a name: if a number is in the map, it has already left a more
+    // recent voicemail.
+    Map<String, ContactInfo> contactInfos = new ArrayMap<>();
+    for (NewCall newCall : newCalls) {
+      if (!contactInfos.containsKey(newCall.number)) {
+        ContactInfo contactInfo =
+            queryHelper.getContactInfo(
+                newCall.number, newCall.numberPresentation, newCall.countryIso);
+        contactInfos.put(newCall.number, contactInfo);
+
+        // This is a new caller. Add it to the back of the list of callers.
+        if (TextUtils.isEmpty(callers)) {
+          callers = contactInfo.name;
+        } else {
+          callers =
+              context.getString(
+                  R.string.notification_voicemail_callers_list, callers, contactInfo.name);
+        }
+      }
+    }
+    VisualVoicemailNotifier.showNotifications(context, newCalls, contactInfos, callers);
+  }
+
+  @WorkerThread
+  private static List<NewCall> filterBlockedNumbers(
+      Context context, FilteredNumberAsyncQueryHandler queryHandler, List<NewCall> newCalls) {
+    Assert.isWorkerThread();
+    if (FilteredNumbersUtil.hasRecentEmergencyCall(context)) {
+      LogUtil.i(
+          "VisualVoicemailUpdateTask.filterBlockedNumbers",
+          "not filtering due to recent emergency call");
+      return newCalls;
+    }
+
+    List<NewCall> result = new ArrayList<>();
+    for (NewCall newCall : newCalls) {
+      if (queryHandler.getBlockedIdSynchronous(newCall.number, newCall.countryIso) != null) {
+        LogUtil.i(
+            "VisualVoicemailUpdateTask.filterBlockedNumbers",
+            "found voicemail from blocked number, deleting");
+        if (newCall.voicemailUri != null) {
+          // Delete the voicemail.
+          CallLogAsyncTaskUtil.deleteVoicemailSynchronous(context, newCall.voicemailUri);
+        }
+      } else {
+        result.add(newCall);
+      }
+    }
+    return result;
+  }
+
+  /** Updates the voicemail notifications displayed. */
+  static void scheduleTask(@NonNull Context context, @NonNull Runnable callback) {
+    Assert.isNotNull(context);
+    Assert.isNotNull(callback);
+    if (!TelecomUtil.isDefaultDialer(context)) {
+      LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "not default dialer, not running");
+      callback.run();
+      return;
+    }
+
+    Input input =
+        new Input(
+            context,
+            CallLogNotificationsQueryHelper.getInstance(context),
+            new FilteredNumberAsyncQueryHandler(context));
+    DialerExecutors.createNonUiTaskBuilder(new VisualVoicemailUpdateTask())
+        .onSuccess(
+            output -> {
+              LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update successful");
+              callback.run();
+            })
+        .onFailure(
+            throwable -> {
+              LogUtil.i("VisualVoicemailUpdateTask.scheduleTask", "update failed: " + throwable);
+              callback.run();
+            })
+        .build()
+        .executeParallel(input);
+  }
+
+  static class Input {
+    @NonNull final Context context;
+    @NonNull final CallLogNotificationsQueryHelper queryHelper;
+    @NonNull final FilteredNumberAsyncQueryHandler queryHandler;
+
+    Input(
+        Context context,
+        CallLogNotificationsQueryHelper queryHelper,
+        FilteredNumberAsyncQueryHandler queryHandler) {
+      this.context = context;
+      this.queryHelper = queryHelper;
+      this.queryHandler = queryHandler;
+    }
+  }
+}
diff --git a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
index 777f4c7..2fbebdd 100644
--- a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
+++ b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
@@ -15,7 +15,6 @@
  */
 package com.android.dialer.app.calllog;
 
-import android.app.NotificationManager;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -23,30 +22,49 @@
 import android.net.Uri;
 import android.provider.CallLog.Calls;
 import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import com.android.dialer.app.R;
+import android.support.annotation.WorkerThread;
 import com.android.dialer.common.Assert;
-import com.android.dialer.notification.GroupedNotificationUtil;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
 
 /** Handles asynchronous queries to the call log for voicemail. */
 public class VoicemailQueryHandler extends AsyncQueryHandler {
 
-  private static final String TAG = "VoicemailQueryHandler";
-
   /** The token for the query to mark all new voicemails as old. */
   private static final int UPDATE_MARK_VOICEMAILS_AS_OLD_TOKEN = 50;
 
-  private Context mContext;
-
   @MainThread
-  public VoicemailQueryHandler(Context context, ContentResolver contentResolver) {
+  private VoicemailQueryHandler(ContentResolver contentResolver) {
     super(contentResolver);
     Assert.isMainThread();
-    mContext = context;
+  }
+
+  @WorkerThread
+  public static void markAllNewVoicemailsAsRead(final @NonNull Context context) {
+    ThreadUtil.postOnUiThread(
+        () -> {
+          new VoicemailQueryHandler(context.getContentResolver()).markNewVoicemailsAsOld(null);
+        });
+  }
+
+  @WorkerThread
+  public static void markSingleNewVoicemailAsRead(
+      final @NonNull Context context, final Uri voicemailUri) {
+    if (voicemailUri == null) {
+      LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsRead", "voicemail URI is null");
+      return;
+    }
+    ThreadUtil.postOnUiThread(
+        () -> {
+          new VoicemailQueryHandler(context.getContentResolver())
+              .markNewVoicemailsAsOld(voicemailUri);
+        });
   }
 
   /** Updates all new voicemails to mark them as old. */
-  public void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
+  private void markNewVoicemailsAsOld(@Nullable Uri voicemailUri) {
     // Mark all "new" voicemails as not new anymore.
     StringBuilder where = new StringBuilder();
     where.append(Calls.NEW);
@@ -70,11 +88,5 @@
         voicemailUri == null
             ? new String[] {Integer.toString(Calls.VOICEMAIL_TYPE)}
             : new String[] {Integer.toString(Calls.VOICEMAIL_TYPE), voicemailUri.toString()});
-
-    GroupedNotificationUtil.removeNotification(
-        mContext.getSystemService(NotificationManager.class),
-        voicemailUri != null ? voicemailUri.toString() : null,
-        R.id.notification_visual_voicemail,
-        DefaultVoicemailNotifier.VISUAL_VOICEMAIL_NOTIFICATION_TAG);
   }
 }
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
index 7645a33..15de143 100644
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
+++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java
@@ -17,10 +17,16 @@
 package com.android.dialer.app.calllog.calllogcache;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
+import android.text.TextUtils;
+import android.util.ArrayMap;
 import com.android.dialer.app.calllog.CallLogAdapter;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.CallUtil;
+import java.util.Map;
+import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * This is the base class for the CallLogCaches.
@@ -31,7 +37,8 @@
  *
  * <p>This is designed with the specific use case of the {@link CallLogAdapter} in mind.
  */
-public abstract class CallLogCache {
+@ThreadSafe
+public class CallLogCache {
   // TODO: Dialer should be fixed so as not to check isVoicemail() so often but at the time of
   // this writing, that was a much larger undertaking than creating this cache.
 
@@ -39,20 +46,18 @@
 
   private boolean mHasCheckedForVideoAvailability;
   private int mVideoAvailability;
+  private final Map<PhoneAccountHandle, String> mPhoneAccountLabelCache = new ArrayMap<>();
+  private final Map<PhoneAccountHandle, Integer> mPhoneAccountColorCache = new ArrayMap<>();
+  private final Map<PhoneAccountHandle, Boolean> mPhoneAccountCallWithNoteCache = new ArrayMap<>();
 
   public CallLogCache(Context context) {
     mContext = context;
   }
 
-  /** Return the most compatible version of the TelecomCallLogCache. */
-  public static CallLogCache getCallLogCache(Context context) {
-    if (CompatUtils.isClassAvailable("android.telecom.PhoneAccountHandle")) {
-      return new CallLogCacheLollipopMr1(context);
-    }
-    return new CallLogCacheLollipop(context);
-  }
-
-  public void reset() {
+  public synchronized void reset() {
+    mPhoneAccountLabelCache.clear();
+    mPhoneAccountColorCache.clear();
+    mPhoneAccountCallWithNoteCache.clear();
     mHasCheckedForVideoAvailability = false;
     mVideoAvailability = 0;
   }
@@ -61,19 +66,12 @@
    * Returns true if the given number is the number of the configured voicemail. To be able to
    * mock-out this, it is not a static method.
    */
-  public abstract boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number);
-
-  /**
-   * Returns {@code true} when the current sim supports video calls, regardless of the value in a
-   * contact's {@link android.provider.ContactsContract.CommonDataKinds.Phone#CARRIER_PRESENCE}
-   * column.
-   */
-  public boolean isVideoEnabled() {
-    if (!mHasCheckedForVideoAvailability) {
-      mVideoAvailability = CallUtil.getVideoCallingAvailability(mContext);
-      mHasCheckedForVideoAvailability = true;
+  public synchronized boolean isVoicemailNumber(
+      PhoneAccountHandle accountHandle, @Nullable CharSequence number) {
+    if (TextUtils.isEmpty(number)) {
+      return false;
     }
-    return (mVideoAvailability & CallUtil.VIDEO_CALLING_ENABLED) != 0;
+    return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString());
   }
 
   /**
@@ -89,10 +87,26 @@
   }
 
   /** Extract account label from PhoneAccount object. */
-  public abstract String getAccountLabel(PhoneAccountHandle accountHandle);
+  public synchronized String getAccountLabel(PhoneAccountHandle accountHandle) {
+    if (mPhoneAccountLabelCache.containsKey(accountHandle)) {
+      return mPhoneAccountLabelCache.get(accountHandle);
+    } else {
+      String label = PhoneAccountUtils.getAccountLabel(mContext, accountHandle);
+      mPhoneAccountLabelCache.put(accountHandle, label);
+      return label;
+    }
+  }
 
   /** Extract account color from PhoneAccount object. */
-  public abstract int getAccountColor(PhoneAccountHandle accountHandle);
+  public synchronized int getAccountColor(PhoneAccountHandle accountHandle) {
+    if (mPhoneAccountColorCache.containsKey(accountHandle)) {
+      return mPhoneAccountColorCache.get(accountHandle);
+    } else {
+      Integer color = PhoneAccountUtils.getAccountColor(mContext, accountHandle);
+      mPhoneAccountColorCache.put(accountHandle, color);
+      return color;
+    }
+  }
 
   /**
    * Determines if the PhoneAccount supports specifying a call subject (i.e. calling with a note)
@@ -101,5 +115,14 @@
    * @param accountHandle The PhoneAccount handle.
    * @return {@code true} if calling with a note is supported, {@code false} otherwise.
    */
-  public abstract boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle);
+  public synchronized boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle) {
+    if (mPhoneAccountCallWithNoteCache.containsKey(accountHandle)) {
+      return mPhoneAccountCallWithNoteCache.get(accountHandle);
+    } else {
+      Boolean supportsCallWithNote =
+          PhoneAccountUtils.getAccountSupportsCallSubject(mContext, accountHandle);
+      mPhoneAccountCallWithNoteCache.put(accountHandle, supportsCallWithNote);
+      return supportsCallWithNote;
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java
deleted file mode 100644
index 78aaa41..0000000
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipop.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2015 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.app.calllog.calllogcache;
-
-import android.content.Context;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
-
-/**
- * This is a compatibility class for the CallLogCache for versions of dialer before Lollipop Mr1
- * (the introduction of phone accounts).
- *
- * <p>This class should not be initialized directly and instead be acquired from {@link
- * CallLogCache#getCallLogCache}.
- */
-class CallLogCacheLollipop extends CallLogCache {
-
-  private String mVoicemailNumber;
-
-  /* package */ CallLogCacheLollipop(Context context) {
-    super(context);
-  }
-
-  @Override
-  public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) {
-    if (TextUtils.isEmpty(number)) {
-      return false;
-    }
-
-    String numberString = number.toString();
-
-    if (!TextUtils.isEmpty(mVoicemailNumber)) {
-      return PhoneNumberUtils.compare(numberString, mVoicemailNumber);
-    }
-
-    if (PhoneNumberUtils.isVoiceMailNumber(numberString)) {
-      mVoicemailNumber = numberString;
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public String getAccountLabel(PhoneAccountHandle accountHandle) {
-    return null;
-  }
-
-  @Override
-  public int getAccountColor(PhoneAccountHandle accountHandle) {
-    return PhoneAccount.NO_HIGHLIGHT_COLOR;
-  }
-
-  @Override
-  public boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle) {
-    return false;
-  }
-}
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
deleted file mode 100644
index 0399987..0000000
--- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2013 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.app.calllog.calllogcache;
-
-import android.content.Context;
-import android.support.annotation.VisibleForTesting;
-import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.util.Pair;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * This is the CallLogCache for versions of dialer Lollipop Mr1 and above with support for multi-SIM
- * devices.
- *
- * <p>This class should not be initialized directly and instead be acquired from {@link
- * CallLogCache#getCallLogCache}.
- */
-class CallLogCacheLollipopMr1 extends CallLogCache {
-
-  /*
-   * Maps from a phone-account/number pair to a boolean because multiple numbers could return true
-   * for the voicemail number if those numbers are not pre-normalized. Access must be synchronzied
-   * as it's used in the background thread in CallLogAdapter. {@see CallLogAdapter#loadData}
-   */
-  @VisibleForTesting
-  final Map<Pair<PhoneAccountHandle, CharSequence>, Boolean> mVoicemailQueryCache =
-      new ConcurrentHashMap<>();
-
-  private final Map<PhoneAccountHandle, String> mPhoneAccountLabelCache = new ArrayMap<>();
-  private final Map<PhoneAccountHandle, Integer> mPhoneAccountColorCache = new ArrayMap<>();
-  private final Map<PhoneAccountHandle, Boolean> mPhoneAccountCallWithNoteCache = new ArrayMap<>();
-
-  /* package */ CallLogCacheLollipopMr1(Context context) {
-    super(context);
-  }
-
-  @Override
-  public void reset() {
-    mVoicemailQueryCache.clear();
-    mPhoneAccountLabelCache.clear();
-    mPhoneAccountColorCache.clear();
-    mPhoneAccountCallWithNoteCache.clear();
-
-    super.reset();
-  }
-
-  @Override
-  public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) {
-    if (TextUtils.isEmpty(number)) {
-      return false;
-    }
-
-    Pair<PhoneAccountHandle, CharSequence> key = new Pair<>(accountHandle, number);
-    Boolean value = mVoicemailQueryCache.get(key);
-    if (value != null) {
-      return value;
-    }
-    boolean isVoicemail =
-        PhoneNumberHelper.isVoicemailNumber(mContext, accountHandle, number.toString());
-    mVoicemailQueryCache.put(key, isVoicemail);
-    return isVoicemail;
-  }
-
-  @Override
-  public String getAccountLabel(PhoneAccountHandle accountHandle) {
-    if (mPhoneAccountLabelCache.containsKey(accountHandle)) {
-      return mPhoneAccountLabelCache.get(accountHandle);
-    } else {
-      String label = PhoneAccountUtils.getAccountLabel(mContext, accountHandle);
-      mPhoneAccountLabelCache.put(accountHandle, label);
-      return label;
-    }
-  }
-
-  @Override
-  public int getAccountColor(PhoneAccountHandle accountHandle) {
-    if (mPhoneAccountColorCache.containsKey(accountHandle)) {
-      return mPhoneAccountColorCache.get(accountHandle);
-    } else {
-      Integer color = PhoneAccountUtils.getAccountColor(mContext, accountHandle);
-      mPhoneAccountColorCache.put(accountHandle, color);
-      return color;
-    }
-  }
-
-  @Override
-  public boolean doesAccountSupportCallSubject(PhoneAccountHandle accountHandle) {
-    if (mPhoneAccountCallWithNoteCache.containsKey(accountHandle)) {
-      return mPhoneAccountCallWithNoteCache.get(accountHandle);
-    } else {
-      Boolean supportsCallWithNote =
-          PhoneAccountUtils.getAccountSupportsCallSubject(mContext, accountHandle);
-      mPhoneAccountCallWithNoteCache.put(accountHandle, supportsCallWithNote);
-      return supportsCallWithNote;
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
index e561b56..155a6a2 100644
--- a/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
+++ b/java/com/android/dialer/app/contactinfo/ContactInfoCache.java
@@ -24,6 +24,7 @@
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.ContactSource.Type;
+import com.android.dialer.oem.CequintCallerIdManager;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.util.ExpirableCache;
@@ -55,6 +56,7 @@
   private final OnContactInfoChangedListener mOnContactInfoChangedListener;
   private final BlockingQueue<ContactInfoRequest> mUpdateRequests;
   private final Handler mHandler;
+  private CequintCallerIdManager mCequintCallerIdManager;
   private QueryThread mContactInfoQueryThread;
   private volatile boolean mRequestProcessingDisabled = false;
 
@@ -95,6 +97,10 @@
     mHandler = new InnerHandler(new WeakReference<>(this));
   }
 
+  public void setCequintCallerIdManager(CequintCallerIdManager cequintCallerIdManager) {
+    mCequintCallerIdManager = cequintCallerIdManager;
+  }
+
   public ContactInfo getValue(
       String number,
       String countryIso,
@@ -156,11 +162,11 @@
     ContactInfo info;
     if (request.isLocalRequest()) {
       info = mContactInfoHelper.lookupNumber(request.number, request.countryIso);
-      if (!info.contactExists) {
-        // TODO: Maybe skip look up if it's already available in cached number lookup
+      if (info != null && !info.contactExists) {
+        // TODO(wangqi): Maybe skip look up if it's already available in cached number lookup
         // service.
         long start = SystemClock.elapsedRealtime();
-        mContactInfoHelper.updateFromCequintCallerId(info, request.number);
+        mContactInfoHelper.updateFromCequintCallerId(mCequintCallerIdManager, info, request.number);
         long time = SystemClock.elapsedRealtime() - start;
         LogUtil.d(
             "ContactInfoCache.queryContactInfo", "Cequint Caller Id look up takes %d ms", time);
diff --git a/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java b/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java
index 4c8e32a..537acd0 100644
--- a/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java
+++ b/java/com/android/dialer/app/contactinfo/ContactPhotoLoader.java
@@ -25,10 +25,10 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
 import com.android.dialer.app.R;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
diff --git a/java/com/android/dialer/app/dialpad/DialpadFragment.java b/java/com/android/dialer/app/dialpad/DialpadFragment.java
deleted file mode 100644
index e9d57b3..0000000
--- a/java/com/android/dialer/app/dialpad/DialpadFragment.java
+++ /dev/null
@@ -1,1687 +0,0 @@
-/*
- * Copyright (C) 2011 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.app.dialpad;
-
-import android.Manifest.permission;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.AudioManager;
-import android.media.ToneGenerator;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Trace;
-import android.provider.Contacts.People;
-import android.provider.Contacts.Phones;
-import android.provider.Contacts.PhonesColumns;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.PhoneNumberFormattingTextWatcher;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.view.HapticFeedbackConstants;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import com.android.contacts.common.dialog.CallSubjectDialog;
-import com.android.contacts.common.util.StopWatch;
-import com.android.contacts.common.widget.FloatingActionButtonController;
-import com.android.dialer.animation.AnimUtils;
-import com.android.dialer.app.DialtactsActivity;
-import com.android.dialer.app.R;
-import com.android.dialer.app.SpecialCharSequenceMgr;
-import com.android.dialer.app.calllog.CallLogAsync;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.dialpadview.DialpadKeyButton;
-import com.android.dialer.dialpadview.DialpadView;
-import com.android.dialer.location.GeoUtil;
-import com.android.dialer.proguard.UsedByReflection;
-import com.android.dialer.telecom.TelecomUtil;
-import com.android.dialer.util.CallUtil;
-import com.android.dialer.util.DialerUtils;
-import com.android.dialer.util.PermissionsUtil;
-import java.util.HashSet;
-import java.util.List;
-
-/** Fragment that displays a twelve-key phone dialpad. */
-public class DialpadFragment extends Fragment
-    implements View.OnClickListener,
-        View.OnLongClickListener,
-        View.OnKeyListener,
-        AdapterView.OnItemClickListener,
-        TextWatcher,
-        PopupMenu.OnMenuItemClickListener,
-        DialpadKeyButton.OnPressedListener {
-
-  private static final String TAG = "DialpadFragment";
-  private static final boolean DEBUG = DialtactsActivity.DEBUG;
-  private static final String EMPTY_NUMBER = "";
-  private static final char PAUSE = ',';
-  private static final char WAIT = ';';
-  /** The length of DTMF tones in milliseconds */
-  private static final int TONE_LENGTH_MS = 150;
-
-  private static final int TONE_LENGTH_INFINITE = -1;
-  /** The DTMF tone volume relative to other sounds in the stream */
-  private static final int TONE_RELATIVE_VOLUME = 80;
-  /** Stream type used to play the DTMF tones off call, and mapped to the volume control keys */
-  private static final int DIAL_TONE_STREAM_TYPE = AudioManager.STREAM_DTMF;
-  /** Identifier for the "Add Call" intent extra. */
-  private static final String ADD_CALL_MODE_KEY = "add_call_mode";
-  /**
-   * Identifier for intent extra for sending an empty Flash message for CDMA networks. This message
-   * is used by the network to simulate a press/depress of the "hookswitch" of a landline phone. Aka
-   * "empty flash".
-   *
-   * <p>TODO: Using an intent extra to tell the phone to send this flash is a temporary measure. To
-   * be replaced with an Telephony/TelecomManager call in the future. TODO: Keep in sync with the
-   * string defined in OutgoingCallBroadcaster.java in Phone app until this is replaced with the
-   * Telephony/Telecom API.
-   */
-  private static final String EXTRA_SEND_EMPTY_FLASH = "com.android.phone.extra.SEND_EMPTY_FLASH";
-
-  private static final String PREF_DIGITS_FILLED_BY_INTENT = "pref_digits_filled_by_intent";
-  private final Object mToneGeneratorLock = new Object();
-  /** Set of dialpad keys that are currently being pressed */
-  private final HashSet<View> mPressedDialpadKeys = new HashSet<View>(12);
-  // Last number dialed, retrieved asynchronously from the call DB
-  // in onCreate. This number is displayed when the user hits the
-  // send key and cleared in onPause.
-  private final CallLogAsync mCallLog = new CallLogAsync();
-  private OnDialpadQueryChangedListener mDialpadQueryListener;
-  private DialpadView mDialpadView;
-  private EditText mDigits;
-  private int mDialpadSlideInDuration;
-  /** Remembers if we need to clear digits field when the screen is completely gone. */
-  private boolean mClearDigitsOnStop;
-
-  private View mOverflowMenuButton;
-  private PopupMenu mOverflowPopupMenu;
-  private View mDelete;
-  private ToneGenerator mToneGenerator;
-  private View mSpacer;
-  private FloatingActionButtonController mFloatingActionButtonController;
-  private ListView mDialpadChooser;
-  private DialpadChooserAdapter mDialpadChooserAdapter;
-  /** Regular expression prohibiting manual phone call. Can be empty, which means "no rule". */
-  private String mProhibitedPhoneNumberRegexp;
-
-  private PseudoEmergencyAnimator mPseudoEmergencyAnimator;
-  private String mLastNumberDialed = EMPTY_NUMBER;
-
-  // determines if we want to playback local DTMF tones.
-  private boolean mDTMFToneEnabled;
-  private String mCurrentCountryIso;
-  private CallStateReceiver mCallStateReceiver;
-  private boolean mWasEmptyBeforeTextChange;
-  /**
-   * This field is set to true while processing an incoming DIAL intent, in order to make sure that
-   * SpecialCharSequenceMgr actions can be triggered by user input but *not* by a tel: URI passed by
-   * some other app. It will be set to false when all digits are cleared.
-   */
-  private boolean mDigitsFilledByIntent;
-
-  private boolean mStartedFromNewIntent = false;
-  private boolean mFirstLaunch = false;
-  private boolean mAnimate = false;
-
-  /**
-   * Determines whether an add call operation is requested.
-   *
-   * @param intent The intent.
-   * @return {@literal true} if add call operation was requested. {@literal false} otherwise.
-   */
-  public static boolean isAddCallMode(Intent intent) {
-    if (intent == null) {
-      return false;
-    }
-    final String action = intent.getAction();
-    if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
-      // see if we are "adding a call" from the InCallScreen; false by default.
-      return intent.getBooleanExtra(ADD_CALL_MODE_KEY, false);
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Format the provided string of digits into one that represents a properly formatted phone
-   * number.
-   *
-   * @param dialString String of characters to format
-   * @param normalizedNumber the E164 format number whose country code is used if the given
-   *     phoneNumber doesn't have the country code.
-   * @param countryIso The country code representing the format to use if the provided normalized
-   *     number is null or invalid.
-   * @return the provided string of digits as a formatted phone number, retaining any post-dial
-   *     portion of the string.
-   */
-  @VisibleForTesting
-  static String getFormattedDigits(String dialString, String normalizedNumber, String countryIso) {
-    String number = PhoneNumberUtils.extractNetworkPortion(dialString);
-    // Also retrieve the post dial portion of the provided data, so that the entire dial
-    // string can be reconstituted later.
-    final String postDial = PhoneNumberUtils.extractPostDialPortion(dialString);
-
-    if (TextUtils.isEmpty(number)) {
-      return postDial;
-    }
-
-    number = PhoneNumberUtils.formatNumber(number, normalizedNumber, countryIso);
-
-    if (TextUtils.isEmpty(postDial)) {
-      return number;
-    }
-
-    return number.concat(postDial);
-  }
-
-  /**
-   * Returns true of the newDigit parameter can be added at the current selection point, otherwise
-   * returns false. Only prevents input of WAIT and PAUSE digits at an unsupported position. Fails
-   * early if start == -1 or start is larger than end.
-   */
-  @VisibleForTesting
-  /* package */ static boolean canAddDigit(CharSequence digits, int start, int end, char newDigit) {
-    if (newDigit != WAIT && newDigit != PAUSE) {
-      throw new IllegalArgumentException(
-          "Should not be called for anything other than PAUSE & WAIT");
-    }
-
-    // False if no selection, or selection is reversed (end < start)
-    if (start == -1 || end < start) {
-      return false;
-    }
-
-    // unsupported selection-out-of-bounds state
-    if (start > digits.length() || end > digits.length()) {
-      return false;
-    }
-
-    // Special digit cannot be the first digit
-    if (start == 0) {
-      return false;
-    }
-
-    if (newDigit == WAIT) {
-      // preceding char is ';' (WAIT)
-      if (digits.charAt(start - 1) == WAIT) {
-        return false;
-      }
-
-      // next char is ';' (WAIT)
-      if ((digits.length() > end) && (digits.charAt(end) == WAIT)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  private TelephonyManager getTelephonyManager() {
-    return (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-  }
-
-  @Override
-  public Context getContext() {
-    return getActivity();
-  }
-
-  @Override
-  public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    mWasEmptyBeforeTextChange = TextUtils.isEmpty(s);
-  }
-
-  @Override
-  public void onTextChanged(CharSequence input, int start, int before, int changeCount) {
-    if (mWasEmptyBeforeTextChange != TextUtils.isEmpty(input)) {
-      final Activity activity = getActivity();
-      if (activity != null) {
-        activity.invalidateOptionsMenu();
-        updateMenuOverflowButton(mWasEmptyBeforeTextChange);
-      }
-    }
-
-    // DTMF Tones do not need to be played here any longer -
-    // the DTMF dialer handles that functionality now.
-  }
-
-  @Override
-  public void afterTextChanged(Editable input) {
-    // When DTMF dialpad buttons are being pressed, we delay SpecialCharSequenceMgr sequence,
-    // since some of SpecialCharSequenceMgr's behavior is too abrupt for the "touch-down"
-    // behavior.
-    if (!mDigitsFilledByIntent
-        && SpecialCharSequenceMgr.handleChars(getActivity(), input.toString(), mDigits)) {
-      // A special sequence was entered, clear the digits
-      mDigits.getText().clear();
-    }
-
-    if (isDigitsEmpty()) {
-      mDigitsFilledByIntent = false;
-      mDigits.setCursorVisible(false);
-    }
-
-    if (mDialpadQueryListener != null) {
-      mDialpadQueryListener.onDialpadQueryChanged(mDigits.getText().toString());
-    }
-
-    updateDeleteButtonEnabledState();
-  }
-
-  @Override
-  public void onCreate(Bundle state) {
-    Trace.beginSection(TAG + " onCreate");
-    super.onCreate(state);
-
-    mFirstLaunch = state == null;
-
-    mCurrentCountryIso = GeoUtil.getCurrentCountryIso(getActivity());
-
-    mProhibitedPhoneNumberRegexp =
-        getResources().getString(R.string.config_prohibited_phone_number_regexp);
-
-    if (state != null) {
-      mDigitsFilledByIntent = state.getBoolean(PREF_DIGITS_FILLED_BY_INTENT);
-    }
-
-    mDialpadSlideInDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration);
-
-    if (mCallStateReceiver == null) {
-      IntentFilter callStateIntentFilter =
-          new IntentFilter(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
-      mCallStateReceiver = new CallStateReceiver();
-      getActivity().registerReceiver(mCallStateReceiver, callStateIntentFilter);
-    }
-    Trace.endSection();
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-    Trace.beginSection(TAG + " onCreateView");
-    Trace.beginSection(TAG + " inflate view");
-    final View fragmentView = inflater.inflate(R.layout.dialpad_fragment, container, false);
-    Trace.endSection();
-    Trace.beginSection(TAG + " buildLayer");
-    fragmentView.buildLayer();
-    Trace.endSection();
-
-    Trace.beginSection(TAG + " setup views");
-
-    mDialpadView = (DialpadView) fragmentView.findViewById(R.id.dialpad_view);
-    mDialpadView.setCanDigitsBeEdited(true);
-    mDigits = mDialpadView.getDigits();
-    mDigits.setKeyListener(UnicodeDialerKeyListener.INSTANCE);
-    mDigits.setOnClickListener(this);
-    mDigits.setOnKeyListener(this);
-    mDigits.setOnLongClickListener(this);
-    mDigits.addTextChangedListener(this);
-    mDigits.setElegantTextHeight(false);
-
-    PhoneNumberFormattingTextWatcher watcher =
-        new PhoneNumberFormattingTextWatcher(GeoUtil.getCurrentCountryIso(getActivity()));
-    mDigits.addTextChangedListener(watcher);
-
-    // Check for the presence of the keypad
-    View oneButton = fragmentView.findViewById(R.id.one);
-    if (oneButton != null) {
-      configureKeypadListeners(fragmentView);
-    }
-
-    mDelete = mDialpadView.getDeleteButton();
-
-    if (mDelete != null) {
-      mDelete.setOnClickListener(this);
-      mDelete.setOnLongClickListener(this);
-    }
-
-    mSpacer = fragmentView.findViewById(R.id.spacer);
-    mSpacer.setOnTouchListener(
-        new View.OnTouchListener() {
-          @Override
-          public boolean onTouch(View v, MotionEvent event) {
-            if (isDigitsEmpty()) {
-              if (getActivity() != null) {
-                return ((HostInterface) getActivity()).onDialpadSpacerTouchWithEmptyQuery();
-              }
-              return true;
-            }
-            return false;
-          }
-        });
-
-    mDigits.setCursorVisible(false);
-
-    // Set up the "dialpad chooser" UI; see showDialpadChooser().
-    mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser);
-    mDialpadChooser.setOnItemClickListener(this);
-
-    FloatingActionButton floatingActionButton =
-        (FloatingActionButton) fragmentView.findViewById(R.id.dialpad_floating_action_button);
-    floatingActionButton.setOnClickListener(this);
-    mFloatingActionButtonController =
-        new FloatingActionButtonController(getActivity(), floatingActionButton);
-    Trace.endSection();
-    Trace.endSection();
-    return fragmentView;
-  }
-
-  private boolean isLayoutReady() {
-    return mDigits != null;
-  }
-
-  @VisibleForTesting
-  public EditText getDigitsWidget() {
-    return mDigits;
-  }
-
-  /** @return true when {@link #mDigits} is actually filled by the Intent. */
-  private boolean fillDigitsIfNecessary(Intent intent) {
-    // Only fills digits from an intent if it is a new intent.
-    // Otherwise falls back to the previously used number.
-    if (!mFirstLaunch && !mStartedFromNewIntent) {
-      return false;
-    }
-
-    final String action = intent.getAction();
-    if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
-      Uri uri = intent.getData();
-      if (uri != null) {
-        if (PhoneAccount.SCHEME_TEL.equals(uri.getScheme())) {
-          // Put the requested number into the input area
-          String data = uri.getSchemeSpecificPart();
-          // Remember it is filled via Intent.
-          mDigitsFilledByIntent = true;
-          final String converted =
-              PhoneNumberUtils.convertKeypadLettersToDigits(
-                  PhoneNumberUtils.replaceUnicodeDigits(data));
-          setFormattedDigits(converted, null);
-          return true;
-        } else {
-          if (!PermissionsUtil.hasContactsReadPermissions(getActivity())) {
-            return false;
-          }
-          String type = intent.getType();
-          if (People.CONTENT_ITEM_TYPE.equals(type) || Phones.CONTENT_ITEM_TYPE.equals(type)) {
-            // Query the phone number
-            Cursor c =
-                getActivity()
-                    .getContentResolver()
-                    .query(
-                        intent.getData(),
-                        new String[] {PhonesColumns.NUMBER, PhonesColumns.NUMBER_KEY},
-                        null,
-                        null,
-                        null);
-            if (c != null) {
-              try {
-                if (c.moveToFirst()) {
-                  // Remember it is filled via Intent.
-                  mDigitsFilledByIntent = true;
-                  // Put the number into the input area
-                  setFormattedDigits(c.getString(0), c.getString(1));
-                  return true;
-                }
-              } finally {
-                c.close();
-              }
-            }
-          }
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Checks the given Intent and changes dialpad's UI state. For example, if the Intent requires the
-   * screen to enter "Add Call" mode, this method will show correct UI for the mode.
-   */
-  private void configureScreenFromIntent(Activity parent) {
-    // If we were not invoked with a DIAL intent,
-    if (!(parent instanceof DialtactsActivity)) {
-      setStartedFromNewIntent(false);
-      return;
-    }
-    // See if we were invoked with a DIAL intent. If we were, fill in the appropriate
-    // digits in the dialer field.
-    Intent intent = parent.getIntent();
-
-    if (!isLayoutReady()) {
-      // This happens typically when parent's Activity#onNewIntent() is called while
-      // Fragment#onCreateView() isn't called yet, and thus we cannot configure Views at
-      // this point. onViewCreate() should call this method after preparing layouts, so
-      // just ignore this call now.
-      LogUtil.i(
-          "DialpadFragment.configureScreenFromIntent",
-          "Screen configuration is requested before onCreateView() is called. Ignored");
-      return;
-    }
-
-    boolean needToShowDialpadChooser = false;
-
-    // Be sure *not* to show the dialpad chooser if this is an
-    // explicit "Add call" action, though.
-    final boolean isAddCallMode = isAddCallMode(intent);
-    if (!isAddCallMode) {
-
-      // Don't show the chooser when called via onNewIntent() and phone number is present.
-      // i.e. User clicks a telephone link from gmail for example.
-      // In this case, we want to show the dialpad with the phone number.
-      final boolean digitsFilled = fillDigitsIfNecessary(intent);
-      if (!(mStartedFromNewIntent && digitsFilled)) {
-
-        final String action = intent.getAction();
-        if (Intent.ACTION_DIAL.equals(action)
-            || Intent.ACTION_VIEW.equals(action)
-            || Intent.ACTION_MAIN.equals(action)) {
-          // If there's already an active call, bring up an intermediate UI to
-          // make the user confirm what they really want to do.
-          if (isPhoneInUse()) {
-            needToShowDialpadChooser = true;
-          }
-        }
-      }
-    }
-    showDialpadChooser(needToShowDialpadChooser);
-    setStartedFromNewIntent(false);
-  }
-
-  public void setStartedFromNewIntent(boolean value) {
-    mStartedFromNewIntent = value;
-  }
-
-  public void clearCallRateInformation() {
-    setCallRateInformation(null, null);
-  }
-
-  public void setCallRateInformation(String countryName, String displayRate) {
-    mDialpadView.setCallRateInformation(countryName, displayRate);
-  }
-
-  /** Sets formatted digits to digits field. */
-  private void setFormattedDigits(String data, String normalizedNumber) {
-    final String formatted = getFormattedDigits(data, normalizedNumber, mCurrentCountryIso);
-    if (!TextUtils.isEmpty(formatted)) {
-      Editable digits = mDigits.getText();
-      digits.replace(0, digits.length(), formatted);
-      // for some reason this isn't getting called in the digits.replace call above..
-      // but in any case, this will make sure the background drawable looks right
-      afterTextChanged(digits);
-    }
-  }
-
-  private void configureKeypadListeners(View fragmentView) {
-    final int[] buttonIds =
-        new int[] {
-          R.id.one,
-          R.id.two,
-          R.id.three,
-          R.id.four,
-          R.id.five,
-          R.id.six,
-          R.id.seven,
-          R.id.eight,
-          R.id.nine,
-          R.id.star,
-          R.id.zero,
-          R.id.pound
-        };
-
-    DialpadKeyButton dialpadKey;
-
-    for (int i = 0; i < buttonIds.length; i++) {
-      dialpadKey = (DialpadKeyButton) fragmentView.findViewById(buttonIds[i]);
-      dialpadKey.setOnPressedListener(this);
-    }
-
-    // Long-pressing one button will initiate Voicemail.
-    final DialpadKeyButton one = (DialpadKeyButton) fragmentView.findViewById(R.id.one);
-    one.setOnLongClickListener(this);
-
-    // Long-pressing zero button will enter '+' instead.
-    final DialpadKeyButton zero = (DialpadKeyButton) fragmentView.findViewById(R.id.zero);
-    zero.setOnLongClickListener(this);
-  }
-
-  @Override
-  public void onStart() {
-    LogUtil.d("DialpadFragment.onStart", "first launch: %b", mFirstLaunch);
-    Trace.beginSection(TAG + " onStart");
-    super.onStart();
-    // if the mToneGenerator creation fails, just continue without it.  It is
-    // a local audio signal, and is not as important as the dtmf tone itself.
-    final long start = System.currentTimeMillis();
-    synchronized (mToneGeneratorLock) {
-      if (mToneGenerator == null) {
-        try {
-          mToneGenerator = new ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME);
-        } catch (RuntimeException e) {
-          LogUtil.e(
-              "DialpadFragment.onStart",
-              "Exception caught while creating local tone generator: " + e);
-          mToneGenerator = null;
-        }
-      }
-    }
-    final long total = System.currentTimeMillis() - start;
-    if (total > 50) {
-      LogUtil.i("DialpadFragment.onStart", "Time for ToneGenerator creation: " + total);
-    }
-    Trace.endSection();
-  }
-
-  @Override
-  public void onResume() {
-    LogUtil.d("DialpadFragment.onResume", "");
-    Trace.beginSection(TAG + " onResume");
-    super.onResume();
-
-    final DialtactsActivity activity = (DialtactsActivity) getActivity();
-    mDialpadQueryListener = activity;
-
-    final StopWatch stopWatch = StopWatch.start("Dialpad.onResume");
-
-    // Query the last dialed number. Do it first because hitting
-    // the DB is 'slow'. This call is asynchronous.
-    queryLastOutgoingCall();
-
-    stopWatch.lap("qloc");
-
-    final ContentResolver contentResolver = activity.getContentResolver();
-
-    // retrieve the DTMF tone play back setting.
-    mDTMFToneEnabled =
-        Settings.System.getInt(contentResolver, Settings.System.DTMF_TONE_WHEN_DIALING, 1) == 1;
-
-    stopWatch.lap("dtwd");
-
-    stopWatch.lap("hptc");
-
-    mPressedDialpadKeys.clear();
-
-    configureScreenFromIntent(getActivity());
-
-    stopWatch.lap("fdin");
-
-    if (!isPhoneInUse()) {
-      // A sanity-check: the "dialpad chooser" UI should not be visible if the phone is idle.
-      showDialpadChooser(false);
-    }
-
-    stopWatch.lap("hnt");
-
-    updateDeleteButtonEnabledState();
-
-    stopWatch.lap("bes");
-
-    stopWatch.stopAndLog(TAG, 50);
-
-    // Populate the overflow menu in onResume instead of onCreate, so that if the SMS activity
-    // is disabled while Dialer is paused, the "Send a text message" option can be correctly
-    // removed when resumed.
-    mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
-    mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
-    mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
-    mOverflowMenuButton.setOnClickListener(this);
-    mOverflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
-
-    if (mFirstLaunch) {
-      // The onHiddenChanged callback does not get called the first time the fragment is
-      // attached, so call it ourselves here.
-      onHiddenChanged(false);
-    }
-
-    mFirstLaunch = false;
-    Trace.endSection();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-
-    // Make sure we don't leave this activity with a tone still playing.
-    stopTone();
-    mPressedDialpadKeys.clear();
-
-    // TODO: I wonder if we should not check if the AsyncTask that
-    // lookup the last dialed number has completed.
-    mLastNumberDialed = EMPTY_NUMBER; // Since we are going to query again, free stale number.
-
-    SpecialCharSequenceMgr.cleanup();
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-
-    synchronized (mToneGeneratorLock) {
-      if (mToneGenerator != null) {
-        mToneGenerator.release();
-        mToneGenerator = null;
-      }
-    }
-
-    if (mClearDigitsOnStop) {
-      mClearDigitsOnStop = false;
-      clearDialpad();
-    }
-  }
-
-  @Override
-  public void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    outState.putBoolean(PREF_DIGITS_FILLED_BY_INTENT, mDigitsFilledByIntent);
-  }
-
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-    if (mPseudoEmergencyAnimator != null) {
-      mPseudoEmergencyAnimator.destroy();
-      mPseudoEmergencyAnimator = null;
-    }
-    getActivity().unregisterReceiver(mCallStateReceiver);
-  }
-
-  private void keyPressed(int keyCode) {
-    if (getView() == null || getView().getTranslationY() != 0) {
-      return;
-    }
-    switch (keyCode) {
-      case KeyEvent.KEYCODE_1:
-        playTone(ToneGenerator.TONE_DTMF_1, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_2:
-        playTone(ToneGenerator.TONE_DTMF_2, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_3:
-        playTone(ToneGenerator.TONE_DTMF_3, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_4:
-        playTone(ToneGenerator.TONE_DTMF_4, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_5:
-        playTone(ToneGenerator.TONE_DTMF_5, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_6:
-        playTone(ToneGenerator.TONE_DTMF_6, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_7:
-        playTone(ToneGenerator.TONE_DTMF_7, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_8:
-        playTone(ToneGenerator.TONE_DTMF_8, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_9:
-        playTone(ToneGenerator.TONE_DTMF_9, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_0:
-        playTone(ToneGenerator.TONE_DTMF_0, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_POUND:
-        playTone(ToneGenerator.TONE_DTMF_P, TONE_LENGTH_INFINITE);
-        break;
-      case KeyEvent.KEYCODE_STAR:
-        playTone(ToneGenerator.TONE_DTMF_S, TONE_LENGTH_INFINITE);
-        break;
-      default:
-        break;
-    }
-
-    getView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
-    KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
-    mDigits.onKeyDown(keyCode, event);
-
-    // If the cursor is at the end of the text we hide it.
-    final int length = mDigits.length();
-    if (length == mDigits.getSelectionStart() && length == mDigits.getSelectionEnd()) {
-      mDigits.setCursorVisible(false);
-    }
-  }
-
-  @Override
-  public boolean onKey(View view, int keyCode, KeyEvent event) {
-    if (view.getId() == R.id.digits) {
-      if (keyCode == KeyEvent.KEYCODE_ENTER) {
-        handleDialButtonPressed();
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * When a key is pressed, we start playing DTMF tone, do vibration, and enter the digit
-   * immediately. When a key is released, we stop the tone. Note that the "key press" event will be
-   * delivered by the system with certain amount of delay, it won't be synced with user's actual
-   * "touch-down" behavior.
-   */
-  @Override
-  public void onPressed(View view, boolean pressed) {
-    if (DEBUG) {
-      LogUtil.d("DialpadFragment.onPressed", "view: " + view + ", pressed: " + pressed);
-    }
-    if (pressed) {
-      int resId = view.getId();
-      if (resId == R.id.one) {
-        keyPressed(KeyEvent.KEYCODE_1);
-      } else if (resId == R.id.two) {
-        keyPressed(KeyEvent.KEYCODE_2);
-      } else if (resId == R.id.three) {
-        keyPressed(KeyEvent.KEYCODE_3);
-      } else if (resId == R.id.four) {
-        keyPressed(KeyEvent.KEYCODE_4);
-      } else if (resId == R.id.five) {
-        keyPressed(KeyEvent.KEYCODE_5);
-      } else if (resId == R.id.six) {
-        keyPressed(KeyEvent.KEYCODE_6);
-      } else if (resId == R.id.seven) {
-        keyPressed(KeyEvent.KEYCODE_7);
-      } else if (resId == R.id.eight) {
-        keyPressed(KeyEvent.KEYCODE_8);
-      } else if (resId == R.id.nine) {
-        keyPressed(KeyEvent.KEYCODE_9);
-      } else if (resId == R.id.zero) {
-        keyPressed(KeyEvent.KEYCODE_0);
-      } else if (resId == R.id.pound) {
-        keyPressed(KeyEvent.KEYCODE_POUND);
-      } else if (resId == R.id.star) {
-        keyPressed(KeyEvent.KEYCODE_STAR);
-      } else {
-        LogUtil.e(
-            "DialpadFragment.onPressed", "Unexpected onTouch(ACTION_DOWN) event from: " + view);
-      }
-      mPressedDialpadKeys.add(view);
-    } else {
-      mPressedDialpadKeys.remove(view);
-      if (mPressedDialpadKeys.isEmpty()) {
-        stopTone();
-      }
-    }
-  }
-
-  /**
-   * Called by the containing Activity to tell this Fragment to build an overflow options menu for
-   * display by the container when appropriate.
-   *
-   * @param invoker the View that invoked the options menu, to act as an anchor location.
-   */
-  private PopupMenu buildOptionsMenu(View invoker) {
-    final PopupMenu popupMenu =
-        new PopupMenu(getActivity(), invoker) {
-          @Override
-          public void show() {
-            final Menu menu = getMenu();
-
-            boolean enable = !isDigitsEmpty();
-            for (int i = 0; i < menu.size(); i++) {
-              MenuItem item = menu.getItem(i);
-              item.setEnabled(enable);
-              if (item.getItemId() == R.id.menu_call_with_note) {
-                item.setVisible(CallUtil.isCallWithSubjectSupported(getContext()));
-              }
-            }
-            super.show();
-          }
-        };
-    popupMenu.inflate(R.menu.dialpad_options);
-    popupMenu.setOnMenuItemClickListener(this);
-    return popupMenu;
-  }
-
-  @Override
-  public void onClick(View view) {
-    int resId = view.getId();
-    if (resId == R.id.dialpad_floating_action_button) {
-      view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
-      handleDialButtonPressed();
-    } else if (resId == R.id.deleteButton) {
-      keyPressed(KeyEvent.KEYCODE_DEL);
-    } else if (resId == R.id.digits) {
-      if (!isDigitsEmpty()) {
-        mDigits.setCursorVisible(true);
-      }
-    } else if (resId == R.id.dialpad_overflow) {
-      mOverflowPopupMenu.show();
-    } else {
-      LogUtil.w("DialpadFragment.onClick", "Unexpected event from: " + view);
-      return;
-    }
-  }
-
-  @Override
-  public boolean onLongClick(View view) {
-    final Editable digits = mDigits.getText();
-    final int id = view.getId();
-    if (id == R.id.deleteButton) {
-      digits.clear();
-      return true;
-    } else if (id == R.id.one) {
-      if (isDigitsEmpty() || TextUtils.equals(mDigits.getText(), "1")) {
-        // We'll try to initiate voicemail and thus we want to remove irrelevant string.
-        removePreviousDigitIfPossible('1');
-
-        List<PhoneAccountHandle> subscriptionAccountHandles =
-            PhoneAccountUtils.getSubscriptionPhoneAccounts(getActivity());
-        boolean hasUserSelectedDefault =
-            subscriptionAccountHandles.contains(
-                TelecomUtil.getDefaultOutgoingPhoneAccount(
-                    getActivity(), PhoneAccount.SCHEME_VOICEMAIL));
-        boolean needsAccountDisambiguation =
-            subscriptionAccountHandles.size() > 1 && !hasUserSelectedDefault;
-
-        if (needsAccountDisambiguation || isVoicemailAvailable()) {
-          // On a multi-SIM phone, if the user has not selected a default
-          // subscription, initiate a call to voicemail so they can select an account
-          // from the "Call with" dialog.
-          callVoicemail();
-        } else if (getActivity() != null) {
-          // Voicemail is unavailable maybe because Airplane mode is turned on.
-          // Check the current status and show the most appropriate error message.
-          final boolean isAirplaneModeOn =
-              Settings.System.getInt(
-                      getActivity().getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0)
-                  != 0;
-          if (isAirplaneModeOn) {
-            DialogFragment dialogFragment =
-                ErrorDialogFragment.newInstance(R.string.dialog_voicemail_airplane_mode_message);
-            dialogFragment.show(getFragmentManager(), "voicemail_request_during_airplane_mode");
-          } else {
-            DialogFragment dialogFragment =
-                ErrorDialogFragment.newInstance(R.string.dialog_voicemail_not_ready_message);
-            dialogFragment.show(getFragmentManager(), "voicemail_not_ready");
-          }
-        }
-        return true;
-      }
-      return false;
-    } else if (id == R.id.zero) {
-      if (mPressedDialpadKeys.contains(view)) {
-        // If the zero key is currently pressed, then the long press occurred by touch
-        // (and not via other means like certain accessibility input methods).
-        // Remove the '0' that was input when the key was first pressed.
-        removePreviousDigitIfPossible('0');
-      }
-      keyPressed(KeyEvent.KEYCODE_PLUS);
-      stopTone();
-      mPressedDialpadKeys.remove(view);
-      return true;
-    } else if (id == R.id.digits) {
-      mDigits.setCursorVisible(true);
-      return false;
-    }
-    return false;
-  }
-
-  /**
-   * Remove the digit just before the current position of the cursor, iff the following conditions
-   * are true: 1) The cursor is not positioned at index 0. 2) The digit before the current cursor
-   * position matches the current digit.
-   *
-   * @param digit to remove from the digits view.
-   */
-  private void removePreviousDigitIfPossible(char digit) {
-    final int currentPosition = mDigits.getSelectionStart();
-    if (currentPosition > 0 && digit == mDigits.getText().charAt(currentPosition - 1)) {
-      mDigits.setSelection(currentPosition);
-      mDigits.getText().delete(currentPosition - 1, currentPosition);
-    }
-  }
-
-  public void callVoicemail() {
-    DialerUtils.startActivityWithErrorToast(
-        getActivity(),
-        new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.DIALPAD).build());
-    hideAndClearDialpad(false);
-  }
-
-  private void hideAndClearDialpad(boolean animate) {
-    ((DialtactsActivity) getActivity()).hideDialpadFragment(animate, true);
-  }
-
-  /**
-   * In most cases, when the dial button is pressed, there is a number in digits area. Pack it in
-   * the intent, start the outgoing call broadcast as a separate task and finish this activity.
-   *
-   * <p>When there is no digit and the phone is CDMA and off hook, we're sending a blank flash for
-   * CDMA. CDMA networks use Flash messages when special processing needs to be done, mainly for
-   * 3-way or call waiting scenarios. Presumably, here we're in a special 3-way scenario where the
-   * network needs a blank flash before being able to add the new participant. (This is not the case
-   * with all 3-way calls, just certain CDMA infrastructures.)
-   *
-   * <p>Otherwise, there is no digit, display the last dialed number. Don't finish since the user
-   * may want to edit it. The user needs to press the dial button again, to dial it (general case
-   * described above).
-   */
-  private void handleDialButtonPressed() {
-    if (isDigitsEmpty()) { // No number entered.
-      handleDialButtonClickWithEmptyDigits();
-    } else {
-      final String number = mDigits.getText().toString();
-
-      // "persist.radio.otaspdial" is a temporary hack needed for one carrier's automated
-      // test equipment.
-      // TODO: clean it up.
-      if (number != null
-          && !TextUtils.isEmpty(mProhibitedPhoneNumberRegexp)
-          && number.matches(mProhibitedPhoneNumberRegexp)) {
-        LogUtil.i(
-            "DialpadFragment.handleDialButtonPressed",
-            "The phone number is prohibited explicitly by a rule.");
-        if (getActivity() != null) {
-          DialogFragment dialogFragment =
-              ErrorDialogFragment.newInstance(R.string.dialog_phone_call_prohibited_message);
-          dialogFragment.show(getFragmentManager(), "phone_prohibited_dialog");
-        }
-
-        // Clear the digits just in case.
-        clearDialpad();
-      } else {
-        final Intent intent =
-            new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD).build();
-        DialerUtils.startActivityWithErrorToast(getActivity(), intent);
-        hideAndClearDialpad(false);
-      }
-    }
-  }
-
-  public void clearDialpad() {
-    if (mDigits != null) {
-      mDigits.getText().clear();
-    }
-  }
-
-  private void handleDialButtonClickWithEmptyDigits() {
-    if (phoneIsCdma() && isPhoneInUse()) {
-      // TODO: Move this logic into services/Telephony
-      //
-      // This is really CDMA specific. On GSM is it possible
-      // to be off hook and wanted to add a 3rd party using
-      // the redial feature.
-      startActivity(newFlashIntent());
-    } else {
-      if (!TextUtils.isEmpty(mLastNumberDialed)) {
-        // Recall the last number dialed.
-        mDigits.setText(mLastNumberDialed);
-
-        // ...and move the cursor to the end of the digits string,
-        // so you'll be able to delete digits using the Delete
-        // button (just as if you had typed the number manually.)
-        //
-        // Note we use mDigits.getText().length() here, not
-        // mLastNumberDialed.length(), since the EditText widget now
-        // contains a *formatted* version of mLastNumberDialed (due to
-        // mTextWatcher) and its length may have changed.
-        mDigits.setSelection(mDigits.getText().length());
-      } else {
-        // There's no "last number dialed" or the
-        // background query is still running. There's
-        // nothing useful for the Dial button to do in
-        // this case.  Note: with a soft dial button, this
-        // can never happens since the dial button is
-        // disabled under these conditons.
-        playTone(ToneGenerator.TONE_PROP_NACK);
-      }
-    }
-  }
-
-  /** Plays the specified tone for TONE_LENGTH_MS milliseconds. */
-  private void playTone(int tone) {
-    playTone(tone, TONE_LENGTH_MS);
-  }
-
-  /**
-   * Play the specified tone for the specified milliseconds
-   *
-   * <p>The tone is played locally, using the audio stream for phone calls. Tones are played only if
-   * the "Audible touch tones" user preference is checked, and are NOT played if the device is in
-   * silent mode.
-   *
-   * <p>The tone length can be -1, meaning "keep playing the tone." If the caller does so, it should
-   * call stopTone() afterward.
-   *
-   * @param tone a tone code from {@link ToneGenerator}
-   * @param durationMs tone length.
-   */
-  private void playTone(int tone, int durationMs) {
-    // if local tone playback is disabled, just return.
-    if (!mDTMFToneEnabled) {
-      return;
-    }
-
-    // Also do nothing if the phone is in silent mode.
-    // We need to re-check the ringer mode for *every* playTone()
-    // call, rather than keeping a local flag that's updated in
-    // onResume(), since it's possible to toggle silent mode without
-    // leaving the current activity (via the ENDCALL-longpress menu.)
-    AudioManager audioManager =
-        (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
-    int ringerMode = audioManager.getRingerMode();
-    if ((ringerMode == AudioManager.RINGER_MODE_SILENT)
-        || (ringerMode == AudioManager.RINGER_MODE_VIBRATE)) {
-      return;
-    }
-
-    synchronized (mToneGeneratorLock) {
-      if (mToneGenerator == null) {
-        LogUtil.w("DialpadFragment.playTone", "mToneGenerator == null, tone: " + tone);
-        return;
-      }
-
-      // Start the new tone (will stop any playing tone)
-      mToneGenerator.startTone(tone, durationMs);
-    }
-  }
-
-  /** Stop the tone if it is played. */
-  private void stopTone() {
-    // if local tone playback is disabled, just return.
-    if (!mDTMFToneEnabled) {
-      return;
-    }
-    synchronized (mToneGeneratorLock) {
-      if (mToneGenerator == null) {
-        LogUtil.w("DialpadFragment.stopTone", "mToneGenerator == null");
-        return;
-      }
-      mToneGenerator.stopTone();
-    }
-  }
-
-  /**
-   * Brings up the "dialpad chooser" UI in place of the usual Dialer elements (the textfield/button
-   * and the dialpad underneath).
-   *
-   * <p>We show this UI if the user brings up the Dialer while a call is already in progress, since
-   * there's a good chance we got here accidentally (and the user really wanted the in-call dialpad
-   * instead). So in this situation we display an intermediate UI that lets the user explicitly
-   * choose between the in-call dialpad ("Use touch tone keypad") and the regular Dialer ("Add
-   * call"). (Or, the option "Return to call in progress" just goes back to the in-call UI with no
-   * dialpad at all.)
-   *
-   * @param enabled If true, show the "dialpad chooser" instead of the regular Dialer UI
-   */
-  private void showDialpadChooser(boolean enabled) {
-    if (getActivity() == null) {
-      return;
-    }
-    // Check if onCreateView() is already called by checking one of View objects.
-    if (!isLayoutReady()) {
-      return;
-    }
-
-    if (enabled) {
-      LogUtil.i("DialpadFragment.showDialpadChooser", "Showing dialpad chooser!");
-      if (mDialpadView != null) {
-        mDialpadView.setVisibility(View.GONE);
-      }
-
-      mFloatingActionButtonController.setVisible(false);
-      mDialpadChooser.setVisibility(View.VISIBLE);
-
-      // Instantiate the DialpadChooserAdapter and hook it up to the
-      // ListView.  We do this only once.
-      if (mDialpadChooserAdapter == null) {
-        mDialpadChooserAdapter = new DialpadChooserAdapter(getActivity());
-      }
-      mDialpadChooser.setAdapter(mDialpadChooserAdapter);
-    } else {
-      LogUtil.i("DialpadFragment.showDialpadChooser", "Displaying normal Dialer UI.");
-      if (mDialpadView != null) {
-        mDialpadView.setVisibility(View.VISIBLE);
-      } else {
-        mDigits.setVisibility(View.VISIBLE);
-      }
-
-      // mFloatingActionButtonController must also be 'scaled in', in order to be visible after
-      // 'scaleOut()' hidden method.
-      if (!mFloatingActionButtonController.isVisible()) {
-        // Just call 'scaleIn()' method if the mFloatingActionButtonController was not already
-        // previously visible.
-        mFloatingActionButtonController.scaleIn(0);
-      }
-      mDialpadChooser.setVisibility(View.GONE);
-    }
-  }
-
-  /** @return true if we're currently showing the "dialpad chooser" UI. */
-  private boolean isDialpadChooserVisible() {
-    return mDialpadChooser.getVisibility() == View.VISIBLE;
-  }
-
-  /** Handle clicks from the dialpad chooser. */
-  @Override
-  public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-    DialpadChooserAdapter.ChoiceItem item =
-        (DialpadChooserAdapter.ChoiceItem) parent.getItemAtPosition(position);
-    int itemId = item.id;
-    if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_USE_DTMF_DIALPAD) {
-      // Fire off an intent to go back to the in-call UI
-      // with the dialpad visible.
-      returnToInCallScreen(true);
-    } else if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_RETURN_TO_CALL) {
-      // Fire off an intent to go back to the in-call UI
-      // (with the dialpad hidden).
-      returnToInCallScreen(false);
-    } else if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_ADD_NEW_CALL) {
-      // Ok, guess the user really did want to be here (in the
-      // regular Dialer) after all.  Bring back the normal Dialer UI.
-      showDialpadChooser(false);
-    } else {
-      LogUtil.w("DialpadFragment.onItemClick", "Unexpected itemId: " + itemId);
-    }
-  }
-
-  /**
-   * Returns to the in-call UI (where there's presumably a call in progress) in response to the user
-   * selecting "use touch tone keypad" or "return to call" from the dialpad chooser.
-   */
-  private void returnToInCallScreen(boolean showDialpad) {
-    TelecomUtil.showInCallScreen(getActivity(), showDialpad);
-
-    // Finally, finish() ourselves so that we don't stay on the
-    // activity stack.
-    // Note that we do this whether or not the showCallScreenWithDialpad()
-    // call above had any effect or not!  (That call is a no-op if the
-    // phone is idle, which can happen if the current call ends while
-    // the dialpad chooser is up.  In this case we can't show the
-    // InCallScreen, and there's no point staying here in the Dialer,
-    // so we just take the user back where he came from...)
-    getActivity().finish();
-  }
-
-  /**
-   * @return true if the phone is "in use", meaning that at least one line is active (ie. off hook
-   *     or ringing or dialing, or on hold).
-   */
-  private boolean isPhoneInUse() {
-    final Context context = getActivity();
-    if (context != null) {
-      return TelecomUtil.isInCall(context);
-    }
-    return false;
-  }
-
-  /** @return true if the phone is a CDMA phone type */
-  private boolean phoneIsCdma() {
-    return getTelephonyManager().getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA;
-  }
-
-  @Override
-  public boolean onMenuItemClick(MenuItem item) {
-    int resId = item.getItemId();
-    if (resId == R.id.menu_2s_pause) {
-      updateDialString(PAUSE);
-      return true;
-    } else if (resId == R.id.menu_add_wait) {
-      updateDialString(WAIT);
-      return true;
-    } else if (resId == R.id.menu_call_with_note) {
-      CallSubjectDialog.start(getActivity(), mDigits.getText().toString());
-      hideAndClearDialpad(false);
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /**
-   * Updates the dial string (mDigits) after inserting a Pause character (,) or Wait character (;).
-   */
-  private void updateDialString(char newDigit) {
-    if (newDigit != WAIT && newDigit != PAUSE) {
-      throw new IllegalArgumentException("Not expected for anything other than PAUSE & WAIT");
-    }
-
-    int selectionStart;
-    int selectionEnd;
-
-    // SpannableStringBuilder editable_text = new SpannableStringBuilder(mDigits.getText());
-    int anchor = mDigits.getSelectionStart();
-    int point = mDigits.getSelectionEnd();
-
-    selectionStart = Math.min(anchor, point);
-    selectionEnd = Math.max(anchor, point);
-
-    if (selectionStart == -1) {
-      selectionStart = selectionEnd = mDigits.length();
-    }
-
-    Editable digits = mDigits.getText();
-
-    if (canAddDigit(digits, selectionStart, selectionEnd, newDigit)) {
-      digits.replace(selectionStart, selectionEnd, Character.toString(newDigit));
-
-      if (selectionStart != selectionEnd) {
-        // Unselect: back to a regular cursor, just pass the character inserted.
-        mDigits.setSelection(selectionStart + 1);
-      }
-    }
-  }
-
-  /** Update the enabledness of the "Dial" and "Backspace" buttons if applicable. */
-  private void updateDeleteButtonEnabledState() {
-    if (getActivity() == null) {
-      return;
-    }
-    final boolean digitsNotEmpty = !isDigitsEmpty();
-    mDelete.setEnabled(digitsNotEmpty);
-  }
-
-  /**
-   * Handle transitions for the menu button depending on the state of the digits edit text.
-   * Transition out when going from digits to no digits and transition in when the first digit is
-   * pressed.
-   *
-   * @param transitionIn True if transitioning in, False if transitioning out
-   */
-  private void updateMenuOverflowButton(boolean transitionIn) {
-    mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
-    if (transitionIn) {
-      AnimUtils.fadeIn(mOverflowMenuButton, AnimUtils.DEFAULT_DURATION);
-    } else {
-      AnimUtils.fadeOut(mOverflowMenuButton, AnimUtils.DEFAULT_DURATION);
-    }
-  }
-
-  /**
-   * Check if voicemail is enabled/accessible.
-   *
-   * @return true if voicemail is enabled and accessible. Note that this can be false "temporarily"
-   *     after the app boot.
-   */
-  private boolean isVoicemailAvailable() {
-    try {
-      PhoneAccountHandle defaultUserSelectedAccount =
-          TelecomUtil.getDefaultOutgoingPhoneAccount(getActivity(), PhoneAccount.SCHEME_VOICEMAIL);
-      if (defaultUserSelectedAccount == null) {
-        // In a single-SIM phone, there is no default outgoing phone account selected by
-        // the user, so just call TelephonyManager#getVoicemailNumber directly.
-        return !TextUtils.isEmpty(getTelephonyManager().getVoiceMailNumber());
-      } else {
-        return !TextUtils.isEmpty(
-            TelecomUtil.getVoicemailNumber(getActivity(), defaultUserSelectedAccount));
-      }
-    } catch (SecurityException se) {
-      // Possibly no READ_PHONE_STATE privilege.
-      LogUtil.w(
-          "DialpadFragment.isVoicemailAvailable",
-          "SecurityException is thrown. Maybe privilege isn't sufficient.");
-    }
-    return false;
-  }
-
-  /** @return true if the widget with the phone number digits is empty. */
-  private boolean isDigitsEmpty() {
-    return mDigits.length() == 0;
-  }
-
-  /**
-   * Starts the asyn query to get the last dialed/outgoing number. When the background query
-   * finishes, mLastNumberDialed is set to the last dialed number or an empty string if none exists
-   * yet.
-   */
-  private void queryLastOutgoingCall() {
-    mLastNumberDialed = EMPTY_NUMBER;
-    if (ContextCompat.checkSelfPermission(getActivity(), permission.READ_CALL_LOG)
-        != PackageManager.PERMISSION_GRANTED) {
-      return;
-    }
-    CallLogAsync.GetLastOutgoingCallArgs lastCallArgs =
-        new CallLogAsync.GetLastOutgoingCallArgs(
-            getActivity(),
-            new CallLogAsync.OnLastOutgoingCallComplete() {
-              @Override
-              public void lastOutgoingCall(String number) {
-                // TODO: Filter out emergency numbers if
-                // the carrier does not want redial for
-                // these.
-                // If the fragment has already been detached since the last time
-                // we called queryLastOutgoingCall in onResume there is no point
-                // doing anything here.
-                if (getActivity() == null) {
-                  return;
-                }
-                mLastNumberDialed = number;
-                updateDeleteButtonEnabledState();
-              }
-            });
-    mCallLog.getLastOutgoingCall(lastCallArgs);
-  }
-
-  private Intent newFlashIntent() {
-    Intent intent = new CallIntentBuilder(EMPTY_NUMBER, CallInitiationType.Type.DIALPAD).build();
-    intent.putExtra(EXTRA_SEND_EMPTY_FLASH, true);
-    return intent;
-  }
-
-  @Override
-  public void onHiddenChanged(boolean hidden) {
-    super.onHiddenChanged(hidden);
-    final DialtactsActivity activity = (DialtactsActivity) getActivity();
-    if (activity == null || getView() == null) {
-      return;
-    }
-    final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view);
-    if (!hidden && !isDialpadChooserVisible()) {
-      if (mAnimate) {
-        dialpadView.animateShow();
-      }
-      mFloatingActionButtonController.setVisible(false);
-      mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
-      activity.onDialpadShown();
-      mDigits.requestFocus();
-    }
-    if (hidden) {
-      if (mAnimate) {
-        mFloatingActionButtonController.scaleOut();
-      } else {
-        mFloatingActionButtonController.setVisible(false);
-      }
-    }
-  }
-
-  public boolean getAnimate() {
-    return mAnimate;
-  }
-
-  public void setAnimate(boolean value) {
-    mAnimate = value;
-  }
-
-  public void setYFraction(float yFraction) {
-    ((DialpadSlidingRelativeLayout) getView()).setYFraction(yFraction);
-  }
-
-  public int getDialpadHeight() {
-    if (mDialpadView == null) {
-      return 0;
-    }
-    return mDialpadView.getHeight();
-  }
-
-  public void process_quote_emergency_unquote(String query) {
-    if (PseudoEmergencyAnimator.PSEUDO_EMERGENCY_NUMBER.equals(query)) {
-      if (mPseudoEmergencyAnimator == null) {
-        mPseudoEmergencyAnimator =
-            new PseudoEmergencyAnimator(
-                new PseudoEmergencyAnimator.ViewProvider() {
-                  @Override
-                  public View getView() {
-                    return DialpadFragment.this.getView();
-                  }
-                });
-      }
-      mPseudoEmergencyAnimator.start();
-    } else {
-      if (mPseudoEmergencyAnimator != null) {
-        mPseudoEmergencyAnimator.end();
-      }
-    }
-  }
-
-  public interface OnDialpadQueryChangedListener {
-
-    void onDialpadQueryChanged(String query);
-  }
-
-  public interface HostInterface {
-
-    /**
-     * Notifies the parent activity that the space above the dialpad has been tapped with no query
-     * in the dialpad present. In most situations this will cause the dialpad to be dismissed,
-     * unless there happens to be content showing.
-     */
-    boolean onDialpadSpacerTouchWithEmptyQuery();
-  }
-
-  /**
-   * LinearLayout with getter and setter methods for the translationY property using floats, for
-   * animation purposes.
-   */
-  public static class DialpadSlidingRelativeLayout extends RelativeLayout {
-
-    public DialpadSlidingRelativeLayout(Context context) {
-      super(context);
-    }
-
-    public DialpadSlidingRelativeLayout(Context context, AttributeSet attrs) {
-      super(context, attrs);
-    }
-
-    public DialpadSlidingRelativeLayout(Context context, AttributeSet attrs, int defStyle) {
-      super(context, attrs, defStyle);
-    }
-
-    @UsedByReflection(value = "dialpad_fragment.xml")
-    public float getYFraction() {
-      final int height = getHeight();
-      if (height == 0) {
-        return 0;
-      }
-      return getTranslationY() / height;
-    }
-
-    @UsedByReflection(value = "dialpad_fragment.xml")
-    public void setYFraction(float yFraction) {
-      setTranslationY(yFraction * getHeight());
-    }
-  }
-
-  public static class ErrorDialogFragment extends DialogFragment {
-
-    private static final String ARG_TITLE_RES_ID = "argTitleResId";
-    private static final String ARG_MESSAGE_RES_ID = "argMessageResId";
-    private int mTitleResId;
-    private int mMessageResId;
-
-    public static ErrorDialogFragment newInstance(int messageResId) {
-      return newInstance(0, messageResId);
-    }
-
-    public static ErrorDialogFragment newInstance(int titleResId, int messageResId) {
-      final ErrorDialogFragment fragment = new ErrorDialogFragment();
-      final Bundle args = new Bundle();
-      args.putInt(ARG_TITLE_RES_ID, titleResId);
-      args.putInt(ARG_MESSAGE_RES_ID, messageResId);
-      fragment.setArguments(args);
-      return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-      super.onCreate(savedInstanceState);
-      mTitleResId = getArguments().getInt(ARG_TITLE_RES_ID);
-      mMessageResId = getArguments().getInt(ARG_MESSAGE_RES_ID);
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-      AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-      if (mTitleResId != 0) {
-        builder.setTitle(mTitleResId);
-      }
-      if (mMessageResId != 0) {
-        builder.setMessage(mMessageResId);
-      }
-      builder.setPositiveButton(
-          android.R.string.ok,
-          new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-              dismiss();
-            }
-          });
-      return builder.create();
-    }
-  }
-
-  /**
-   * Simple list adapter, binding to an icon + text label for each item in the "dialpad chooser"
-   * list.
-   */
-  private static class DialpadChooserAdapter extends BaseAdapter {
-
-    // IDs for the possible "choices":
-    static final int DIALPAD_CHOICE_USE_DTMF_DIALPAD = 101;
-    static final int DIALPAD_CHOICE_RETURN_TO_CALL = 102;
-    static final int DIALPAD_CHOICE_ADD_NEW_CALL = 103;
-    private static final int NUM_ITEMS = 3;
-    private LayoutInflater mInflater;
-    private ChoiceItem[] mChoiceItems = new ChoiceItem[NUM_ITEMS];
-
-    public DialpadChooserAdapter(Context context) {
-      // Cache the LayoutInflate to avoid asking for a new one each time.
-      mInflater = LayoutInflater.from(context);
-
-      // Initialize the possible choices.
-      // TODO: could this be specified entirely in XML?
-
-      // - "Use touch tone keypad"
-      mChoiceItems[0] =
-          new ChoiceItem(
-              context.getString(R.string.dialer_useDtmfDialpad),
-              BitmapFactory.decodeResource(
-                  context.getResources(), R.drawable.ic_dialer_fork_tt_keypad),
-              DIALPAD_CHOICE_USE_DTMF_DIALPAD);
-
-      // - "Return to call in progress"
-      mChoiceItems[1] =
-          new ChoiceItem(
-              context.getString(R.string.dialer_returnToInCallScreen),
-              BitmapFactory.decodeResource(
-                  context.getResources(), R.drawable.ic_dialer_fork_current_call),
-              DIALPAD_CHOICE_RETURN_TO_CALL);
-
-      // - "Add call"
-      mChoiceItems[2] =
-          new ChoiceItem(
-              context.getString(R.string.dialer_addAnotherCall),
-              BitmapFactory.decodeResource(
-                  context.getResources(), R.drawable.ic_dialer_fork_add_call),
-              DIALPAD_CHOICE_ADD_NEW_CALL);
-    }
-
-    @Override
-    public int getCount() {
-      return NUM_ITEMS;
-    }
-
-    /** Return the ChoiceItem for a given position. */
-    @Override
-    public Object getItem(int position) {
-      return mChoiceItems[position];
-    }
-
-    /** Return a unique ID for each possible choice. */
-    @Override
-    public long getItemId(int position) {
-      return position;
-    }
-
-    /** Make a view for each row. */
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-      // When convertView is non-null, we can reuse it (there's no need
-      // to reinflate it.)
-      if (convertView == null) {
-        convertView = mInflater.inflate(R.layout.dialpad_chooser_list_item, null);
-      }
-
-      TextView text = (TextView) convertView.findViewById(R.id.text);
-      text.setText(mChoiceItems[position].text);
-
-      ImageView icon = (ImageView) convertView.findViewById(R.id.icon);
-      icon.setImageBitmap(mChoiceItems[position].icon);
-
-      return convertView;
-    }
-
-    // Simple struct for a single "choice" item.
-    static class ChoiceItem {
-
-      String text;
-      Bitmap icon;
-      int id;
-
-      public ChoiceItem(String s, Bitmap b, int i) {
-        text = s;
-        icon = b;
-        id = i;
-      }
-    }
-  }
-
-  private class CallStateReceiver extends BroadcastReceiver {
-
-    /**
-     * Receive call state changes so that we can take down the "dialpad chooser" if the phone
-     * becomes idle while the chooser UI is visible.
-     */
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      String state = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
-      if ((TextUtils.equals(state, TelephonyManager.EXTRA_STATE_IDLE)
-              || TextUtils.equals(state, TelephonyManager.EXTRA_STATE_OFFHOOK))
-          && isDialpadChooserVisible()) {
-        // Note there's a race condition in the UI here: the
-        // dialpad chooser could conceivably disappear (on its
-        // own) at the exact moment the user was trying to select
-        // one of the choices, which would be confusing.  (But at
-        // least that's better than leaving the dialpad chooser
-        // onscreen, but useless...)
-        showDialpadChooser(false);
-      }
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java b/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
deleted file mode 100644
index be2964d..0000000
--- a/java/com/android/dialer/app/dialpad/PseudoEmergencyAnimator.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2015 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.app.dialpad;
-
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.ArgbEvaluator;
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.LightingColorFilter;
-import android.os.Handler;
-import android.os.Vibrator;
-import android.view.View;
-import com.android.dialer.app.R;
-
-/** Animates the dial button on "emergency" phone numbers. */
-public class PseudoEmergencyAnimator {
-
-  public static final String PSEUDO_EMERGENCY_NUMBER = "01189998819991197253";
-  private static final int VIBRATE_LENGTH_MILLIS = 200;
-  private static final int ITERATION_LENGTH_MILLIS = 1000;
-  private static final int ANIMATION_ITERATION_COUNT = 6;
-  private ViewProvider mViewProvider;
-  private ValueAnimator mPseudoEmergencyColorAnimator;
-
-  PseudoEmergencyAnimator(ViewProvider viewProvider) {
-    mViewProvider = viewProvider;
-  }
-
-  public void destroy() {
-    end();
-    mViewProvider = null;
-  }
-
-  public void start() {
-    if (mPseudoEmergencyColorAnimator == null) {
-      Integer colorFrom = Color.BLUE;
-      Integer colorTo = Color.RED;
-      mPseudoEmergencyColorAnimator =
-          ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
-
-      mPseudoEmergencyColorAnimator.addUpdateListener(
-          new AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animator) {
-              try {
-                int color = (int) animator.getAnimatedValue();
-                ColorFilter colorFilter = new LightingColorFilter(Color.BLACK, color);
-
-                View floatingActionButtonContainer =
-                    getView().findViewById(R.id.floating_action_button);
-                if (floatingActionButtonContainer != null) {
-                  floatingActionButtonContainer.getBackground().setColorFilter(colorFilter);
-                }
-              } catch (Exception e) {
-                animator.cancel();
-              }
-            }
-          });
-
-      mPseudoEmergencyColorAnimator.addListener(
-          new AnimatorListener() {
-            @Override
-            public void onAnimationCancel(Animator animation) {}
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-              try {
-                vibrate(VIBRATE_LENGTH_MILLIS);
-              } catch (Exception e) {
-                animation.cancel();
-              }
-            }
-
-            @Override
-            public void onAnimationStart(Animator animation) {}
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-              try {
-                View floatingActionButtonContainer =
-                    getView().findViewById(R.id.floating_action_button);
-                if (floatingActionButtonContainer != null) {
-                  floatingActionButtonContainer.getBackground().clearColorFilter();
-                }
-
-                new Handler()
-                    .postDelayed(
-                        new Runnable() {
-                          @Override
-                          public void run() {
-                            try {
-                              vibrate(VIBRATE_LENGTH_MILLIS);
-                            } catch (Exception e) {
-                              // ignored
-                            }
-                          }
-                        },
-                        ITERATION_LENGTH_MILLIS);
-              } catch (Exception e) {
-                animation.cancel();
-              }
-            }
-          });
-
-      mPseudoEmergencyColorAnimator.setDuration(VIBRATE_LENGTH_MILLIS);
-      mPseudoEmergencyColorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-      mPseudoEmergencyColorAnimator.setRepeatCount(ANIMATION_ITERATION_COUNT);
-    }
-    if (!mPseudoEmergencyColorAnimator.isStarted()) {
-      mPseudoEmergencyColorAnimator.start();
-    }
-  }
-
-  public void end() {
-    if (mPseudoEmergencyColorAnimator != null && mPseudoEmergencyColorAnimator.isStarted()) {
-      mPseudoEmergencyColorAnimator.end();
-    }
-  }
-
-  private View getView() {
-    return mViewProvider == null ? null : mViewProvider.getView();
-  }
-
-  private Context getContext() {
-    View view = getView();
-    return view != null ? view.getContext() : null;
-  }
-
-  private void vibrate(long milliseconds) {
-    Context context = getContext();
-    if (context != null) {
-      Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-      if (vibrator != null) {
-        vibrator.vibrate(milliseconds);
-      }
-    }
-  }
-
-  public interface ViewProvider {
-
-    View getView();
-  }
-}
diff --git a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java b/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java
deleted file mode 100644
index a0c8b18..0000000
--- a/java/com/android/dialer/app/dialpad/SmartDialCursorLoader.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2013 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.app.dialpad;
-
-import android.content.AsyncTaskLoader;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.database.Database;
-import com.android.dialer.database.DialerDatabaseHelper;
-import com.android.dialer.database.DialerDatabaseHelper.ContactNumber;
-import com.android.dialer.smartdial.SmartDialNameMatcher;
-import com.android.dialer.smartdial.SmartDialPrefix;
-import com.android.dialer.util.PermissionsUtil;
-import java.util.ArrayList;
-
-/** Implements a Loader<Cursor> class to asynchronously load SmartDial search results. */
-public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
-
-  private static final String TAG = "SmartDialCursorLoader";
-  private static final boolean DEBUG = false;
-
-  private final Context mContext;
-
-  private Cursor mCursor;
-
-  private String mQuery;
-  private SmartDialNameMatcher mNameMatcher;
-
-  private boolean mShowEmptyListForNullQuery = true;
-
-  public SmartDialCursorLoader(Context context) {
-    super(context);
-    mContext = context;
-  }
-
-  /**
-   * Configures the query string to be used to find SmartDial matches.
-   *
-   * @param query The query string user typed.
-   */
-  public void configureQuery(String query) {
-    if (DEBUG) {
-      LogUtil.v(TAG, "Configure new query to be " + query);
-    }
-    mQuery = SmartDialNameMatcher.normalizeNumber(query, SmartDialPrefix.getMap());
-
-    /** Constructs a name matcher object for matching names. */
-    mNameMatcher = new SmartDialNameMatcher(mQuery, SmartDialPrefix.getMap());
-    mNameMatcher.setShouldMatchEmptyQuery(!mShowEmptyListForNullQuery);
-  }
-
-  /**
-   * Queries the SmartDial database and loads results in background.
-   *
-   * @return Cursor of contacts that matches the SmartDial query.
-   */
-  @Override
-  public Cursor loadInBackground() {
-    if (DEBUG) {
-      LogUtil.v(TAG, "Load in background " + mQuery);
-    }
-
-    if (!PermissionsUtil.hasContactsReadPermissions(mContext)) {
-      return new MatrixCursor(PhoneQuery.PROJECTION_PRIMARY);
-    }
-
-    /** Loads results from the database helper. */
-    final DialerDatabaseHelper dialerDatabaseHelper =
-        Database.get(mContext).getDatabaseHelper(mContext);
-    final ArrayList<ContactNumber> allMatches =
-        dialerDatabaseHelper.getLooseMatches(mQuery, mNameMatcher);
-
-    if (DEBUG) {
-      LogUtil.v(TAG, "Loaded matches " + allMatches.size());
-    }
-
-    /** Constructs a cursor for the returned array of results. */
-    final MatrixCursor cursor = new MatrixCursor(PhoneQuery.PROJECTION_PRIMARY);
-    Object[] row = new Object[PhoneQuery.PROJECTION_PRIMARY.length];
-    for (ContactNumber contact : allMatches) {
-      row[PhoneQuery.PHONE_ID] = contact.dataId;
-      row[PhoneQuery.PHONE_NUMBER] = contact.phoneNumber;
-      row[PhoneQuery.CONTACT_ID] = contact.id;
-      row[PhoneQuery.LOOKUP_KEY] = contact.lookupKey;
-      row[PhoneQuery.PHOTO_ID] = contact.photoId;
-      row[PhoneQuery.DISPLAY_NAME] = contact.displayName;
-      row[PhoneQuery.CARRIER_PRESENCE] = contact.carrierPresence;
-      cursor.addRow(row);
-    }
-    return cursor;
-  }
-
-  @Override
-  public void deliverResult(Cursor cursor) {
-    if (isReset()) {
-      /** The Loader has been reset; ignore the result and invalidate the data. */
-      releaseResources(cursor);
-      return;
-    }
-
-    /** Hold a reference to the old data so it doesn't get garbage collected. */
-    Cursor oldCursor = mCursor;
-    mCursor = cursor;
-
-    if (isStarted()) {
-      /** If the Loader is in a started state, deliver the results to the client. */
-      super.deliverResult(cursor);
-    }
-
-    /** Invalidate the old data as we don't need it any more. */
-    if (oldCursor != null && oldCursor != cursor) {
-      releaseResources(oldCursor);
-    }
-  }
-
-  @Override
-  protected void onStartLoading() {
-    if (mCursor != null) {
-      /** Deliver any previously loaded data immediately. */
-      deliverResult(mCursor);
-    }
-    if (mCursor == null) {
-      /** Force loads every time as our results change with queries. */
-      forceLoad();
-    }
-  }
-
-  @Override
-  protected void onStopLoading() {
-    /** The Loader is in a stopped state, so we should attempt to cancel the current load. */
-    cancelLoad();
-  }
-
-  @Override
-  protected void onReset() {
-    /** Ensure the loader has been stopped. */
-    onStopLoading();
-
-    /** Release all previously saved query results. */
-    if (mCursor != null) {
-      releaseResources(mCursor);
-      mCursor = null;
-    }
-  }
-
-  @Override
-  public void onCanceled(Cursor cursor) {
-    super.onCanceled(cursor);
-
-    /** The load has been canceled, so we should release the resources associated with 'data'. */
-    releaseResources(cursor);
-  }
-
-  private void releaseResources(Cursor cursor) {
-    if (cursor != null) {
-      cursor.close();
-    }
-  }
-
-  public void setShowEmptyListForNullQuery(boolean show) {
-    mShowEmptyListForNullQuery = show;
-    if (mNameMatcher != null) {
-      mNameMatcher.setShouldMatchEmptyQuery(!show);
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/dialpad/UnicodeDialerKeyListener.java b/java/com/android/dialer/app/dialpad/UnicodeDialerKeyListener.java
deleted file mode 100644
index 051daf4..0000000
--- a/java/com/android/dialer/app/dialpad/UnicodeDialerKeyListener.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 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.app.dialpad;
-
-import android.telephony.PhoneNumberUtils;
-import android.text.Spanned;
-import android.text.method.DialerKeyListener;
-
-/**
- * {@link DialerKeyListener} with Unicode support. Converts any Unicode(e.g. Arabic) characters that
- * represent digits into digits before filtering the results so that we can support pasted digits
- * from Unicode languages.
- */
-public class UnicodeDialerKeyListener extends DialerKeyListener {
-
-  public static final UnicodeDialerKeyListener INSTANCE = new UnicodeDialerKeyListener();
-
-  @Override
-  public CharSequence filter(
-      CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-    final String converted =
-        PhoneNumberUtils.convertKeypadLettersToDigits(
-            PhoneNumberUtils.replaceUnicodeDigits(source.toString()));
-    // PhoneNumberUtils.replaceUnicodeDigits performs a character for character replacement,
-    // so we can assume that start and end positions should remain unchanged.
-    CharSequence result = super.filter(converted, start, end, dest, dstart, dend);
-    if (result == null) {
-      if (source.equals(converted)) {
-        // There was no conversion or filtering performed. Just return null according to
-        // the behavior of DialerKeyListener.
-        return null;
-      } else {
-        // filter returns null if the charsequence is to be returned unchanged/unfiltered.
-        // But in this case we do want to return a modified character string (even if
-        // none of the characters in the modified string are filtered). So if
-        // result == null we return the unfiltered but converted numeric string instead.
-        return converted.subSequence(start, end);
-      }
-    }
-    return result;
-  }
-}
diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java
index dbd4e86..ca12e43 100644
--- a/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java
+++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersAdapter.java
@@ -20,9 +20,9 @@
 import android.database.Cursor;
 import android.telephony.PhoneNumberUtils;
 import android.view.View;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.BlockNumberDialogFragment;
+import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.InteractionEvent;
diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
index f53a458..db119ab 100644
--- a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
+++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
@@ -31,7 +31,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.BlockedNumbersMigrator;
 import com.android.dialer.blocking.BlockedNumbersMigrator.Listener;
@@ -40,6 +39,7 @@
 import com.android.dialer.blocking.FilteredNumbersUtil.CheckForSendToVoicemailContactListener;
 import com.android.dialer.blocking.FilteredNumbersUtil.ImportSendToVoicemailContactsListener;
 import com.android.dialer.database.FilteredNumberContract;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 
 public class BlockedNumbersFragment extends ListFragment
diff --git a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
index f71517a..6e1d1a5 100644
--- a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
+++ b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
@@ -26,14 +26,15 @@
 import android.widget.QuickContactBadge;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.app.R;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.util.UriUtils;
 
 public class NumbersAdapter extends SimpleCursorAdapter {
 
@@ -98,8 +99,8 @@
         info.lookupUri == null ? null : UriUtils.getLookupKeyFromUri(info.lookupUri);
     final int contactType =
         mContactInfoHelper.isBusiness(info.sourceType)
-            ? ContactPhotoManager.TYPE_BUSINESS
-            : ContactPhotoManager.TYPE_DEFAULT;
+            ? LetterTileDrawable.TYPE_BUSINESS
+            : LetterTileDrawable.TYPE_DEFAULT;
     final DefaultImageRequest request =
         new DefaultImageRequest(displayName, lookupKey, contactType, true /* isCircular */);
     badge.assignContactUri(info.lookupUri);
diff --git a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java
index 313efb4..1e90eec 100644
--- a/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java
+++ b/java/com/android/dialer/app/filterednumber/ViewNumbersToImportAdapter.java
@@ -19,9 +19,9 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.view.View;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.FilteredNumbersUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
index 1cdeb21..a483af9 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
@@ -40,6 +40,8 @@
       Activity activity,
       ViewGroup alertContainer,
       CallLogAdapter.CallFetcher callFetcher,
+      CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
index 6e32843..488fbad 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
@@ -34,6 +34,8 @@
       Activity activity,
       ViewGroup alertContainer,
       CallLogAdapter.CallFetcher callFetcher,
+      CallLogAdapter.MultiSelectRemoveView multiSelectRemoveView,
+      CallLogAdapter.OnActionModeStateChangedListener actionModeStateChangedListener,
       CallLogCache callLogCache,
       ContactInfoCache contactInfoCache,
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
@@ -43,6 +45,8 @@
         activity,
         alertContainer,
         callFetcher,
+        multiSelectRemoveView,
+        actionModeStateChangedListener,
         callLogCache,
         contactInfoCache,
         voicemailPlaybackPresenter,
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
index 0460997..32a99e7 100644
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ b/java/com/android/dialer/app/list/AllContactsFragment.java
@@ -38,12 +38,16 @@
 import com.android.contacts.common.list.ContactListFilter;
 import com.android.contacts.common.list.DefaultContactListAdapter;
 import com.android.dialer.app.R;
-import com.android.dialer.app.widget.EmptyContentView;
-import com.android.dialer.app.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 /** Fragments to show all contacts with phone numbers. */
 public class AllContactsFragment extends ContactEntryListFragment<ContactEntryListAdapter>
@@ -149,6 +153,8 @@
   public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
     final Uri uri = (Uri) view.getTag();
     if (uri != null) {
+      Logger.get(getContext())
+          .logInteraction(InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_ALL_CONTACTS_GENERAL);
       if (CompatUtils.hasPrioritizedMimeType()) {
         QuickContact.showQuickContact(getContext(), view, uri, null, Phone.CONTENT_ITEM_TYPE);
       } else {
@@ -169,9 +175,15 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) {
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "AllContactsFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
       FragmentCompat.requestPermissions(
-          this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
     } else {
       // Add new contact
       DialerUtils.startActivityWithErrorToast(
diff --git a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
index 537f488..fc0bd3c 100644
--- a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
+++ b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
@@ -19,6 +19,8 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
@@ -29,7 +31,6 @@
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.app.R;
 import com.android.dialer.location.GeoUtil;
-import com.android.dialer.util.CallUtil;
 
 /**
  * {@link PhoneNumberListAdapter} with the following added shortcuts, that are displayed as list
@@ -50,7 +51,6 @@
 
   private final boolean[] mShortcutEnabled = new boolean[SHORTCUT_COUNT];
   private final BidiFormatter mBidiFormatter = BidiFormatter.getInstance();
-  private final boolean mVideoCallingEnabled;
   private final String mCountryIso;
 
   private String mFormattedQueryString;
@@ -59,7 +59,6 @@
     super(context);
 
     mCountryIso = GeoUtil.getCurrentCountryIso(context);
-    mVideoCallingEnabled = CallUtil.isVideoEnabled(context);
   }
 
   @Override
@@ -110,8 +109,7 @@
         return convertView;
       } else {
         final ContactListItemView v =
-            new ContactListItemView(
-                getContext(), null, mVideoCallingEnabled, isCallAndShareEnabled());
+            new ContactListItemView(getContext(), null, mIsImsVideoEnabled);
         assignShortcutToView(v, shortcutType);
         return v;
       }
@@ -125,8 +123,7 @@
       Context context, int partition, Cursor cursor, int position, ViewGroup parent) {
     final ContactListItemView view = super.newView(context, partition, cursor, position, parent);
 
-    view.setSupportVideoCallIcon(mVideoCallingEnabled);
-    view.setSupportCallAndShareIcon(isCallAndShareEnabled());
+    view.setSupportVideoCallIcon(mIsImsVideoEnabled);
     return view;
   }
 
@@ -171,7 +168,7 @@
 
   private void assignShortcutToView(ContactListItemView v, int shortcutType) {
     final CharSequence text;
-    final int drawableId;
+    final Drawable drawable;
     final Resources resources = getContext().getResources();
     final String number = getFormattedQueryString();
     switch (shortcutType) {
@@ -181,34 +178,39 @@
                 resources,
                 R.string.search_shortcut_call_number,
                 mBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
-        drawableId = R.drawable.ic_search_phone;
+        drawable = ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_call_vd_theme_24);
         break;
       case SHORTCUT_CREATE_NEW_CONTACT:
         text = resources.getString(R.string.search_shortcut_create_new_contact);
-        drawableId = R.drawable.ic_search_add_contact;
+        drawable =
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
+        drawable.setAutoMirrored(true);
         break;
       case SHORTCUT_ADD_TO_EXISTING_CONTACT:
         text = resources.getString(R.string.search_shortcut_add_to_contact);
-        drawableId = R.drawable.quantum_ic_person_white_24;
+        drawable =
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
         break;
       case SHORTCUT_SEND_SMS_MESSAGE:
         text = resources.getString(R.string.search_shortcut_send_sms_message);
-        drawableId = R.drawable.quantum_ic_message_white_24;
+        drawable =
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_message_vd_theme_24);
         break;
       case SHORTCUT_MAKE_VIDEO_CALL:
         text = resources.getString(R.string.search_shortcut_make_video_call);
-        drawableId = R.drawable.quantum_ic_videocam_white_24;
+        drawable =
+            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
         break;
       case SHORTCUT_BLOCK_NUMBER:
         text = resources.getString(R.string.search_shortcut_block_number);
-        drawableId = R.drawable.ic_not_interested_googblue_24dp;
+        drawable =
+            ContextCompat.getDrawable(getContext(), R.drawable.ic_not_interested_googblue_24dp);
         break;
       default:
         throw new IllegalArgumentException("Invalid shortcut type");
     }
-    v.setDrawableResource(drawableId);
+    v.setDrawable(drawable);
     v.setDisplayName(text);
-    v.setPhotoPosition(super.getPhotoPosition());
     v.setAdjustSelectionBoundsEnabled(false);
   }
 
diff --git a/java/com/android/dialer/app/list/DialerViewPager.java b/java/com/android/dialer/app/list/DialerViewPager.java
new file mode 100644
index 0000000..ae99f05
--- /dev/null
+++ b/java/com/android/dialer/app/list/DialerViewPager.java
@@ -0,0 +1,55 @@
+/*
+ * 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.app.list;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/** Class that handles enabling/disabling swiping between @{ViewPagerTabs}. */
+public class DialerViewPager extends ViewPager {
+
+  private boolean enableSwipingPages;
+
+  public DialerViewPager(Context context, AttributeSet attributeSet) {
+    super(context, attributeSet);
+    enableSwipingPages = true;
+  }
+
+  @Override
+  public boolean onInterceptTouchEvent(MotionEvent event) {
+    if (enableSwipingPages) {
+      return super.onInterceptTouchEvent(event);
+    }
+
+    return false;
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    if (enableSwipingPages) {
+      return super.onTouchEvent(event);
+    }
+
+    return false;
+  }
+
+  public void setEnableSwipingPages(boolean enabled) {
+    enableSwipingPages = enabled;
+  }
+}
diff --git a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
index dba3d3a..1fbf0f0 100644
--- a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
+++ b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
@@ -24,13 +24,12 @@
 import android.view.ViewGroup;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
-import com.android.dialer.calllog.CallLogComponent;
-import com.android.dialer.calllog.CallLogFramework;
-import com.android.dialer.calllog.ui.NewCallLogFragment;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.contactsfragment.ContactsFragment;
+import com.android.dialer.contactsfragment.ContactsFragment.ClickAction;
+import com.android.dialer.contactsfragment.ContactsFragment.Header;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.ViewUtil;
@@ -58,12 +57,10 @@
   private final List<Fragment> fragments = new ArrayList<>();
   private final String[] tabTitles;
   private final boolean useNewSpeedDialTab;
-  private final boolean useNewCallLogTab;
   private final boolean useNewContactsTab;
   private OldSpeedDialFragment oldSpeedDialFragment;
   private SpeedDialFragment speedDialFragment;
   private CallLogFragment callLogFragment;
-  private NewCallLogFragment newCallLogFragment;
   private AllContactsFragment oldContactsFragment;
   private ContactsFragment contactsFragment;
   private CallLogFragment voicemailFragment;
@@ -75,10 +72,8 @@
     super(fm);
     useNewSpeedDialTab =
         ConfigProviderBindings.get(context).getBoolean("enable_new_favorites_tab", false);
-    CallLogFramework callLogFramework = CallLogComponent.get(context).callLogFramework();
-    useNewCallLogTab = callLogFramework.isNewCallLogEnabled(context);
     useNewContactsTab =
-        ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", false);
+        ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", true);
     this.tabTitles = tabTitles;
     hasActiveVoicemailProvider = hasVoicemailProvider;
     fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));
@@ -106,21 +101,15 @@
           return oldSpeedDialFragment;
         }
       case TAB_INDEX_HISTORY:
-        if (useNewCallLogTab) {
-          if (newCallLogFragment == null) {
-            newCallLogFragment = new NewCallLogFragment();
-          }
-          return newCallLogFragment;
-        } else {
-          if (callLogFragment == null) {
-            callLogFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);
-          }
-          return callLogFragment;
+        if (callLogFragment == null) {
+          callLogFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);
         }
+        return callLogFragment;
       case TAB_INDEX_ALL_CONTACTS:
         if (useNewContactsTab) {
           if (contactsFragment == null) {
-            contactsFragment = new ContactsFragment();
+            contactsFragment =
+                ContactsFragment.newInstance(Header.ADD_CONTACT, ClickAction.OPEN_CONTACT_CARD);
           }
           return contactsFragment;
         } else {
@@ -156,8 +145,6 @@
       speedDialFragment = (SpeedDialFragment) fragment;
     } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_HISTORY) {
       callLogFragment = (CallLogFragment) fragment;
-    } else if (fragment instanceof NewCallLogFragment) {
-      newCallLogFragment = (NewCallLogFragment) fragment;
     } else if (fragment instanceof ContactsFragment) {
       contactsFragment = (ContactsFragment) fragment;
     } else if (fragment instanceof AllContactsFragment) {
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index 8dd52a9..86a3d2f 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -31,7 +31,6 @@
 import android.os.Trace;
 import android.preference.PreferenceManager;
 import android.provider.VoicemailContract;
-import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,9 +43,12 @@
 import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
+import com.android.dialer.database.CallLogQueryHandler.Listener;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
@@ -60,11 +62,11 @@
  * Contacts list. This will also eventually contain the logic that allows sliding the ViewPager
  * containing the lists up above the search bar and pin it against the top of the screen.
  */
-public class ListsFragment extends Fragment
-    implements ViewPager.OnPageChangeListener, CallLogQueryHandler.Listener {
+public class ListsFragment extends Fragment implements OnPageChangeListener, Listener {
 
   private static final String TAG = "ListsFragment";
-  private ViewPager mViewPager;
+
+  private DialerViewPager mViewPager;
   private ViewPagerTabs mViewPagerTabs;
   private DialtactsPagerAdapter mAdapter;
   private RemoveView mRemoveView;
@@ -73,14 +75,15 @@
   private SharedPreferences mPrefs;
   private boolean mHasFetchedVoicemailStatus;
   private boolean mShowVoicemailTabAfterVoicemailStatusIsFetched;
-  private VoicemailStatusHelper mVoicemailStatusHelper;
   private final ArrayList<OnPageChangeListener> mOnPageChangeListeners = new ArrayList<>();
   /** The position of the currently selected tab. */
   private int mTabIndex = TAB_INDEX_SPEED_DIAL;
-  private boolean mPaused;
 
+  private boolean mPaused;
   private CallLogQueryHandler mCallLogQueryHandler;
 
+  private UiAction.Type[] actionTypeList;
+
   private final ContentObserver mVoicemailStatusObserver =
       new ContentObserver(new Handler()) {
         @Override
@@ -95,8 +98,7 @@
     LogUtil.d("ListsFragment.onCreate", null);
     Trace.beginSection(TAG + " onCreate");
     super.onCreate(savedInstanceState);
-    mVoicemailStatusHelper = new VoicemailStatusHelper();
-    mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+    mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
     Trace.endSection();
   }
 
@@ -151,6 +153,12 @@
     Trace.endSection();
     Trace.beginSection(TAG + " setup views");
 
+    actionTypeList = new UiAction.Type[TAB_COUNT_WITH_VOICEMAIL];
+    actionTypeList[TAB_INDEX_SPEED_DIAL] = UiAction.Type.CHANGE_TAB_TO_FAVORITE;
+    actionTypeList[TAB_INDEX_HISTORY] = UiAction.Type.CHANGE_TAB_TO_CALL_LOG;
+    actionTypeList[TAB_INDEX_ALL_CONTACTS] = UiAction.Type.CHANGE_TAB_TO_CONTACTS;
+    actionTypeList[TAB_INDEX_VOICEMAIL] = UiAction.Type.CHANGE_TAB_TO_VOICEMAIL;
+
     String[] tabTitles = new String[TAB_COUNT_WITH_VOICEMAIL];
     tabTitles[TAB_INDEX_SPEED_DIAL] = getResources().getString(R.string.tab_speed_dial);
     tabTitles[TAB_INDEX_HISTORY] = getResources().getString(R.string.tab_history);
@@ -163,7 +171,7 @@
     tabIcons[TAB_INDEX_ALL_CONTACTS] = R.drawable.quantum_ic_people_white_24;
     tabIcons[TAB_INDEX_VOICEMAIL] = R.drawable.quantum_ic_voicemail_white_24;
 
-    mViewPager = (ViewPager) parentView.findViewById(R.id.lists_pager);
+    mViewPager = (DialerViewPager) parentView.findViewById(R.id.lists_pager);
     mAdapter =
         new DialtactsPagerAdapter(
             getContext(),
@@ -180,7 +188,6 @@
     mViewPagerTabs.configureTabIcons(tabIcons);
     mViewPagerTabs.setViewPager(mViewPager);
     addOnPageChangeListener(mViewPagerTabs);
-
     mRemoveView = (RemoveView) parentView.findViewById(R.id.remove_view);
     mRemoveViewContent = parentView.findViewById(R.id.remove_view_content);
 
@@ -191,7 +198,7 @@
           .registerContentObserver(
               VoicemailContract.Status.CONTENT_URI, true, mVoicemailStatusObserver);
     } else {
-      LogUtil.w("ListsFragment.onCreateView", "no voicemail read/add permissions");
+      LogUtil.w("ListsFragment.onCreateView", "no voicemail read permissions");
     }
 
     Trace.endSection();
@@ -213,8 +220,8 @@
 
   /**
    * Shows the tab with the specified index. If the voicemail tab index is specified, but the
-   * voicemail status hasn't been fetched, it will try to show the tab after the voicemail status
-   * has been fetched.
+   * voicemail status hasn't been fetched, it will show the speed dial tab and try to show the
+   * voicemail tab after the voicemail status has been fetched.
    */
   public void showTab(int index) {
     if (index == TAB_INDEX_VOICEMAIL) {
@@ -241,6 +248,8 @@
 
   @Override
   public void onPageSelected(int position) {
+    PerformanceReport.recordClick(actionTypeList[position]);
+
     LogUtil.i("ListsFragment.onPageSelected", "position: %d", position);
     mTabIndex = mAdapter.getRtlPosition(position);
 
@@ -283,7 +292,7 @@
 
     // Update hasActiveVoicemailProvider, which controls the number of tabs displayed.
     boolean hasActiveVoicemailProvider =
-        mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0;
+        VoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0;
     if (hasActiveVoicemailProvider != mAdapter.hasActiveVoicemailProvider()) {
       mAdapter.setHasActiveVoicemailProvider(hasActiveVoicemailProvider);
       mAdapter.notifyDataSetChanged();
@@ -375,7 +384,7 @@
   public void markMissedCallsAsReadAndRemoveNotifications() {
     if (mCallLogQueryHandler != null) {
       mCallLogQueryHandler.markMissedCallsAsRead();
-      CallLogNotificationsService.markNewMissedCallsAsOld(getContext(), null);
+      CallLogNotificationsService.cancelAllMissedCalls(getContext());
     }
   }
 
@@ -385,6 +394,11 @@
     mRemoveView.animate().alpha(show ? 1 : 0).start();
   }
 
+  public void showMultiSelectRemoveView(boolean show) {
+    mViewPagerTabs.setVisibility(show ? View.GONE : View.VISIBLE);
+    mViewPager.setEnableSwipingPages(!show);
+  }
+
   public boolean hasFrequents() {
     Fragment page = mAdapter.getItem(mAdapter.getRtlPosition(TAB_INDEX_SPEED_DIAL));
     return page instanceof OldSpeedDialFragment
diff --git a/java/com/android/dialer/app/list/OldSpeedDialFragment.java b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
index 40fe745..afc7c13 100644
--- a/java/com/android/dialer/app/list/OldSpeedDialFragment.java
+++ b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
@@ -45,18 +45,18 @@
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.ImageView;
 import android.widget.ListView;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactTileLoaderFactory;
 import com.android.contacts.common.list.ContactTileView;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.dialer.app.R;
-import com.android.dialer.app.widget.EmptyContentView;
-import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.ViewUtil;
+import com.android.dialer.widget.EmptyContentView;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /** This fragment displays the user's favorite/frequent contacts in a grid. */
 public class OldSpeedDialFragment extends Fragment
@@ -404,9 +404,15 @@
       return;
     }
 
-    if (!PermissionsUtil.hasPermission(activity, READ_CONTACTS)) {
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "OldSpeedDialFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
       FragmentCompat.requestPermissions(
-          this, new String[] {READ_CONTACTS}, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
     } else {
       // Switch tabs
       ((HostInterface) activity).showAllContactsTab();
@@ -430,7 +436,7 @@
     void showAllContactsTab();
   }
 
-  private class ContactTileLoaderListener implements LoaderManager.LoaderCallbacks<Cursor> {
+  class ContactTileLoaderListener implements LoaderManager.LoaderCallbacks<Cursor> {
 
     @Override
     public CursorLoader onCreateLoader(int id, Bundle args) {
@@ -460,24 +466,17 @@
   private class ContactTileAdapterListener implements ContactTileView.Listener {
 
     @Override
-    public void onContactSelected(Uri contactUri, Rect targetRect) {
+    public void onContactSelected(
+        Uri contactUri, Rect targetRect, CallSpecificAppData callSpecificAppData) {
       if (mPhoneNumberPickerActionListener != null) {
-        CallSpecificAppData callSpecificAppData =
-            CallSpecificAppData.newBuilder()
-                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)
-                .build();
         mPhoneNumberPickerActionListener.onPickDataUri(
             contactUri, false /* isVideoCall */, callSpecificAppData);
       }
     }
 
     @Override
-    public void onCallNumberDirectly(String phoneNumber) {
+    public void onCallNumberDirectly(String phoneNumber, CallSpecificAppData callSpecificAppData) {
       if (mPhoneNumberPickerActionListener != null) {
-        CallSpecificAppData callSpecificAppData =
-            CallSpecificAppData.newBuilder()
-                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)
-                .build();
         mPhoneNumberPickerActionListener.onPickPhoneNumber(
             phoneNumber, false /* isVideoCall */, callSpecificAppData);
       }
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteListView.java b/java/com/android/dialer/app/list/PhoneFavoriteListView.java
index 9516f06..f4f395f 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteListView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteListView.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2012 Google Inc.
- * Licensed to The Android Open Source Project.
+ * 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.
@@ -24,7 +23,6 @@
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.DragEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -33,6 +31,7 @@
 import android.widget.ImageView;
 import com.android.dialer.app.R;
 import com.android.dialer.app.list.DragDropController.DragItemContainer;
+import com.android.dialer.common.LogUtil;
 
 /** Viewgroup that presents the user's speed dial contacts in a grid. */
 public class PhoneFavoriteListView extends GridView
@@ -40,14 +39,14 @@
 
   public static final String LOG_TAG = PhoneFavoriteListView.class.getSimpleName();
   final int[] mLocationOnScreen = new int[2];
-  private final long SCROLL_HANDLER_DELAY_MILLIS = 5;
-  private final int DRAG_SCROLL_PX_UNIT = 25;
-  private final float DRAG_SHADOW_ALPHA = 0.7f;
+  private static final long SCROLL_HANDLER_DELAY_MILLIS = 5;
+  private static final int DRAG_SCROLL_PX_UNIT = 25;
+  private static final float DRAG_SHADOW_ALPHA = 0.7f;
   /**
    * {@link #mTopScrollBound} and {@link mBottomScrollBound} will be offseted to the top / bottom by
    * {@link #getHeight} * {@link #BOUND_GAP_RATIO} pixels.
    */
-  private final float BOUND_GAP_RATIO = 0.2f;
+  private static final float BOUND_GAP_RATIO = 0.2f;
 
   private float mTouchSlop;
   private int mTopScrollBound;
@@ -67,7 +66,6 @@
         }
       };
   private boolean mIsDragScrollerRunning = false;
-  private int mTouchDownForDragStartX;
   private int mTouchDownForDragStartY;
   private Bitmap mDragShadowBitmap;
   private ImageView mDragShadowOverlay;
@@ -98,7 +96,7 @@
   }
 
   public PhoneFavoriteListView(Context context, AttributeSet attrs) {
-    this(context, attrs, -1);
+    this(context, attrs, 0);
   }
 
   public PhoneFavoriteListView(Context context, AttributeSet attrs, int defStyle) {
@@ -121,7 +119,6 @@
   @Override
   public boolean onInterceptTouchEvent(MotionEvent ev) {
     if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-      mTouchDownForDragStartX = (int) ev.getX();
       mTouchDownForDragStartY = (int) ev.getY();
     }
 
@@ -287,7 +284,7 @@
       try {
         bitmap = cache.copy(Bitmap.Config.ARGB_8888, false);
       } catch (final OutOfMemoryError e) {
-        Log.w(LOG_TAG, "Failed to copy bitmap from Drawing cache", e);
+        LogUtil.w(LOG_TAG, "Failed to copy bitmap from Drawing cache", e);
         bitmap = null;
       }
     }
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
index 5a18d03..40f23ea 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
@@ -26,6 +26,8 @@
 import com.android.contacts.common.list.ContactEntry;
 import com.android.dialer.app.R;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 
 /** Displays the contact's picture overlaid with their name and number type in a tile. */
 public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView {
@@ -87,6 +89,8 @@
           new OnClickListener() {
             @Override
             public void onClick(View v) {
+              Logger.get(getContext())
+                  .logInteraction(InteractionEvent.Type.SPEED_DIAL_OPEN_CONTACT_CARD);
               launchQuickContact();
             }
           });
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
index db89cf3..e0961be 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
@@ -18,16 +18,25 @@
 
 import android.content.ClipData;
 import android.content.Context;
+import android.net.Uri;
+import android.provider.ContactsContract.PinnedPositions;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.contacts.common.list.ContactTileView;
+import com.android.contacts.common.model.ContactLoader;
 import com.android.dialer.app.R;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallSpecificAppData;
+import com.android.dialer.callintent.SpeedDialContactType;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 
 /**
  * A light version of the {@link com.android.contacts.common.list.ContactTileView} that is used in
@@ -42,7 +51,6 @@
   // tile is long pressed.
   static final String DRAG_PHONE_FAVORITE_TILE = "PHONE_FAVORITE_TILE";
   private static final String TAG = PhoneFavoriteTileView.class.getSimpleName();
-  private static final boolean DEBUG = false;
   // These parameters instruct the photo manager to display the default image/letter at 70% of
   // its normal size, and vertically offset upwards 12% towards the top of the letter tile, to
   // make room for the contact name and number label at the bottom of the image.
@@ -55,6 +63,9 @@
   private View mShadowOverlay;
   /** Users' most frequent phone number. */
   private String mPhoneNumberString;
+  private boolean isPinned;
+  private boolean isStarred;
+  private int position = -1;
 
   public PhoneFavoriteTileView(Context context, AttributeSet attrs) {
     super(context, attrs);
@@ -83,12 +94,14 @@
     super.loadFromContact(entry);
     // Set phone number to null in case we're reusing the view.
     mPhoneNumberString = null;
+    isPinned = (entry.pinned != PinnedPositions.UNPINNED);
+    isStarred = entry.isFavorite;
     if (entry != null) {
+      sendViewNotification(getContext(), entry.lookupUri);
       // Grab the phone-number to call directly. See {@link onClick()}.
       mPhoneNumberString = entry.phoneNumber;
 
-      // If this is a blank entry, don't show anything.
-      // TODO krelease: Just hide the view for now. For this to truly look like an empty row
+      // If this is a blank entry, don't show anything. For this to truly look like an empty row
       // the entire ContactTileRow needs to be hidden.
       if (entry == ContactEntry.BLANK_ENTRY) {
         setVisibility(View.INVISIBLE);
@@ -113,16 +126,37 @@
         if (mListener == null) {
           return;
         }
+
+        CallSpecificAppData.Builder callSpecificAppData =
+            CallSpecificAppData.newBuilder()
+                .setAllowAssistedDialing(true)
+                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)
+                .setSpeedDialContactPosition(position);
+        if (isStarred) {
+          callSpecificAppData.addSpeedDialContactType(SpeedDialContactType.Type.STARRED_CONTACT);
+        } else {
+          callSpecificAppData.addSpeedDialContactType(SpeedDialContactType.Type.FREQUENT_CONTACT);
+        }
+        if (isPinned) {
+          callSpecificAppData.addSpeedDialContactType(SpeedDialContactType.Type.PINNED_CONTACT);
+        }
+
         if (TextUtils.isEmpty(mPhoneNumberString)) {
+          // Don't set performance report now, since user may spend some time on picking a number
+
           // Copy "superclass" implementation
+          Logger.get(getContext())
+              .logInteraction(InteractionEvent.Type.SPEED_DIAL_CLICK_CONTACT_WITH_AMBIGUOUS_NUMBER);
           mListener.onContactSelected(
-              getLookupUri(), MoreContactUtils.getTargetRectFromView(PhoneFavoriteTileView.this));
+              getLookupUri(),
+              MoreContactUtils.getTargetRectFromView(PhoneFavoriteTileView.this),
+              callSpecificAppData.build());
         } else {
           // When you tap a frequently-called contact, you want to
           // call them at the number that you usually talk to them
           // at (i.e. the one displayed in the UI), regardless of
           // whether that's their default number.
-          mListener.onCallNumberDirectly(mPhoneNumberString);
+          mListener.onCallNumberDirectly(mPhoneNumberString, callSpecificAppData.build());
         }
       }
     };
@@ -133,7 +167,7 @@
     return new DefaultImageRequest(
         displayName,
         lookupKey,
-        ContactPhotoManager.TYPE_DEFAULT,
+        LetterTileDrawable.TYPE_DEFAULT,
         DEFAULT_IMAGE_LETTER_SCALE,
         DEFAULT_IMAGE_LETTER_OFFSET,
         false);
@@ -152,4 +186,26 @@
     // Unlike Contacts' tiles, the Dialer's favorites tiles are square.
     return false;
   }
+
+  public void setPosition(int position) {
+    this.position = position;
+  }
+
+  /**
+   * Send a notification using a {@link ContactLoader} to inform the sync adapter that we are
+   * viewing a particular contact, so that it can download the high-res photo.
+   */
+  private static void sendViewNotification(Context context, Uri contactUri) {
+    ContactLoader loader = new ContactLoader(context, contactUri, true /* postViewNotification */);
+    loader.registerListener(
+        0,
+        (loader1, contact) -> {
+          try {
+            loader1.reset();
+          } catch (RuntimeException e) {
+            LogUtil.e("PhoneFavoriteTileView.onLoadComplete", "error resetting loader", e);
+          }
+        });
+    loader.startLoading();
+  }
 }
diff --git a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
index c692eca..cd5712e 100644
--- a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
+++ b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
@@ -30,17 +30,21 @@
 import android.provider.ContactsContract.PinnedPositions;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.LongSparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactTileLoaderFactory;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.contacts.common.list.ContactTileView;
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.dialer.app.R;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.lightbringer.Lightbringer;
+import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.shortcuts.ShortcutRefresher;
 import com.google.common.collect.ComparisonChain;
 import java.util.ArrayList;
@@ -190,6 +194,14 @@
     // Track the length of {@link #mContactEntries} and compare to {@link #TILES_SOFT_LIMIT}.
     int counter = 0;
 
+    // Data for logging
+    int starredContactsCount = 0;
+    int pinnedContactsCount = 0;
+    int multipleNumbersContactsCount = 0;
+    int contactsWithPhotoCount = 0;
+    int contactsWithNameCount = 0;
+    int lightbringerReachableContactsCount = 0;
+
     // The cursor should not be closed since this is invoked from a CursorLoader.
     if (cursor.moveToFirst()) {
       int starredColumn = cursor.getColumnIndexOrThrow(Contacts.STARRED);
@@ -262,6 +274,22 @@
         contact.pinned = pinned;
         mContactEntries.add(contact);
 
+        // Set counts for logging
+        if (isStarred) {
+          // mNumStarred might be larger than the number of visible starred contact,
+          // since it includes invisible ones (starred contact with no phone number).
+          starredContactsCount++;
+        }
+        if (pinned != PinnedPositions.UNPINNED) {
+          pinnedContactsCount++;
+        }
+        if (!TextUtils.isEmpty(name)) {
+          contactsWithNameCount++;
+        }
+        if (photoUri != null) {
+          contactsWithPhotoCount++;
+        }
+
         duplicates.put(id, contact);
 
         counter++;
@@ -274,6 +302,47 @@
 
     ShortcutRefresher.refresh(mContext, mContactEntries);
     notifyDataSetChanged();
+
+    Lightbringer lightbringer = LightbringerComponent.get(mContext).getLightbringer();
+    for (ContactEntry contact : mContactEntries) {
+      if (contact.phoneNumber == null) {
+        multipleNumbersContactsCount++;
+      } else if (lightbringer.isReachable(mContext, contact.phoneNumber)) {
+        lightbringerReachableContactsCount++;
+      }
+    }
+
+    Logger.get(mContext)
+        .logSpeedDialContactComposition(
+            counter,
+            starredContactsCount,
+            pinnedContactsCount,
+            multipleNumbersContactsCount,
+            contactsWithPhotoCount,
+            contactsWithNameCount,
+            lightbringerReachableContactsCount);
+    // Logs for manual testing
+    LogUtil.v("PhoneFavoritesTileAdapter.saveCursorToCache", "counter: %d", counter);
+    LogUtil.v(
+        "PhoneFavoritesTileAdapter.saveCursorToCache",
+        "starredContactsCount: %d",
+        starredContactsCount);
+    LogUtil.v(
+        "PhoneFavoritesTileAdapter.saveCursorToCache",
+        "pinnedContactsCount: %d",
+        pinnedContactsCount);
+    LogUtil.v(
+        "PhoneFavoritesTileAdapter.saveCursorToCache",
+        "multipleNumbersContactsCount: %d",
+        multipleNumbersContactsCount);
+    LogUtil.v(
+        "PhoneFavoritesTileAdapter.saveCursorToCache",
+        "contactsWithPhotoCount: %d",
+        contactsWithPhotoCount);
+    LogUtil.v(
+        "PhoneFavoritesTileAdapter.saveCursorToCache",
+        "contactsWithNameCount: %d",
+        contactsWithNameCount);
   }
 
   /** Iterates over the {@link Cursor} Returns position of the first NON Starred Contact */
@@ -347,7 +416,7 @@
   @Override
   public void notifyDataSetChanged() {
     if (DEBUG) {
-      Log.v(TAG, "notifyDataSetChanged");
+      LogUtil.v(TAG, "notifyDataSetChanged");
     }
     super.notifyDataSetChanged();
   }
@@ -355,7 +424,7 @@
   @Override
   public View getView(int position, View convertView, ViewGroup parent) {
     if (DEBUG) {
-      Log.v(TAG, "get view for " + String.valueOf(position));
+      LogUtil.v(TAG, "get view for " + position);
     }
 
     PhoneFavoriteTileView tileView = null;
@@ -371,6 +440,7 @@
     tileView.setPhotoManager(mPhotoManager);
     tileView.setListener(mListener);
     tileView.loadFromContact(getItem(position));
+    tileView.setPosition(position);
     return tileView;
   }
 
@@ -455,8 +525,9 @@
           // update the database here with the new pinned positions
           try {
             mContext.getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations);
+            Logger.get(mContext).logInteraction(InteractionEvent.Type.SPEED_DIAL_PIN_CONTACT);
           } catch (RemoteException | OperationApplicationException e) {
-            Log.e(TAG, "Exception thrown when pinning contacts", e);
+            LogUtil.e(TAG, "Exception thrown when pinning contacts", e);
           }
         }
       }
@@ -609,6 +680,7 @@
     if (mDraggedEntry != null) {
       unstarAndUnpinContact(mDraggedEntry.lookupUri);
       mAwaitingRemove = true;
+      Logger.get(mContext).logInteraction(InteractionEvent.Type.SPEED_DIAL_REMOVE_CONTACT);
     }
   }
 
diff --git a/java/com/android/dialer/app/list/RegularSearchFragment.java b/java/com/android/dialer/app/list/RegularSearchFragment.java
index 0289679..73120c5 100644
--- a/java/com/android/dialer/app/list/RegularSearchFragment.java
+++ b/java/com/android/dialer/app/list/RegularSearchFragment.java
@@ -18,19 +18,28 @@
 import static android.Manifest.permission.READ_CONTACTS;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v13.app.FragmentCompat;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.PinnedHeaderListView;
 import com.android.dialer.app.R;
-import com.android.dialer.app.widget.EmptyContentView;
-import com.android.dialer.app.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
 import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.Arrays;
 
 public class RegularSearchFragment extends SearchFragment
     implements OnEmptyViewActionButtonClickedListener,
@@ -41,6 +50,8 @@
   private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5;
   protected String mPermissionToRequest;
 
+  private DialerExecutor<CachedContactInfo> addContactTask;
+
   public RegularSearchFragment() {
     configureDirectorySearch();
   }
@@ -51,6 +62,18 @@
   }
 
   @Override
+  public void onCreate(Bundle savedState) {
+    super.onCreate(savedState);
+
+    addContactTask =
+        DialerExecutors.createUiTaskBuilder(
+                getFragmentManager(),
+                "RegularSearchFragment.addContact",
+                new AddContactWorker(getContext().getApplicationContext()))
+            .build();
+  }
+
+  @Override
   protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
     super.onCreateView(inflater, container);
     ((PinnedHeaderListView) getListView()).setScrollToSectionOnHeaderTouch(true);
@@ -71,8 +94,9 @@
         PhoneNumberCache.get(getContext()).getCachedNumberLookupService();
     if (cachedNumberLookupService != null) {
       final RegularSearchListAdapter adapter = (RegularSearchListAdapter) getAdapter();
-      cachedNumberLookupService.addContact(
-          getContext(), adapter.getContactInfo(cachedNumberLookupService, position));
+      CachedContactInfo cachedContactInfo =
+          adapter.getContactInfo(cachedNumberLookupService, position);
+      addContactTask.executeSerial(cachedContactInfo);
     }
   }
 
@@ -114,8 +138,15 @@
     }
 
     if (READ_CONTACTS.equals(mPermissionToRequest)) {
-      FragmentCompat.requestPermissions(
-          this, new String[] {mPermissionToRequest}, PERMISSION_REQUEST_CODE);
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+      if (deniedPermissions.length > 0) {
+        LogUtil.i(
+            "RegularSearchFragment.onEmptyViewActionButtonClicked",
+            "Requesting permissions: " + Arrays.toString(deniedPermissions));
+        FragmentCompat.requestPermissions(this, deniedPermissions, PERMISSION_REQUEST_CODE);
+      }
     }
   }
 
@@ -143,4 +174,24 @@
 
     boolean isNearbyPlacesSearchEnabled();
   }
+
+  private static class AddContactWorker implements Worker<CachedContactInfo, Void> {
+
+    private final Context appContext;
+
+    private AddContactWorker(Context appContext) {
+      this.appContext = appContext;
+    }
+
+    @Nullable
+    @Override
+    public Void doInBackground(@Nullable CachedContactInfo contactInfo) throws Throwable {
+      CachedNumberLookupService cachedNumberLookupService =
+          PhoneNumberCache.get(appContext).getCachedNumberLookupService();
+      if (cachedNumberLookupService != null) {
+        cachedNumberLookupService.addContact(appContext, contactInfo);
+      }
+      return null;
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/list/RemoveView.java b/java/com/android/dialer/app/list/RemoveView.java
index 3b917db..1d566c5 100644
--- a/java/com/android/dialer/app/list/RemoveView.java
+++ b/java/com/android/dialer/app/list/RemoveView.java
@@ -41,7 +41,7 @@
   }
 
   public RemoveView(Context context, AttributeSet attrs) {
-    this(context, attrs, -1);
+    this(context, attrs, 0);
   }
 
   public RemoveView(Context context, AttributeSet attrs, int defStyle) {
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index fcf8236..e21e073 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -34,19 +34,20 @@
 import android.widget.ListView;
 import android.widget.Space;
 import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.contacts.common.list.PhoneNumberPickerFragment;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.app.R;
-import com.android.dialer.app.dialpad.DialpadFragment.ErrorDialogFragment;
 import com.android.dialer.app.widget.DialpadSearchEmptyContentView;
-import com.android.dialer.app.widget.EmptyContentView;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.dialpadview.DialpadFragment.ErrorDialogFragment;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
 
 public class SearchFragment extends PhoneNumberPickerFragment {
 
@@ -80,7 +81,6 @@
     setQuickContactEnabled(true);
     setAdjustSelectionBoundsEnabled(false);
     setDarkTheme(false);
-    setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(false /* opposite */));
     setUseCallableUri(true);
 
     try {
@@ -98,9 +98,6 @@
   public void onStart() {
     LogUtil.d("SearchFragment.onStart", "");
     super.onStart();
-    if (isSearchMode()) {
-      getAdapter().setHasHeader(0, false);
-    }
 
     mActivity = (HostInterface) getActivity();
 
@@ -172,16 +169,6 @@
     return animator;
   }
 
-  @Override
-  protected void setSearchMode(boolean flag) {
-    super.setSearchMode(flag);
-    // This hides the "All contacts with phone numbers" header in the search fragment
-    final ContactEntryListAdapter adapter = getAdapter();
-    if (adapter != null) {
-      adapter.setHasHeader(0, false);
-    }
-  }
-
   public void setAddToContactNumber(String addToContactNumber) {
     mAddToContactNumber = addToContactNumber;
   }
@@ -249,6 +236,10 @@
         }
         break;
       case DialerPhoneNumberListAdapter.SHORTCUT_CREATE_NEW_CONTACT:
+        if (this instanceof SmartDialSearchFragment) {
+          Logger.get(getContext())
+              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_DIALPAD);
+        }
         number =
             TextUtils.isEmpty(mAddToContactNumber)
                 ? adapter.getFormattedQueryString()
@@ -257,6 +248,10 @@
         DialerUtils.startActivityWithErrorToast(getActivity(), intent);
         break;
       case DialerPhoneNumberListAdapter.SHORTCUT_ADD_TO_EXISTING_CONTACT:
+        if (this instanceof SmartDialSearchFragment) {
+          Logger.get(getContext())
+              .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_DIALPAD);
+        }
         number =
             TextUtils.isEmpty(mAddToContactNumber)
                 ? adapter.getFormattedQueryString()
diff --git a/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java b/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java
index 566a15d..3b00c76 100644
--- a/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java
+++ b/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java
@@ -20,9 +20,9 @@
 import android.support.annotation.NonNull;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
-import android.util.Log;
 import com.android.contacts.common.list.ContactListItemView;
-import com.android.dialer.app.dialpad.SmartDialCursorLoader;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.dialpadview.SmartDialCursorLoader;
 import com.android.dialer.smartdial.SmartDialMatchPosition;
 import com.android.dialer.smartdial.SmartDialNameMatcher;
 import com.android.dialer.smartdial.SmartDialPrefix;
@@ -43,14 +43,14 @@
     setShortcutEnabled(SmartDialNumberListAdapter.SHORTCUT_DIRECT_CALL, false);
 
     if (DEBUG) {
-      Log.v(TAG, "Constructing List Adapter");
+      LogUtil.v(TAG, "Constructing List Adapter");
     }
   }
 
   /** Sets query for the SmartDialCursorLoader. */
   public void configureLoader(SmartDialCursorLoader loader) {
     if (DEBUG) {
-      Log.v(TAG, "Configure Loader with query" + getQueryString());
+      LogUtil.v(TAG, "Configure Loader with query" + getQueryString());
     }
 
     if (getQueryString() == null) {
@@ -77,7 +77,7 @@
       for (SmartDialMatchPosition match : nameMatches) {
         view.addNameHighlightSequence(match.start, match.end);
         if (DEBUG) {
-          Log.v(
+          LogUtil.v(
               TAG,
               cursor.getString(PhoneQuery.DISPLAY_NAME)
                   + " "
diff --git a/java/com/android/dialer/app/list/SmartDialSearchFragment.java b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
index eb1508c..e97a16c 100644
--- a/java/com/android/dialer/app/list/SmartDialSearchFragment.java
+++ b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
@@ -28,12 +28,13 @@
 import android.support.v13.app.FragmentCompat;
 import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.dialer.app.R;
-import com.android.dialer.app.dialpad.SmartDialCursorLoader;
-import com.android.dialer.app.widget.EmptyContentView;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.DialerDatabaseHelper;
+import com.android.dialer.dialpadview.SmartDialCursorLoader;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import java.util.Arrays;
 
 /** Implements a fragment to load and display SmartDial search results. */
 public class SmartDialSearchFragment extends SearchFragment
@@ -80,6 +81,11 @@
   }
 
   @Override
+  public boolean getShowEmptyListForNullQuery() {
+    return true;
+  }
+
+  @Override
   protected void setupEmptyView() {
     if (mEmptyView != null && getActivity() != null) {
       if (!PermissionsUtil.hasPermission(getActivity(), CALL_PHONE)) {
@@ -123,8 +129,16 @@
       return;
     }
 
-    FragmentCompat.requestPermissions(
-        this, new String[] {CALL_PHONE}, CALL_PHONE_PERMISSION_REQUEST_CODE);
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "SmartDialSearchFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      FragmentCompat.requestPermissions(
+          this, deniedPermissions, CALL_PHONE_PERMISSION_REQUEST_CODE);
+    }
   }
 
   @Override
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index ca93da0..0729d72 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -19,7 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.app">
 
-  <application>
+  <application android:theme="@style/Theme.AppCompat">
 
     <activity
       android:exported="false"
@@ -41,6 +41,7 @@
       android:resizeableActivity="true"
       android:theme="@style/DialtactsActivityTheme"
       android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+      <!-- LINT.IfChange -->
       <intent-filter>
         <action android:name="android.intent.action.DIAL"/>
 
@@ -106,6 +107,7 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.TAB"/>
       </intent-filter>
+      <!-- LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/dialer/dialtacts/impl/AndroidManifest.xml) -->
 
       <meta-data
         android:name="com.android.keyguard.layout"
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_archive_white_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_archive_white_24dp.png
deleted file mode 100644
index bb72e89..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_archive_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_48dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_48dp.png
new file mode 100644
index 0000000..eeed895
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_blue_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_blue_24dp.png
new file mode 100644
index 0000000..b041a74
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_check_mark_blue_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_content_copy_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_content_copy_24dp.png
deleted file mode 100644
index 70eb073..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_content_copy_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_delete_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_delete_24dp.png
deleted file mode 100644
index 9fb43b0..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_delete_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_empty_check_mark_white_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_empty_check_mark_white_24dp.png
new file mode 100644
index 0000000..2c5ba8d
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_empty_check_mark_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_grade_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_grade_24dp.png
deleted file mode 100644
index 86eecdd..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_grade_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_more_vert_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_more_vert_24dp.png
deleted file mode 100644
index 67f07e4..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_more_vert_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_pause_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_pause_24dp.png
deleted file mode 100644
index 4d2ea05..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_pause_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_people_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_people_24dp.png
deleted file mode 100644
index ff698af..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_people_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_play_arrow_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_play_arrow_24dp.png
deleted file mode 100644
index 57c9fa5..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_play_arrow_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_results_phone.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_results_phone.png
deleted file mode 100644
index 3a1a7a7..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_results_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_schedule_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_schedule_24dp.png
deleted file mode 100644
index f3581d1..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_schedule_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_share_white_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_share_white_24dp.png
deleted file mode 100644
index b09a692..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_share_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dis.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dis.png
deleted file mode 100644
index 47e3249..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dk.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dk.png
deleted file mode 100644
index 2bfe0c0..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_off_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dis.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dis.png
deleted file mode 100644
index 90b5238..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dk.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dk.png
deleted file mode 100644
index 7556637..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_vm_sound_on_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_voicemail_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_voicemail_24dp.png
deleted file mode 100644
index 03a62e1..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_voicemail_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_down_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_down_24dp.png
deleted file mode 100644
index e22e92c..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_down_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_up_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_up_24dp.png
deleted file mode 100644
index 57d7871..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_volume_up_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_check_mark_48dp.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_check_mark_48dp.png
new file mode 100644
index 0000000..f3b76be
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_check_mark_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_results_phone.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_results_phone.png
deleted file mode 100644
index 74ccf14..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_results_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dis.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dis.png
deleted file mode 100644
index 4c671ec..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dk.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dk.png
deleted file mode 100644
index 41044b4..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_off_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dis.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dis.png
deleted file mode 100644
index c6040c0..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dk.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dk.png
deleted file mode 100644
index ac6a69c..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_vm_sound_on_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_check_mark_48dp.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_check_mark_48dp.png
new file mode 100644
index 0000000..01a3bbe
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_check_mark_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_results_phone.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_results_phone.png
deleted file mode 100644
index 0e24fa4..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_results_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dis.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dis.png
deleted file mode 100644
index 36b5e20..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dk.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dk.png
deleted file mode 100644
index 99d7fd5..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_off_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dis.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dis.png
deleted file mode 100644
index 468023d..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dk.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dk.png
deleted file mode 100644
index 9703294..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_vm_sound_on_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_check_mark_48dp.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_check_mark_48dp.png
new file mode 100644
index 0000000..2043279
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_check_mark_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_results_phone.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_results_phone.png
deleted file mode 100644
index 9594619..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_results_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dis.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dis.png
deleted file mode 100644
index bab4a43..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dk.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dk.png
deleted file mode 100644
index 1c13101..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_off_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dis.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dis.png
deleted file mode 100644
index ed3a173..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dis.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dk.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dk.png
deleted file mode 100644
index c04b8d1..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_vm_sound_on_dk.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_check_mark_48dp.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_check_mark_48dp.png
new file mode 100644
index 0000000..bfbe69e
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_check_mark_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_results_phone.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_results_phone.png
deleted file mode 100644
index 395652c..0000000
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_results_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable/background_dial_holo_dark.xml b/java/com/android/dialer/app/res/drawable/background_dial_holo_dark.xml
deleted file mode 100644
index 35afbe0..0000000
--- a/java/com/android/dialer/app/res/drawable/background_dial_holo_dark.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <gradient
-    android:angle="270"
-    android:endColor="#ff0a242d"
-    android:startColor="#ff020709"/>
-</shape>
diff --git a/java/com/android/dialer/app/res/drawable/ic_search_phone.xml b/java/com/android/dialer/app/res/drawable/ic_search_phone.xml
deleted file mode 100644
index 5d449ee..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_search_phone.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_results_phone"
-  android:tint="@color/search_shortcut_icon_color"/>
diff --git a/java/com/android/dialer/app/res/drawable/ic_speakerphone_off.xml b/java/com/android/dialer/app/res/drawable/ic_speakerphone_off.xml
deleted file mode 100644
index f07d0a8..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_speakerphone_off.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_vm_sound_off_dis" android:state_enabled="false"/>
-  <item android:drawable="@drawable/ic_vm_sound_off_dk"/>
-</selector>
diff --git a/java/com/android/dialer/app/res/drawable/ic_speakerphone_on.xml b/java/com/android/dialer/app/res/drawable/ic_speakerphone_on.xml
deleted file mode 100644
index 456a048..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_speakerphone_on.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_vm_sound_on_dis" android:state_enabled="false"/>
-  <item android:drawable="@drawable/ic_vm_sound_on_dk"/>
-</selector>
diff --git a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml
deleted file mode 100644
index 45ef933..0000000
--- a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <!-- spacer view -->
-    <View
-      android:id="@+id/spacer"
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="4"
-      android:background="#00000000"/>
-
-    <!-- Dialpad shadow -->
-    <View
-      android:layout_width="@dimen/shadow_length"
-      android:layout_height="match_parent"
-      android:background="@drawable/shadow_fade_left"/>
-
-    <RelativeLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="6">
-
-      <include
-        layout="@layout/dialpad_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-      <!-- "Dialpad chooser" UI, shown only when the user brings up the
-               Dialer while a call is already in progress.
-               When this UI is visible, the other Dialer elements
-               (the textfield/button and the dialpad) are hidden. -->
-
-      <ListView
-        android:id="@+id/dialpadChooser"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background_dialer_light"
-        android:visibility="gone"/>
-
-      <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
-      <Space
-        android:id="@+id/dialpad_floating_action_button_margin_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/floating_action_button_margin_bottom"
-        android:layout_alignParentBottom="true"/>
-
-      <android.support.design.widget.FloatingActionButton
-          android:id="@+id/dialpad_floating_action_button"
-          android:layout_width="@dimen/floating_action_button_width"
-          android:layout_height="@dimen/floating_action_button_height"
-          android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
-          android:layout_centerHorizontal="true"
-          android:src="@drawable/quantum_ic_call_white_24"
-          android:contentDescription="@string/description_dial_button"
-          app:elevation="@dimen/floating_action_button_translation_z"
-          app:backgroundTint="@color/dialpad_fab_green"/>
-    </RelativeLayout>
-  </LinearLayout>
-</view>
diff --git a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
index 5f80680..59d1363 100644
--- a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
+++ b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
@@ -26,14 +26,14 @@
       android:layout_height="0dp"
       android:layout_weight="1"/>
     <ImageView
-      android:id="@+id/emptyListViewImage"
+      android:id="@+id/empty_list_view_image"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       android:importantForAccessibility="no"/>
 
     <TextView
-      android:id="@+id/emptyListViewMessage"
+      android:id="@+id/empty_list_view_message"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
@@ -45,7 +45,7 @@
       android:textSize="@dimen/empty_list_message_text_size"/>
 
     <TextView
-      android:id="@+id/emptyListViewAction"
+      android:id="@+id/empty_list_view_action"
       style="@style/TextActionStyle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
diff --git a/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml b/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml
deleted file mode 100644
index c6e1862..0000000
--- a/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Layout showing the type of account filter for phone favorite screen
-     (or, new phone "all" screen).
-     This is very similar to account_filter_header.xml but different in its
-     top padding. -->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/account_filter_header_container"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
-  android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
-  android:paddingTop="8dip"
-  android:background="?android:attr/selectableItemBackground"
-  android:orientation="vertical"
-  android:visibility="gone">
-  <TextView
-    android:id="@+id/account_filter_header"
-    style="@style/ContactListSeparatorTextViewStyle"
-    android:paddingStart="@dimen/contact_browser_list_item_text_indent"/>
-  <TextView
-    android:id="@+id/contact_list_all_empty"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/contact_phone_list_empty_description_padding"
-    android:paddingBottom="@dimen/contact_phone_list_empty_description_padding"
-    android:paddingStart="8dip"
-    android:text="@string/listFoundAllContactsZero"
-    android:textColor="?android:attr/textColorSecondary"
-    android:textSize="@dimen/contact_phone_list_empty_description_size"
-    android:visibility="gone"/>
-</LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/action_mode_close_button.xml b/java/com/android/dialer/app/res/layout/action_mode_close_button.xml
new file mode 100644
index 0000000..4cb85d4
--- /dev/null
+++ b/java/com/android/dialer/app/res/layout/action_mode_close_button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/action_mode_close_button"
+    style="?attr/actionModeCloseButtonStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="16dip"
+    android:layout_marginRight="16dip"
+    android:paddingStart="8dp"
+    android:paddingLeft="8dp"
+    android:clickable="true"
+    android:contentDescription="@string/description_cancel_multi_select"
+    android:focusable="true"
+    android:src="@drawable/quantum_ic_close_white_24"/>
+
+
diff --git a/java/com/android/dialer/app/res/layout/all_contacts_activity.xml b/java/com/android/dialer/app/res/layout/all_contacts_activity.xml
deleted file mode 100644
index 72f0a14..0000000
--- a/java/com/android/dialer/app/res/layout/all_contacts_activity.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/all_contacts_frame"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-  <fragment
-    android:id="@+id/all_contacts_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:name="com.android.dialer.app.list.AllContactsFragment"/>
-</FrameLayout>
diff --git a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml b/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml
index 17a4520..422c529 100644
--- a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml
@@ -45,7 +45,7 @@
       android:cropToPadding="false"
       android:clipToPadding="false"/>
 
-    <com.android.dialer.app.widget.EmptyContentView
+    <com.android.dialer.widget.EmptyContentView
       android:id="@+id/empty_list_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/java/com/android/dialer/app/res/layout/call_log_activity.xml b/java/com/android/dialer/app/res/layout/call_log_activity.xml
index 4e2b188..a5e5326 100644
--- a/java/com/android/dialer/app/res/layout/call_log_activity.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_activity.xml
@@ -15,26 +15,27 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/calllog_frame"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
+    android:id="@+id/calllog_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_dialer_light"
+    android:orientation="vertical">
   <com.android.contacts.common.list.ViewPagerTabs
-    android:id="@+id/viewpager_header"
-    style="@style/DialtactsActionBarTabTextStyle"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/tab_height"
-    android:layout_gravity="top"
-    android:elevation="@dimen/tab_elevation"
-    android:orientation="horizontal"
-    android:textAllCaps="true"/>
+      android:id="@+id/viewpager_header"
+      style="@style/DialtactsActionBarTabTextStyle"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/tab_height"
+      android:layout_gravity="top"
+      android:elevation="@dimen/tab_elevation"
+      android:orientation="horizontal"
+      android:textAllCaps="true"/>
   <android.support.v4.view.ViewPager
-    android:id="@+id/call_log_pager"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"/>
+      android:id="@+id/call_log_pager"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1"/>
   <RelativeLayout
-    android:id="@+id/floating_action_button_container"
-    android:layout_width="0dp"
-    android:layout_height="0dp"/>
+      android:id="@+id/floating_action_button_container"
+      android:layout_width="0dp"
+      android:layout_height="0dp"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
index 64f7c10..efc08fb 100644
--- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
@@ -18,9 +18,39 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_call_log"
   android:orientation="vertical">
 
+  <LinearLayout
+      android:id="@+id/multi_select_select_all_view_content"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/tab_height"
+      android:layout_gravity="start"
+      android:background="@color/actionbar_background_color"
+      android:orientation="horizontal"
+      android:visibility="gone">
+
+    <ImageView
+        android:id="@+id/select_all_view_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/select_all_icon_padding"
+        android:paddingRight="@dimen/select_all_icon_padding"
+        android:gravity="center_vertical"
+        android:contentDescription="@string/select_all"
+        android:src="@drawable/ic_empty_check_mark_white_24dp"/>
+    <TextView
+        android:id="@+id/select_all_view_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/select_all_text_left_padding"
+        android:gravity="center_vertical"
+        android:text="@string/select_all"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        android:textColor="@color/remove_text_color"
+        android:textSize="@dimen/select_all_text_size"/>
+  </LinearLayout>
+
   <FrameLayout
     android:id="@+id/modal_message_container"
     android:layout_width="match_parent"
@@ -34,10 +64,9 @@
     android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
     android:paddingStart="@dimen/call_log_horizontal_margin"
     android:paddingEnd="@dimen/call_log_horizontal_margin"
-    android:background="@color/background_dialer_call_log"
     android:clipToPadding="false"/>
 
-  <com.android.dialer.app.widget.EmptyContentView
+  <com.android.dialer.widget.EmptyContentView
     android:id="@+id/empty_list_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
index 0fbbb9d..e967924 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             >
 
-          <QuickContactBadge
+          <com.android.dialer.app.calllog.DialerQuickContactBadge
               android:id="@+id/quick_contact_photo"
               android:layout_width="@dimen/contact_photo_size"
               android:layout_height="@dimen/contact_photo_size"
@@ -80,7 +80,7 @@
               android:layout_width="@dimen/contact_photo_size"
               android:layout_height="@dimen/contact_photo_size"
               android:visibility="gone"
-              android:src="@drawable/quantum_ic_check_circle_googblue_24" />
+              android:src="@drawable/ic_check_mark_48dp" />
 
         </FrameLayout>
 
@@ -148,17 +148,34 @@
             android:visibility="gone"
             android:singleLine="true"/>
 
-          <TextView
-            android:id="@+id/voicemail_transcription"
+          <LinearLayout
+            android:id="@+id/transcription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/call_log_icon_margin"
-            android:textColor="@color/call_log_voicemail_transcript_color"
-            android:textSize="@dimen/call_log_voicemail_transcription_text_size"
-            android:ellipsize="marquee"
             android:visibility="gone"
-            android:singleLine="false"
-            android:maxLines="10"/>
+            android:orientation="vertical">
+
+            <TextView
+              android:id="@+id/voicemail_transcription_branding"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textColor="@color/call_log_voicemail_transcript_branding_color"
+              android:textSize="@dimen/call_log_voicemail_transcription_text_size"
+              android:paddingBottom="2dp"
+              android:singleLine="true"/>
+
+            <TextView
+              android:id="@+id/voicemail_transcription"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textColor="@color/call_log_voicemail_transcript_color"
+              android:textSize="@dimen/call_log_voicemail_transcription_text_size"
+              android:ellipsize="marquee"
+              android:singleLine="false"
+              android:maxLines="10"/>
+
+          </LinearLayout>
 
         </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
index d3a5531..ec9e5a0 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
@@ -35,8 +35,7 @@
 
   <LinearLayout
     android:id="@+id/call_action"
-    style="@style/CallLogActionStyle"
-    android:paddingTop="@dimen/call_log_actions_top_padding">
+    style="@style/CallLogActionStyle">
 
     <ImageView
       style="@style/CallLogActionIconStyle"
@@ -50,7 +49,7 @@
       <TextView
         android:id="@+id/call_action_text"
         style="@style/CallLogActionTextStyle"
-        android:text="@string/description_call_log_call_action"/>
+        android:text="@string/call"/>
 
       <TextView
         android:id="@+id/call_type_or_location_text"
@@ -135,7 +134,7 @@
 
     <ImageView
       style="@style/CallLogActionIconStyle"
-      android:src="@drawable/ic_call_and_share"/>
+      android:src="@drawable/ic_phone_attach"/>
 
     <TextView
       style="@style/CallLogActionTextStyle"
diff --git a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout/dialpad_fragment.xml
deleted file mode 100644
index dd6dab7..0000000
--- a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <!-- spacer view -->
-    <View
-      android:id="@+id/spacer"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      android:background="#00000000"/>
-    <!-- Dialpad shadow -->
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/shadow_length"
-      android:background="@drawable/shadow_fade_up"/>
-    <include layout="@layout/dialpad_view"/>
-    <!-- "Dialpad chooser" UI, shown only when the user brings up the
-             Dialer while a call is already in progress.
-             When this UI is visible, the other Dialer elements
-             (the textfield/button and the dialpad) are hidden. -->
-    <ListView
-      android:id="@+id/dialpadChooser"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@color/background_dialer_light"
-      android:visibility="gone"/>
-
-  </LinearLayout>
-
-  <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
-  <Space
-    android:id="@+id/dialpad_floating_action_button_margin_bottom"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/floating_action_button_margin_bottom"
-    android:layout_alignParentBottom="true"/>
-
-  <android.support.design.widget.FloatingActionButton
-      android:id="@+id/dialpad_floating_action_button"
-      android:layout_width="@dimen/floating_action_button_width"
-      android:layout_height="@dimen/floating_action_button_height"
-      android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
-      android:layout_centerHorizontal="true"
-      android:src="@drawable/quantum_ic_call_white_24"
-      android:contentDescription="@string/description_dial_button"
-      app:elevation="@dimen/floating_action_button_translation_z"
-      app:backgroundTint="@color/dialpad_fab_green"/>
-</view>
diff --git a/java/com/android/dialer/app/res/layout/empty_content_view.xml b/java/com/android/dialer/app/res/layout/empty_content_view.xml
deleted file mode 100644
index 96a6a02..0000000
--- a/java/com/android/dialer/app/res/layout/empty_content_view.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-  <ImageView
-    android:id="@+id/emptyListViewImage"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"/>
-
-  <TextView
-    android:id="@+id/emptyListViewMessage"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:gravity="center_horizontal|top"
-    android:textColor="@color/empty_list_text_color"
-    android:textSize="@dimen/empty_list_message_text_size"/>
-
-  <TextView
-    android:id="@+id/emptyListViewAction"
-    style="@style/TextActionStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:gravity="center_horizontal"/>
-
-  <Space
-    android:layout_width="match_parent"
-    android:layout_height="40dp"/>
-
-</merge>
diff --git a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
index e245aac..1d20479 100644
--- a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
+++ b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
@@ -16,7 +16,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
   <ImageView
-    android:id="@+id/emptyListViewImage"
+    android:id="@+id/empty_list_view_image"
     android:layout_height="0dp"
     android:layout_weight="1"
     android:layout_width="match_parent"
@@ -24,7 +24,7 @@
     android:gravity="center_horizontal" />
 
   <TextView
-    android:id="@+id/emptyListViewMessage"
+    android:id="@+id/empty_list_view_message"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal|top"
@@ -36,7 +36,7 @@
     android:paddingBottom="8dp"/>
 
   <TextView
-    android:id="@+id/emptyListViewAction"
+    android:id="@+id/empty_list_view_action"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
diff --git a/java/com/android/dialer/app/res/layout/keyguard_preview.xml b/java/com/android/dialer/app/res/layout/keyguard_preview.xml
index 41fe891..eab98d2 100644
--- a/java/com/android/dialer/app/res/layout/keyguard_preview.xml
+++ b/java/com/android/dialer/app/res/layout/keyguard_preview.xml
@@ -15,9 +15,11 @@
   ~ limitations under the License
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+    tools:ignore="UnusedResources">
   <View
     android:layout_width="match_parent"
     android:layout_height="25dp"
diff --git a/java/com/android/dialer/app/res/layout/lists_fragment.xml b/java/com/android/dialer/app/res/layout/lists_fragment.xml
index 442b428..9596172 100644
--- a/java/com/android/dialer/app/res/layout/lists_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml
@@ -15,41 +15,41 @@
 -->
 
 <FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/lists_frame"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:animateLayoutChanges="true">
-
-  <LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/lists_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:animateLayoutChanges="true">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical">
 
     <!-- TODO: Apply background color to ActionBar instead of a FrameLayout. For now, this is
          the easiest way to preserve correct pane scrolling and searchbar collapse/expand
          behaviors. -->
     <FrameLayout
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/action_bar_height_large"
-      android:background="@color/actionbar_background_color"
-      android:elevation="@dimen/tab_elevation"/>
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/action_bar_height_large"
+        android:background="@color/actionbar_background_color"
+        android:elevation="@dimen/tab_elevation"/>
 
     <com.android.contacts.common.list.ViewPagerTabs
-      android:id="@+id/lists_pager_header"
-      style="@style/DialtactsActionBarTabTextStyle"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/tab_height"
-      android:layout_gravity="top"
-      android:elevation="@dimen/tab_elevation"
-      android:orientation="horizontal"
-      android:textAllCaps="true"/>
+        android:id="@+id/lists_pager_header"
+        style="@style/DialtactsActionBarTabTextStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tab_height"
+        android:layout_gravity="top"
+        android:elevation="@dimen/tab_elevation"
+        android:orientation="horizontal"
+        android:textAllCaps="true"/>
 
-    <android.support.v4.view.ViewPager
-      android:id="@+id/lists_pager"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1"/>
+    <com.android.dialer.app.list.DialerViewPager
+        android:id="@+id/lists_pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
   </LinearLayout>
 
@@ -58,38 +58,38 @@
        This is required since drag and drop event is only sent to views are visible when drag
        starts. -->
   <com.android.dialer.app.list.RemoveView
-    android:id="@+id/remove_view"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/tab_height"
-    android:layout_marginTop="@dimen/action_bar_height_large"
-    android:contentDescription="@string/remove_contact"
-    android:importantForAccessibility="no">
+      android:id="@+id/remove_view"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/tab_height"
+      android:layout_marginTop="@dimen/action_bar_height_large"
+      android:contentDescription="@string/remove_contact"
+      android:importantForAccessibility="no">
 
     <LinearLayout
-      android:id="@+id/remove_view_content"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@color/actionbar_background_color"
-      android:gravity="center"
-      android:orientation="horizontal"
-      android:visibility="gone">
+        android:id="@+id/remove_view_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/actionbar_background_color"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone">
 
       <ImageView
-        android:id="@+id/remove_view_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:src="@drawable/ic_remove"
-        android:tint="@color/remove_text_color"/>
+          android:id="@+id/remove_view_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="8dp"
+          android:layout_marginBottom="8dp"
+          android:src="@drawable/ic_remove"
+          android:tint="@color/remove_text_color"/>
 
       <TextView
-        android:id="@+id/remove_view_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/remove_contact"
-        android:textColor="@color/remove_text_color"
-        android:textSize="@dimen/remove_text_size"/>
+          android:id="@+id/remove_view_text"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/remove_contact"
+          android:textColor="@color/remove_text_color"
+          android:textSize="@dimen/remove_text_size"/>
 
     </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml
index c02512d..bb6a5f7 100644
--- a/java/com/android/dialer/app/res/layout/search_edittext.xml
+++ b/java/com/android/dialer/app/res/layout/search_edittext.xml
@@ -29,7 +29,7 @@
       android:padding="@dimen/search_box_search_icon_padding"
       android:importantForAccessibility="no"
       android:scaleType="center"
-      android:src="@drawable/quantum_ic_search_white_24"
+      android:src="@drawable/quantum_ic_search_vd_theme_24"
       android:tint="@color/searchbox_icon_tint"/>
 
     <TextView
diff --git a/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml b/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml
index c778c6b..3fa3be2 100644
--- a/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml
@@ -41,7 +41,7 @@
       android:numColumns="@integer/contact_tile_column_count_in_favorites"/>
   </FrameLayout>
 
-  <com.android.dialer.app.widget.EmptyContentView
+  <com.android.dialer.widget.EmptyContentView
     android:id="@+id/empty_list_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/java/com/android/dialer/app/res/menu/dialtacts_options.xml b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
index 25a3e18..b50e6ad 100644
--- a/java/com/android/dialer/app/res/menu/dialtacts_options.xml
+++ b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
@@ -28,5 +28,8 @@
   <item
     android:id="@+id/menu_simulator_submenu"
     android:title="@string/simulator_submenu_label"/>
+  <item
+      android:id="@+id/menu_new_ui_launcher_shortcut"
+      android:title="@string/new_ui_launcher_shortcut_label"/>
 
 </menu>
diff --git a/java/com/android/dialer/app/res/values-af/strings.xml b/java/com/android/dialer/app/res/values-af/strings.xml
index 2eb462b..52005c9 100644
--- a/java/com/android/dialer/app/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/res/values-af/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Foon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Foonsleutelblok"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Foon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Oproepgeskiedenis"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Gee foutiewe nommer aan"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopieer nommer"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopieer transkripsie"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokkeer nommer"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblokkeer nommer"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Wysig nommer voor oproep"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Vee oproepgeskiedenis uit"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Vee stemboodskap uit"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vee oproepgeskiedenis uit?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dit sal alle oproepe uit jou geskiedenis vee"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Vee tans oproepgeskiedenis uit …"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Foon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Gemiste oproep"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Gemiste werkoproep"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Gemiste oproepe"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Stemboodskappe </item>
       <item quantity="one">Stemboodskap</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Speel"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuwe stemboodskap van <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Kon nie stemboodskap speel nie"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Laai tans stemboodskap …"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Argiveer tans stemboodskap …"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kon nie stemboodskap laai nie"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Slegs oproepe met stemboodskappe"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Slegs inkomende oproepe"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Slegs uitgaande oproepe"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Slegs gemisde oproepe"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>)<xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"soek"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"bel"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nommer om te skakel"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Speel of stop terugspeel"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Skakel luidsprekerfoon aan of af"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Soek terugspeelposisie"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Verlaag terugspeelkoers"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Verhoog terugspeelkoers"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Oproepgeskiedenis"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Meer opsies"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"sleutelblok"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Wys slegs uitgaande"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Wys slegs inkomende"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Wys slegs misgeloop"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Wys net stemboodskappe"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Wys alle oproepe"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Voeg 2-sek.-pouse by"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Voeg wagtyd by"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Instellings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Nabootser"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakte"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gebruik raak-nommerbord"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Keer terug na oproep wat besig is"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Voeg oproep by"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Inkomende oproepe"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Speel stemboodskap"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Bekyk kontak <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Bel <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skep nuwe UI-kortpad"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Gaan tans grootmaathandelingmodus in"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Het grootmaathandelingmodus verlaat"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Het <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> gekies"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Het <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ontkies"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontakbesonderhede van <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontakbesonderhede vir verdagte strooiposbeller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> oproepe."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video-oproep."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Stuur SMS aan <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Ongeluisterde stemboodskap"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Begin stemsoektog"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Stemboodskap"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"stemboodskap"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"stemboodskappe"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nee"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vee geselekteerde <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> uit?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselleer grootmaathandelingmodus"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Vee uit"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselleer"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> gekies"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vee hierdie stemboodskappe uit? "</b>"</item>
+      <item quantity="one">"<b>"Vee hierdie stemboodskap uit? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Kan nie hierdie nommer bel nie"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Om stemboodskapdiens op te stel, gaan na Kieslys &gt; Instellings."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Om stemboodskap te bel, skakel eers vliegtuigmodus af."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Laai tans…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Laai tans van SIM-kaart af…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM-kaartkontakte"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Geen kontakte-program beskikbaar nie"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Stemsoektog is nie beskikbaar nie"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Kan nie \'n foonoproep maak nie want die Foon-program is gedeaktiveer."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Deursoek kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Gee nommer of soek in kontakte"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Jou oproepgeskiedenis is leeg"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Maak \'n oproep"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Jy het geen gemiste oproepe nie."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Jou stemboodskapdiens se inkassie is leeg."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Wys net gunstelinge"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Oproepgeskiedenis"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alles"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Gemis"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Stemboodskap"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Spoedbel"</string>
     <string name="tab_history" msgid="7420269368689503596">"Oproepgeskiedenis"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakte"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Stemboodskap"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Verwyder uit gunstelinge"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Ontdoen"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Skep nuwe kontak"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Voeg by \'n kontak"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Stuur SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Maak video-oproep"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkeer nommer"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nuwe gemiste oproepe"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Daar is nog niemand op jou spoedbel nie"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Voeg \'n gunsteling by"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Jy het nog nie enige kontakte nie"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Voeg \'n kontak by"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Raak aan prent om al die nommers te sien of raak en hou om te herorganiseer"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Verwyder"</string>
+    <string name="select_all" msgid="408601760696146245">"Kies alles"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video-oproep"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Stuur \'n boodskap"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Oproepbesonderhede"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Bel <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Maak video-oproep na <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Luister na stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Speel stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Laat wag stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Vee stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g> uit"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nuwe stemboodskappe</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nuwe stemboodskap</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Skep kontak vir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Voeg <xliff:g id="NAMEORNUMBER">^1</xliff:g> by \'n bestaande kontak"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Oproepbesonderhede vir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Uit oproepgeskiedenis gevee"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Vandag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gister"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ouer"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Oproepelys"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Skakel luidspreker aan."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Skakel luidspreker af."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Speel vinniger."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Speel stadiger."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Begin of laat wag speel."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Vertoonopsies"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Klanke en vibrasie"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Oproepe"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepblokkering"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Stemboodskap"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Kies SIM vir stemboodskap-instellings"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering is tydelik af"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is gedeaktiveer omdat jy die afgelope 48 uur nooddienste van hierdie foon af gekontak het. Dit sal outomaties heraktiveer word sodra die 48-uurtydperk verstryk."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Voer nommers in"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Geblokkeerde nommers"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is reeds geblokkeer."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Oproeprekeninge"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Skakel aan"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Stel toestemmings"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Skakel die kontaktetoestemming aan om spoedbel te aktiveer."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Skakel die foontoestemming aan om jou oproeprekord te sien."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Skakel die kontaktetoestemming aan om jou kontakte te sien."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Skakel die foontoestemming aan om na jou stemboodskapdiens te gaan."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Skakel die foontoestemming aan om \'n oproep te maak."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Foonprogram het nie toestemming om stelselinstellings te stel nie."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Strooipos"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is vanlyn en kan nie bereik word nie"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Meer oor"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Deur Google getranskribeer"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkribeer tans …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkripsie nie beskikbaar nie"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Bekyk"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Oproep geskrap. Bekyk en vee aanhegsels uit wat gedurende hierdie oproep in Boodskappe gedeel is."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Oproepe geskrap. Bekyk en vee aanhegsels uit wat gedurende oproepe in Boodskappe gedeel is."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml
index 8230301..91396a4 100644
--- a/java/com/android/dialer/app/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/res/values-am/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ስልክ"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"የስልክ የቁልፍ ሰሌዳ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ስልክ"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"የጥሪ ታሪክ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"ትክክለኛ ያልሆነ ቁጥርን ሪፓርት አድርግ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ቁጥር ቅዳ"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ወደ ጽሑፍ የተገለበጠውን ቅዳ"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"ቁጥርን አግድ"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ቁጥርን አታግድ"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ከመደወል በፊት ቁጥር አርትዕ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"የጥሪ ታሪክን አጽዳ"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"የድምፅ መልዕክት ሰርዝ"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"የጥሪ ታሪክ ይጽዳ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ይሄ ሁሉንም ጥሪዎች ከታሪክዎ ይሰርዛቸዋል"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"የጥሪ ታሪክን በማጽዳት ላይ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ስልክ"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"ያመለጠጥሪ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ያመለጠ የሥራ ጥሪ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ያመለጡ ጥሪዎች"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> የድምፅ መልዕክቶች </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> የድምፅ መልዕክቶች </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"አጫውት"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>፤<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ከ<xliff:g id="CALLER">%1$s</xliff:g> አዲስ የድምፅመልዕክት"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"የድምጽ መልዕክትን ማጫወት አልተቻለም"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"የድምጽ መልዕክትን በመጫን ላይ…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"የድምፅ መልዕክት ማህደር ውስጥ በማስቀመጥ ላይ…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"የድምጽ መልዕክትን መጫን አልተቻለም"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"የድምጽ መልዕክት ያላቸው ጥሪዎች ብቻ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ገቢ ጥሪዎች ብቻ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ወጪ ጥሪዎች ብቻ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"ያመለጡ ጥሪዎች ብቻ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ፍለጋ"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ደውል"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ቁጥር ለመደወል"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"መልሶ ማጫወት አጫውት ወይም አቁም"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"የስልክ ድምጽ ማጉያን ያብሩ ወይም ያጥፉ"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"የመልሶ ማጫወት ቦታ ይፈልጉ"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"የመልሶ ማጫወት ፍጥነት ቀንስ"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"የመልሶ ማጫወት ፍጥነት ጨምር"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"የጥሪ ታሪክ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ተጨማሪ አማራጮች"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ቁልፍ ሰሌዳ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ወጪዎቹን ብቻ አሳይ"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ገቢዎቹን ብቻ አሳይ"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"ያመለጡትን ብቻ አሳይ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"የድምፅ መልዕክቶች ብቻ አሳይ"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ሁሉንም ጥሪዎች አሳይ"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 ሴኮንድ ፋታ አክል"</string>
-    <string name="add_wait" msgid="1177723010768282578">"መጠበቅ አክል"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ቅንብሮች"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ማስመሰያ"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ሁሉም እውቅያዎች"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"የድምፅ ቁልፍ ሰሌዳን ንካ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"በመካሄድ ላይ ወዳለው ጥሪ ተመለስ"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ጥሪ ያክሉ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ገቢ ጥሪዎች"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"የድምፅ መልዕክት አጫውት"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"ዕውቂያ <xliff:g id="NAME">%1$s</xliff:g> ዕይ"</string>
-    <string name="description_call" msgid="1532402285334775372">"ጥሪ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"አዲስ የዩአይ አቋራጭ ፍጠር"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ወደ የጅምላ እርምጃ ሁነታ በመግባት ላይ"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ከጅምላ እርምጃ ሁነታ ለቀው ወጥተዋል"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ተመርጧል"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> አልተመረጠም"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"የ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> እውቂያ ዝርዝሮች"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"የተጠረጠረው አይፈለጌ ጥሪ አድራጊ ማግኛ አድራሻ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ጥሪዎች።"</string>
     <string name="description_video_call" msgid="3738199365585751727">"የቪዲዮ ጥሪ።"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"ኤስኤምኤስ ለ<xliff:g id="NAME">%1$s</xliff:g> ላክ"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"ያልተሰማ የድምፅመልዕክት"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"በድምፅ ፍለጋ ይጀምሩ"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"ደውል<xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"የድምፅ መልዕክት"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ሰከንድ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%s</xliff:g> ሴከ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"የድምፅ መልዕክት"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"የድምፅ መልዕክቶች"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"አዎ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"አይ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"የተመረጠው <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ይሰረዝ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"የጅምላ እርምጃ ሁነታ ይቅር"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ሰርዝ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ይቅር"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ተመርጠዋል"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
+      <item quantity="other">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ላይ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ይህን ቁጥር መደወል አልተቻለም"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ድምጽ መልዕክትን ለማደራጀት ወደ ምናሌ &gt; ቅንብሮች ሂድ።"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"የድምጽ መልዕክት ጥሪ ለማድረግ፣ በመጀመሪያ የአውሮፕላን ሁነታን አጥፋ።"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"በመስቀል ላይ…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"ከSIM ካርድ ላይ በመጫን ላይ..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"የSIM ካርድ ዕውቂያዎች"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"ምንም የእውቂያዎች መተግበሪያ አይገኝም"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"የድምጽ ፍለጋ አይገኝም"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"የስልክ መተግበሪያው ስለተሰናከለ የስልክ ጥሪ ማድረግ አይቻልም።"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ዕውቅያዎችን ፈልግ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"ቁጥር ያክሉ ወይም እውቂያዎችን ይፈልጉ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"የእርስዎ የጥሪ ታሪክ ባዶ ነው"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ደውል"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ምንም ያመለጡዎት ጥሪዎች የሉዎትም።"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"የእርስዎ የድምጽ መልዕክት ገቢ መልዕክት ባዶ ነው።"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ተወዳጆችን ብቻ አሳይ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"የስልክ ጥሪ ታሪክ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ሁሉም"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ያመለጡ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"የድምፅ መልዕክት"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"ፈጣን ደውል"</string>
     <string name="tab_history" msgid="7420269368689503596">"የጥሪ ታሪክ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"ዕውቂያዎች"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"የድምፅ መልዕክት"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ከተወዳጆች ውስጥ ተወግዷል።"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"ቀልብስ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"ደውል<xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"አዲስ እውቂያ ይፍጠሩ"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ወደ እውቂያ አክል"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ኤስኤምኤስ ላክ"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"የቪዲዮ ጥሪ አድርግ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"ቁጥርን አግድ"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> አዲስ ያልተመለሱ ጥሪዎች"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"በፈጥኖ መደወያ ላይ ገና ማንም የለዎትም"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ተወዳጅ አክል"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ገና ምንም እውቂያዎች የሉዎትም"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ዕውቂያ አክል"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ሁሉንም ቁጥሮች ለማየት ምስል ይንኩ ወይም ዳግም ለመደርደር ነክተው ይያዙት"</string>
     <string name="remove_contact" msgid="2353580570488923668">"አስወግድ"</string>
+    <string name="select_all" msgid="408601760696146245">"ሁሉንም ምረጥ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"የቪዲዮ ጥሪ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"መልእክት ላክ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"የጥሪ ዝርዝሮች"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ቪዲዮ ጥሪ <xliff:g id="NAMEORNUMBER">^1</xliff:g>።"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"የ<xliff:g id="NAMEORNUMBER">^1</xliff:g>ን የድምጽ መልዕክት ያዳምጡ"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"የድምጽ መልዕክት ያጫውቱ ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"የድምጽ መልዕክት ለአፍታ ያቁሙ ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"የድምጽ መልዕክት ይሰርዙ ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> አዲስ የድምጽ መልዕክቶች</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> አዲስ የድምጽ መልዕክቶች</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"ለ<xliff:g id="NAMEORNUMBER">^1</xliff:g> እውቂያ ፍጠር"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ን ወደ አሁን ያለ እውቂያ አክል"</string>
     <string name="description_details_action" msgid="2061866409737706174">"የ<xliff:g id="NAMEORNUMBER">^1</xliff:g> የጥሪ ዝርዝሮች"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ከጥሪ ታሪክ ተሰርዟል"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ዛሬ"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ትላንት"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"የቆየ"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"የጥሪዎች ዝርዝር"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ድምጽ ማጉያን አብራ።"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ድምጽ ማጉያን አጥፋ።"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"በፍጥነት አጫውት።"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"በዝግታ አጫውት።"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"መልሰህ አጫውትን አስጀምር ወይም ለአፍታ አቁም።"</string>
     <string name="display_options_title" msgid="3880091801055797975">"የማሳያ አማራጮች"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ድምጾች እና ንዝረት"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ጥሪዎች"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ጥሪን ማገድ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"የድምፅ መልዕክት"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ለድምጽ መልዕክት ቅንብሮች ሲም ይምረጡ"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ጥሪን ማገድ ለጊዜው ተሰናክሏል"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ባለፉት 48 ሰዓቶች ውስጥ ከዚህ ስልክ ሆነው የአስቸኳይ አደጋ አገልግሎቶችን ስላነጋገሩ ጥሪን ማገድ ተሰናክሏል። አንዴ የ48 ሰዓቱ ጊዜ ካለፈ በኋላ በራስ-ሰር ዳግም ይነቃል።"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ቁጥሮችን አስመጣ"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"የታገዱ ቁጥሮች"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ቀድሞውኑ ታግዷል።"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"የመደወያ መለያዎች"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"አብራ"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ፍቃዶችን አዋቅር"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ፈጥኖ መደወያን ለማንቃት የእውቂያዎች ፍቃዱን ያብሩ።"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"የጥሪ ምዝግብ ማስታወአሽዎን ለማየት የስልክ ፍቃዱን ያብሩ።"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"የእርስዎን እውቂያዎች ለማየት የእውቂያዎች ፍቃዱን ያብሩ።"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"የድምፅ መልዕክትዎን ለመድረስ የስልክ ፍቃዱን ያብሩ።"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"የእርስዎን እውቂያዎች ለመከታተል የእውቂያዎች ፍቃዶችን ያብሩ።"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ስልክ ለመደወል የስልክ ፍቃዱን ያብሩ።"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"የስልክ መተግበሪያ ወደ የስርዓት ቅንብሮች የመጻፍ ፍቃድ የለውም።"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"አይፈለጌ መልዕክት"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ከመስመር ውጭ ነው እና ሊደረስበት አይችልም"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ስለ"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"በGoogle ወደ ጽሁፍ የተለወጠ"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ወደ ጽሁፍ በመለወጥ ላይ ነው …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ወደ ጽሁፍ ግልባጭ የለም"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"አሳይ"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ar/strings.xml b/java/com/android/dialer/app/res/values-ar/strings.xml
index e4dfb4d..b194777 100644
--- a/java/com/android/dialer/app/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/res/values-ar/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"الهاتف"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"لوحة مفاتيح الهاتف"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"الهاتف"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"سجل المكالمات"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"الإبلاغ عن رقم غير دقيق"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"نسخ الرقم"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"نسخ الكتابة الصوتية"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"حظر الرقم"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"إلغاء حظر الرقم"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"تعديل الرقم قبل الاتصال"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"محو سجل المكالمات"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"حذف رسالة البريد الصوتي"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"هل تريد محو سجل المكالمات؟"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"سيؤدي ذلك إلى حذف جميع المكالمات من السجل"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"جارٍ محو سجل المكالمات…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"الهاتف"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"مكالمة فائتة"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"مكالمة عمل فائتة"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"المكالمات الفائتة"</string>
@@ -52,107 +47,70 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> من رسائل البريد الصوتي </item>
       <item quantity="one">رسالة بريد صوتي</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"تشغيل"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"بريد صوتي جديد من <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"تعذر تشغيل البريد الصوتي"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"جارٍ تحميل البريد الصوتي…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"تجري أرشفة البريد الصوتي..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"تعذر تحميل البريد الصوتي"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"المكالمات التي تشتمل على بريد صوتي فقط"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"المكالمات الواردة فقط"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"المكالمات الصادرة فقط"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"المكالمات الفائتة فقط"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"بحث"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"طلب"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"الرقم الذي سيتم طلبه"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"بدء التشغيل أو إيقافه"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"تشغيل مكبر الصوت أو تعطيله"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"طلب موضع تشغيل"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"خفض معدل التشغيل"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"زيادة معدل التشغيل"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"سجل المكالمات"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"مزيد من الخيارات"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"لوحة المفاتيح"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"عرض الصادر فقط"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"عرض الوارد فقط"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"عرض الفائت فقط"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"إظهار رسائل البريد الصوتي فقط"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"عرض جميع المكالمات"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"إضافة ثانيتين إيقاف مؤقت"</string>
-    <string name="add_wait" msgid="1177723010768282578">"إضافة انتظار"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"الإعدادات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"المحاكي"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"جميع جهات الاتصال"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"استخدام لوحة مفاتيح نغمات باللمس"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"عودة إلى المكالمة الجارية"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"إضافة مكالمة"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"المكالمات الواردة"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"تشغيل البريد الصوتي"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"عرض جهة الاتصال <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"الاتصال بـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"إنشاء اختصار للواجهة الجديدة"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"يتم الدخول إلى وضع الإجراء المجمَّع"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"تمت مغادرة وضع الإجراء المجمَّع"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"تم تحديد <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"تم إلغاء تحديد <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"تفاصيل جهة الاتصال بـ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"تفاصيل جهة الاتصال للمتصل غير المرغوب فيه المشتبه به <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> من المكالمات."</string>
     <string name="description_video_call" msgid="3738199365585751727">"مكالمة فيديو."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"‏إرسال رسالة قصيرة SMS إلى <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"البريد الصوتي غير المسموع"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"بدء البحث الصوتي"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"البريد الصوتي"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> دقيقة <xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"البريد الصوتي"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"رسائل البريد الصوتي"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"نعم"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"لا"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"حذف رسائل <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> المحددة؟"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"إلغاء وضع الإجراءات المجمَّع"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"إلغاء"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"تم تحديد <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="zero">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="two">"<b>"حذف رسالتي البريد الصوتي هاتين؟ "</b>"</item>
+      <item quantity="few">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="many">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="other">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
+      <item quantity="one">"<b>"حذف رسالة البريد الصوتي هذه؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> في <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"لا يمكن الاتصال بهذا الرقم"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"لإعداد البريد الصوتي، انتقل إلى القائمة &gt; الإعدادات."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"للاتصال بالبريد الصوتي، يجب أولاً إيقاف وضع الطائرة."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"جارٍ التحميل..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"‏جارٍ التحميل من شريحة SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"‏شريحة SIM وجهات الاتصال"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"لا يتوفر تطبيق لجهات الاتصال"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"البحث الصوتي غير متاح"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"يتعذر إجراء مكالمة هاتفية نظرًا لأنه تم تعطيل تطبيق الهاتف."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"البحث في جهات الاتصال"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"إضافة رقم أو البحث في جهات الاتصال"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"سجل مكالماتك فارغ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"إجراء مكالمة"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ليست لديك أية مكالمات لم يتم الرد عليها."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"مجلد بريدك الوارد الصوتي فارغ."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"عرض المفضلة فقط"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"سجل المكالمات"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"الكل"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"فائتة"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"البريد الصوتي"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"اتصال سريع"</string>
     <string name="tab_history" msgid="7420269368689503596">"سجل المكالمات"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"جهات الاتصال"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"البريد الصوتي"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"تمت إزالة جهة الاتصال من المفضلة"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"تراجع"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"إنشاء جهة اتصال جديدة"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"إضافة إلى جهة اتصال"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏إرسال رسالة قصيرة SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"إجراء مكالمة فيديو"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"حظر الرقم"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> من المكالمات الجديدة الفائتة"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"لم تتم إضافة أية جهة اتصال إلى قائمة الاتصال السريع حتى الآن"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"إضافة مفضلة"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ليست لديك أية جهات اتصال حتى الآن"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"إضافة جهة اتصال"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"المس الصورة للاطلاع على جميع الأرقام أو المس مع الاستمرار لإعادة الترتيب"</string>
     <string name="remove_contact" msgid="2353580570488923668">"إزالة"</string>
+    <string name="select_all" msgid="408601760696146245">"تحديد الكل"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"مكالمة فيديو"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"إرسال رسالة"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"تفاصيل المكالمة"</string>
@@ -168,29 +126,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"الاتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"إجراء مكالمة فيديو مع <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"استماع إلى بريد صوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"تشغيل البريد الصوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"إيقاف البريد الصوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g> مؤقتًا"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"حذف البريد الصوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="zero">ليست هناك أية رسائل صوتية جديدة (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
-      <item quantity="two">رسالتان صوتيتان جديدتان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> رسائل صوتية</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> رسالة صوتية</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> من الرسائل الصوتية</item>
-      <item quantity="one">رسالة صوتية جديدة (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"إنشاء جهة اتصال لـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"إضافة <xliff:g id="NAMEORNUMBER">^1</xliff:g> إلى جهة اتصال حالية"</string>
     <string name="description_details_action" msgid="2061866409737706174">"تفاصيل الاتصال لـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"تم الحذف من سجل المكالمات"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"اليوم"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"أمس"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"أقدم"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"قائمة المكالمات"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"تشغيل مكبر الصوت."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"تعطيل مكبر الصوت."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"تشغيل أسرع."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"تشغيل أقل سرعة."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"بدء التشغيل أو إيقافه مؤقتًا."</string>
     <string name="display_options_title" msgid="3880091801055797975">"خيارات العرض"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"الأصوات والاهتزاز"</string>
@@ -207,7 +150,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"المكالمات"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"حظر المكالمات"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"البريد الصوتي"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"‏حدد SIM لإعدادات البريد الصوتي"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"حظر المكالمات معطّل مؤقتًا"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"تم تعطيل حظر المكالمات لأنك اتصلت بخدمات الطوارئ خلال 48 ساعة ماضية. وستتم إعادة تمكينه تلقائيًا بعد انتهاء هذه الفترة التي تبلغ 48 ساعة."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"استيراد الأرقام"</string>
@@ -221,12 +163,8 @@
     <string name="block_list" msgid="4701585783411870782">"الأرقام المحظورة"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"حسابات الاتصال"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"تشغيل"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"تعيين الأذونات"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"لتمكين الاتصال السريع، شغِّل إذن جهات الاتصال."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"للاطلاع على سجل المكالمات، شغِّل إذن الهاتف."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"للاطلاع على جهات الاتصال، شغِّل إذن جهات الاتصال."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"للوصول إلى البريد الصوتي، شغِّل إذن الهاتف."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"للبحث عن جهات الاتصال، عليك تشغيل أذونات جهات الاتصال."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"لإجراء مكالمة، شغِّل إذن الهاتف."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ليس لدى تطبيق الهاتف إذن لتعديل إعدادات النظام."</string>
@@ -238,4 +176,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"تعليق غير مرغوب فيه"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> غير متصل ولا يمكن الوصول إليه"</string>
     <string name="about_phone_label" msgid="582991354677973731">"حول"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏تم النسخ بواسطة Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"‏جارٍ تحويل الصوت إلى نص بواسطة Google..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"النص غير متاح"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"عرض"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء هذه المكالمة في Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء إجراء المكالمات في Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-az/strings.xml b/java/com/android/dialer/app/res/values-az/strings.xml
index 62bc117..90849a8 100644
--- a/java/com/android/dialer/app/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/res/values-az/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon Klaviaturası"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zəng tarixçəsi"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Qeyri-dəqiq sayı bildirin"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Nömrəni kopyalayın"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Transkripsiyanı kopyalayın"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Nömrəni blok edin"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Nömrəni blokdan çıxarın"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Zəng etmədən öncə nömrəyə düzəliş edin"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Zəng tarixçəsini təmizlə"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Səsli məktubu silin"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Zəng tarixçəsi təmizlənsin?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bu, tarixçənizdən bütün zəngləri siləcəkdir"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Zəng tarixçəsi silinir…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Buraxılmış zəng"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Buraxılmış iş çağrısı"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Buraxılmış zənglər"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Səsli poçt </item>
       <item quantity="one">Səsli poçt</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Oxudun"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> adlı şəxsdən yeni səsli məktub"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Səsli poçtu səsləndirmək mümkün deyil"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Səsli poçt yüklənir…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Səsli poçt arxivləşdirilir…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Səsli poçtu yükləmək mümkün olmadı"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Yalnız səsli məktublu zənglər"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Yalnız daxil olan zənglər"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Yalnız gedən zənglər"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Yalnız buraxılmış zənglər"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"axtarış"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"Yığ"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"yığmaq üçün nömrə"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Oxudun və ya dayandırın"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Spikerfonu aktiv və ya deaktiv edin"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Oxutma pozisiyası axtarın"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Oxutma reytinqini azaldın"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Oxutma reytinqini artırın"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zəng tarixçəsi"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Daha çox seçim"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatura"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Yalnız gedəni göstərin"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Yalnız gələni göstərin"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Yalnız buraxılmışı göstərin"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Yalnız səsli mesajları göstərin"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Bütün zəngləri göstərin"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 saniyəlik pauza əlavə edin"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Gözləmə əlavə edin"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Stimulyator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Bütün kontaktlar"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Toxunma ton klaviaturasını istifadə edin"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Davam edən zəngə qayıdın"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Zəng əlavə edin"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Gələn zənglər"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Səsli məktubu oxudun"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> adlı kontakta baxın"</string>
-    <string name="description_call" msgid="1532402285334775372">"Zəng <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yeni İİ Qısayolu yaradın"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Toplu əməliyyat rejiminə daxil olunur"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Toplu əməliyyat rejimi tərk edilir"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seçildi"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seçilmədi"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üçün kontakt detalları"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> şübhəli spam zəng edəni üçün kontakt detalları"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> zəng."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video çağrı."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> adlı şəxsə SMS göndər"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Eşidilməmiş səsli mesaj"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Səs axtarışına başlayın"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> zəng edin"</string>
     <string name="voicemail" msgid="8899540969000957954">"Səsli poçt"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> san"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> dəq <xliff:g id="SECONDS">%s</xliff:g> san"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"səsli e-məktub"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"səsli e-məktublar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Bəli"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Xeyr"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Seçilmiş <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> silinsin?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Qrup əməliyyatları rejimini ləğv edin"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Silin"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ləğv edin"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seçilib"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
+      <item quantity="one">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> tarixində <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Bu nömrəyə zəng etmək mümkün deyil"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Səsli poçtu ayarlamaq üçün Menyu &gt; Ayarlar bölməsinə gedin."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Səsli poçta zəng etmək üçün Təyyarə rejimini söndürün."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Yüklənir…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM kartdan yüklənir..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM kart kontaktları"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Əlaqələr proqramı mövcud deyil"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Səsli axtarış mövcud deyil"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefon tətbiqi deaktiv edildiyinə görə telefon zəngi etmək mümkün deyil."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kontakt axtarın"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Nömrə əlavə edin və ya kontaktlarda axtarın"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Zəng tarixçəniz boşdur"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Zəng edin"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Buraxılmış heç bir zənginiz yoxdur."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Səsli poçt qutunuz boşdur."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Yalnız seçilmişləri göstər"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Çağrı Tarixçəsi"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Bütün"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Buraxılmış"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Səsli poçt"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Sürətli nömrə yığımı"</string>
     <string name="tab_history" msgid="7420269368689503596">"Zəng Tarixçəsi"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktlar"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Səsli poçt"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Seçilmişlərdən silindi"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Geri qaytar"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> zəng edin"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yeni kontakt yaradın"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Kontakta əlavə edin"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS göndərin"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Video zəng edin"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nömrəni blok edin"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> yeni buraxılmış zəng"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Hələ sürətli zəng siyahınızda hec kim yoxdur"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Sevimlilərə əlavə edin"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Hələ heç bir kontaktınız yoxdur"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Kontakt əlavə edin"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Bütün nömrələri görmək üçün təsvirə toxunun və ya yenidən qaydaya salmaq üçün basıb saxlayın"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Yığışdır"</string>
+    <string name="select_all" msgid="408601760696146245">"Hamısını seçin"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video zəng"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Mesaj göndərin"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Zəng detalları"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Çağrı <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> video zəng edin."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tərəfdən səsli mesajı dinləyin"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> nömrəsindən gələn səsli mesajı oxudun"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> nömrəsindən gələn səsli mesajı durdurun"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> nömrəsindən gələn səsli mesajı silin"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yeni səsli mesaj</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yeni səsli mesaj</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> üçün kontakt yaradın"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Mövcud kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g> əlavə edin"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> üçün detalları çağırın"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Zəng tarixçəsindən silindi"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Bu gün"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dünən"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Keçmi"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Zənglər siyahısı"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Dinamiki aktiv et."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Dinamiki deaktiv et."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Daha sürətlə oxut."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Daha yavaş oxut."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Oxunuşu başlat və ya durdur"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Ekran seçimləri"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Səslər və vibrasiya"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Zənglər"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zəng blok edilir"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Səsli e-məktub"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Səsli e-poçt üçün SIM seçin"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrının blok edilməsi müvəqqəti olaraq deaktiv edilib"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat ərzində bu telefondan təcili yardım xidmətləri ilə əlaqə saxladığınız üçün Çağrı Bloklanması deaktiv edildi. 48 saatlıq müddət başa çatdıqda avtomatik olaraq yenidən aktiv ediləcək."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nömrələri import edin"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Bloklanmış nömrələr"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> artıq bloklanıb."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Hesabların çağrılması"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktiv edin"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"İcazələri quraşdırın"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Sürətli yığımı aktivləşdirmək üçün, Kontakt icazələrini aktivləşdirin."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Çağrı jurnalınızı görmək üçün Telefon icazəsini aktivləşdirin."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kontaktlarınızı görmək üçün Kontakt icazəsini aktivləşdirin."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Səsli poçta daxil olmaq üçün, Telefon icazəsini aktivləşdirin."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kontaktlarınızı axtarmaq üçün, Kontakt icazələrini aktiv edin."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Zəng etmək üçün, Telefon icazəsini aktivləşdirin."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon tətbiqinin sistem ayarlarına yazmaq icazəsi yoxdur."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> oflayn olduğu üçün əlaqə saxlamaq mümkün deyil"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Haqqında"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google tərəfindən kopyalandı"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google kopyalayır..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkripsiya əlçatan deyil"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Baxın"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Zəng silindi. Bu zəng zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Zənglər silindi. Bu zənglər zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
index 9df7291..aeff07e 100644
--- a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tastatura"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Istorija poziva"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Prijavi netačan broj"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj transkripciju"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokiraj broj"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblokiraj broj"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Izmeni broj pre poziva"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Obriši istoriju poziva"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poruku"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite da obrišete istoriju poziva?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ovo će izbrisati sve pozive iz istorije"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Briše se istorija poziva…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušten poziv"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušten poziv za Work"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
@@ -49,107 +44,67 @@
       <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> govorne poruke </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> govornih poruka </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Pusti"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna poruka od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Puštanje govorne pošte nije uspelo"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Govorna pošta se učitava…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Govorna pošta se arhivira…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Učitavanje govorne pošte nije uspelo"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Samo pozivi sa govornom poštom"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Samo dolazni pozivi"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Samo odlazni pozivi"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Samo propušteni pozivi"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pretraži"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"biranje"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"broj za biranje"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Pokretanje ili zaustavljanje reprodukcije"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključivanje ili isključivanje spikerfona"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Traženje pozicije u reprodukciji"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Smanjivanje brzine reprodukcije"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Povećavanje brzine reprodukcije"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Istorija poziva"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Još opcija"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatura"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Prikaži samo odlazne"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Prikaži samo dolazne"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Prikaži samo propuštene"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Prikaži samo govorne poruke"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Prikaži sve pozive"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Dodaj pauzu od 2 sekunde"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Podešavanja"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Upotrebite brojčanik za tonsko biranje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vrati se na poziv koji je u toku"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Dodaj poziv"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Dolazni pozivi"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Puštanje govorne pošte"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Prikaži kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Pozovi <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Napravite prečicu za novi UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazite u režim grupnih radnji"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Izašli ste iz režima grupnih radnji"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Izabrano je <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Opozvan je izbor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalji o kontaktu za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontakt informacije potencijalnog nepoželjnog pozivaoca <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> poziva."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video poziv."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Slanje SMS-a za <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nepreslušana govorna pošta"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Pokretanje glasovne pretrage"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"govornu poruku"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"govorne poruke"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite li da izbrišete izabranu(e) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkažite režim grupnih radnji"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Izabranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+      <item quantity="few">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+      <item quantity="other">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nije moguće pozvati ovaj broj"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Da biste podesili govornu poštu, idite u Meni &gt; Podešavanja."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Da biste pozvali govornu poštu, prvo isključite režim rada u avionu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Učitava se…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Učitava se sa SIM kartice…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakti na SIM kartici"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nema dostupne aplikacije za kontakte"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovna pretraga nije dostupna"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nije moguće uputiti telefonski poziv jer je aplikacija Telefon onemogućena."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pretraži kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte broj ili pretražite kontakte"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Istorija poziva je prazna"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Pozovi"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate nijedan propušten poziv."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Prijemno sanduče govorne pošte je prazno."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Prikaži samo omiljene"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Istorija poziva"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Svi"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Govorna pošta"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
     <string name="tab_history" msgid="7420269368689503596">"Istorija poziva"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Uklonjeno je iz omiljenih"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Opozovi"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Napravi novi kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj u kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputi video poziv"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Novih propuštenih poziva: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Nemate nijedan kontakt na brzom biranju"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj omiljen kontakt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Još uvek nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Dodaj kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Dodirnite sliku da biste videli sve brojeve ili dodirnite i zadržite da biste im promenili raspored"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
+    <string name="select_all" msgid="408601760696146245">"Izaberi sve"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video poziv"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalji poziva"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Uputite video poziv kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Pusti govornu poštu od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reprodukuj govornu poštu kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pauziraj govornu poštu kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Izbriši govornu poštu kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nova poruka govorne pošte</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nove poruke govorne pošte</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novih poruka govorne pošte</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Napravite kontakt za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodajte <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalji poziva za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Izbrisano iz istorije poziva"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Juče"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Stariji"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista poziva"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključite zvučnik."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključite zvučnik."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Brža reprodukcija."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Sporija reprodukcija."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Započnite ili pauzirajte reprodukciju."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuci i vibracija"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Izbor SIM-a – podešav. gov. pošte"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno zato što ste kontaktirali službe za pomoć u hitnim slučajevima sa ovog telefona u poslednjih 48 sati. Automatski će biti ponovo omogućeno kada istekne period od 48 sati."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> je već blokiran."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Nalozi za pozivanje"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Uključi"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Podesi dozvole"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Da biste omogućili brzo biranje, uključite dozvolu za Kontakte."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Da biste videli evidenciju poziva, uključite dozvolu za Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Da biste videli kontakte, uključite dozvolu za Kontakte."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Da biste pristupili govornoj pošti, uključite dozvolu za Telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Da biste pretražili kontakte, uključite dozvole za Kontakte."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Da biste uputili poziv, uključite dozvolu za Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nema dozvolu za upisivanje u sistemska podešavanja."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nepoželjan"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> je oflajn i ne možete da ga/je kontaktirate"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Osnovni podaci"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkript je napravio Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google pravi transkript…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkript nije dostupan"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. Pregledajte i izbrišite priloge deljene tokom ovog poziva u Messages-u."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. Pregledajte i izbrišite priloge deljene tokom poziva u Messages-u."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-be/strings.xml b/java/com/android/dialer/app/res/values-be/strings.xml
index aac3df2..fa4c66f 100644
--- a/java/com/android/dialer/app/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/res/values-be/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Тэлефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Клавіятура тэлефона"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Тэлефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Гісторыя выклікаў"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Паведаміць аб недакладным нумары"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Скапіраваць нумар"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Капіраваць транскрыпцыю"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Заблакіраваць нумар"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Разблакіраваць нумар"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Змяніць нумар перад тым, як тэлефанаваць"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Ачысціць гісторыю выклікаў"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Выдаліць галас. паведамленне"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Ачысціць гісторыю выклікаў?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Гэта выдаліць усе выклікі з вашай гісторыі"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Ачыстка гісторыі выклікаў…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Патэлефанаваць"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Прапушчаны выклік"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Прапушчаны выклік па працы"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Прапушчаныя выклікі"</string>
@@ -50,107 +45,68 @@
       <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамленняў галасавой пошты </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамлення галасавой пошты </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Прайграць"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Новае паведамл. ад <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Не ўдалося прайграць галасавую пошту"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Загрузка галасавой пошты…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Архіваванне галасавой пошты..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не ўдалося загрузіць галасавую пошту"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Толькi выклiкі з галасавой поштай"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Толькi ўваходныя выклiкi"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Толькi выходныя выклiкi"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Толькі прапушчаныя выклiкi"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"пошук"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"набор"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"нумар для набору"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Пачаць ці спыніць прайграванне"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Уключыць ці адключыць гучную сувязь"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Шукаць становішча прайгравання"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Панізіць хуткасць прайгравання"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Павялічыць хуткасць прайгравання"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Гісторыя выклікаў"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Дадатковыя параметры"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавіятура"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Паказаць толькі выходныя"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Паказаць толькі ўваходныя"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Паказаць толькі прапушчаныя"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Паказаць толькі галас. пошту"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Паказаць усе выклікі"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Дадаць 2-секундную паўзу"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Дадаць чаканне"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Налады"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Сродак мадэліравання"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Усе кантакты"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Выкарыстанне тонавай клавіятуры"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Звярнуцца да бягучага выкліку"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Дадаць выклік"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Уваходныя выклікі"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Прайграць паведамленне галасавой пошты"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Прагледзець кантакт <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Выклікаць карыстальнiка <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ярлык новага карыст. інтэрфейсу"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Уваход у рэжым групавога дзеяння"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Выхад з рэжыму групавога дзеяння"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Выбрана: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Выбар скасаваны: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Падрабязнасці кантакту для <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Кантактныя даныя абанента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, які падазраецца ў спамерскіх выкліках"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Выклікаў: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Відэавыклік."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Адправіць SMS абаненту <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непраслуханая галасавая пошта"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Пачаць галасавы пошук"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Выклікаць <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Галасавая пошта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"галасавая пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"галасавая пошта"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Так"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Выдаліць вылучанае: <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасаваць рэжым пакетных дзеянняў"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Выдаліць"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасаваць"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрана: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="few">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="many">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+      <item quantity="other">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Немагчыма выклікаць гэты нумар"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Каб наладзіць галасавую пошту, перайдзіце ў раздзел \"Меню &gt; Налады\"."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Каб пазваніць на галасавую пошту, спачатку адключыце Рэжым палёту."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Загрузка..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Загрузка з SIM-карты..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Кантакты SIM-карты"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Праграмы для аперацый з кантактамі няма"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Галасавы пошук недаступны"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Немагчыма зрабіць выклік па тэлефоне, таму што праграма Тэлефон была адключана."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пошук кантактаў"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Дадайце нумар ці шукайце ў кантактах"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Ваша гісторыя выклікаў пустая"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Зрабіць выклік"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"У вас няма прапушчаных выклікаў."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ваша галасавая пошта пустая."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Паказаць толькі ўпадабаныя"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Гісторыя выклікаў"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Усе"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Прапушчаныя"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Галасавая пошта"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Хуткі набор"</string>
     <string name="tab_history" msgid="7420269368689503596">"Гісторыя выклікаў"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Кантакты"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Галасавая пошта"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Выдалена з выбранага"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Адрабіць"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Выклікаць <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Новы кантакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Дадаць у кантакт"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Адправiць SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Зрабіць відэавыклік"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблакіраваць нумар"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Новых прапушчаных выклікаў: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"У вас пакуль нікога няма на хуткім наборы"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Дадаць улюбёны"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"У вас пакуль няма ніякіх кантактаў"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Дадаць кантакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Дакраніцеся да відарыса, каб прагледзець усе нумары, або дакраніцеся і ўтрымлівайце, каб змяніць парадак"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Выдаліць"</string>
+    <string name="select_all" msgid="408601760696146245">"Выбраць усё"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Відэавыклік"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Адправiць паведамленне"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Падрабязнасці выкліку"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Выклікаць <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Відэавыклік ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Праслухаць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Прайграць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Прыпыніць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Выдаліць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> новае паведамленне галасавой пошты</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> новыя паведамленні галасавой пошты</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> новых паведамленняў галасавой пошты</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> новага паведамлення галасавой пошты</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Стварыць кантакт для <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Дадаць <xliff:g id="NAMEORNUMBER">^1</xliff:g> да існуючага кантакту"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Падрабязнасці кантакту для <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Выдалена з гісторыі выклікаў."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Сёння"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Учора"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Больш старыя"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Спіс выклікаў"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Уключыць дынамік."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Адключыць дынамік."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Прайграваць хутчэй."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Прайграваць павольней."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Пачаць ці прыпыніць прайграванне."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Параметры адлюстравання"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Гукі і вібрацыя"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Выклікі"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блакіраванне выклікаў"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Галасавая пошта"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Выбр. SIM для налад гал. пошты"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блакіроўка выклікаў часова адключана"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блакіроўка выклікаў будзе адключана, таму што вы выклікалі экстранныя службы з гэтага тэлефона на працягу апошніх 48 гадзін. Яна будзе аўтаматычна адноўлена пасля заканчэння перыяду ў 48 гадзін."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпартаваць нумары"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Заблакіраваныя нумары"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ужо заблакіраваны."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Уліковыя запісы для выклікаў"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Уключыць"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Задаць дазволы"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Каб уключыць хуткі набор, уключыце дазвол для Кантактаў."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Каб прагледзець свой журнал выклікаў, уключыце дазволы Тэлефона."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Каб бачыць свае кантакты, уключыце дазвол для Кантактаў."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Каб атрымаць доступ да галасавой пошты, уключыце дазвол для Тэлефона."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Каб шукаць свае кантакты, уключыце дазвол для Кантактаў."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Каб зрабіць выклік, уключыце дазвол для Тэлефона."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Праграма Тэлефон не мае дазволу на запіс у налады сістэмы."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> па-за сеткай і не даступны"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Інфармацыя"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Расшыфравана Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google расшыфроўвае..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Расшыфроўка недаступная"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Праглядзець"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Выклік выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтага выкліку."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Выклікі выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтых выклікаў."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bg/strings.xml b/java/com/android/dialer/app/res/values-bg/strings.xml
index 7bab71f..812aaa4 100644
--- a/java/com/android/dialer/app/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/res/values-bg/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефонна клавиатура"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Телефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"История на обажданията"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Сигнал за неправилен номер"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Копиране на номера"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Копиране на преписа"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Блокиране на номера"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Отблокиране на номера"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Редактиране на номера преди обаждане"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Изчистване на историята на обажд."</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Изтриване на гласова поща"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Да се изчисти ли историята на обажд.?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Така ще се изтрият всички обаждания от историята ви"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Историята на обажд. се изчиства…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Телефон"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуснато обаждане"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуснато служебно обаждане"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуснати обаждания"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> гласови съобщения </item>
       <item quantity="one">Гласово съобщение</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Пускане"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова гласова поща от <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Гл. поща не можа да се възпроизведе"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Гласовата поща се зарежда…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Гласовата поща се архивира…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Гласовата поща не можа да се зареди"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Само обаждания с гласова поща"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Само входящи обаждания"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Само изходящи обаждания"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Само пропуснати обаждания"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"търсене"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"набиране"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"номер за набиране"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Пускане или спиране на възпроизвеждането"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Включване или изключване на високоговорителя"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Търсене на позиция за възпроизвеждане"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Намаляване на скоростта на възпроизвеждане"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Увеличаване на скоростта на възпроизвеждане"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"История на обажданията"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Още опции"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"цифрова клавиатура"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Показване само на изходящите"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Показване само на входящите"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Показване само на пропуснатите"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Показване само на гл. поща"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Показване на всички обаждания"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Добавяне на 2-сек пауза"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Добавяне на изчакване"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Всички контакти"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Използване на тонова клавиатура"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Назад към текущото обаждане"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Добавяне на обаждане"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Вх. обаждания"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Пускане на гласовата поща"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Преглед на контактa <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Обаждане на <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Пряк път към новия ПИ"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Влизате в режима на групови действия"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Излязохте от режима на групови действия"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Избрахте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Премахнахте избора от <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Подробности за контакта за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Подробности за връзка за обаждащия се <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, евентуално разпространяващ спам"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> обаждания."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видеообаждане."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Изпращане на SMS до <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непрослушана гласова поща"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Стартиране на гласово търсене"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Гласова поща"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"гласово съобщение"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"гласови съобщения"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Избрахте <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> – да се изтрие ли избраното?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Анулиране на режима на групови действия"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Изтриване"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отказ"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрахте <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Да се изтрият ли тези гласови съобщения? "</b>"</item>
+      <item quantity="one">"<b>"Да се изтрие ли това гласово съобщение? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Не можете да се обадите на този номер"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"За да настроите гласовата поща, отворете „Меню“ &gt; „Настройки“."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"За да чуете гласовата си поща, първо изключете самолетния режим."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Зарежда се…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Зарежда се от SIM карта..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Контакти от SIM карта"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Няма налично приложение за контакти"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовото търсене не е налице"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Не може да се осъществи телефонно обаждане, защото приложението Телефон е деактивирано."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Търсене в контактите"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Доб. номер или потърс. контакт"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Историята на обажданията ви е празна"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Извършване на обаждане"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Нямате пропуснати обаждания."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Входящата ви гласова поща е празна."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Показване само на любимите"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"История на обажданията"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Всички"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Пропуснати"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Гл. поща"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Бързо набиране"</string>
     <string name="tab_history" msgid="7420269368689503596">"История на обажданията"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Гласова поща"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Премахнато от любимите"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Отмяна"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Създаване на нов контакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Добавяне към контакт"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Изпращане на SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Провеждане на видеообаждане"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокиране на номера"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> нови пропуснати обаждания"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Още нямате контакти за бързо набиране"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Добавяне на любим контакт"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Още нямате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Добавяне на контакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Докоснете изображението, за да видите всички номера, или го натиснете и задръжте за пренареждане"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Премахване"</string>
+    <string name="select_all" msgid="408601760696146245">"Избиране на всички"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеообаждане"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Изпращане на съобщение"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Подробности за обаждането"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Обаждане на <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеообаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушване на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Пускане на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Поставяне на пауза на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Изтриване на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> нови гласови съобщения</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ново гласово съобщение</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Създаване на контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Добавяне на <xliff:g id="NAMEORNUMBER">^1</xliff:g> към съществуващ контакт"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Подробности за обаждането за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Изтрито от историята на обажданията"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Днес"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"По-стари"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Списък с обаждания"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Включване на високоговорителя."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Изключване на високоговорителя."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"По-бързо възпроизвеждане."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"По-бавно възпроизвеждане."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Стартиране или поставяне на пауза на възпроизвеждането."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Опции за показване"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибриране"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Обаждания"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокиране на обажданията"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Гласова поща"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"SIM за настройки на гл. поща"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокир. на обажданията е временно изкл."</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирането на обажданията е деактивирано, защото в рамките на последните 48 часа сте се свързали със спешните служби от този телефон. То автоматично ще бъде активирано отново, когато периодът от 48 часа изтече."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортиране на номерата"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Блокирани номера"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> вече е блокиран."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Профили за обаждане"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Включване"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Задаване на разрешенията"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"За да активирате бързото набиране, включете разрешението за Контакти."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"За да видите списъка с обажданията си, включете разрешението за Телефон."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"За да видите контактите си, включете разрешението за Контакти."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"За да осъществите достъп до гласовата си поща, включете разрешението за Телефон."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"За да търсите в контактите си, включете разрешенията за тях."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"За да извършите обаждане, включете разрешението за Телефон."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Приложението Телефон няма разрешение да записва в системните настройки."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"С <xliff:g id="NAME">%1$s</xliff:g> не може да се установи връзка, тъй като е офлайн"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Информация"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрибирано от Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google създава препис…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Няма запис"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Преглед"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Обаждането е изтрито. Прегледайте и изтрийте прикачените файлове, споделени по време на това обаждане в Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Обажданията са изтрити. Прегледайте и изтрийте прикачените файлове, споделени по време на обажданията в Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bn/strings.xml b/java/com/android/dialer/app/res/values-bn/strings.xml
index 271247b..ab0d896 100644
--- a/java/com/android/dialer/app/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/res/values-bn/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ফোন"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ফোনের কীপ্যাড"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ফোন"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"পুরোনো কলের তালিকা"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"ভুল নম্বর অভিযোগ করুন"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"নম্বর প্রতিলিপি করুন"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ট্রান্সক্রিপশান প্রতিলিপি করুন"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"নম্বর অবরোধ করুন"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"নম্বর অবরোধ মুক্ত করুন"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"কল করার আগে নম্বর সম্পাদনা করুন"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"পুরোনো কলের তালিকা সাফ করুন"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ভয়েসমেল মুছুন"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"পুরোনো কলের তালিকা সাফ করবেন?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"এটি আপনার ইতিহাস থেকে সমস্ত কল মুছে দেবে"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"পুরোনো কলের তালিকা সাফ করা হচ্ছে…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ফোন"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"মিসড কল"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"কাজের কল মিস করেছেন"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"মিস করা কলগুলি"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g>টি ভয়েসমেল </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g>টি ভয়েসমেল </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"শুনুন"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> এর থেকে নতুন ভয়েসমেল"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ভয়েসমেল প্লে করা যায়নি"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ভয়েসমেল লোড করা হচ্ছে..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ভয়েসমেল সংরক্ষণাগারভুক্ত করা হচ্ছে…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ভয়েসমেল লোড করা যায়নি"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"কেবলমাত্র ভয়েসমেলের সাথে কলগুলি"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"কেবলমাত্র ইনকামিং কলগুলি"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"কেবলমাত্র আউটগোয়িং কলগুলি"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"কেবলমাত্র মিসড কলগুলি"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"অনুসন্ধান"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ডায়াল করুন"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ডায়াল করার জন্য নম্বর"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"প্লেব্যাক প্লে করুন বা থামান"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"স্পিকার চালু বা বন্ধ করুন"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"প্লেব্যাক অবস্থান খুঁজুন"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"প্লেব্যাকের হার হ্রাস করুন"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"প্লেব্যাকের হার বৃদ্ধি করুন"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"কলের ইতিহাস"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"আরো বিকল্প"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"কীপ্যাড"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"কেবলমাত্র আউটগোয়িং দেখান"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"কেবলমাত্র ইনকামিং দেখান"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"কেবলমাত্র মিসড দেখান"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"কেবলমাত্র ভয়েসমেলগুলি দেখান"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"সমস্ত কল দেখান"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"২- সেকেন্ড বিরতি যোগ করুন"</string>
-    <string name="add_wait" msgid="1177723010768282578">"অপেক্ষা যোগ করুন"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"সেটিংস"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"সিমুলেটার"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"সকল পরিচিতি"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"স্পর্শ স্বর কীপ্যাড ব্যবহার করুন"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"প্রগতিতে থাকা কলে প্রত্যাবর্তন"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"কল যোগ করুন"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ইনকামিং কলগুলি"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ভয়েসমেল প্লে করুন"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> পরিচিতি দেখুন"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> কে কল করুন"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"নতুন UI শর্টকাট তৈরি করুন"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"বাল্ক অ্যাকশন মোডে প্রবেশ করা হচ্ছে"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"বাল্ক অ্যাকশন মোড ত্যাগ করুন"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> নির্বাচন করা হয়েছে"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> অনির্বাচন করা হয়েছে"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> পরিচিতির বিশদ বিবরণ"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"সন্দেহভাজন স্প্যাম কলারের পরিচিতির বিশদ বিবরণ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>টি কল৷"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ভিডিও কল।"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> কে SMS পাঠান"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"না শোনা ভয়েসমেল"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ভয়েস অনুসন্ধান শুরু করুন"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> এ কল করুন"</string>
     <string name="voicemail" msgid="8899540969000957954">"ভয়েসমেল"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> মিনিট <xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ভয়েসমেল"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ভয়েসমেলগুলি"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"হ্যাঁ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"না"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"নির্বাচিত <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> মুছে ফেলতে চান?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ব্যাচ অ্যাকশন মোড বাতিল করুন"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"মুছুন"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"বাতিল করুন"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>টি নির্বাচিত"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
+      <item quantity="other">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> তারিখে <xliff:g id="TIME">%2$s</xliff:g>\'টায়"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"এই নম্বরে কল করতে পারবেন না"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ভয়েসমেল সেট আপ করতে, মেনু &gt; সেটিংস এ যান৷"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ভয়েসমেলে কল করতে, সবার আগে বিমানমোড বন্ধ করুন৷"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"লোড হচ্ছে..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"সিম কার্ড থেকে লোড করা হচ্ছে…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"সিম কার্ডের পরিচিতিগুলি"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"কোনো পরিচিতি অ্যাপ্লিকেশান উপলব্ধ নয়"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ভয়েস অনুসন্ধান অনুপলব্ধ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"কোনো ফোন কল করা যাবে না কারণ ফোন অ্যাপ্লিকেশানটি অক্ষম করা হয়েছে৷"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"পরিচিতিগুলি খুঁজুন"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"সংখ্যা যোগ করুন বা পরিচিতিগুলি অনুসন্ধান করুন"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"আপনার পুরোনো কলের তালিকা খালি আছে"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"একটি কল করুন"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"আপনার কোনো মিসড কল নেই।"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"আপনার ভয়েসমেলের ইনবক্স খালি রয়েছে।"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"কেবলমাত্র পছন্দসইগুলি দেখান"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"পুরোনো কলের তালিকা"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"সমস্ত"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"মিসড"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ভয়েসমেল"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"দ্রুত ডায়াল"</string>
     <string name="tab_history" msgid="7420269368689503596">"পুরোনো কলের তালিকা"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"পরিচিতিগুলি"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ভয়েস মেল"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"পছন্দসই থেকে সরানো হয়েছে"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"পূর্বাবস্থায় ফিরুন"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> এ কল করুন"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"নতুন পরিচিতি বানান"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"একটি পরিচিতিতে যোগ করুন"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS পাঠান"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ভিডিও কল করুন"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"নম্বর অবরোধ করুন"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g>টি নতুন মিসড কল"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"আপনার স্পীড ডায়ালে এখনও পর্যন্ত কেউ নেই"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"একটি পছন্দসই যোগ করুন"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"আপনার এখনও পর্যন্ত কোনো পরিচিতি নেই"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"একটি পরিচিতি যোগ করুন"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"সমস্ত নম্বর দেখতে ছবিতে স্পর্শ করুন বা রেকর্ড করতে স্পর্শ করে ধরে রাখুন"</string>
     <string name="remove_contact" msgid="2353580570488923668">"সরান"</string>
+    <string name="select_all" msgid="408601760696146245">"সবগুলি নির্বাচন করুন"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ভিডিও কল"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"একটি বার্তা পাঠান"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"কলের বিশদ বিবরণ"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কল"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-এ ভিডিও কল করুন।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর থেকে আসা ভয়েসমেল শোনা হয়েছে"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর থেকে ভয়েসমেল প্লে করুন"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর থেকে ভয়েসমেলে বিরাম দিন"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর থেকে ভয়েসমেল মুছুন"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি নতুন ভয়েসমেল</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি নতুন ভয়েসমেল</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর জন্য পরিচিতি তৈরি করুন"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"বিদ্যমান পরিচিতিতে <xliff:g id="NAMEORNUMBER">^1</xliff:g> যোগ করুন"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কলের বিবরণ"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"কলের ইতিহাস থেকে মোছা হয়েছে"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"আজ"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"গতকাল"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"পুরোনো"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"কলগুলির তালিকা"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"স্পিকার চালু করুন৷"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"স্পিকার বন্ধ করুন৷"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"দ্রুত প্লে করুন৷"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ধীরে প্লে করুন৷"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"প্লেব্যাক শুরু করুন বা বিরতি দিন৷"</string>
     <string name="display_options_title" msgid="3880091801055797975">"প্রদর্শনের বিকল্পগুলি"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"শব্দ এবং কম্পন"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"কল"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"কল অবরোধ করা"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ভয়েসমেল"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ভয়েসমেল সেটিংসের জন্য সিম নির্বাচন করুন"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"কল অবরোধ সাময়িকভাবে বন্ধ রয়েছে"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"কল অবরোধ অক্ষম করা হয়েছে কারণ আপনি গত ২৮ ঘন্টার মধ্যে এই ফোন থেকে জরুরি পরিষেবায় যোগাযোগ করেছেন। ২৮ ঘন্টার সময়সীমা পেরিয়ে গেলেই এটি স্বয়ংক্রিয়ভাবে আবার সক্ষম হবে।"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"নম্বরগুলি আমদানি করুন"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ব্লক করা নাম্বারগুলি"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ইতিমধ্যেই অববোধ করা রয়েছে৷"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"কলিং অ্যাকাউন্টগুলি"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"চালু করুন"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"অনুমতিগুলি সেট করুন"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"স্পীড ডায়াল সক্ষম করতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"আপনার কল লগ দেখতে, ফোনের অনুমতি চালু করুন।"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"আপনার পরিচিতিগুলি দেখতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"আপনার ভয়েসমেল অ্যাক্সেস করতে, ফোনের অনুমতি চালু করুন।"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"আপনার পরিচিতিগুলি অনুসন্ধান করতে, পরিচিতির অনুমতিগুলি চালু করুন।"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"একটি কল করতে, ফোনের অনুমতি চালু করুন।"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ফোনের অ্যাপ্লিকেশানকে সিস্টেম সেটিংসে লেখার অনুমতি দেওয়া হয়নি।"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"স্প্যাম"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> এখন অফলাইনে থাকায় যোগাযোগ করা যাবে না"</string>
     <string name="about_phone_label" msgid="582991354677973731">"সম্পর্কে"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google এর প্রতিলিপি করা হয়েছে"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ট্রান্সক্রাইব করছে …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"প্রতিলিপি উপলব্ধ নয়"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"দেখুন"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"কল মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তি দেখুন ও মুছুন।"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"কলগুলি মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তিগুলি দেখুন ও মুছুন।"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bs/strings.xml b/java/com/android/dialer/app/res/values-bs/strings.xml
index 92c9c14..b55f901 100644
--- a/java/com/android/dialer/app/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/res/values-bs/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tastatura"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historija poziva"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Prijavi netačan broj"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj transkripciju"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokiraj broj"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblokiraj broj"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Uredi broj prije poziva"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Obriši historiju poziva"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poštu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Obrisati historiju poziva?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ovo će izbrisati sve pozive iz historije"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Brisanje historije poziva u toku…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušteni poziv"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušteni poslovni poziv"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
@@ -49,107 +44,67 @@
       <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> Poruke govorne pošte </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Poruka govorne pošte </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Pokreni"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna pošta od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nije moguće pokrenuti govornu poštu"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Učitavanje govorne pošte…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arhiviranje govorne pošte..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nije moguće učitati govornu poštu"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Samo pozivi s govornom poštom"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Samo dolazni pozivi"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Samo odlazni pozivi"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Samo propušteni pozivi"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pretraga"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"biraj"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"broj za biranje"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Pokreni ili zaustavi pokretanje"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključi ili isključi zvučnik"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Traženje položaja reprodukcije"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Smanjenje brzine reprodukcije"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Povećavanje brzine reprodukcije"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historija poziva"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Više opcija"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"telefonska tastatura"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Prikaži samo odlazne"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Prikaži samo dolazne"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Prikaži samo propuštene"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Prikaži samo govornu poštu"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Prikaži sve pozive"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Dodaj pauzu od 2 sekunde"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Koristi tastaturu za tonsko biranje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Povratak na poziv u toku"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Dodaj poziv"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Dolazni pozivi"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Pokretanje govorne pošte"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Prikaži kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Pozovi kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kreiraj prečicu za novi UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazak u način rada za skupnu radnju"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Napuštanje načina rada za skupnu radnju"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Odabrano <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Poništen odabir <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalji o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalji o kontaktu za potencijalnog neželjenog pozivaoca <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videopoziv."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Pošalji SMS kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nepreslušana govorna pošta"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Pokreni glasovnu pretragu"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="description_start_voice_search" msgid="8380022725973015261">"Pokreni glasovno pretraživanje"</string>
     <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"poruka govorne pošte"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"poruke govorne pošte"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Izbrisati izabranu/e <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način rada za grupnu radnju"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+      <item quantity="few">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+      <item quantity="other">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nije moguće pozvati ovaj broj"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Da postavite govornu poštu, idite na Meni &gt; Postavke."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Da pozovete govornu poštu, prvo isključite Način rada u avionu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Učitavanje..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Učitavanje sa SIM kartice…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakti sa SIM kartice"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nije dostupna nijedna aplikacija za kontakte"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovna pretraga nije dostupna"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nije moguće uputiti poziv jer je aplikacija Telefon onemogućena."</string>
+    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno pretraživanje nije dostupno"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Traži kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte broj ili tražite kontakte"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Vaša historija poziva je prazna."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Pozovi"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate propuštenih poziva."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Vaše sanduče govorne pošte je prazno."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Prikaži samo favorite"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historija poziva"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Sve"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Govorna pošta"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historija poziva"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Uklonjeno iz favorita"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Poništi"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Napravi novi kontakt"</string>
+    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izrada novog kontakta"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj u kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputi videopoziv"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Broj novih propuštenih poziva: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Nemate nikog na brzom biranju"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj u favorite"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Dodaj kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Dodirnite sliku da vidite sve brojeve ili dodirnite i držite da promijenite raspored."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
+    <string name="select_all" msgid="408601760696146245">"Odaberi sve"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalji o pozivu"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Uputi videopoziv kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Preslušaj govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Pokreni govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pauziraj govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Izbriši govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nova poruka govorne pošte</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nove poruke govorne pošte</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novih poruka govorne pošte</item>
-    </plurals>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Napravi kontakt za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
+    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kreirajte kontakt za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodaj <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalji poziva za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Izbrisano iz historije poziva"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jučer"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Starije"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista poziva"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključite zvučnik."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključivanje zvučnika."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Brže pokretanje."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Sporije pokretanje.."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pokreni ili pauziraj pokretanje"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvukovi i vibracija"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Odaberite SIM karticu za postavke govorne pošte"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno jer ste kontaktirali hitnu službu s ovog telefona u proteklih 48 sati. Automatski će se ponovo omogućiti kada istekne 48 sati."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> je već blokiran."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Računi za pozivanje"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Uključi"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Postavi dozvole"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Da omogućite brzo biranje, uključite dozvolu za Kontakte."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Da vidite popis poziva, uključite dozvolu za Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Da vidite kontakte, uključite dozvolu za Kontakte."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Da pristupite govornoj pošti,uključite dozvolu za telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Da pretražujete kontakte, uključite dozvole za Kontakte."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Da uputite poziv, uključite dozvolu za Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija za telefon nema dozvolu za pisanje u postavkama sistema."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Neželjena pošta"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Osoba <xliff:g id="NAME">%1$s</xliff:g> je van mreže i ne možete je kontaktirati"</string>
     <string name="about_phone_label" msgid="582991354677973731">"O aplikaciji"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribirao Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkribira…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkript nije dostupan"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. Pogledajte i izbrišite priloge podijeljene tokom ovog poziva u aplikaciji Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. Pogledajte i izbrišite priloge podijeljene tokom poziva u aplikaciji Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ca/strings.xml b/java/com/android/dialer/app/res/values-ca/strings.xml
index fa04dd9..e87a615 100644
--- a/java/com/android/dialer/app/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/res/values-ca/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telèfon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclat del telèfon"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telèfon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de trucades"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informa d\'un número incorrecte"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copia el número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copia la transcripció"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloqueja el número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloqueja el número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edita el número abans de trucar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Esborra l\'historial de trucades"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Suprimeix la bústia de veu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Esborrar l\'historial de trucades?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se suprimiran totes les trucades de l\'historial."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Esborrant historial de trucades..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telèfon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Trucada perduda"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Trucada perduda de feina"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Trucades perdudes"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> bústies de veu </item>
       <item quantity="one">Bústia de veu</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reprodueix"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nou missatge de veu de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Error en reproduir el missatge de veu."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"S\'està carregant la bústia de veu..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"S\'estan arxivant els missatges de veu…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"No s\'ha pogut carregar la bústia de veu."</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Només trucades amb bústia de veu"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Només trucades entrants"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Només trucades sortints"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Només trucades perdudes"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"cerca"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"marca"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número que es marcarà"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Reprodueix o atura la reproducció"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activa o desactiva el mans lliures"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Cerca la posició de la reproducció"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Disminueix la velocitat de la reproducció"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Augmenta la velocitat de la reproducció"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de trucades"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Més opcions"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclat"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostra només trucades sortints"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostra només trucades entrants"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostra només trucades perdudes"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Mostra només missatges de veu"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostra totes les trucades"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Afegeix una pausa de 2 segons"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Afegeix espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuració"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tots els contactes"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utilitza el teclat de tons"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Torna a la trucada en curs"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Afegeix una trucada"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Trucades entrants"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reprodueix el missatge de veu"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Visualitza el contacte <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Truca a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea drecera per a la nova IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"S\'està accedint al mode d\'acció massiva"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"S\'ha sortit del mode d\'acció massiva"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"S\'ha seleccionat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"S\'ha desseleccionat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Dades de contacte de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Dades de contacte de la possible trucada brossa: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> trucades"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videotrucada"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Envia un SMS a <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Missatge de veu no escoltat"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Inicia la cerca per veu"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Bústia de veu"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"missatge de veu"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"missatges de veu"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vols suprimir l\'element o elements seleccionats (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel·la el mode d\'accions en lot"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Suprimeix"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel·la"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionades"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vols suprimir aquests missatges de veu? "</b>"</item>
+      <item quantity="one">"<b>"Vols suprimir aquest missatge de veu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a les <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"No es pot trucar a aquest número."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Per configurar els missatges de veu, vés a Menú &gt; Configuració."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"S\'està carregant…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"S\'està carregant des de la targeta SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contactes de la targeta SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No hi ha cap contacte disponible."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"La cerca per veu no està disponible."</string>
-    <string name="call_not_available" msgid="7850148370757361155">"No es pot fer una trucada telefònica perquè s\'ha desactivat l\'aplicació de telèfon."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cerca als contactes"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Afegeix núm. o cerca contactes"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"El teu historial de trucades és buit"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Fes una trucada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"No tens cap trucada perduda."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La safata d\'entrada de la bústia de veu està buida."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostra només els preferits"</string>
+    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La safata d\'entrada de la bústia de veu és buida."</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de trucades"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Totes"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdudes"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Missatge de veu"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Marcatge ràpid"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historial de trucades"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contactes"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Bústia de veu"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eliminat dels preferits"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Desfés"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crea un contacte"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Afegeix a un contacte"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envia SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fes una videotrucada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloqueja el número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> trucades perdudes noves"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Encara no tens cap contacte al marcatge ràpid"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Afegeix un preferit"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Encara no tens cap contacte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Afegeix un contacte"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toca la imatge per veure\'n tots els números o bé mantén-la premuda per canviar-ne l\'ordre"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Suprimeix"</string>
+    <string name="select_all" msgid="408601760696146245">"Selecciona-ho tot"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videotrucada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envia un missatge"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalls de la trucada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Truca a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videotrucada amb <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escolta el missatge a la bústia de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reprodueix el missatge de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Posa en pausa el missatge de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Suprimeix el missatge de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nous correus de veu</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nou correu de veu</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crea un contacte per a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Afegeix <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacte existent"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalls de la trucada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"S\'ha suprimit de l\'historial de trucades."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Avui"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ahir"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Més antiga"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Llista de trucades"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activa l\'altaveu."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactiva l\'altaveu."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reprodueix més ràpidament."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reprodueix més lentament."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicia la reproducció o la posa en pausa."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcions de visualització"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons i vibració"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Trucades"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueig de trucades"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Bústia de veu"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Tria la SIM per a la configuració de la bústia"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueig de trucades desactivat tempor."</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"El bloqueig de trucades s\'ha desactivat perquè has contactat amb els serveis d\'emergència des d\'aquest telèfon durant les últimes 48 hores. Es tornarà a activar automàticament una vegada transcorregut el període de 48 hores."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa els números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloquejats"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ja està bloquejat."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes de trucades"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activa"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Defineix els permisos"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Activa el permís Contactes per activar el marcatge ràpid."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Activa el permís Telèfon per veure el teu registre de trucades."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Activa el permís Contactes per veure els teus contactes."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Activa el permís Telèfon per accedir a la bústia de veu."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Per cercar els teus contactes, activa els permisos de Contactes."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Activa el permís Telèfon per fer una trucada."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'aplicació Telèfon no té permís per escriure a la configuració del sistema."</string>
@@ -227,7 +165,13 @@
     <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloqueja el número"</string>
     <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No és una trucada brossa"</string>
     <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloqueja el número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Contingut brossa"</string>
+    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Trucada brossa"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> no té connexió i no s\'hi pot contactar"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Informació"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcripció feta per Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google està transcrivint…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcripció no disponible"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Mostra"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"S\'ha suprimit la trucada. Consulta i suprimeix els fitxers adjunts compartits durant aquesta trucada a Missatges."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"S\'han suprimit les trucades. Consulta i suprimeix els fitxers adjunts compartits durant les trucades a Missatges."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-cs/strings.xml b/java/com/android/dialer/app/res/values-cs/strings.xml
index 5a3e429..d69c96e 100644
--- a/java/com/android/dialer/app/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/res/values-cs/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klávesnice telefonu"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historie volání"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Nahlásit nesprávné číslo"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopírovat číslo"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopírovat přepis"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokovat číslo"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Zrušit blokování čísla"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Před voláním upravit číslo"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Vymazat historii volání"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Smazat hlasovou zprávu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vymazat historii hovorů?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tímto z historie smažete všechny hovory."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Mazání historie volání…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Zmeškaný hovor"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zmeškaný pracovní hovor"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Zmeškané hovory"</string>
@@ -50,107 +45,68 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> hlasových zpráv </item>
       <item quantity="one">Hlasová zpráva</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Přehrát"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nová hlasová zpráva – <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Hlasovou schránku nelze přehrát."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Načítání hlasové schránky…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivace hlasové zprávy…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hlasovou schránku nelze načíst."</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Jen hovory s hlasovou schránkou"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Jen příchozí hovory"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Jen odchozí hovory"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Jen zmeškané hovory"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"vyhledat"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"vytáčení"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"vytáčené číslo"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Spuštění a zastavení přehrávání"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Zapnutí a vypnutí reproduktoru"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Vyhledání pozice přehrávání"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Snížení rychlosti přehrávání"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Zvýšení rychlosti přehrávání"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historie volání"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Více možností"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klávesnice"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Zobrazit pouze odchozí"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Zobrazit pouze příchozí"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Zobrazit pouze zmeškané"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Zobrazit pouze hlas. schránku"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Zobrazit všechny hovory"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Přidat pauzu 2 s"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Přidat čekání"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavení"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Všechny kontakty"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Použít dotykovou tónovou klávesnici"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Návrat k probíhajícímu hovoru"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Přidat hovor"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Příchozí volání"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Přehrát hlasovou schránku"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Zobrazit kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Volat kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vytv. zkratku na nové rozhraní"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Vstupování do režimu hromadných akcí"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Opustili jste režim hromadných akcí"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> je vybrána"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> není vybrána"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti kontaktu pro <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktní údaje volajícího podezřelého ze spamu: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Počet hovorů: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videohovor"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Odeslat SMS kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nevyslechnutá hlasová zpráva"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Spustit hlasové vyhledávání"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Zavolat <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Hlasová schránka"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"vybranou hlasovou zprávu"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"vybrané hlasové zprávy"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ano"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Smazat <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušit režim hromadných akcí"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Smazat"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušit"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybráno: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="many">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="other">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
+      <item quantity="one">"<b>"Smazat tuto hlasovou zprávu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> v <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Na toto číslo nelze volat."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Pokud chcete nastavit hlasovou schránku, přejděte na nabídku &gt; Nastavení."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Pokud chcete volat do hlasové schránky, vypněte nejdříve režim letadla."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Načítá se..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Načítání ze SIM karty..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakty na SIM kartě"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Není k dispozici žádná aplikace pro práci s kontakty."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Hlasové vyhledávání není k dispozici."</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefonický hovor nelze uskutečnit, protože aplikace Telefon byla zakázána."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Vyhledat kontakty"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Přidejte číslo nebo vyhledejte kontakty"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Historie volání je prázdná"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Zavolat"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemáte žádné zmeškané hovory."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hlasová schránka je prázdná."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Zobrazit pouze oblíbené"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historie volání"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Všechny"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Zmeškané"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Schránka"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Rychlá volba"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historie volání"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Hlasová schránka"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Odebráno z oblíbených"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Vrátit zpět"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zavolat <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Vytvořit nový kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Přidat ke kontaktu"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Odeslat SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uskutečnit videohovor"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokovat číslo"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Nové zmeškané hovory: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"V rychlém vytáčení zatím nemáte žádný kontakt."</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Přidat oblíbený kontakt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Zatím nemáte žádné kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Přidat kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Klepnutím na obrázek zobrazíte všechna čísla. Podržením můžete změnit pořadí."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Odstranit"</string>
+    <string name="select_all" msgid="408601760696146245">"Vybrat všechny"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Odeslat zprávu"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Volat kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videohovor s kontaktem <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Poslech hlasové schránky od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Přehrát hlasovou zprávu od kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pozastavit hlasovou zprávu od kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Smazat hlasovou zprávu od kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nové zprávy v hlasové schránce</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> nové zprávy v hlasové schránce</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nových zpráv v hlasové schránce</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nová zpráva v hlasové schránce</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Pro záznam <xliff:g id="NAMEORNUMBER">^1</xliff:g> se vytvoří nový kontakt"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Záznam <xliff:g id="NAMEORNUMBER">^1</xliff:g> se přidá k existujícímu kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti volání <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Smazáno z historie volání"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Dnes"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včera"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Starší"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Seznam volání"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Zapnout reproduktor."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vypnout reproduktor."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Přehrávat rychleji."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Přehrávat pomaleji."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Spustit nebo pozastavit přehrávání."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Možnosti zobrazení"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuky a vibrace"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Volání"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokování hovorů"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Vyberte SIM kartu k nastavení hlasové schránky"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokování hovorů je dočasně vypnuto"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Protože jste z tohoto telefonu během posledních 48 hodin volali na tísňovou linku, bylo blokování hovorů vypnuto. Po uplynutí 48 hodin se automaticky znovu zapne."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovat čísla"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokovaná čísla"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je již blokováno."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Účty pro volání"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Zapnout"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Nastavit oprávnění"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Chcete-li povolit rychlé vytáčení, aktivujte oprávnění Kontakty."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Chcete-li zobrazit seznam hovorů, aktivujte oprávnění Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Chcete-li zobrazit kontakty, aktivujte oprávnění Kontakty."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Chcete-li přejít do hlasové schránky, aktivujte oprávnění Telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Chcete-li uskutečnit hovor, aktivujte oprávnění Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikace Telefon nemá oprávnění provádět zápis do nastavení systému."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Uživatel <xliff:g id="NAME">%1$s</xliff:g> je offline a není možné se s ním spojit"</string>
     <string name="about_phone_label" msgid="582991354677973731">"O aplikaci"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Přepsáno Googlem"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google přepisuje zprávu…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Přepis není k dispozici"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Zobrazit"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Hovor byl smazán. Přílohy sdílené během něj můžete zobrazit a smazat v aplikaci Zprávy."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hovory byly smazány. Přílohy sdílené během nich můžete zobrazit a smazat v aplikaci Zprávy."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml
index 42aa663..be2dd48 100644
--- a/java/com/android/dialer/app/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/res/values-da/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Opkald"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Opkald"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Opkaldshistorik"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Rapportér et forkert nummer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transskriptionen"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloker nummeret"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Ophæv blokering af nummeret"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Rediger nummeret før opkald"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Ryd opkaldshistorik"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slet talemeddelelsen"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du rydde opkaldshistorikken?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette vil slette alle opkald fra din historik"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Opkaldshistorik ryddes..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ubesvarede opkald"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ubesvaret arbejdsopkald"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Ubesvarede opkald"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> talebeskeder </item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talebeskeder </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Spil"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny besked fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Telefonsvarerbesked kan ikke afspilles"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Telefonsvarerbesked indlæses..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arkiverer talebeskeden…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Telefonsvarerbesked kan ikke indlæses"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Kun opkald med telefonsvarer"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Kun indgående opkald"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Kun udgående opkald"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Kun ubesvarede opkald"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"søg"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ring op"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nummer at ringe op"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Start eller stop afspilning"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå medhør til eller fra"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Søg efter afspilningsposition"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Skru ned for afspilningshastigheden"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Skru op for afspilningshastigheden"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Opkaldshistorik"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere valgmuligheder"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatur"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Vis kun udgående"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Vis kun indgående"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Vis kun ubesvarede"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Vis kun telefonsvarerbeskeder"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Vis alle opkald"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Tilføj pause på 2 sek."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Tilføj ventetid"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Indstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Brug numerisk tastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vend tilbage til igangværende opkald"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Tilføj opkald"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Indgående opkald"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Afspil telefonsvarerbesked"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Vis kontaktpersonen <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ring til <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Opret ny brugerfladegenvej"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Massehandlingstilstanden startes"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingstilstanden blev afsluttet"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fravalgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktoplysninger for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktoplysninger om formodet spammer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> opkald."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videoopkald."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send sms-besked til <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Uaflyttet besked på telefonsvareren"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøgning"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talebesked"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talebeskeder"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nej"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vil du slette de valgte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuller massehandlingstilstand"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slet"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuller"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Vil du slette denne talebesked? "</b>"</item>
+      <item quantity="other">"<b>"Vil du slette disse talebeskeder? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Det er ikke muligt at ringe til dette nummer"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Hvis du vil konfigurere telefonsvareren, skal du gå til Menu &gt; Indstillinger."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Hvis du vil ringe til telefonsvareren, skal du først slå Flytilstand fra."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Indlæser…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI-nummer"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Indlæser fra SIM-kort ..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakter på SIM-kort"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Der er ingen app til kontaktpersoner"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøgning er ikke tilgængelig"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Det er ikke muligt at foretage et telefonopkald, fordi applikationen Telefon er deaktiveret."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søg i kontakter"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Tilføj nummer, eller søg i kontaktpersoner"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Din opkaldshistorik er tom"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Foretag et opkald"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen ubesvarede opkald."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Indbakken for din telefonsvarer er tom."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Vis kun foretrukne"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Opkaldshistorik"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarede"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Talebesked"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigopkald"</string>
     <string name="tab_history" msgid="7420269368689503596">"Opkaldshistorik"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktpersoner"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Telefonsvarer"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Fjernet fra foretrukne"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Fortryd"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opret ny kontaktperson"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Føj til en kontaktperson"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send sms"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Foretag videoopkald"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloker nummer"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nye ubesvarede opkald"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Der er endnu ingen kontaktpersoner i Hurtigopkald"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Angiv en kontaktperson som foretrukken"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Du har endnu ikke nogen kontaktpersoner"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Tilføj en kontaktperson"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tryk på billedet for at se alle numre, eller tryk og hold nede på billedet for at omarrangere"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
+    <string name="select_all" msgid="408601760696146245">"Vælg alt"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoopkald"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en sms-besked"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Opkaldsinfo"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videoopkald <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lyt til indtalt besked fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Afspil talemeddelelsen fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Sæt talemeddelelsen fra <xliff:g id="NAMEORNUMBER">^1</xliff:g> på pause"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Slet talemeddelelsen fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nye talemeddelelser</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nye talemeddelelser</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opret en kontaktperson for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Føj <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontaktperson"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Opkaldsoplysninger for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Slettet fra opkaldshistorik"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ældre"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Opkaldsliste"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå højttaler til."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå højttaler fra."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Afspil hurtigere."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Afspil langsommere."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start afspilningen, eller sæt den på pause."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Valgmuligheder for visning"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyde og vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Opkald"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Opkaldsblokering"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Telefonsvarer"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Vælg SIM til telefonsvarerindst."</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Opkaldsblokering er midlertidigt slået fra"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Opkaldsblokering er blevet deaktiveret, da du inden for de sidste 48 timer har kontaktet en alarmcentral. Blokeringen aktiveres automatisk igen, når perioden på 48 timer er udløbet."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokerede telefonnumre"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokeret."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Opkaldskonti"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktivér"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Angiv tilladelser"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Slå tilladelsen Kontaktpersoner til for at aktivere hurtigopkald."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Slå tilladelsen Telefon til for at se din opkaldsliste."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Slå tilladelsen Kontaktpersoner til for at se dine kontaktpersoner."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Slå tilladelsen Telefon til for at få adgang til din telefonsvarer,"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Hvis du vil søge i dine kontaktpersoner, skal du slå tilladelserne Kontaktpersoner til."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Slå tilladelsen Telefon til for at foretage et opkald."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Opkaldsappen har ikke tilladelse til at ændre systemindstillinger."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er offline og kan ikke nås"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transskriberet af Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transskriberer…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transskription ej tilgængelig"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Vis"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Opkaldet er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med dette opkald, i Beskeder."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Opkaldene er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med opkald, i Beskeder."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-de/strings.xml b/java/com/android/dialer/app/res/values-de/strings.xml
index 5653e0f..48732ef 100644
--- a/java/com/android/dialer/app/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/res/values-de/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Wähltasten für Telefon"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anrufliste"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Falsche Nummer melden"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Nummer kopieren"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Transkription kopieren"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Nummer blockieren"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Blockierung der Nummer aufheben"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Nummer vor Anruf bearbeiten"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Anrufliste löschen"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Mailboxnachricht löschen"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Anrufliste löschen?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Alle Anrufe werden aus deinem Verlauf gelöscht."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Anrufliste wird gelöscht…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Entgangener Anruf"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Verpasster geschäftlicher Anruf"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Entgangene Anrufe"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Mailboxnachrichten </item>
       <item quantity="one">Mailboxnachricht</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Anhören"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Neue Mailboxnachricht von <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Mailboxnachricht-Wiedergabe nicht möglich"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Mailboxnachricht wird geladen…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Mailboxnachricht wird archiviert…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Laden der Mailboxnachricht nicht möglich"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Nur Mailbox-Anrufe"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Nur eingehende Anrufe"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Nur ausgehende Anrufe"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Nur entgangene Anrufe"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"Suchen"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"Wählen"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"Zu wählende Nummer"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Wiedergabe starten oder stoppen"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Freisprechfunktion aktivieren oder deaktivieren"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Wiedergabeposition suchen"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Wiedergabegeschwindigkeit verringern"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Wiedergabegeschwindigkeit erhöhen"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anrufliste"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mehr Optionen"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Wähltasten"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Nur ausgehende Anrufe anzeigen"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Nur eingehende Anrufe anzeigen"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Nur entgangene Anrufe anzeigen"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Nur Mailbox-Nachr. anzeigen"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Alle Anrufe anzeigen"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 Sekunden Pause hinzufügen"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Warten hinzufügen"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Einstellungen"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle Kontakte"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Telefontastatur verwenden"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Zurück zum aktuellen Anruf"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Anruf hinzufügen"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Eingehende Anrufe"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Mailbox abhören"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Kontakt <xliff:g id="NAME">%1$s</xliff:g> anzeigen"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> anrufen"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Verknüpfung für neue Benutzeroberfläche erstellen"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Es wird in den Modus für Bulk-Aktionen gewechselt"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Der Modus für Bulk-Aktionen wurde verlassen"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ausgewählt"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Auswahl für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> aufgehoben"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktdetails für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetails für möglichen Spamanrufer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> Anrufe"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videoanruf"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"SMS an <xliff:g id="NAME">%1$s</xliff:g> senden"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nicht abgehörte Mailboxnachricht"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Sprachsuche starten"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> wählen"</string>
     <string name="voicemail" msgid="8899540969000957954">"Mailbox"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"Mailboxnachricht"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"Mailboxnachrichten"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nein"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ausgewählte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> löschen?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus für Batch-Aktionen abbrechen"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Löschen"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Abbrechen"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ausgewählt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Diese Mailboxnachrichten löschen? "</b>"</item>
+      <item quantity="one">"<b>"Diese Mailboxnachricht löschen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> um <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Diese Nummer kann nicht angerufen werden."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Konfiguriere deine Mailbox unter \"Menü\" &gt; \"Einstellungen\"."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Deaktiviere zunächst den Flugmodus, um die Mailbox anzurufen."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Wird geladen…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Ladevorgang von SIM-Karte läuft..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakte auf SIM-Karte"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Keine Kontakte-App verfügbar"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Sprachsuche nicht verfügbar"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Es kann kein Anruf getätigt werden, da die App \"Telefon\" deaktiviert wurde."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"In Kontakten suchen"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Nummer hinzufügen oder in Kontakten suchen"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Deine Anrufliste ist leer"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Anrufen"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Keine verpassten Anrufe"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Dein Mailbox-Posteingang ist leer."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Nur Favoriten anzeigen"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Anrufliste"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Verpasst"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mailboxnachrichten"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Schnellauswahl"</string>
     <string name="tab_history" msgid="7420269368689503596">"Anrufliste"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakte"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Mailbox"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Aus Favoriten entfernt"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Rückgängig machen"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> wählen"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Neuen Kontakt erstellen"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Zu Kontakt hinzufügen"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS senden"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videoanruf starten"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nummer blockieren"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> neue entgangene Anrufe"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Du hast für noch niemanden eine Kurzwahl festgelegt"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Favoriten hinzufügen"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Du hast noch keine Kontakte."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Kontakt hinzufügen"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tippe auf das Bild, um alle Nummern zu sehen, oder halte das Bild länger gedrückt, um sie neu anzuordnen"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Entfernen"</string>
+    <string name="select_all" msgid="408601760696146245">"Alle auswählen"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanruf"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"SMS senden"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Anrufdetails"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> anrufen"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> über Videoanruf anrufen"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> anhören"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> abhören"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> pausieren"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> löschen"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> neue Mailboxnachrichten</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> neue Mailboxnachricht</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kontakt für <xliff:g id="NAMEORNUMBER">^1</xliff:g> erstellen"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> zu vorhandenem Kontakt hinzufügen"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Anrufdetails für <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Aus Anrufliste gelöscht"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Heute"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gestern"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ältere"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Anrufliste"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Lautsprecher einschalten"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Lautsprecher ausschalten"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Schneller wiedergeben"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Langsamer wiedergeben"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Wiedergabe starten oder pausieren"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Anzeigeoptionen"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Töne und Vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Anrufe"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anrufblockierung"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Mailbox"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"SIM für Mailboxeinstellungen auswählen"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Anrufblockierung vorübergehend aus"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Die Anrufblockierung wurde deaktiviert, weil du innerhalb der letzten 48 Stunden mit diesem Telefon den Notruf gewählt hast. Nach Ablauf dieser 48-Stunden-Frist wird die Blockierung automatisch wieder aktiviert."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummern importieren"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blockierte Nummern"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ist bereits blockiert."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Anrufkonten"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktivieren"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Berechtigungen festlegen"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Aktiviere die Berechtigung \"Kontakte\", um die Kurzwahlfunktion zu verwenden."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Aktiviere die Berechtigung \"Telefon\", um dein Anrufprotokoll abzurufen."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Aktiviere die Berechtigung \"Kontakte\", um deine Kontakte abzurufen."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Aktiviere die Berechtigung \"Telefon\", um auf deine Mailbox zuzugreifen."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Aktiviere die Berechtigung \"Telefon\", um einen Anruf zu tätigen."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Die App \"Telefon\" ist nicht berechtigt, die Systemeinstellungen zu überschreiben."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ist offline und nicht erreichbar"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Info"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribiert von Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkribiert…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkript nicht verfügbar"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ansehen"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Anruf gelöscht. Du kannst in diesem Anruf geteilte Anhänge unter \"Nachrichten\" ansehen und löschen."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anrufe gelöscht. Du kannst in diesen Anrufen geteilte Anhänge unter \"Nachrichten\" ansehen und löschen."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-el/strings.xml b/java/com/android/dialer/app/res/values-el/strings.xml
index 847f60a..da49db3 100644
--- a/java/com/android/dialer/app/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/res/values-el/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Τηλέφωνο"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Πληκτρολόγιο τηλεφώνου"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Τηλέφωνο"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Ιστορικό κλήσεων"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Αναφορά ανακριβούς αριθμού"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Αντιγραφή αριθμού"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Αντιγραφή μεταγραφής"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Αποκλεισμός αριθμού"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Κατάργηση αποκλεισμού αριθμού"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Επεξεργασία αριθμού πριν την κλήση"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Διαγραφή ιστορικού κλήσεων"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Διαγραφή αυτόματου τηλεφωνητή"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Διαγραφή ιστορικού κλήσεων;"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Αυτό θα διαγράψει όλες τις κλήσεις από το ιστορικό σας"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Διαγραφή ιστορικού κλήσεων…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Τηλέφωνο"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Αναπάντητη κλήση"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Αναπάντητη κλήση εργασίας"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Αναπάντητες κλήσεις"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Μηνύματα αυτόμ. τηλεφωνητή </item>
       <item quantity="one">Μήνυμα αυτόματου τηλεφωνητή</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Αναπαραγωγή"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Νέα μην. αυτ. τηλεφ. από <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Αδύνατη αναπαραγωγή φωνητικού μηνύματος"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Φόρτωση φωνητικών μηνυμάτων…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Αρχειοθέτηση μηνυμ. αυτόμ. τηλεφωνητή…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Αδύνατη φόρτωση φωνητικών μηνυμάτων"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Μόνο κλήσεις με ηχητικά μηνύματα"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Μόνο εισερχόμενες κλήσεις"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Μόνο εξερχόμενες κλήσεις"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Μόνο αναπάντητες κλήσεις"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"αναζήτηση"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"κλήση"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"αριθμός για κλήση"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Αναπαραγωγή ή διακοπή αναπαραγωγής"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ενεργοποίηση ή απενεργοποίηση μεγαφώνου"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Αναζήτηση θέσης αναπαραγωγής"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Μείωση ρυθμού αναπαραγωγής"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Αύξηση ρυθμού αναπαραγωγής"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Ιστορικό κλήσεων"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Περισσότερες επιλογές"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"πληκτρολόγιο"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Εμφάνιση μόνο εξερχόμενων"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Εμφάνιση μόνο εισερχόμενων"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Εμφάνιση μόνο αναπάντητων"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Εμφ. μόνο μην. αυτόμ. τηλεφων."</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Εμφάνιση όλων"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Προσθήκη παύσης 2 δευτερολέπτων"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Προσθήκη αναμονής"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ρυθμίσεις"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Προσομοιωτής"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Όλες οι επαφές"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Προσθήκη κλήσης"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Εισερχόμενες κλήσεις"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Αναπαραγωγή μηνύματος αυτόματου τηλεφωνητή"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Προβολή επαφής <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Κλήση <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Δημ. νέας συντόμ. διεπαφής"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Εισαγωγή στη λειτουργία μαζικών ενεργειών"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Αποχώρηση από τη λειτουργία μαζικών ενεργειών"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Έγινε επιλογή <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Καταργήθηκε η επιλογή <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Στοιχεία επικοινωνίας του <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Στοιχεία επικοινωνίας για πιθανώς ανεπιθύμητο καλούντα <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> κλήσεις."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Βιντεοκλήση."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Αποστολή SMS στο χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Μηνύματα αυτόματου τηλεφωνητή που δεν έχετε ακούσει"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Έναρξη φωνητικής αναζήτησης"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Κλήση <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Αυτόματος τηλεφωνητής"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> δευτερόλεπτα"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> λεπτά <xliff:g id="SECONDS">%s</xliff:g> δευτερόλεπτα"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"φωνητικού μηνύματος αυτόματου τηλεφωνητή"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"φωνητικών μηνυμάτων αυτόματου τηλεφωνητή"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ναι"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Όχι"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Διαγραφή επιλεγμ. <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>;"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ακύρωση λειτουργίας μαζικών ενεργειών"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Διαγραφή"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ακύρωση"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Έχουν επιλεγεί <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Διαγραφή αυτών των μηνυμάτων αυτόματου τηλεφωνητή; "</b>"</item>
+      <item quantity="one">"<b>"Διαγραφή αυτού του μηνύματος αυτόματου τηλεφωνητή; "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> στις <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Δεν μπορείτε να καλέσετε αυτόν τον αριθμό"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Για τη ρύθμιση του αυτόματου τηλεφωνητή, μεταβείτε στο στοιχείο Μενού &gt; Ρυθμίσεις."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Για κλήση αυτόματου τηλεφωνητή, πρώτα απενεργοποιήστε τη λειτουργία πτήσης."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Φόρτωση…"</string>
-    <string name="imei" msgid="5214505934662768308">"Αριθμός ΙΜΕΙ"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Φόρτωση από κάρτα SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Επαφές στην κάρτα SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Δεν υπάρχουν διαθέσιμες εφαρμογές επαφών"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Η φωνητική αναζήτηση δεν είναι διαθέσιμη"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Δεν είναι δυνατή η πραγματοποίηση τηλεφωνικής κλήσης επειδή η εφαρμογή \"Τηλέφωνο\" έχει απενεργοποιηθεί."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Αναζήτηση επαφών"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Προσθήκη αριθμού ή αναζήτηση επαφών"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Το ιστορικό κλήσεων είναι κενό"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Πραγματοποίηση κλήσης"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Δεν υπάρχουν αναπάντητες κλήσεις."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ο φάκελος εισερχομένων του αυτόματου τηλεφωνητή σας είναι κενός."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Εμφάνιση μόνο των αγαπημένων"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Ιστορικό κλήσεων"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Όλα"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Αναπάντητες"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Φωνητικό μήνυμα"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Γρήγορη κλήση"</string>
     <string name="tab_history" msgid="7420269368689503596">"Ιστορικό κλήσεων"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Επαφές"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Αυτόματος τηλεφωνητής"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Καταργήθηκε από τα αγαπημένα"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Αναίρεση"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Κλήση <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Δημιουργία νέας επαφής"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Προσθήκη σε μια επαφή"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Αποστολή SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Πραγματοποίηση βιντεοκλήσης"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Αποκλεισμός αριθμού"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> νέες αναπάντητες κλήσεις"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Δεν έχετε ορίσει ακόμη κάποια επαφή στις ταχείες κλήσεις"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Προσθέστε ένα αγαπημένο"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Δεν έχετε επαφές ακόμη"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Προσθήκη επαφής"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Αγγίξτε την εικόνα για να δείτε όλους τους αριθμούς ή αγγίξτε παρατεταμένα για αναδιάταξη"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Κατάργηση"</string>
+    <string name="select_all" msgid="408601760696146245">"Επιλογή όλων"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Βιντεοκλήση"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Αποστολή μηνύματος"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Λεπτομέρειες κλήσης"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Κλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Βιντεοκλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ακρόαση μηνύματος αυτόματου τηλεφωνητή από το χρήστη <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Ακρόαση μηνύματος αυτόματου τηλεφωνητή από <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Παύση μηνύματος αυτόματου τηλεφωνητή από <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Διαγραφή μηνύματος αυτόματου τηλεφωνητή από <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> νέα φωνητικά μηνύματα</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> νέο φωνητικό μήνυμα</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Δημιουργία επαφής για <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Προσθήκη <xliff:g id="NAMEORNUMBER">^1</xliff:g> σε υπάρχουσα επαφή"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Λεπτομέρειες κλήσης για <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Διαγράφηκε από το ιστορικό κλήσεων"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Σήμερα"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Χθες"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Παλαιότερες"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Λίστα κλήσεων"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ενεργοποίηση ηχείου."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Απενεργοποίηση ηχείου."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Αναπαραγωγή πιο γρήγορα."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Αναπαραγωγή πιο αργά."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Έναρξη ή παύση αναπαραγωγής."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Επιλογές εμφάνισης"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ήχοι και δόνηση"</string>
@@ -197,9 +140,8 @@
   </string-array>
     <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Γρήγορες απαντήσεις"</string>
     <string name="call_settings_label" msgid="7824611757200960807">"Κλήσεις"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Φραγή κλήσεων"</string>
+    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Αποκλεισμός κλήσεων"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Αυτόματος τηλεφωνητής"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Επιλέξτε SIM για ρυθμ. τηλεφ/τη"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Προσωρινά απενεργοποιημένη φραγή κλήσεων"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Η φραγή κλήσεων έχει απενεργοποιηθεί προσωρινά επειδή επικοινωνήσατε με τις υπηρεσίες έκτακτης ανάγκης από αυτό το τηλέφωνο μέσα στις τελευταίες 48 ώρες. Θα ενεργοποιηθεί ξανά αυτόματα μόλις λήξει η περίοδος των 48 ωρών."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Εισαγωγή αριθμών"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Αποκλεισμένοι αριθμοί"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε ήδη."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Λογαριασμοί κλήσης"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ενεργοποίηση"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Ορισμός αδειών"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Για να ενεργοποιήσετε την ταχεία κλήση, ενεργοποιήστε την άδεια επαφών."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Για να δείτε το αρχείο καταγραφής κλήσεών σας, ενεργοποιήστε την άδεια τηλεφώνου."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Για να δείτε τις επαφές σας, ενεργοποιήστε την άδεια επαφών."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Για να αποκτήσετε πρόσβαση στον τηλεφωνητή σας, ενεργοποιήστε την άδεια τηλεφώνου."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\"."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Για να πραγματοποιήσετε μια κλήση, ενεργοποιήστε την άδεια τηλεφώνου."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Η εφαρμογή \"Τηλέφωνο\" δεν έχει άδεια εγγραφής στις ρυθμίσεις συστήματος."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ανεπιθύμητα"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> είναι εκτός σύνδεσης και δεν μπορείτε να έρθετε σε επικοινωνία μαζί του"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Πληροφορίες"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Μεταγραφή από την Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Μεταγραφή Google σε εξέλιξη…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Δεν υπάρχει απομαγνητοφώνηση"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Προβολή"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Η κλήση διαγράφηκε. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτής της κλήσης στο Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Οι κλήσεις διαγράφηκαν. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτών των κλήσεων στο Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
index 28eea8b..45ab37e 100644
--- a/java/com/android/dialer/app/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Phone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Report inaccurate number"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Block number"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Unblock number"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Phone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
       <item quantity="one">Voicemail</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Play"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archiving voicemail…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Calls with voicemail only"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Incoming calls only"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Outgoing calls only"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Missed calls only"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"search"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"dial"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"number to dial"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Play or stop playback"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Decrease playback rate"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Increase playback rate"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Show outgoing only"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Show incoming only"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Show missed only"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Show voicemails only"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Show all calls"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Add call"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Incoming calls"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Play voicemail"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"View contact <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Call <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send SMS to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Unheard voicemail"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Can\'t call this number"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"To call voicemail, turn off Aeroplane mode first."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Loading…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM card contacts"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No contacts app available"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Cannot make a phone call because the Phone application has been disabled."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Show favourites only"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
     <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removed from favourites"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Undo"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> new missed calls"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Add a contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Touch image to see all numbers, or touch &amp; hold to re-arrange"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
+    <string name="select_all" msgid="408601760696146245">"Select all"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Play voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pause voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Delete voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> new voicemails</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> new voicemail</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Deleted from call history"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Calls list"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Play faster."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Play slower."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Select SIM for voicemail settings"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Turn on"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Set permissions"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"To access your voicemail, turn on the Phone permission."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
     <string name="about_phone_label" msgid="582991354677973731">"About"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google is transcribing …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcript not available"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
index 28eea8b..45ab37e 100644
--- a/java/com/android/dialer/app/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Phone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Report inaccurate number"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Block number"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Unblock number"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Phone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
       <item quantity="one">Voicemail</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Play"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archiving voicemail…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Calls with voicemail only"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Incoming calls only"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Outgoing calls only"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Missed calls only"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"search"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"dial"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"number to dial"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Play or stop playback"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Decrease playback rate"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Increase playback rate"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Show outgoing only"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Show incoming only"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Show missed only"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Show voicemails only"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Show all calls"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Add call"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Incoming calls"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Play voicemail"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"View contact <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Call <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send SMS to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Unheard voicemail"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Can\'t call this number"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"To call voicemail, turn off Aeroplane mode first."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Loading…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM card contacts"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No contacts app available"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Cannot make a phone call because the Phone application has been disabled."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Show favourites only"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
     <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removed from favourites"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Undo"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> new missed calls"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Add a contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Touch image to see all numbers, or touch &amp; hold to re-arrange"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
+    <string name="select_all" msgid="408601760696146245">"Select all"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Play voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pause voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Delete voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> new voicemails</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> new voicemail</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Deleted from call history"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Calls list"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Play faster."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Play slower."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Select SIM for voicemail settings"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Turn on"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Set permissions"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"To access your voicemail, turn on the Phone permission."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
     <string name="about_phone_label" msgid="582991354677973731">"About"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google is transcribing …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcript not available"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
index 28eea8b..45ab37e 100644
--- a/java/com/android/dialer/app/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Phone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Report inaccurate number"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Block number"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Unblock number"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Phone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
       <item quantity="one">Voicemail</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Play"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archiving voicemail…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Calls with voicemail only"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Incoming calls only"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Outgoing calls only"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Missed calls only"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"search"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"dial"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"number to dial"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Play or stop playback"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Decrease playback rate"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Increase playback rate"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Show outgoing only"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Show incoming only"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Show missed only"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Show voicemails only"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Show all calls"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Add wait"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"All contacts"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Add call"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Incoming calls"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Play voicemail"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"View contact <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Call <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send SMS to <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Unheard voicemail"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Delete selected <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Can\'t call this number"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"To call voicemail, turn off Aeroplane mode first."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Loading…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM card contacts"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No contacts app available"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Cannot make a phone call because the Phone application has been disabled."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Show favourites only"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
     <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removed from favourites"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Undo"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> new missed calls"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Add a contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Touch image to see all numbers, or touch &amp; hold to re-arrange"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
+    <string name="select_all" msgid="408601760696146245">"Select all"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Play voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pause voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Delete voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> new voicemails</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> new voicemail</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Deleted from call history"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Calls list"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Play faster."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Play slower."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Select SIM for voicemail settings"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Turn on"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Set permissions"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"To access your voicemail, turn on the Phone permission."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
     <string name="about_phone_label" msgid="582991354677973731">"About"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google is transcribing …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcript not available"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
index 9d80bc9..f74fd7c 100644
--- a/java/com/android/dialer/app/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado del teléfono"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Teléfono"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de llamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informar número incorrecto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcripción"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de realizar llamada"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Eliminar el historial de llamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Borrar buzón de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"¿Eliminar el historial de llamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se eliminarán todas las llamadas del historial."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Eliminando historial de llamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Teléfono"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Llamada perdida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Llamada de trabajo perdida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Llamadas perdidas"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensajes de voz </item>
       <item quantity="one">mensaje de voz</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproducir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuevo mensaje de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Error al reproducir el buzón de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando buzón de voz…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivando el mensaje de voz…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Error al cargar el buzón de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Solo llamadas con buzón de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Solo llamadas entrantes"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Solo llamadas salientes"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Solo llamadas perdidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"búsqueda"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"marcar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número para marcar"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Reproducir o detener la reproducción"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar o desactivar el altavoz"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Busca la posición de reproducción"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Disminuir la velocidad de reproducción"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar la velocidad de reproducción"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de llamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Más opciones"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar solo salientes"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar solo entrantes"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar solo perdidas"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Mostrar solo mensajes de voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas las llamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Agregar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Agregar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos los contactos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado numérico"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Regresar a la llamada en curso"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Agregar llamada"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Llamadas entrantes"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproducir mensaje de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ver contacto <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Llamar a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la nueva IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando al modo de acción masiva"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saliendo del modo de acción masiva"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Se seleccionó <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Se anuló la selección de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Datos de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalles de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (posible generador de spam)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videollamada"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Enviar SMS a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Buzón de voz no escuchado"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar búsqueda por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Correo de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"el mensaje de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"los mensajes de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"¿Deseas borrar <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> que seleccionaste?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acción masiva"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Borrar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionada(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"¿Deseas borrar estos mensajes de voz? "</b>"</item>
+      <item quantity="one">"<b>"¿Deseas borrar este mensaje de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"El <xliff:g id="DATE">%1$s</xliff:g> a la hora <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"No se puede llamar a este número."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar el buzón de voz, ve a Menú &gt; Configuración."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para llamar al buzón de voz, desactiva primero el modo de avión."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Cargando..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Cargando desde tarjeta SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contactos de tarjeta SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No hay aplicaciones de contactos disponibles."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Búsqueda por voz no disponible"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"No se pueden realizar llamadas porque se inhabilitó la aplicación Teléfono."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Agregar número o buscar contactos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"El historial de llamadas está vacío."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Hacer una llamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"No tienes llamadas perdidas"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"La bandeja de entrada del buzón de voz está vacía."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar solo favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de llamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todo"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Buzón voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Marcado rápido"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historial de llamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Buzón de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eliminado de favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Deshacer"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear contacto nuevo"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Agregar a un contacto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Realizar videollamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> llamadas perdidas nuevas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Aún no tienes contactos en la opción de marcado rápido"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Agregar un favorito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Agregar un contacto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toca la imagen para ver todos los números o mantenla presionada para reorganizar"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
+    <string name="select_all" msgid="408601760696146245">"Seleccionar todo"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Realizar una videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproducir buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausar buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Borrar buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mensajes de voz nuevos</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> mensaje de voz nuevo</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear un contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Agregar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacto existente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalles de llamada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Se eliminó del historial de llamadas."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoy"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ayer"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Antiguos"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de llamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar altavoz"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar altavoz"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Aumentar velocidad de reproducción"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Disminuir velocidad de reproducción"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar o pausar la reproducción"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opciones de visualización"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sonidos y vibración"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Elige una SIM para configurar el buzón de voz"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se inhabilitó el bloqueo de llamadas porque te comunicaste con servicios de emergencia en las últimas 48 horas desde este teléfono. Se volverá a habilitar de forma automática una vez que venza el período de 48 horas."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ya está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Cuentas telefónicas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Configurar permisos"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para habilitar el marcado rápido, activa el permiso Contactos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver el registro de llamadas, activa el permiso Teléfono."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver los contactos, activa el permiso Contactos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para acceder al buzón de voz, activa el permiso Teléfono."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para buscar contactos, activa el permiso Contactos."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para realizar una llamada, activa el permiso Teléfono."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"La aplicación de teléfono no tiene permiso para modificar la configuración del sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está sin conexión y no se lo puede contactar"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google está transcribiendo…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcripción no disponible."</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Llamada eliminada. En Mensajes, puedes ver y eliminar archivos adjuntos compartidos durante esta llamada."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Llamadas eliminadas. En Mensajes, puedes ver y eliminar archivos adjuntos durante las llamadas."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-es/strings.xml b/java/com/android/dialer/app/res/values-es/strings.xml
index b7383d9..961fc6f 100644
--- a/java/com/android/dialer/app/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/res/values-es/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado del teléfono"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Teléfono"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de llamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informar sobre número incorrecto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcripción"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de llamar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Borrar historial de llamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar mensaje de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"¿Borrar historial de llamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se eliminarán todas las llamadas del historial."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Borrando historial de llamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Teléfono"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Llamada perdida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Llamada de trabajo perdida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Llamadas perdidas"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensajes de voz </item>
       <item quantity="one"> mensaje de voz</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproducir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuevo mensaje de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Error al reproducir el buzón de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando buzón de voz…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivando el mensaje de voz…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Error al cargar el buzón de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Solo llamadas con mensajes de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Solo llamadas entrantes"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Solo llamadas salientes"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Solo llamadas perdidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"buscar"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"marcar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número que se va a marcar"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Iniciar o detener la reproducción"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar o desactivar el altavoz"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Buscar posición de reproducción"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Disminuir la velocidad de reproducción"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar la velocidad de reproducción"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de llamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Más opciones"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar solo llamadas salientes"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar solo llamadas entrantes"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar solo llamadas perdidas"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Solo mensajes de voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas las llamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Añadir pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Añadir espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ajustes"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos los contactos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado táctil"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Volver a la llamada"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Añadir llamada"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Llamadas entrantes"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproducir mensaje de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ver contacto <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Llamar a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la interfaz"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando en el modo de acción en bloque"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Se ha salido del modo de acción en bloque"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seleccionado"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Selección de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> anulada"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Información de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Información de contacto del posible spammer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videollamada."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Enviar SMS a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Mensaje de voz sin oír"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar búsqueda por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Llamar a <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Buzón de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min y <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mensaje de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mensajes de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sí"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"¿Eliminar la selección de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acciones en lote"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Se han seleccionado <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"¿Eliminar estos mensajes de voz? "</b>"</item>
+      <item quantity="one">"<b>"¿Eliminar este mensaje de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a las <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"No se puede llamar a este número"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar el buzón de voz, ve a Menú &gt; Ajustes."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para llamar al buzón de voz, debes desactivar el modo avión."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Cargando..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Cargando desde tarjeta SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contactos de tarjeta SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"No hay aplicaciones de contactos disponibles"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"La búsqueda por voz no está disponible"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"No se puede hacer llamadas porque se ha inhabilitado la aplicación Teléfono."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Añade número o busca contactos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Tu historial de llamadas está vacío"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Hacer una llamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"No tienes llamadas perdidas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"La bandeja de entrada del buzón de voz está vacía."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar solo favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de llamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mensaje de voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Marcación rápida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historial de llamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Buzón de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eliminado de favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Deshacer"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Llamar a <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear nuevo contacto"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Añadir a un contacto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Hacer videollamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> llamadas perdidas nuevas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Aún no tienes contactos en la función de marcación rápida"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Añadir un favorito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Añadir un contacto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tocar la imagen para ver todos los números o mantenerla pulsada para cambiar el orden"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
+    <string name="select_all" msgid="408601760696146245">"Seleccionar todo"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar el buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproducir mensaje de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausar mensaje de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Eliminar mensaje de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mensajes de voz nuevos</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> mensaje de voz nuevo</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Añadir <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacto"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalles de llamada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Eliminada del historial de llamadas"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoy"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ayer"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Más antiguo"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de llamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar altavoz."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar altavoz."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reproducir más rápido."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reproducir más lento."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar o pausar reproducción."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opciones de visualización"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sonido y vibración"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Elegir SIM para ajustes del buzón"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se ha inhabilitado el bloqueo de llamadas porque te has puesto en contacto con los servicios de emergencia desde este teléfono en las últimas 48 horas. Se volverá a habilitar automáticamente cuando finalice este periodo de tiempo."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,21 +155,23 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ya está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Cuentas de llamadas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Establecer permisos"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para habilitar la marcación rápida, activa el permiso la aplicación Contactos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver el registro de llamadas, activa el permiso de la aplicación Teléfono."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver tus contactos, activa el permiso de la aplicación Contactos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para acceder al buzón de voz, activa el permiso de la aplicación Teléfono."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para poder buscar tus contactos, activa los permisos de contactos."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para hacer una llamada, activa el permiso de la aplicación Teléfono."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"La aplicación Teléfono no tiene permiso para editar los ajustes del sistema."</string>
     <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear / Marcar como spam"</string>
+    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/Marcar como spam"</string>
     <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
     <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No es spam"</string>
     <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> no tiene conexión y no se puede contactar"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Información"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google está transcribiendo el mensaje…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcripción no disponible"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Se ha eliminado la llamada. Si quieres ver y eliminar los archivos adjuntos compartidos durante esta llamada, ve a Mensajes."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Se han eliminado las llamadas. Si quieres ver y eliminar los archivos adjuntos compartidos durante las llamadas, ve a Mensajes."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-et/strings.xml b/java/com/android/dialer/app/res/values-et/strings.xml
index d4e4faa..538e5b4 100644
--- a/java/com/android/dialer/app/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/res/values-et/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefoni klaviatuur"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Kõneajalugu"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Valest numbrist teavitamine"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopeeri number"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopeeri transkribeerimine"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokeeri number"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblokeeri number"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Muuda enne helistamist numbrit"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Kõneajaloo kustutamine"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Kustuta kõnepost"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Kas kustutada kõneajalugu?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"See kustutab ajaloost kõik kõned"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Kõneajaloo kustutamine ..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Vastamata kõne"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Vastamata kõne töölt"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Vastamata kõned"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> kõneposti teadet </item>
       <item quantity="one">Kõneposti teade</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Esitamine"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Uus kõnepostisõnum kasutajalt <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Kõneposti ei õnnestunud esitada"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Kõneposti laadimine ..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Kõnepostisõnumi arhiivimine …"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kõneposti laadimine ebaõnnestus"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Ainult kõnepostiga kõned"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Ainult sissetulevad kõned"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Ainult väljuvad kõned"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Ainult vastamata kõned"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"otsing"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"helista"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"number valimiseks"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Taasesituse alustamine või peatamine"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Valjuhääldi sisse- või väljalülitamine"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Taasesituse positsiooni otsimine"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Taasesituse kiiruse vähendamine"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Taasesituse kiiruse suurendamine"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Kõneajalugu"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Rohkem valikuid"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatuur"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Kuva ainult väljuvad"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Kuva ainult sissetulevad"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Kuva ainult vastamata"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Kuva ainult kõnepostisõnumeid"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Kuva kõik kõned"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Lisa 2-sekundiline paus"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Lisa ootamine"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Seaded"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Kõik kontaktid"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Kasuta puutetooniga klahvistikku"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Tagasi käimasolevale kõnele"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Lisa kõne"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Sissetulevad kõned"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Esita kõnepostisõnum"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Kuva kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Helista kasutajale <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Loo uue kasutajaliid. otsetee"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Sisenemine hulgitoimingute režiimi"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Lahkumine hulgitoimingute režiimist"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> on valitud"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> on valimata"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontakti <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üksikasjad"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Arvatava rämpskõnetegija <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktandmed"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> kõnet."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videokõne."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"SMS-i saatmine kontaktile <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Kuulamata kõnepostisõnum"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Häälotsingu alustamine"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Helista: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Kõnepost"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"kõnepostisõnum"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"kõnepostisõnumid"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Jah"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ei"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Kas kustutada valitud kõnepostisõnumid <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Mitme toimigu režiimi tühistamine"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Kustuta"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Tühista"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> on valitud"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Kas kustutada need kõnepostisõnumid? "</b>"</item>
+      <item quantity="one">"<b>"Kas kustutada see kõnepostisõnum? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kell <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Sellele numbrile ei saa helistada"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Kõnepostisõnumite seadistamiseks tehke valikud Menüü &gt; Seaded."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Kõnepostisõnumite kuulamiseks lülitage esmalt välja lennurežiim."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Laadimine ..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Laadimine SIM-kaardilt ..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM-kaardi kontaktid"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Kontaktide rakendus pole saadaval"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Häälotsing ei ole saadaval"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Helistada ei saa, sest telefonirakendus on keelatud."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Otsige kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Lisage nr või otsige kontakte"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Teie kõneajalugu on tühi"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Helista"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Vastamata kõnesid pole."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kõneposti postkast on tühi."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Kuva ainult lemmikud"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Kõneajalugu"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Kõik"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Vastamata"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Kõnepost"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Kiirvalimine"</string>
     <string name="tab_history" msgid="7420269368689503596">"Kõneajalugu"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktid"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Kõnepost"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eemaldatud lemmikute hulgast"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Võta tagasi"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Helista: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Loo uus kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lisa kontaktile"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Saada SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videokõne tegemine"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokeeri number"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> uus/uut vastamata kõne(t)"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Te pole veel kedagi kiirvalimisse lisanud"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lisa lemmik"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Teil pole veel kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Lisa kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Puudutage kujutist kõigi numbrite nägemiseks või puudutage pikalt järjestuse muutmiseks"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eemalda"</string>
+    <string name="select_all" msgid="408601760696146245">"Vali kõik"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videokõne"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Saada sõnum"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Kõne üksikasjad"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Helistamine: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videokõne kirjele <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Kontakti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kõneposti kuulamine"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Kõnepostisõnumite esita kontaktilt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Kõnepostisõnumite peatamine kontaktilt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Kõnepostisõnumite kustutamine kontaktilt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uut kõnepostisõnumit</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uus kõnepostisõnum</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kontakti loomine kirjele <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Kirje <xliff:g id="NAMEORNUMBER">^1</xliff:g> lisamine olemasolevale kontaktile"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Kontakti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kõne üksikasjad"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Kustutatud kõneajaloost"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Täna"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Eile"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Vanem"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Kõneloend"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Kõlari sisselülitamine."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Kõlari väljalülitamine."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Kiirem esitus."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Aeglasem esitus."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Esituse alustamine või peatamine."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Kuvamisvalikud"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Helid ja vibreerimine"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Kõned"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kõnede blokeerimine"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Kõnepost"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Kõnepostis. seadete SIM-kaart"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kõnede blokeerimine on ajutiselt väljas"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kõnede blokeerimine on keelatud, kuna võtsite sellelt telefonilt viimase 48 tunni jooksul ühendust hädaabiteenustega. See lubatakse 48 tunni möödumisel automaatselt uuesti."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impordi numbrid"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokeeritud numbrid"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> on juba blokeeritud."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Helistamiskontod"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Lülita sisse"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Määra load"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Kiirvalimise lubamiseks lülitage sisse kontaktiluba."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Kõnelogi vaatamiseks lülitage sisse telefoniluba."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kontaktide vaatamiseks lülitage sisse kontaktiluba."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Kõnepostile juurdepääsemiseks lülitage sisse telefoniluba."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kontaktide otsimiseks lülitage sisse kontaktiload."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Helistamiseks lülitage sisse telefoniluba."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonirakendusel pole luba süsteemiseadetesse kirjutada."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Rämpspost"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ei ole võrgus ja temaga ei saa ühendust"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Teave"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google\'i transkribeeritud"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkribeerib …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Logifail pole saadaval"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Kuva"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Kõne kustutati. Selle kõne ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Kõned kustutati. Nende kõnede ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-eu/strings.xml b/java/com/android/dialer/app/res/values-eu/strings.xml
index 95f4621..e4f9f3f 100644
--- a/java/com/android/dialer/app/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/res/values-eu/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefonoa"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonoko teklatua"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefonoa"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Deien historia"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Jakinarazi zenbakia okerra dela"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiatu zenbakia"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiatu transkripzioa"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokeatu zenbakia"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desblokeatu zenbakia"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editatu zenbakia deitu aurretik"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Garbitu deien historia"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ezabatu ahots-mezua"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Deien historia garbitu?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Historiako dei guztiak ezabatuko dira"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Deien historia garbitzen…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefonoa"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Galdutako deia"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Laneko dei bat galdu duzu"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Dei galduak"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> Erantzungailuko <xliff:g id="COUNT">%1$d</xliff:g> mezu </item>
       <item quantity="one">Erantzungailuko mezua</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Erreproduzitu"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> deitzailearen ahots-mezu berria"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Ezin izan dira erreproduzitu ahots-mezuak"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Erantzungailua kargatzen…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ahots-mezua artxibatzen…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ezin izan da kargatu erantzungailua"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Erantzungailuko deiak soilik"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Sarrerako deiak soilik"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Irteerako deiak soilik"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Dei galduak soilik"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"bilatu"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"markatu"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"markatu beharreko zenbakia"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Erreproduzitu edo pausatu erreprodukzioa"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Aktibatu edo desaktibatu bozgorailua"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Bilatu erreprodukzioaren posizioa"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Mantsotu erreprodukzioaren abiadura"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Bizkortu erreprodukzioaren abiadura"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Deien historia"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Aukera gehiago"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teklatua"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Erakutsi irteerakoak soilik"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Erakutsi sarrerakoak soilik"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Erakutsi galduak soilik"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Erakutsi erantzungailukoak soilik"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Erakutsi dei guztiak"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Gehitu 2 segundoko pausa"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Gehitu itxaronaldia"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ezarpenak"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulagailua"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Kontaktu guztiak"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Erabili ukipen-tonuak dituen teklatua"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Itzuli abian den deira"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Gehitu deia"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Sarrerako deiak"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Erreproduzitu erantzungailuko ahots-mezuak"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ikusi <xliff:g id="NAME">%1$s</xliff:g> kontaktua"</string>
-    <string name="description_call" msgid="1532402285334775372">"Deitu <xliff:g id="NAME">%1$s</xliff:g> erabiltzaileari"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sortu interfazerako esteka"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ekintzak multzoka gauzatzeko modua aktibatzen"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ekintzak multzoka gauzatzeko modua desaktibatu da"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> hautatu da"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> desautatu da"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktuaren xehetasunak"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Antza spam-igorlea den <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> zenbakiaren harremanetarako datuak"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> dei."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Bideo-deia."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Bidali SMSa <xliff:g id="NAME">%1$s</xliff:g> kontaktuari"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Entzun ez diren erantzungailuko ahots-mezuak"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Hasi ahozko bilaketa"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira"</string>
     <string name="voicemail" msgid="8899540969000957954">"Erantzungailua"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ahots-mezua"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ahots-mezuak"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Bai"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ez"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Hautatutako <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ezabatu?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Utzi bertan behera ekintzak multzoka gauzatzeko modua"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ezabatu"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Utzi"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> hautatu dira"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Ahots-mezu hauek ezabatu nahi dituzu? "</b>"</item>
+      <item quantity="one">"<b>"Ahots-mezu hau ezabatu nahi duzu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> (<xliff:g id="TIME">%2$s</xliff:g>)"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Ezin da zenbaki horretara deitu"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Erantzungailua konfiguratzeko, joan Menua &gt; Ezarpenak atalera."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Erantzungailua entzuteko, Hegaldi modua desaktibatu behar duzu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Kargatzen…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM txarteletik kargatzen…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM txarteleko kontaktuak"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ez dago kontaktuen aplikaziorik erabilgarri"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Ahozko bilaketa ez dago erabilgarri"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Ezin da telefono-deirik egin Telefonoa aplikazioa desgaitu egin delako."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Bilatu kontaktuetan"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Gehitu zk. edo bilatu kontaktua"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Hutsik dago deien historia"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Deitu"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Ez duzu dei galdurik."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Erantzungailuaren sarrerako ontzia hutsik dago."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Erakutsi gogokoak soilik"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Deien historia"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Guztiak"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Galduak"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Erantzungailuko deiak"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Markatze bizkorra"</string>
     <string name="tab_history" msgid="7420269368689503596">"Deien historia"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktuak"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Erantzungailua"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Gogokoetatik kendu da"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Desegin"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Sortu kontaktua"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Gehitu kontaktuetan"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Bidali SMS mezua"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Egin bideo-deia"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokeatu zenbakia"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> dei galdu berri"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Ez duzu inor markatze bizkorrean oraindik"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Gehitu gogokoak"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Ez duzu kontakturik oraindik"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Gehitu kontaktua"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Ukitu irudia zenbaki guztiak ikusteko, edo eduki ezazu sakatuta berrantolatzeko"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Kendu"</string>
+    <string name="select_all" msgid="408601760696146245">"Hautatu guztiak"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Bideo-deia"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Bidali mezua"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Deiaren xehetasunak"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Deitu <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzaileari"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Egin bideo-deia (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Deitzaile honek erantzungailuan utzitako ahots-mezuak entzutea: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Erreproduzitu erantzungailuko <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzailearen mezua"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausatu erantzungailuko <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzailearen mezua"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Ezabatu erantzungailuko <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzailearen mezua"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ahots-postako mezu berri</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ahots-postako mezu berri</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Sortu kontaktua (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Gehitu <xliff:g id="NAMEORNUMBER">^1</xliff:g> lehendik dagoen kontaktu batean"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktuaren xehetasunak"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Ezabatu deien historiatik"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Gaur"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Atzo"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Zaharrak"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Deien zerrenda"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktibatu bozgorailua."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desaktibatu bozgorailua."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Erreproduzitu bizkorrago."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Erreproduzitu mantsoago."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Hasi edo gelditu erreprodukzioa."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Bistaratze-aukerak"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Soinuak eta dardara"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Deiak"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Deien blokeoa"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Erantzungailua"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Hautatu erantzungailuaren ezarpenak aldatzeko SIM txartela"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Deien blokeoa aldi baterako desgaituta"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Deiak blokeatzeko aukera desgaitu egin da, azken 48 orduetan larrialdi-zerbitzuekin harremanetan jarri zarelako telefono honetatik. Berriro gaituko da 48 orduko epea igaro ondoren."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Inportatu zenbakiak"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokeatutako zenbakiak"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatuta dago dagoeneko."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Deiak egiteko kontuak"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktibatu"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Ezarri baimenak"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Markatze bizkorra gaitzeko, aktibatu Kontaktuak erabiltzeko baimena."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Deien erregistroa ikusteko, aktibatu Telefonoa erabiltzeko baimena."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kontaktuak ikusteko, aktibatu Kontaktuak erabiltzeko baimena."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Erantzungailuan sartzeko, aktibatu Telefonoa erabiltzeko baimena."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kontaktuak bilatzeko, aktibatu kontaktuak atzitzeko baimenak."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Deiak egiteko, aktibatu Telefonoa erabiltzeko baimena."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonoa aplikazioak ez du baimenik sistemaren ezarpenetan ezer idazteko."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spama"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ez dago konektatuta, eta ezin zara jarri harremanetan berarekin"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Honi buruz"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google-k transkribatu du"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ari da transkribatzen…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Ez dago transkripziorik"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ikusi"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Ezabatu da deia. Ikusi eta ezabatu dei honetan partekatutako eranskinak Mezuak aplikazioan."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Ezabatu dira deiak. Ikusi eta ezabatu dei hauetan partekatutako eranskinak Mezuak aplikazioan."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fa/strings.xml b/java/com/android/dialer/app/res/values-fa/strings.xml
index 9c8c01b..51b02ff 100644
--- a/java/com/android/dialer/app/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/res/values-fa/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"تلفن"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"صفحه کلید تلفن"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"تلفن"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"سابقه تماس"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"گزارش شماره نادرست"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"کپی کردن شماره"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"کپی کردن آوانویسی"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"مسدود کردن شماره"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"رفع انسداد شماره"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ویرایش شماره قبل از تماس"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"پاک کردن سابقه تماس"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"حذف پست صوتی"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"سابقه تماس پاک شود؟"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"این کار همه تماس‌ها را از سابقه شما حذف می‌کند"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"در حال پاک کردن سابقه تماس..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"تلفن"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"تماس بی پاسخ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"تماس کاری ازدست‌رفته"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"تماس‌های بی‌پاسخ"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> پست صوتی </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> پست صوتی </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"پخش"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"پست صوتی جدید از <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"پست صوتی پخش نشد"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"در حال بارگیری پست صوتی..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"در حال بایگانی کردن پست صوتی..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"پست صوتی بارگیری نشد"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"فقط تماس‌های دارای پست صوتی"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"فقط تماس‌های دریافتی"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"فقط تماس‌های خروجی"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"فقط تماس‌های بی‌پاسخ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"جستجو"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"شماره گیری"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"شماره برای شماره گیری"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"پخش یا توقف بازپخش"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"روشن یا خاموش کردن بلندگوی تلفن"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"جستجوی موقعیت بازپخش"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"کاهش سرعت بازپخش"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"افزایش سرعت بازپخش"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"سابقه تماس"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"گزینه‌های بیشتر"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"صفحه کلید"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"فقط نمایش خروجی"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"فقط نمایش ورودی"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"فقط نمایش بی‌پاسخ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"فقط نمایش پست‌های صوتی"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"نمایش همه مکالمات"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"افزودن یک مکث ۲ ثانیه‌ای"</string>
-    <string name="add_wait" msgid="1177723010768282578">"افزودن انتظار"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"تنظیمات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"شبیه‌ساز"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"همه مخاطبین"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"استفاده از صفحه‌کلید لمسی"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"برگشت به تماس درحال انجام"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"افزودن تماس"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"تماس‌های ورودی"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"پخش پست صوتی"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"مشاهده مخاطب <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"تماس با <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ایجاد میان‌بر رابط کاربری جدید"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"درحال ورود به حالت اقدام انبوه"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"خروج از حالت اقدام انبوه"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> انتخاب شد"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> از حالت انتخاب خارج شد"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"جزئیات تماس برای <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"جزئیات تماس برای تماس‌گیرندگان هرزنامه پشتیبانی شده <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> تماس."</string>
     <string name="description_video_call" msgid="3738199365585751727">"تماس ویدئویی."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"ارسال پیامک به <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"پست صوتی شنیده نشده"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"شروع جستجوی گفتاری"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"پست صوتی"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> دقیقه <xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"پست صوتی"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"پست‌های صوتی"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"بله"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"نه"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> انتخاب‌شده حذف شود؟"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"لغو حالت اقدام‌ دسته‌ای"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"لغو"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> مورد انتخاب شد"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
+      <item quantity="other">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ساعت <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"تماس با این شماره ممکن نیست"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"برای راه‌اندازی پست صوتی به منو &gt; تنظیمات بروید."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"در حال بارکردن…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"در حال بارگیری سیم کارت..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"مخاطبین سیم کارت"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"هیچ برنامه مخاطبی در دسترس نیست"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"جستجوی گفتاری در دسترس نیست"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"برقراری تماس تلفنی ممکن نیست، زیرا برنامه تلفن غیرفعال شده است."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"جستجوی مخاطبین"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"افزودن شماره یا جستجوی مخاطب"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"سابقه تماستان خالی است"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"برقراری تماس تلفنی"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"تماس بی‌پاسخی ندارید."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"صندوق پست صوتی‌تان خالی است."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"فقط نمایش موارد دلخواه"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"سابقه تماس"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"همه موارد"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"بی‌پاسخ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"پست صوتی"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"شماره‌گیری سریع"</string>
     <string name="tab_history" msgid="7420269368689503596">"سابقه تماس"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"مخاطبین"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"پست صوتی"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"از موارد دلخواه حذف شد"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"واگرد"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ایجاد مخاطب جدید"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"افزودن به مخاطب"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ارسال پیامک"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"برقراری تماس ویدئویی"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"مسدود کردن شماره"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> تماس‌ بی‌پاسخ جدید"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"هنوز کسی در فهرست شماره‌گیری سریع شما نیست"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"افزودن مورد دلخواه"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"هنوز هیچ مخاطبی ندارید"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"افزودن مخاطب"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"برای مشاهده همه شماره‌ها، تصویر را لمس کنید، یا برای ترتیب مجدد، لمس کنید و نگه‌دارید"</string>
     <string name="remove_contact" msgid="2353580570488923668">"حذف"</string>
+    <string name="select_all" msgid="408601760696146245">"انتخاب همه"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"تماس ویدئویی"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ارسال پیام"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"جزئیات تماس"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"تماس ویدئویی با <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"گوش دادن به پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"پخش پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"مکث پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"حذف پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one">‏<xliff:g id="COUNT_1">%d</xliff:g> پست صوتی جدید</item>
-      <item quantity="other">‏<xliff:g id="COUNT_1">%d</xliff:g> پست صوتی جدید</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"ایجاد مخاطب برای <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"افزودن <xliff:g id="NAMEORNUMBER">^1</xliff:g> به مخاطب موجود"</string>
     <string name="description_details_action" msgid="2061866409737706174">"جزئیات تماس برای <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"از سابقه تماس حذف شد"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"امروز"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"دیروز"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"قدیمی‌تر"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"فهرست تماس‌ها"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"روشن کردن بلندگو."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"خاموش کردن بلندگو."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"پخش سریع‌تر"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"پخش آهسته‌تر."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"شروع یا مکث بازپخش."</string>
     <string name="display_options_title" msgid="3880091801055797975">"گزینه‌های نمایش"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"صدا و لرزش"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"تماس‌ها"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"مسدود کردن تماس"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"پست صوتی"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"انتخاب سیم‌کارت برای تنظیمات پست صوتی"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"انسداد تماس موقتاً خاموش است"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"چون در ۴۸ ساعت گذشته با این تلفن با سرویس‌های اضطراری تماس گرفتید، انسداد تماس غیرفعال شده است. پس از گذشت ۴۸ ساعت، این قابلیت دوباره فعال می‌شود."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"وارد کردن شماره‌ها"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"شماره‌های مسدود‌شده"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> درحال‌حاضر مسدود شده است."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"حساب‌های تماس"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"روشن کردن"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"تنظیم مجوزها"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"برای فعال کردن شماره‌گیری سریع، مجوز «مخاطبین» را روشن کنید."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"برای دیدن گزارش تماستان، مجوز «تلفن» را روشن کنید."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"برای دیدن مخاطبینتان، مجوز «مخاطبین» را روشن کنید."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"برای دسترسی به پست صوتی‌تان، مجوز «تلفن» را روشن کنید."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"برای برقراری تماس، مجوز «تلفن» را روشن کنید."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"برنامه تلفن اجازه نوشتن در تنظیمات سیستم را ندارد."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"هرزنامه"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> آفلاین است و در دسترس نمی‌باشد"</string>
     <string name="about_phone_label" msgid="582991354677973731">"درباره"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏رونویسی‌شده توسط Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"‏Google درحال ترانویسی است…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"رونوشت موجود نیست"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"مشاهده"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"تماس حذف شد. پیوست‌های به اشتراک‌گذاشته‌شده درطول این تماس را در «پیام‌ها» مشاهده و حذف کنید."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"تماس‌ها حذف شدند. پیوست‌های به اشتراک‌گذاشته‌شده درطول تماس‌ها را در «پیام‌ها» مشاهده و حذف کنید."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fi/strings.xml b/java/com/android/dialer/app/res/values-fi/strings.xml
index c5a103d..4586db7 100644
--- a/java/com/android/dialer/app/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/res/values-fi/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Puhelin"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Puhelimen näppäimistö"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Puhelin"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Soittohistoria"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Ilmoita epätarkasta numerosta"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopioi numero"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopioi transkriptio"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Estä numero"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Kumoa numeron esto"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Muokkaa numeroa ennen puhelua"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Tyhjennä soittohistoria"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Poista vastaajaviesti"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Tyhjennetäänkö soittohistoria?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Kaikki soittohistorian tiedot poistetaan"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Tyhjennetään soittohistoriaa…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Puhelin"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Vastaamatta jäänyt puhelu"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Vastaamaton työpuhelu"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Vastaamattomat puhelut"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> vastaajaviestiä </item>
       <item quantity="one">Vastaajaviesti</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Toista"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Uusi vastaajaviesti: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Viestin toistaminen epäonnistui"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Ladataan puhelinvastaajaa…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arkistoidaan vastaajaviestiä…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Puhelinvastaajan lataaminen epäonnistui"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Vain vastaajaan menneet puhelut"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Vain saapuvat puhelut"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Vain soitetut puhelut"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Vain vastaamattomat puhelut"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"haku"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"soita"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numero johon soitetaan"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Aloita tai lopeta toisto"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ota kaiutin käyttöön tai poista käytöstä"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Toisto-osoitin"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Hidasta toistoa"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Nopeuta toistoa"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Soittohistoria"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Lisää vaihtoehtoja"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"näppäimistö"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Näytä vain soitetut"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Näytä vain saapuneet"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Näytä vain vastaamattomat"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Näytä vain vastaajaviestit"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Näytä kaikki puhelut"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Lisää 2 sekunnin tauko"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Lisää tauko"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Asetukset"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaattori"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Kaikki yhteystiedot"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Käytä näppäimistöä"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Palaa käynnissä olevaan puheluun"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Lisää puhelu"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Saapuvat puhelut"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Toista vastaajaviesti"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Näytä yhteystieto <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Soita: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Luo uusi UI-pikakuvake"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Siirrytään joukkotoimintotilaan."</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Poistuttiin joukkotoimintotilasta."</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> valittiin."</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ei ole enää valittuna."</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Mahdollisen häirikkösoittajan yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> puhelua."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videopuhelu."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Lähetä tekstiviesti: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Kuuntelematon vastaajaviesti"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Aloita puhehaku"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Vastaaja"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"vastaajaviesti"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"vastaajaviestit"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Kyllä"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ei"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Poistetaanko <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Peruuta joukkotoimintotila."</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Poista"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Peruuta"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valittu"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Poistetaanko nämä vastaajaviestit? "</b>"</item>
+      <item quantity="one">"<b>"Poistetaanko tämä vastaajaviesti? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> klo <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Numeroon ei voi soittaa"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Määritä vastaaja-asetukset valitsemalla Valikko &gt; Asetukset."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Poista lentokonetila käytöstä ennen vastaajaan soittamista."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Ladataan..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI-koodi"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Ladataan SIM-kortilta…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM-kortin yhteystiedot"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ei käytettävissä olevaa yhteystietosovellusta"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Puhehaku ei ole käytettävissä"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Puhelua ei voi soittaa, koska Puhelin-sovellus on poistettu käytöstä."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Hae yhteystiedoista"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Lisää numero tai hae yhteystiedoista"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Soittohistoriasi on tyhjä."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Soita puhelu"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Sinulla ei ole vastaamattomia puheluita."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Puhelinvastaajasi postilaatikko on tyhjä."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Näytä vain suosikit"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Soittohistoria"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Kaikki"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Vastaamattomat"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Vastaaja"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Pikavalinta"</string>
     <string name="tab_history" msgid="7420269368689503596">"Soittohistoria"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Yhteystiedot"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Puhelinvastaaja"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Poistettu suosikeista"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Kumoa"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Luo uusi yhteystieto"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lisää yhteystietoihin"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Lähetä tekstiviesti"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Soita videopuhelu"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Estä numero"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> uutta vastaamatonta puhelua"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Pikavalinnassa ei ole vielä yhtään yhteystietoa."</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lisää suosikki"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Sinulla ei ole yhteystietoja."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Lisää yhteystieto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Katso kaikki numerot koskettamalla kuvaa tai järjestele tietoja koskettamalla kuvaa pitkään."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Poista"</string>
+    <string name="select_all" msgid="408601760696146245">"Valitse kaikki"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopuhelu"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Lähetä viesti"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Puhelun tiedot"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Soita: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Soita videopuhelu: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Kuuntele vastaajaviesti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Toista vastaajaviesti lähettäjältä <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Keskeytä vastaajaviesti lähettäjältä <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Poista vastaajaviesti lähettäjältä <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uutta vastaajaviestiä</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uusi vastaajaviesti</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Luo kontakti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Lisää <xliff:g id="NAMEORNUMBER">^1</xliff:g> olemassa olevaan kontaktiin."</string>
     <string name="description_details_action" msgid="2061866409737706174">"Yhteystiedon <xliff:g id="NAMEORNUMBER">^1</xliff:g> puhelutiedot"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Poistettu soittohistoriasta"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Tänään"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Eilen"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Vanhempi"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Puheluluettelo"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ota kaiutin käyttöön."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Poista kaiutin käytöstä."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Toista nopeammin."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Toista hitaammin."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Aloita tai keskeytä toisto."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Näyttöasetukset"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Äänet ja värinä"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Puhelut"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Puhelujen esto"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Vastaaja"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Valitse vastaajaviestien SIM"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Puheluesto väliaikaisesti pois käytöstä"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Puheluiden estäminen on poistettu käytöstä, koska olet ottanut yhteyttä hätäpalveluihin tästä puhelimesta viimeisen 48 tunnin aikana. Esto otetaan automaattisesti uudelleen käyttöön, kun puhelusta on kulunut 48 tuntia."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Tuo numerot"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Estetyt numerot"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> on jo estetty."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Puhelutilit"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ota käyttöön"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Määritä käyttöoikeudet"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Jos haluat käyttää pikavalintaa, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Jos haluat katsella puhelulokiasi, ota Puhelin-käyttöoikeus käyttöön."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Jos haluat katsella yhteystietojasi, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Jos haluat käyttää puhelinvastaajaa, ota Puhelin-käyttöoikeus käyttöön."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Jos haluat soittaa puheluja, ota Puhelin-käyttöoikeus käyttöön."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Puhelinsovelluksella ei ole oikeutta muokata järjestelmän asetuksia."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Roskaposti"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> on offline-tilassa, eikä siihen saada yhteyttä."</string>
     <string name="about_phone_label" msgid="582991354677973731">"Tietoja"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Googlen litteroima"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google litteroi…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Litteraatti ei saatavilla"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Näytä"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Puhelu poistettu. Voit tarkastella ja poistaa puhelun aikana jaettuja liitteitä Viesteissä."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Puhelut poistettu. Voit tarkastella ja poistaa puhelujen aikana jaettuja liitteitä Viesteissä."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
index d557d74..c0c467e 100644
--- a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Téléphone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Clavier du téléphone"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Téléphone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historique des appels"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Signaler un numéro incorrect"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copier le numéro"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copier la transcription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquer le numéro"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Débloquer le numéro"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifier le numéro avant l\'appel"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Effacer l\'historique d\'appels"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Supprimer le message vocal"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Effacer l\'historique des appels?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tous les appels seront supprimés de votre historique."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Suppression historique des appels…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Téléphone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Appel manqué"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Appel professionnel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Appels manqués"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> message vocal </item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> messages vocaux </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Lire"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nouveau message vocal de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossible de lire le message vocal"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Chargement du message vocal en cours…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivage des messages vocaux en cours…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossible de charger la messagerie vocale"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Seulement les appels avec message vocal"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Seulement les appels entrants"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Seulement les appels sortants"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Seulement les appels manqués"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"rechercher"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"composer"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numéro à composer"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Lire ou arrêter la lecture"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activer ou désactiver le haut-parleur"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Rechercher une position de lecture"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Réduire la vitesse de lecture"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Accroître la vitesse de lecture"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historique des appels"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Plus d\'options"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"clavier"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Afficher appels sortants uniq."</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Afficher appels entrants uniq."</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Afficher appels manqués uniq."</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Messages vocaux uniquement"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Afficher tous les appels"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Ajouter une pause de 2 s"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Ajouter Attendre"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tous les contacts"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utiliser le clavier DTMF"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reprendre l\'appel en cours"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Autre appel"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Appels entrants"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Écouter le message vocal"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Afficher le contact <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Appeler <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers l\'IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrée du mode d\'action groupée en cours…"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Mode d\'action groupée quitté"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Sélection : <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Désélection : <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Coordonnées de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Coordonnées de l\'auteur de l\'appel suspect <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Appel vidéo."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Envoyer un texto à <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nouveau message vocal"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Démarrer la recherche vocale"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Messagerie vocale"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"message vocal"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messages vocaux"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oui"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Supprimer la sélection (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'action par lots"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélection(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Supprimer ce message vocal? "</b>"</item>
+      <item quantity="other">"<b>"Supprimer ces messages vocaux? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Vous ne pouvez pas appeler ce numéro"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Chargement en cours..."</string>
-    <string name="imei" msgid="5214505934662768308">"Code IIEM"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Chargement depuis la carte SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contacts de carte SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Aucune application de gestion des contacts n\'est disponible"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Recherche vocale non disponible"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Impossible d\'effectuer un appel téléphonique, car l\'application Téléphone a été désactivée."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Rechercher des contacts"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Ajouter nº ou chercher contact"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Votre historique des appels est vide"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Faire un appel"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Vous n\'avez aucun appel manqué."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"La boîte de réception de votre messagerie vocale est vide."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Afficher les contacts favoris uniquement"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historique des appels"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Tous"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Manqués"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mess. voc."</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Composition abrégée"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historique des appels"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Messagerie vocale"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Supprimé des favoris"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Annuler"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Créer un contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ajouter à un contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envoyer un texto"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Faire un appel vidéo"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquer le numéro"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nouveaux appels manqués"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Aucun contact ne figure dans vos numéros de composition abrégée"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ajouter un favori"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Vous n\'avez pas encore de contacts"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Ajouter un contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Touchez l\'image pour afficher tous les numéros, ou maintenez le doigt dessus pour les réorganiser"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
+    <string name="select_all" msgid="408601760696146245">"Tout sélectionner"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Détails de l\'appel"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo avec <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Jouer le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Interrompre le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Supprimer le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nouveau message vocal</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nouveaux messages vocaux</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Créer un contact pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ajouter <xliff:g id="NAMEORNUMBER">^1</xliff:g> à un contact existant"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Détails de l\'appel pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"L\'appel a bien été supprimé de l\'historique"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Aujourd\'hui"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hier"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Plus anciens"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Liste des appels"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activer le haut-parleur."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Désactiver le haut-parleur."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Lire plus vite."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Lire moins vite."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lancer ou interrompre la lecture."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Options d\'affichage"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons et vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Choisir SIM pour mess. vocale"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez communiqué avec les services d\'urgence à partir de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Numéros bloqués"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> est déjà bloqué."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes d\'appel"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activer"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Définir les autorisations"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Pour activer la composition abrégée, activez l\'autorisation Contacts."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Pour accéder à votre messagerie vocale, activez l\'autorisation Téléphone."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Pour rechercher vos contacts et les lieux à proximité, activez les autorisations Contacts."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Pour faire un appel, activez l\'autorisation Téléphone."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Pourriel"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> est hors connexion et injoignable"</string>
     <string name="about_phone_label" msgid="582991354677973731">"À propos"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrit par Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transcrit…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcription non disponible"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Afficher"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Appel supprimé. Affichez et supprimez les pièces jointes partagées pendant cet appel dans les messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Appels supprimés. Affichez et supprimez les pièces jointes partagées pendant ces appels dans les messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fr/strings.xml b/java/com/android/dialer/app/res/values-fr/strings.xml
index d8a5939..c992ea9 100644
--- a/java/com/android/dialer/app/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Téléphone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Clavier téléphonique"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Tél."</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historique des appels"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Signaler un numéro incorrect"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copier le numéro"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copier la transcription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquer le numéro"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Débloquer le numéro"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifier numéro avant d\'appeler"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Supprimer l\'historique des appels"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Supprimer le message vocal"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Supprimer l\'historique des appels ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tous les appels seront supprimés de votre historique."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Suppression historique des appels…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Téléphoner"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Appel manqué"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Appel professionnel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Appels manqués"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> message vocal </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> messages vocaux </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Lire"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nouveau message vocal de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossible de lire le message vocal."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Chargement du message vocal en cours…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivage du message vocal…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossible de charger le message vocal."</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Seulement les appels avec message vocal"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Seulement les appels entrants"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Seulement les appels sortants"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Seulement les appels manqués"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"rechercher"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"composer"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numéro à composer"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Lancer ou interrompre la lecture"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activer ou désactiver le haut-parleur"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Rechercher une position de lecture"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Réduire la vitesse de lecture"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Accroître la vitesse de lecture"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historique des appels"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Plus d\'options"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Clavier"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Afficher appels sortants uniq."</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Afficher appels entrants uniq."</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Afficher appels manqués uniq."</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Messages vocaux uniquement"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Afficher tous les appels"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Ajouter une pause de 2 s"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Ajouter une attente"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tous les contacts"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utiliser le clavier DTMF"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reprendre l\'appel en cours"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Autre appel"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Appels entrants"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Écouter le message vocal"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Afficher le contact <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Appeler <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers la nouvelle interface"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Activation du mode d\'action groupée"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Désactivation du mode d\'action groupée"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> sélectionné"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> désélectionné"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Coordonnées associées à <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Coordonnées correspondant à l\'appel indésirable suspecté (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Appel vidéo"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Envoyer un SMS à <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nouveau message vocal"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Démarrer la recherche vocale"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Messagerie vocale"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secondes"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"message vocal"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messages vocaux"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oui"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Supprimer les messages vocaux sélectionnés (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>) ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'actions groupées"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélectionnés"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Supprimer ce message vocal ? "</b>"</item>
+      <item quantity="other">"<b>"Supprimer ces message vocaux ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Impossible d\'appeler ce numéro."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Chargement…"</string>
-    <string name="imei" msgid="5214505934662768308">"Code IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Chargement depuis la carte SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contacts de carte SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Aucune application de gestion des contacts n\'est disponible."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Recherche vocale non disponible"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Impossible d\'effectuer un appel téléphonique, car l\'application Téléphone a été désactivée."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Rech. des contacts"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Ajouter num. ou rech. contacts"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Votre historique des appels est vide."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Passer un appel"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Vous n\'avez aucun appel manqué."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"La boîte de réception de la messagerie vocale est vide."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Afficher les contacts ajoutés aux favoris uniquement"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historique des appels"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Tous"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Manqués"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mess. vocale"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Numérotation abrégée"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historique des appels"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Messagerie vocale"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Supprimé des favoris."</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Annuler"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Créer un contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ajouter à un contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envoyer un SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Passer un appel vidéo"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquer le numéro"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Nouveaux appels manqués : <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Aucun contact pour la numérotation abrégée"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ajouter un favori"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Vous n\'avez pas encore de contacts."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Ajouter un contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Appuyer sur l\'image pour afficher tous les numéros, ou appuyer dessus de manière prolongée pour réorganiser ces derniers"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
+    <string name="select_all" msgid="408601760696146245">"Tout sélectionner"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Informations sur l\'appel"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo de \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal laissé par le numéro ou le contact \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Lire le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Interrompre le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Supprimer le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nouveau message vocal</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nouveaux messages vocaux</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Créer un contact pour \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ajouter \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\" à un contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Informations sur l\'appel pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"L\'appel a bien été supprimé de l\'historique."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Aujourd\'hui"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hier"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Plus anciens"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Liste des appels"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activer le haut-parleur"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Désactiver le haut-parleur"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Lire plus vite"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Lire moins vite"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lancer ou suspendre la lecture"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Options d\'affichage"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons et vibreur"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Choisir une carte SIM pour la messagerie vocale"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez contacté les services d\'urgence à l\'aide de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Numéros bloqués"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" est déjà bloqué."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes téléphoniques"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activer"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Définir les autorisations"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Pour activer la numérotation abrégée, activez l\'autorisation Contacts."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Pour accéder à votre messagerie vocale, activez l\'autorisation Téléphone."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Pour rechercher vos contacts, activez l\'autorisation Contacts."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Pour passer un appel, activez l\'autorisation Téléphone."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> est injoignable, car non connecté"</string>
     <string name="about_phone_label" msgid="582991354677973731">"À propos"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Message transcrit par Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Transcription Google..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcription non disponible"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Afficher"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Appel supprimé. Affichez et supprimez les pièces jointes échangées au cours de cet appel dans Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Appels supprimés. Affichez et supprimez les pièces jointes échangées au cours de ces appels dans Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-gl/strings.xml b/java/com/android/dialer/app/res/values-gl/strings.xml
index 33b55a7..67d04ab 100644
--- a/java/com/android/dialer/app/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/res/values-gl/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do teléfono"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Teléfono"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de chamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informar dun número incorrecto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrición"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Borrar historial de chamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar correo de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Borrar o historial de chamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta acción eliminará todas as chamadas do teu historial"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Borrando historial de chamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Teléfono"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de traballo perdida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> correos de voz </item>
       <item quantity="one">Correo de voz</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproducir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Novo correo de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Non se puido reproducir o correo de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando correo de voz…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arquivando correo de voz…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Non se puido cargar o correo de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Só chamadas con correo de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Só chamadas entrantes"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Só chamadas saíntes"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Só chamadas perdidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"buscar"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"marcar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número que se vai marcar"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Reproducir ou deter a reprodución"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar ou desactivar o altofalante"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Buscar posición de reprodución"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reducir a velocidade da reprodución"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar a velocidade de reprodución"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de chamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Máis opcións"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar só as saíntes"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar só as entrantes"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar só as perdidas"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Mostrar só os correos de voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas as chamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Engadir pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Engadir espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contactos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado de tons táctiles"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Volver á chamada en curso"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Engadir chamada"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Chamadas entrantes"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproducir correo de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ver contacto <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Chamar a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear atallo para a nova IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de acción en bloque"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saíu do modo de acción en bloque"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Seleccionouse: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Anulouse a selección de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalles de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalles de contacto da chamada sospeitosa de spam: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videochamada"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Envía unha SMS a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Correo de voz sen escoitar"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar busca por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Chamar ao <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Correo de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correo de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correos de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Si"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Non"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Queres eliminar a selección (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancela o modo de accións en lote"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Cantidade seleccionada: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Queres eliminar estes correos de voz? "</b>"</item>
+      <item quantity="one">"<b>"Queres eliminar este correo de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ás <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> (<xliff:g id="DURATION">%2$s</xliff:g>)"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Non é posible chamar a este número"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar o correo de voz, accede a Menú &gt; Configuración."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para chamar ao correo de voz, primeiro desactiva o modo avión."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Cargando..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Cargando da tarxeta SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contactos da tarxeta SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Non hai aplicacións de contactos dispoñibles"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Busca por voz non dispoñible"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Non se pode facer unha chamada telefónica porque se desactivou a aplicación de teléfono."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Engade número/busca contactos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"O teu historial de chamadas está baleiro"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Facer unha chamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Non tes chamadas perdidas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"A caixa de entrada do correo de voz está baleira."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar só os favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de chamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Correo de voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Marcación rápida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historial de chamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Correo de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eliminado dos favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Desfacer"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Chamar ao <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear novo contacto"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Engadir a un contacto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Realizar unha videochamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> chamadas perdidas novas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Aínda non tes ningún contacto na marcación directa"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Engade un favorito para a marcación directa"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Aínda non tes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Engade un contacto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toca a imaxe para ver todos os números ou mantena premida para reordenalos"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
+    <string name="select_all" msgid="408601760696146245">"Seleccionar todos"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar unha mensaxe"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalles da chamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Chamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Escoitar o correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproducir correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausar correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Eliminar correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> correos de voz novos</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> correo de voz novo</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Engadir <xliff:g id="NAMEORNUMBER">^1</xliff:g> ao contacto existente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalles da chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Eliminouse do historial de chamadas"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoxe"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Onte"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Anteriores"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de chamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar o altofalante."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar o altofalante."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reproducir máis rápido."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reproducir máis lento."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar ou pausar a reprodución."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcións de visualización"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibración"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de chamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Correo de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Elixir SIM e configurar correo"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"O bloqueo de chamadas desactivouse temporalmente"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueo de chamadas desactivouse porque contactaches cos servizos de emerxencias desde este teléfono nas últimas 48 horas. Volverase activar automaticamente unha vez que pase o período de 48 horas."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"O <xliff:g id="NUMBER">%1$s</xliff:g> xa está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Establecer permisos"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para activar a marcación rápida, activa o permiso de Contactos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver o teu rexistro de chamadas, activa o permiso de Teléfono."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver os teus contactos, activa o permiso de Contactos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para acceder ao correo de voz, activa o permiso de Teléfono."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para buscar os teus contactos, activa os permisos de Contactos."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para facer unha chamada, activa o permiso de Teléfono."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A aplicación Teléfono non ten permiso para modificar a configuración do sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Non se pode contactar con <xliff:g id="NAME">%1$s</xliff:g> porque está sen conexión"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google está transcribindo…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcrición non dispoñible"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Eliminouse a chamada. Podes ver e eliminar os anexos compartidos durante esta chamada en Mensaxes."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Elimináronse as chamadas. Podes ver e eliminar os anexos compartidos durante as chamadas en Mensaxes."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-gu/strings.xml b/java/com/android/dialer/app/res/values-gu/strings.xml
index 1df1826..4424327 100644
--- a/java/com/android/dialer/app/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/res/values-gu/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ફોન"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ફોન કીપેડ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ફોન"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"કૉલ ઇતિહાસ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"અચોક્કસ નંબરની જાણ કરો"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"નંબર કૉપિ કરો"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ટ્રાંસ્ક્રિપ્શન કૉપિ કરો"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"નંબર અવરોધિત કરો"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"નંબર અનાવરોધિત કરો"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"કૉલ ઇતિહાસ સાફ કરો"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"વૉઇસમેઇલ કાઢી નાખો"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"કૉલ ઇતિહાસ સાફ કરીએ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"આ તમારા ઇતિહાસમાંથી તમામ કૉલ્સ કાઢી નાખશે"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"કૉલ ઇતિહાસ સાફ કરી રહ્યાં છે…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ફોન"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"છૂટેલો કૉલ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ચૂકી ગયેલ કાર્ય કૉલ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"છૂટેલા કૉલ્સ"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> વૉઇસમેઇલ્સ </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> વૉઇસમેઇલ્સ </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ચલાવો"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> તરફથી નવો વૉઇસમેઇલ."</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"વૉઇસમેઇલ ચલાવી શકાઈ નથી"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"વૉઇસમેઇલ લોડ કરી રહ્યું છે…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"વૉઇસમેઇલને આર્કાઇવ કરી રહ્યાં છે…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"વૉઇસમેઇલ લોડ કરી શકાઈ નથી"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"ફક્ત વૉઇસમેઇલ સાથેના કૉલ્સ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ફક્ત ઇનકમિંગ કૉલ્સ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ફક્ત આઉટગોઇંગ કૉલ્સ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"ફક્ત છૂટી ગયેલ કૉલ્સ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"શોધો"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ડાયલ કરો"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ડાયલ કરવા માટેનો નંબર"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"પ્લેબેક ચલાવો અથવા રોકો"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"સ્પીકરફોન ચાલુ કે બંધ કરો"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"પ્લેબેક સ્થિતિ શોધો"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"પ્લેબેક રેટ ઘટાડો"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"પ્લેબેક રેટ વધારો"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"કૉલ ઇતિહાસ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"વધુ વિકલ્પો"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"કી પેડ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ફક્ત આઉટગોઇંગ બતાવો"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ફક્ત આવનારા બતાવો"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"ફક્ત છૂટેલ બતાવો"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"ફક્ત વૉઇસમેઇલ્સ બતાવો"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"તમામ કૉલ્સ બતાવો"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-સંકડનો વિરામ ઉમેરો"</string>
-    <string name="add_wait" msgid="1177723010768282578">"પ્રતીક્ષા ઉમેરો"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"સેટિંગ્સ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"સિમ્યુલેટર"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"તમામ સંપર્કો"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ટચ ટોન કીપેડનો ઉપયોગ કરો"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"કૉલ પર પાછા આવવું પ્રગતિ પર છે"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"કૉલ ઉમેરો"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ઇનકમિંગ કૉલ્સ"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"વૉઇસમેઇલ ચલાવો"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> સંપર્ક જુઓ"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ને કૉલ કરો"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"નવું UI શૉર્ટકટ્સ બનાવો"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"બલ્ક ક્રિયા મોડમાં દાખલ થઈ રહ્યાં છે"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"બલ્ક ક્રિયા મોડ છોડી દીધો"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> પસંદ કર્યો"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> પસંદગીમાંથી દૂર કર્યો"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટે સંપર્ક વિગતો"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"શંકાસ્પદ સ્પામ કૉલર <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટેની સંપર્ક વિગતો"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> કૉલ્સ."</string>
     <string name="description_video_call" msgid="3738199365585751727">"વિડિઓ કૉલ."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> ને SMS મોકલો"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"વણસાંભળેલ વૉઇસમેઇલ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"વૉઇસ શોધ શરૂ કરો"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ને કૉલ કરો"</string>
     <string name="voicemail" msgid="8899540969000957954">"વૉઇસમેઇલ"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> સેકંડ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> મિ <xliff:g id="SECONDS">%s</xliff:g> સે"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"વૉઇસમેઇલ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"વૉઇસમેઇલ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"હા"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"નહીં"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"પસંદ કરેલ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ને કાઢી નાખીએ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"બૅચ ક્રિયા મોડ રદ કરો"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"કાઢી નાખો"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"રદ કરો"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> પસંદ કરી"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
+      <item quantity="other">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> નાં રોજ <xliff:g id="TIME">%2$s</xliff:g> વાગ્યે"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"આ નંબર પર કૉલ કરી શકતાં નથી"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"વૉઇસમેઇલ સેટ કરવા માટે, મેનૂ &gt; સેટિંગ્સ પર જાઓ."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"વૉઇસમેઇલ પર કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"લોડ કરી રહ્યું છે..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM કાર્ડમાંથી લોડ કરી રહ્યું છે…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM કાર્ડ સંપર્કો"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"કોઈ સંપર્કો ઍપ્લિકેશન ઉપલબ્ધ નથી"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"વૉઇસ શોધ ઉપલબ્ધ નથી"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ફોન કૉલ કરી શકાતો નથી કારણ કે ફોન ઍપ્લિકેશન અક્ષમ કરવામાં આવી છે."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"સંપર્કો શોધો"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"નંબર ઉમેરો અથવા સંપર્કો શોધો"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"તમારો કૉલ ઇતિહાસ ખાલી છે"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"કૉલ કરો"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"તમારી પાસે કોઇ છૂટેલાં કૉલ્સ નથી."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"તમારું વૉઇસમેઇલ ઇનબોક્સ ખાલી છે."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ફક્ત મનપસંદ બતાવો"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"કૉલ ઇતિહાસ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"તમામ"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"છૂટેલ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"વૉઇસમેઇલ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"સ્પીડ ડાયલ"</string>
     <string name="tab_history" msgid="7420269368689503596">"કૉલ ઇતિહાસ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"સંપર્કો"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"વૉઇસમેઇલ"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"મનપસંદમાંથી દૂર કર્યું"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"પૂર્વવત્ કરો"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ને કૉલ કરો"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"નવો સંપર્ક બનાવો"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"સંપર્કમાં ઉમેરો"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS મોકલો"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"વિડિઓ કૉલ કરો"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"નંબર અવરોધિત કરો"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> નવા છૂટેલા કૉલ્સ"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"તમારા ઝડપી ડાયલ પર હજી સુધી કોઇ નથી"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"એક મનપસંદ ઉમેરો"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"તમે હજી સુધી કોઇપણ સંપર્કો ધરાવતાં નથી"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"સંપર્ક ઉમેરો"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"બધા નંબર્સ જોવા માટે છબી ટચ કરો અથવા પુનઃક્રમાંકિત કરવા માટે ટચ કરો અને પકડી રાખો"</string>
     <string name="remove_contact" msgid="2353580570488923668">"દૂર કરો"</string>
+    <string name="select_all" msgid="408601760696146245">"તમામ પસંદ કરો"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"વિડિઓ કૉલ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"એક સંદેશ મોકલો"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"કૉલની વિગતો"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને કૉલ કરો"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને વિડિઓ કૉલ કરો."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ના વૉઇસમેઇલને સાંભળો"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માંથી વૉઇસમેઇલ ચલાવો"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માંથી વૉઇસમેઇલ થોભાવો"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માંથી વૉઇસમેઇલ કાઢી નાખો"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> નવી વૉઇસમેઇલ્સ</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> નવી વૉઇસમેઇલ્સ</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માટે સંપર્ક બનાવો"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને અસ્તિત્વમાંના સંપર્કમાં ઉમેરો"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માટે કૉલ વિગતો"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"કૉલ ઇતિહાસમાંથી કાઢી નાખી"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"આજે"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ગઈ કાલે"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"જૂનું"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"કૉલ્સની સૂચિ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"સ્પીકર ચાલુ કરો."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"સ્પીકર બંધ કરો."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"વધુ ઝડપથી ચલાવો."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"વધુ ધીરેથી ચલાવો."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"પ્લેબેક ચલાવો અથવા થોભાવો"</string>
     <string name="display_options_title" msgid="3880091801055797975">"પ્રદર્શન વિકલ્પો"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ધ્વનિ અને વાઇબ્રેશન"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"કૉલ્સ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"કૉલ અવરોધ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"વૉઇસમેઇલ"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"વૉઇસમેઇલ સેટિંગ્સ માટે SIM પસંદ કરો"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"કૉલ અવરોધિત કરવાનું અસ્થાયીરૂપે બંધ છે"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"કૉલ અવરોધિત કરવાનું અક્ષમ કરવામાં આવ્યું છે કારણ કે તમે આ ફોનમાંથી છેલ્લા 48 કલાકમાં કટોકટીની સેવાઓનો સંપર્ક કર્યો હતો. એકવાર 48 કલાકનો સમયગાળો સમાપ્ત થાય, પછી તે આપમેળે ફરીથી સક્ષમ કરવામાં આવશે."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"નંબર્સ આયાત કરો"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"અવરોધિત નંબરો"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ને પહેલેથી અવરોધિત કરવામાં આવ્યો છે."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"કૉલિંગ એકાઉન્ટ્સ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ચાલુ કરો"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"પરવાનગીઓ સેટ કરો"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ઝડપી ડાયલ સક્ષમ કરવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"તમારો કૉલ લૉગ જોવા માટે, ફોન પરવાનગી ચાલુ કરો."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"તમારા સંપર્કો જોવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"તમારી વૉઇસમેઇલને ઍક્સેસ કરવા માટે, ફોન પરવાનગી ચાલુ કરો."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"કૉલ કરવા માટે, ફોન પરવાનગી ચાલુ કરો."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ફોન એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ પર લખવાની પરવાનગી નથી."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"સ્પામ"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ઑફલાઇન છે અને તેના સુધી પહોંચી શકતાં નથી"</string>
     <string name="about_phone_label" msgid="582991354677973731">"વિશે"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google દ્વારા ટ્રાન્સ્ક્રાઇબ કરેલ"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ટ્રાન્સ્ક્રાઇબ કરી રહ્યું છે..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"જુઓ"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"કૉલ કાઢી નાખ્યો. આ કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"કૉલ કાઢી નાખ્યા. કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hi/strings.xml b/java/com/android/dialer/app/res/values-hi/strings.xml
index 84d2d97..489d73b 100644
--- a/java/com/android/dialer/app/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/res/values-hi/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"फ़ोन"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फ़ोन कीपैड"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"फ़ोन"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"कॉल इतिहास"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"गलत नंबर की रिपोर्ट करें"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"नंबर कॉपी करें"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ट्रांसक्रिप्शन को कॉपी करें"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"नंबर अवरुद्ध करें"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"नंबर अनवरोधित करें"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"कॉल करने से पहले नंबर संपादित करें"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"कॉल इतिहास साफ़ करें"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"वॉइसमेल हटाएं"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कॉल इतिहास साफ़ करें?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"इससे आपके इतिहास से सभी कॉल हटा दिए जाएंगे"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"कॉल इतिहास साफ़ किया जा रहा है…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"फ़ोन"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"छूटी कॉल"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"कार्यस्थल का छूटा हुआ कॉल"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"छूटे कॉल"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> वॉइसमेल </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> वॉइसमेल </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"चलाएं"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> की ओर से नया ध्‍वनिमेल"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"वॉइसमेल नहीं चलाया जा सका"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"वॉइसमेल लोड हो रहा है…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"वॉइसमेल संग्रहित किया जा रहा है…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"वॉइसमेल लोड नहीं किया जा सका"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"केवल वॉयस मेल वाले कॉल"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"केवल इनकमिंग कॉल"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"केवल आउटगोइंग कॉल"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"केवल छूटे कॉल"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"खोजें"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"डायल करें"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"डायल करने के लिए नंबर"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"प्लेबैक चलाएं या बंद करें"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्पीकरफ़ोन को चालू या बंद पर स्विच करें"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"प्लेबैक स्थिति का पता लगाएं"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"प्लेबैक दर घटाएं"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"प्लेबैक दर बढ़ाएं"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"कॉल इतिहास"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"अधिक विकल्प"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"कीपैड"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"केवल आउटगोइंग ही दिखाएं"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"केवल इनकमिंग ही दिखाएं"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"केवल छूटे हुए ही दिखाएं"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"केवल ध्‍वनि‍मेल दि‍खाएं"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"सभी कॉल दि‍खाएं"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-सेकंड का विराम जोड़ें"</string>
-    <string name="add_wait" msgid="1177723010768282578">"प्रतीक्षा का समय बढ़ाएं"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"सभी संपर्क"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"टच टोन कीपैड का उपयोग करें"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"कॉल पर लौटना प्रगति पर है"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"कॉल जोड़ें"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"इनकमिंग कॉल"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ध्‍वनिमेल चलाएं"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> संपर्क देखें"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> को कॉल करें"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नया UI शॉर्टकट बनाएं"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"बल्क कार्रवाई मोड में प्रवेश कर रहे हैं"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"बल्क कार्रवाई मोड छोड़ा"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को चुना गया"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को नहीं चुना गया"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का संपर्क विवरण"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"संदिग्ध स्पैम कॉलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> के लिए संपर्क विवरण"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कॉल."</string>
     <string name="description_video_call" msgid="3738199365585751727">"वीडियो कॉल."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> को SMS भेजें"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"नहीं सुना गया वॉयस मेल"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"बोलकर खोजें शुरु करें"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string>
     <string name="voicemail" msgid="8899540969000957954">"वॉयस मेल"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकंड"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g> से."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"वॉयसमेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"वॉयसमेल"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"हां"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"नहीं"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"क्या चुने गए <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> हटाना चाहते हैं?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"बैच कार्रवाई मोड रद्द करें"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटाएं"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करें"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयनित"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
+      <item quantity="other">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> को <xliff:g id="TIME">%2$s</xliff:g> बजे"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"इस नंबर पर कॉल नहीं किया जा सकता"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"वॉइसमेल सेट करने के लिए, मेनू &gt; सेटिंग पर जाएं."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"वॉइसमेल कॉल करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"लोड हो रही है..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"सिम कार्ड से लोड हो रहा है…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"सिम कार्ड के संपर्क"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"कोई भी संपर्क ऐप उपलब्‍ध नहीं है"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"बोलकर खोजना उपलब्‍ध नहीं है"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"फ़ोन कॉल नहीं किया जा सकता क्योंकि फ़ोन ऐप्लिकेशन अक्षम कर दिया गया है."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"संपर्क खोजें"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"नंबर जोड़ें या संपर्क खोजें"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"आपका कॉल इतिहास खाली है"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"कॉल करें"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"आपके पास कोई भी छूटा हुआ कॉल नहीं है."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"आपका वॉइसमेल इनबाॅक्‍स खाली है."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"केवल पसंदीदा दिखाएं"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"कॉल इतिहास"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"सभी"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"छूटे हुए"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"वॉयस मेल"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"स्पीड डायल"</string>
     <string name="tab_history" msgid="7420269368689503596">"कॉल इतिहास"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"संपर्क"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"वॉइसमेल"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"पसंदीदा से निकाल दिया गया"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"वापस लाएं"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नया संपर्क बनाएं"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"किसी संपर्क में जोड़ें"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS भेजें"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"वीडियो कॉल करें"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"नंबर अवरुद्ध करें"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g>  छूटे हुए नए कॉल"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"आपके स्‍पीड डायल पर अभी तक कोई भी नहीं है"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"कोई पसंदीदा जोड़ें"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"आपके पास अभी कोई भी संपर्क नहीं है"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"कोई संपर्क जोड़ें"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"सभी नंबर देखने के लिए चित्र को स्‍पर्श करें या पुन: क्रमित करने के लिए स्‍पर्श करके रखें"</string>
     <string name="remove_contact" msgid="2353580570488923668">"निकालें"</string>
+    <string name="select_all" msgid="408601760696146245">"सभी चुनें"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"वीडियो कॉल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"संदेश भेजें"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कॉल विवरण"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को कॉल करें"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को वीडियो कॉल करें."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> की वॉयस मेल सुनें"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का वॉइसमेल चलाएं"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का वॉइसमेल रोकें"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का वॉइसमेल हटाएं"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> नए वॉइसमेल</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> नए वॉइसमेल</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> के लिए संपर्क बनाएं"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को मौजूदा संपर्क में जोड़ें"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> के कॉल विवरण"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"कॉल इतिहास से हटाएं"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"कल"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"पुराना"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"कॉल की सूची"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पीकर चालू करें."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पीकर बंद करें."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"तेज़ी से चलाएं."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"धीरे चलाएं."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"प्लेबैक प्रारंभ करें या रोकें."</string>
     <string name="display_options_title" msgid="3880091801055797975">"प्रदर्शन विकल्प"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्‍वनि और कंपन"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरुद्ध करें"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"वॉइसमेल"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"वॉइसमेल सेटिंग हेतु सिम चुनें"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरुद्ध करना अस्‍थायी रूप से बंद है"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कॉल अवरुद्ध किए जाने को अक्षम कर दिया गया है क्योंकि पिछले 48 घंटों में आपने इस फ़ोन से आपातकालीन सेवाओं से संपर्क किया है. 48 घंटे की अवधि बीत जाने पर यह अपने आप फिर से सक्षम हो जाएगी."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर आयात करें"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"अवरोधित नंबर"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> पहले से अवरोधित है."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"कॉलिंग खाते"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"चालू करें"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"अनुमतियां सेट करें"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"स्पीड डायल सक्षम करने के लिए, संपर्क अनुमति चालू करें."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"अपना कॉल लॉग देखने के लिए, फ़ोन अनुमति चालू करें."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"अपने संपर्क देखने के लिए, संपर्क अनुमति चालू करें."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"अपना वॉइसमेल ऐक्सेस करने के लिए, फ़ोन अनुमति चालू करें."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"कॉल करने के लिए, फ़ोन अनुमति चालू करें."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"फ़ोन ऐप को सिस्टम सेटिंग में लिखने की अनुमति नहीं है."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्पैम"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ऑफ़लाइन हैं और उन तक नहीं पहुंचा जा सकता"</string>
     <string name="about_phone_label" msgid="582991354677973731">"संक्षिप्त विवरण"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"यह ट्रांसक्रिप्शन Google ने किया है"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google प्रतिलेखन कर रहा है …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ट्रांसक्रिप्ट उपलब्‍ध नहीं है"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"देखें"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"कॉल हटाया गया. संदेश में जा कर इस कॉल के दौरान साझा किए गए अटैचमेंट देखें और हटाएं."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कॉल हटाए गए. संदेश में जा कर इस कॉल के दौरान साझा किए गए अटैचमेंट देखें और हटाएं."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hr/strings.xml b/java/com/android/dialer/app/res/values-hr/strings.xml
index cd35353..b08ff09 100644
--- a/java/com/android/dialer/app/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/res/values-hr/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tipkovnica"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Povijest poziva"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Prijavi netočan broj"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj prijepis"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokiraj broj"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblokiraj broj"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Uredi broj prije pozivanja"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Izbriši povijest poziva"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poštu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite li izbrisati povijest poziva?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Izbrisat će se svi pozivi iz vaše povijesti"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Brisanje povijesti poziva…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušteni poziv"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušten poslovni poziv"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
@@ -49,107 +44,67 @@
       <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> poruke govorne pošte </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> poruka govorne pošte </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproduciraj"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna pošta od kontakta <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nije moguće reproducirati govornu poštu"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Učitavanje govorne pošte…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arhiviranje govorne pošte..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Govorna pošta nije učitana"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Samo pozivi s govornom poštom"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Samo dolazni pozivi"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Samo odlazni pozivi"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Samo propušteni pozivi"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pretraži"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"biraj"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"broj za pozivanje"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Pokretanje ili zaustavljanje reprodukcije"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključivanje ili isključivanje zvučnika"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Traženje položaja reprodukcije"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Smanjenje brzine reprodukcije"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Povećanje brzine reprodukcije"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Povijest poziva"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Više opcija"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tipkovnica"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Prikaži samo odlazne"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Prikaži samo dolazne"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Prikaži samo propuštene"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Prikaži samo govorne pošte"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Prikaz svih poziva"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Dodaj pauzu od 2 s."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Dodaj čekanje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Svi kontakti"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Koristi dodirnu zvučnu tipkovnicu"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Natrag na poziv u tijeku"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Dodaj poziv"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Dolazni pozivi"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reprodukcija govorne pošte"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Prikaz kontakta <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Nazovi <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Izrada prečaca novog sučelja"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazak u način skupne radnje"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Napuštanje načina skupne radnje"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Odabrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Poništen odabir: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Pojedinosti o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Podaci za kontakt mogućeg neželjenog pozivatelja <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videopoziv."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Slanje SMS-a kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nepreslušana govorna pošta"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Pokretanje glasovnog pretraživanja"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"poruka govorne pošte"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"poruke govorne pošte"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite li izbrisati odabranu poruku/e govorne pošte <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način skupnih radnji"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Odustani"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+      <item quantity="few">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+      <item quantity="other">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nije moguće nazvati taj broj"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Da biste postavili govornu poštu, idite na Izbornik &gt; Postavke."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Da biste nazvali govornu poštu, najprije isključite način rada u zrakoplovu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Učitavanje..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Učitavanje sa SIM kartice..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakti SIM kartice"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nije dostupna nijedna aplikacija za kontakte"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno pretraživanje nije dostupno"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefoniranje nije moguće jer je aplikacija Telefon onemogućena."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pretraži kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Dodaj broj ili potraži kontakt"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Vaša je povijest poziva prazna"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Uputite poziv"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate propuštene pozive."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Nemate pristiglih poruka govorne pošte."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Prikaži samo favorite"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Povijest poziva"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Sve"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Gov. pošta"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
     <string name="tab_history" msgid="7420269368689503596">"Povijest poziva"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Uklonjeno iz favorita"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Poništi"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izrada novog kontakta"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj kontaktu"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputite videopoziv"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Broj novih propuštenih poziva: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Još nemate nikog na brzom biranju"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj omiljeni kontakt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Dodajte kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Dodirnite sliku da biste vidjeli sve brojeve ili dodirnite i zadržite da biste promijenili redoslijed"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
+    <string name="select_all" msgid="408601760696146245">"Odaberi sve"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Pojedinosti poziva"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videopoziv <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Slušanje govorne pošte kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproduciranje govorne pošte od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pauziranje govorne pošte od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Brisanje govorne pošte od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> nova govorna pošta</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nove govorne pošte</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novih govornih pošta</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Izrada kontakta za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodavanje kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Pojedinosti o pozivu za kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Izbrisano iz povijesti poziva"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jučer"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Stariji"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Popis poziva"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključivanje zvučnika."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključivanje zvučnika."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Brža reprodukcija."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Sporija reprodukcija."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pokretanje ili pauziranje reprodukcije."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvukovi i vibracije"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Odabir SIM-a za postavke govorne pošte"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva privremeno isključeno"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva onemogućeno je jer ste kontaktirali hitne službe s ovog telefona u posljednjih 48 sati. Automatski će se ponovo omogućiti kada prođe 48 sati."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz brojeva"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> već je blokiran."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Pozivanje računa"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Uključi"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Postavi dopuštenja"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Da biste omogućili brzo biranje, uključite dopuštenje za kontakte."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Da biste vidjeli zapisnik poziva, uključite dopuštenje za telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Da biste vidjeli svoje kontakte, uključite dopuštenje za kontakte."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Da biste pristupili govornoj pošti, uključite dopuštenje za telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Da biste pretraživali kontakte, uključite dopuštenja za kontakte."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Da biste nazvali nekog, uključite dopuštenje za telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nema dopuštenje za pisanje u postavke sustava."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Neželjena pošta"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> nije online i nije dostupan"</string>
     <string name="about_phone_label" msgid="582991354677973731">"O aplikaciji"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prijepis: Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google provodi prijepis..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Prijepis nije dostupan"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. U Porukama pregledajte i izbrišite privitke podijeljene tijekom ovog poziva."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. U Porukama pregledajte i izbrišite privitke podijeljene tijekom poziva."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hu/strings.xml b/java/com/android/dialer/app/res/values-hu/strings.xml
index 2e64d74..6171d57 100644
--- a/java/com/android/dialer/app/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/res/values-hu/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonbillenyűzet"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Híváslista"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Pontatlan szám jelentése"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Szám másolása"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Átírás másolása"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Szám tiltása"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Szám tiltásának feloldása"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Szám szerkesztése hívás előtt"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"A híváslista törlése"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Hangposta törlése"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Törli a híváslistát?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ezzel törli az összes hívást az előzmények közül"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Híváslista törlése…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefonhívás"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Nem fogadott hívás"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Nem fogadott munkahelyi hívás"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Elmulasztott hívások"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> hangpostaüzenet </item>
       <item quantity="one">Hangpostaüzenet</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Lejátszás"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Új hangüzenet tőle: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nem sikerült lejátszani a hangpostát"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Hangposta betöltése…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Hangpostaüzenet archiválása…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nem sikerült betölteni a hangpostát"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Csak hangpostahívások"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Csak bejövő hívások"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Csak kimenő hívások"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Csak nem fogadott hívások"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"keresés"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"tárcsázás"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"a tárcsázandó szám"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Lejátszás indítása vagy leállítása"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Kihangosító be- vagy kikapcsolása"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Lejátszási pozíció módosítása"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Lejátszás sebességének csökkentése"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Lejátszás sebességének növelése"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Híváslista"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"További beállítások"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"billentyűzet"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Csak a kimenők megjelenítése"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Csak a bejövők megjelenítése"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Csak a nem fogadottak"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Csak a hangüzenetek"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Összes hívás megjelenítése"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 mp-es szünet hozzáadása"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Várakozás hozzáadása"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Beállítások"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Szimulátor"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Összes névjegy"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Hangkódos telefonbillentyűzet használata"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Vissza a folyamatban lévő híváshoz"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Hívás hozzáadása"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Bejövő hívások"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Hangposta lejátszása"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> névjegyének megtekintése"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> hívása"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Új felh. felület-parancsikon"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Belépés tömeges műveleti módba"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Kilépett a tömeges műveleti módból"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Kijelölés: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Kijelölés megszüntetve: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> részletes adatai."</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (feltételezett spamhívó) részletes adatai"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> hívás"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videohívás."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"SMS küldése <xliff:g id="NAME">%1$s</xliff:g> részére"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nem lejátszott hangüzenet"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Hangalapú keresés indítása"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Hangposta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> másodperc"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> perc <xliff:g id="SECONDS">%s</xliff:g> másodperc"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"hangpostaüzenetet"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"hangpostaüzeneteket"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Igen"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nem"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Törli a kiválasztott <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Köteges művelet mód leállítva"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Törlés"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Mégse"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> kiválasztva"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Törli ezeket a hangpostaüzeneteket? "</b>"</item>
+      <item quantity="one">"<b>"Törli ezt a hangpostaüzenetet? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nem lehet felhívni ezt a számot"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"A hangposta beállításához válassza a Menü &gt; Beállítások lehetőséget."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Hangposta hívásához kapcsolja ki a Repülőgép üzemmódot."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Betöltés..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Betöltés a SIM kártyáról..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Névjegyek a SIM kártyán"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nincs elérhető névjegyek alkalmazás"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"A hangalapú keresés nem érhető el"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nem lehet telefonhívást kezdeményezni, mert a Telefon alkalmazást letiltották."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Keresés a névjegyek között"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Adjon meg egy számot, vagy keressen a névjegyek között"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"A híváslista üres"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Hívásindítás"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nincsenek nem fogadott hívások."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hangpostafiókjában nincsenek beérkezett üzenetek."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Csak kedvencek megjelenítése"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Hívási előzmények"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Összes"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Nem fogadott"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Hangposta"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Gyorshívó"</string>
     <string name="tab_history" msgid="7420269368689503596">"Híváslista"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Címtár"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Hangposta"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Eltávolítva a kedvencek közül"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Visszavonás"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Új névjegy létrehozása"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Hozzáadás névjegyhez"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS küldése"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videohívás kezdeményezése"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Szám tiltása"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> új nem fogadott hívás"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Még semelyik telefonszám sincs gyorshívón"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Kedvenc hozzáadása"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Még nem rendelkezik egyetlen névjeggyel sem"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Névjegy hozzáadása"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Koppintson a képre az összes szám megjelenítéséhez, vagy tartsa nyomva az átrendezéshez"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eltávolítás"</string>
+    <string name="select_all" msgid="408601760696146245">"Az összes kijelölése"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohívás"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Üzenet küldése"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Hívás adatai"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hívása"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"A következő hívása videokapcsolattal: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hangpostaüzenetének meghallgatása"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Hangposta lejátszása a következőnél: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Hangposta szüneteltetése a következőnél: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Hangposta törlése a következőnél: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> új hangpostaüzenet</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> új hangpostaüzenet</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Névjegy létrehozása a következőhöz: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"A(z) <xliff:g id="NAMEORNUMBER">^1</xliff:g> hozzáadása meglévő névjegyhez"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – hívásrészletek"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Törölve a híváslistáról"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Ma"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Tegnap"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Korábbi"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Híváslista"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hangszóró bekapcsolása."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Hangszóró kikapcsolása."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Gyorsabb lejátszás."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Lassabb lejátszás."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lejátszás indítása vagy szüneteltetése."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Megjelenítési beállítások"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Hangok és rezgés"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Hívások"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Hívásletiltás"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Hangposta"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Válassza ki a SIM-kártyát"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Hívástiltás átmenetileg felfüggesztve"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Felfüggesztettük a hívások tiltását, mert az elmúlt 48 órában tárcsázta a segélyhívót erről a telefonról. A funkciót automatikusan újból engedélyezzük 48 óra elteltével."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Számok importálása"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Letiltott számok"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"A következő szám már le van tiltva: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Telefonos fiókok"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Engedélyezés"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Engedélyek beállítása"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Gyorshívás engedélyezéséhez kapcsolja be a Névjegyek engedélyt."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"A hívásnapló megtekintéséhez kapcsolja be a Telefon engedélyt."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"A névjegyek megtekintéséhez kapcsolja be a Névjegyek engedélyt."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"A hangposta eléréséhez kapcsolja be a Telefon engedélyt."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"A névjegyek kereséséhez adja meg a Névjegyek engedélyeket."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Hívásindításhoz kapcsolja be a Telefon engedélyt."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A Telefon alkalmazásnak nincs engedélye szerkeszteni a rendszerbeállításokat."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> offline, és nem érhető el."</string>
     <string name="about_phone_label" msgid="582991354677973731">"Névjegy"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Az átirat készítője a Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"A Google átiratot készít…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Nincs elérhető átirat"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Megtekintés"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Hívás törölve. A hívás során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hívások törölve. A hívások során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hy/strings.xml b/java/com/android/dialer/app/res/values-hy/strings.xml
index 6f3931c..73e3501 100644
--- a/java/com/android/dialer/app/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/res/values-hy/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Հեռախոս"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Հեռախոսի ստեղնաշար"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Հեռախոս"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Զանգերի պատմություն"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Հաղորդել սխալ համարի մասին"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Պատճենել համարը"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Պատճենել տառադարձությունը"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Արգելափակել համարը"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Արգելաբացել համարը"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Փոփոխել համարը զանգելուց առաջ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Մաքրել զանգերի պատմությունը"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ջնջել ձայնային փոստը"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Մաքրե՞լ զանգերի պատմությունը:"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Այս գործողությունը ամբողջովին կջնջի զանգերի պատմությունը"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Զանգերի պատմության մաքրում…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Հեռախոս"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Բաց թողնված զանգ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Բաց թողնված աշխատանքային զանգ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Բաց թողնված զանգեր"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ձայնային փոստ </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ձայնային փոստ </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Նվագարկել"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Նոր ձայնային փոստ <xliff:g id="CALLER">%1$s</xliff:g>-ից"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Հաղորդագրությունը չհաջողվեց նվագարկել"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Ձայնային հաղորդագրության բեռնում…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ձայնային փոստի արխիվացում…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Հաղորդագրությունը չհաջողվեց բեռնել"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Միայն ձայնային փոստով զանգերը"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Միայն մուտքային զանգեր"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Միայն ելքային զանգերը"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Միայն բաց թողնված զանգերը"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"որոնել"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"համարհավաքել"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"համարհավաքման հեռախոսահամարը"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Միացնել կամ անջատել նվագարկումը"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Միացնել կամ անջատել բարձրախոսը"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Փնտրել նվագարկման դիրքը"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Իջեցնել նվագարկման վարկանիշը"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Բարձրացնել նվագարկման վարկանիշը"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Զանգերի պատմություն"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Այլ ընտրանքներ"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ստեղնաշար"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Ցույց տալ միայն ելքայինները"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Ցույց տալ միայն մուտքայինները"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Ցույց տալ միայն բաց թողնվածները"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Ցուցադրել միայն ձայնային փոստերը"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Ցուցադրել բոլոր զանգերը"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Ավելացնել 2 վայրկյան դադար"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Ավելացնել սպասում"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Կարգավորումներ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Նմանակիչ"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Բոլոր կոնտակտները"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Օգտագործել հնչերանգներով ստեղնաշարը"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Վերադառնալ ընթացիկ զանգին"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Ավելացնել զանգ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Մուտքային զանգեր"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Նվագարկել ձայնային փոստը"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Դիտել <xliff:g id="NAME">%1$s</xliff:g> կոնտակտը"</string>
-    <string name="description_call" msgid="1532402285334775372">"Զանգել <xliff:g id="NAME">%1$s</xliff:g>-ին"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ստեղծել միջերեսի նոր դյուրանցում"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Դուք մտել եք զանգվածային գործողության ռեժիմ"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Դուք դուրս եկաք զանգվածային գործողությունների ռեժիմից"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Ընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Ապընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալներ (լցոնի կասկած)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> զանգ:"</string>
     <string name="description_video_call" msgid="3738199365585751727">"Տեսազանգ"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Ուղարկել SMS <xliff:g id="NAME">%1$s</xliff:g>-ին"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Չլսված ձայնային փոստ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Սկսկեք ձայնային որոնումը"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Զանգել <xliff:g id="NUMBER">%s</xliff:g>-ին"</string>
     <string name="voicemail" msgid="8899540969000957954">"Ձայնային փոստ"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> վրկ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> րոպե <xliff:g id="SECONDS">%s</xliff:g> վայրկյան"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ձայնային հաղորդագրություն"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ձայնային հաղորդագրություններ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Այո"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ոչ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ջնջե՞լ նշված <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ը"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Չեղարկել փաթեթային գործողությունների ռեժիմը"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ջնջել"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Չեղարկել"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Ընտրվել է՝ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Delete these voicemails? "</b>"</item>
+      <item quantity="other">"<b>"Ջնջե՞լ այս ձայնային հաղորդագրությունները "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>-ին, ժամը <xliff:g id="TIME">%2$s</xliff:g>-ին"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Հնարավոր չէ զանգահարել այս համարով"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Ձայնային փոստը կարգավորելու համար անցեք Ընտրացնակ &gt; Կարգավորումներ:"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Ձայնային փոստին զանգելու համար նախ անջատեք Ինքնաթիռի ռեժիմը:"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Բեռնում..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM քարտը բեռնվում է..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM քարտի կոնտակտները"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Կոնտակտների հավելված չկա"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Ձայնային որոնումը հասանելի չէ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Հնարավոր չէ զանգահարել, քանի որ Հեռախոս հավելվածն անջատված է:"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Կոնտակտների որոնում"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Ավելացրեք համար/որոնեք կոնտակտներ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Զանգերի մատյանը դատարկ է"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Զանգել"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Բաց թողնված զանգեր չունեք:"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ձայնային փոստի մուտքի արկղը դատարկ է:"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Ցույց տալ միայն ընտրյալները"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Զանգերի պատմությունը"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Բոլորը"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Բաց թողնված"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Ձայնափոստ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Արագ համարարկում"</string>
     <string name="tab_history" msgid="7420269368689503596">"Զանգերի պատմությունը"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Կոնտակտներ"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Ձայնային փոստ"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Հեռացված է ընտրյալներից"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Հետարկել"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Զանգել <xliff:g id="NUMBER">%s</xliff:g>-ին"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ստեղծել նոր կոնտակտ"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ավելացնել կոնտակտին"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Ուղարկել SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Տեսազանգ սկսել"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Արգելափակել համարը"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> նոր բաց թողնված զանգ"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Արագ համարահավաքման ցանկը դատարկ է"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ավելացնել կոնտակտ"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Դեռ կոնտակտներ չունեք"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Ավելացնել կոնտակտ"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Բոլոր համարները տեսնելու համար հպեք պատկերին: Վերադասավորելու համար հպեք և պահեք:"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Հեռացնել"</string>
+    <string name="select_all" msgid="408601760696146245">"Ընտրել բոլորը"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Տեսազանգ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Ուղարկել հաղորդագրություն"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Զանգի մանրամասները"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Զանգել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ին"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Տեսազանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտին:"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Լսել ձայնային փոստը <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ից"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Նվագարկել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ի ձայնային փոստի հաղորդագրությունները"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Դադարեցնել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ից ձայնային փոստի հաղորդագրությունների ստացումը"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Ջնջել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ի ձայնային փոստի հաղորդագրությունները"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> նոր ձայնային փոստ</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> նոր ձայնային փոստ</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Ստեղծել <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտը"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ավելացնել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ը առկա կոնտակտին"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> զանգի մասին տվյալներ"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Ջնջվել է զանգերի պատմությունից"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Այսօր"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Երեկ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ավելի հին"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Զանգերի ցանկ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Միացնել խոսափողը:"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Անջատել բարձրախոսը:"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Նվագարկել ավելի արագ:"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Նվագարկել ավելի դանդաղ:"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Սկսել կամ դադարեցնել նվագարկումը:"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Ցուցադրման ընտրանքներ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ձայներ և թրթռոց"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Զանգեր"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Զանգերի արգելափակում"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Ձայնային փոստ"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Ընտրեք SIM քարտը՝ ձայնային փոստը կարգավորելու համար"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Զանգերի արգելափակումը կասեցվել է"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Զանգերի արգելափակումը կասեցվել է, քանի որ վերջին 48 ժամվա ընթացքում դուք այս հեռախոսից զանգել եք արտակարգ իրավիճակների ծառայություններին: 48 ժամ տևողությամբ ժամանակահատվածի ավարտից հետո այն ավտոմատ կերպով կվերամիացվի:"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ներմուծել համարները"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Արգելափակված համարներ"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> համարն արդեն արգելափակված է:"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Հաշիվներ զանգերի համար"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Միացնել"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Թույլտվությունների սահմանում"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Արագ համարահավաքը թույլատրելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Ձեր զանգերի մատյանը տեսնելու համար միացրեք Հեռախոսի թույլտվությունը:"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Ձեր կոնտակտները տեսնելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Ձայնային փոստն օգտագործելու համար միացրեք Հեռախոսի թույլտվությունը:"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Զանգ կատարելու համար միացրեք Հեռախոսի թույլտվությունը:"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Հեռախոս հավելվածը համակարգի կարգավորումները գրելու թույլտվություն չունի:"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Լցոն"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը միացած չէ ցանցին և անհասանելի է"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Հավելվածի մասին"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Տառադրումն ըստ Google-ի"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Տառադրում…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Տառադրումն անհասանելի է"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Դիտել"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Զանգը ջնջվեց: Դիտեք և ջնջեք զանգի ընթացքում ստացված կցորդները Messages հավելվածում:"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Զանգերը ջնջվեցին: Դիտեք և ջնջեք զանգերի ընթացքում ստացված կցորդները Messages հավելվածում:"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-in/strings.xml b/java/com/android/dialer/app/res/values-in/strings.xml
index c0de9b3..0db472c 100644
--- a/java/com/android/dialer/app/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/res/values-in/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telepon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Keypad Ponsel"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telepon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Riwayat panggilan"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Laporkan nomor yang tidak akurat"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Salin nomor"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Salin transkripsi"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokir nomor"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Bebaskan nomor"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit nomor sebelum memanggil"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Hapus riwayat panggilan"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Hapus pesan suara"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Hapus riwayat panggilan?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tindakan ini akan menghapus semua panggilan telepon dari riwayat"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Menghapus riwayat panggilan..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telepon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Panggilan tak terjawab"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Panggilan tak terjawab di telepon kerja"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Panggilan tak terjawab"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Pesan suara </item>
       <item quantity="one">Pesan suara</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Putar"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Pesan suara baru dari <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Tidak dapat memutar pesan suara"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Memuat pesan suara..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Mengarsipkan pesan suara…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Tidak dapat memuat pesan suara"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Hanya panggilan dengan pesan suara"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Hanya panggilan masuk"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Hanya panggilan keluar"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Hanya panggilan tak terjawab"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"telusuri"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"panggil"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nomor untuk dipanggil"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Memutar atau menghentikan pemutaran"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Mengaktifkan/menonaktifkan pengeras suara ponsel"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Mencari posisi pemutaran"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Menurunkan laju pemutaran"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Meningkatkan laju pemutaran"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Riwayat panggilan"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Opsi lainnya"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"keypad"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Tampilkan panggilan keluar"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Tampilkan panggilan masuk saja"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Tampilkan panggilan terlewat"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Tampilkan pesan suara saja"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Tampilkan semua panggilan"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Tambahkan jeda 2 dtk"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Tambahkan tunggu"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Setelan"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Semua kontak"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gunakan keypad nada sentuh"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kembali ke panggilan sedang berlangsung"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Tambahkan panggilan"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Panggilan masuk"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Putar pesan suara"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Lihat kontak <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Telepon <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baru"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Masuk ke mode tindakan massal"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Keluar dari mode tindakan massal"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dipilih"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tidak dipilih"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detail kontak untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detail kontak untuk penelepon spam yang dicurigai <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Kirim SMS ke <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Pesan suara yang belum didengar"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Memulai penelusuran suara"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Telepon <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Kotak Pesan"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> mnt <xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"pesan suara"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"pesan suara"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ya"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Tidak"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Hapus <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> yang dipilih?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Membatalkan mode tindakan kelompok"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Hapus"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Hapus pesan suara ini? "</b>"</item>
+      <item quantity="one">"<b>"Hapus pesan suara ini? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pukul <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Tidak dapat menelepon nomor ini"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Untuk menyiapkan pesan suara, buka Menu &gt; Setelan."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Untuk memanggil pesan suara, pertama-tama matikan mode Pesawat."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Memuat..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Memuat dari kartu SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontak pada kartu SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Aplikasi kontak tidak tersedia"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Penelusuran suara tidak tersedia"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Tidak dapat melakukan panggilan telepon karena aplikasi Telepon telah dinonaktifkan."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Telusuri kontak"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Tambahkan nomor atau telusuri kontak"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Riwayat panggilan kosong"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Lakukan panggilan telepon"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Tidak ada panggilan yang tidak terjawab."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kotak masuk pesan suara kosong."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Hanya tampilkan favorit"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Riwayat Panggilan"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Semua"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Tak Dijawab"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"PesanSuara"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Panggilan cepat"</string>
     <string name="tab_history" msgid="7420269368689503596">"Riwayat Panggilan"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontak"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Pesan suara"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Dihapus dari favorit"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Batalkan"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telepon <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Buat kontak baru"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Tambahkan ke kontak"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Kirim SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Lakukan video call"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokir nomor"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> panggilan tidak terjawab baru"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Daftar panggilan cepat masih kosong"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tambahkan favorit"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Anda belum memiliki kontak"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Tambahkan kontak"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Sentuh foto untuk melihat semua nomor atau sentuh &amp; tahan untuk menyusun ulang"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Hapus"</string>
+    <string name="select_all" msgid="408601760696146245">"Pilih semua"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Kirim pesan"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detail panggilan"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Telepon <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Lakukan panggilan video ke <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dengarkan kotak pesan dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Putar pesan suara dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Jeda pesan suara dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Hapus pesan suara dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pesan suara baru</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> pesan suara baru</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Buat kontak untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Tambahkan <xliff:g id="NAMEORNUMBER">^1</xliff:g> ke akun yang ada"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detail panggilan telepon untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Dihapus dari riwayat panggilan"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hari ini"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kemarin"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Lebih lama"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Daftar panggilan telepon"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktifkan pengeras suara."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Nonaktifkan pengeras suara."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Putar lebih cepat."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Putar lebih lambat."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Mulai atau jeda pemutaran."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opsi tampilan"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Suara dan getaran"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Panggilan telepon"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pemblokiran panggilan telepon"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Pesan Suara"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Memilih SIM untuk setelan pesan suara"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokir panggilan dinonaktifkan sementara"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pemblokiran panggilan telepon telah dinonaktifkan karena Anda menghubungi layanan darurat dari telepon ini dalam 48 jam terakhir. Akan diaktifkan kembali secara otomatis setelah masa 48 jam berakhir."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impor nomor"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Nomor yang diblokir"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> sudah diblokir."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Akun panggilan"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktifkan"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Setel izin"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Untuk mengaktifkan panggilan cepat, aktifkan izin Kontak."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Untuk melihat log panggilan, aktifkan izin Telepon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Untuk melihat kontak, aktifkan izin Kontak."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Untuk mengakses pesan suara, aktifkan izin Telepon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Untuk menelusuri kontak, aktifkan izin Kontak."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Untuk melakukan panggilan, aktifkan izin Telepon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikasi telepon tidak memiliki izin untuk menulis ke setelan sistem."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> sedang offline dan tidak dapat dijangkau"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Tentang"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Ditranskripsi oleh Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google sedang membuat transkripsi …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkrip tidak tersedia"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Tampilkan"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-is/strings.xml b/java/com/android/dialer/app/res/values-is/strings.xml
index fdd6356..a87605e 100644
--- a/java/com/android/dialer/app/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/res/values-is/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Sími"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Talnaborð á síma"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Sími"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Símtalaferill"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Tilkynna rangt númer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Afrita númer"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Afrita umritun"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Setja númer á bannlista"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Taka númer af bannlista"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Breyta númeri áður en hringt er"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Hreinsa símtalaferil"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eyða talhólfsskilaboðum"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Hreinsa símtalaferil?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Þetta eyðir öllum símtölum af ferlinum"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Hreinsar símtalaferil…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Sími"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ósvarað símtal"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ósvarað vinnusímtal"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Ósvöruð símtöl"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> talhólfsskilaboð </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> talhólfsskilaboð </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Spila"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ný talhólfsskilaboð frá <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Ekki tókst að spila talhólfsskilaboð"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Hleður talhólfsskilaboð…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Setur talhólfsskilaboð í geymslu..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ekki tókst að hlaða talhólfsskilaboð"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Símtöl með talhólfi eingöngu"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Móttekin símtöl eingöngu"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Hringd símtöl eingöngu"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Ósvöruð símtöl eingöngu"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"leita"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"hringja"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"númer til að hringja í"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Hefja eða stöðva spilun"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Kveikja eða slökkva á hátalara"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Breyta spilunarstöðu"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Draga úr spilunarhraða"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Auka spilunarhraða"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Símtalaferill"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Fleiri valkostir"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"talnaborð"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Sýna hringd símtöl eingöngu"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Sýnir móttekin símtöl eingöngu"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Sýna ósvöruð símtöl eingöngu"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Sýna talhólfsskilaboð eingöngu"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Sýna öll símtöl"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Bæta við 2 sekúndna töf"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Bæta töf við"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Stillingar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Hermir"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Allir tengiliðir"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Nota snertitónatakkaborð"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Fara aftur í símtal í gangi"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Bæta við símtali"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Móttekin símtöl"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Spila talhólfsskilaboð"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Skoða tengiliðinn <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Hringja í <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Stofna flýtileið í nýtt viðmót"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Opnar fjöldaaðgerðastillingu"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Fjöldaaðgerðastillingu lokað"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Valdi <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fjarlægði val á <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Tengiliðaupplýsingar um <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Tengiliðaupplýsingar fyrir mögulegt ruslnúmer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> símtöl."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Myndsímtal"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Senda SMS til <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Óspiluð talhólfsskilaboð"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Hefja raddleit"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Hringja í <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Talhólf"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> mín. og <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talhólfsskilaboð"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talhólfsskilaboð"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Já"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Eyða völdum <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hætta við runuaðgerðastillingu"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eyða"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hætta við"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valin"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
+      <item quantity="other">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Ekki er hægt að hringja í þetta númer"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Til að setja upp talhólf þarftu að opna valmyndina og velja Stillingar."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Til að hringja í talhólfið þarftu fyrst að slökkva á flugstillingu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Hleður…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Hleður af SIM-kortinu…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Tengiliðir á SIM-korti"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ekkert tengiliðaforrit í boði"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Raddleit er ekki í boði"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Ekki er hægt að hringja vegna þess að forritið Sími hefur verið gert óvirkt."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Leita í tengiliðum"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Bættu við númeri eða tengilið"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Símtalaferillinn er auður"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Hringja"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Þú ert ekki með nein ósvöruð símtöl."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talhólfið þitt er tómt."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Sýna aðeins uppáhaldstengiliði"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Símtalaferill"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Allt"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Ósvöruð"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Talhólf"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hraðval"</string>
     <string name="tab_history" msgid="7420269368689503596">"Símtalaferill"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Tengiliðir"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Talhólf"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Fjarlægður úr uppáhaldi"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Afturkalla"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Hringja í <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Búa til nýjan tengilið"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Bæta við tengilið"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Senda SMS-skilaboð"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Hringja myndsímtal"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Setja númer á bannlista"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ný ósvöruð símtöl"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Þú ert ekki með neinn í hraðvali enn sem komið er"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Bæta uppáhaldi við"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Þú ert ekki með neina tengiliði enn sem komið er"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Bæta tengilið við"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Snertu myndina til að sjá öll númer eða haltu henni inni til að endurraða"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Fjarlægja"</string>
+    <string name="select_all" msgid="408601760696146245">"Velja allt"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Myndsímtal"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Senda skilaboð"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Símtalsupplýsingar"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Hringja í <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Hringja myndsímtal í <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Hlusta á talhólfsskilaboð frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Spila talhólfsskilaboð sem <xliff:g id="NAMEORNUMBER">^1</xliff:g> sendi"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Gera hlé á talhólfsskilaboðum sem <xliff:g id="NAMEORNUMBER">^1</xliff:g> sendi"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Eyða talhólfsskilaboðum sem <xliff:g id="NAMEORNUMBER">^1</xliff:g> sendi"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ný talhólfsskilaboð</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ný talhólfsskilaboð</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Búa til tengilið fyrir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Bæta <xliff:g id="NAMEORNUMBER">^1</xliff:g> við fyrirliggjandi tengilið"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Símtalsupplýsingar fyrir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Eytt af símtalaferli"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Í dag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Í gær"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Eldra"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Símtalalisti"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Kveikja á hátalara."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slökkva á hátalara."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Spila hraðar."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Spila hægar."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Hefja eða gera hlé á spilun."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Birtingarvalkostir"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Hljóð og titringur"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Símtöl"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Lokað fyrir símtöl"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Talhólf"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Veldu SIM-kort fyrir talhólf"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tímabundið slökkt á lokun fyrir símtöl"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Lokun fyrir símtöl hefur verið gerð óvirk vegna þess að þú hafðir samband við neyðarþjónustu úr þessum síma á undanförnum tveimur sólarhringum. Lokunin verður aftur virk að þessum tveimur sólarhringum liðnum."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Flytja inn númer"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Númer á bannlista"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er nú þegar á bannlista."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Símtalareikningar"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Kveikja"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Stilla heimildir"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Kveiktu á tengiliðaheimildinni til að gera hraðval virkt."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Kveiktu á heimild símaforritsins til að sjá símtalaskrána þína."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kveiktu á tengiliðaheimildinni til að sjá tengiliðina þína."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Kveiktu á heimild símaforritsins til að fá aðgang að talhólfinu þínu."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Kveiktu á heimild símaforritsins til að hringja símtal."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Símaforritið hefur ekki heimild til að breyta kerfisstillingum."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ruslnúmer"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er án nettengingar og ekki er hægt að ná í viðkomandi"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Um forritið"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Umritað af Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google er að umrita …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Textauppskrift er ekki í boði"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Skoða"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Símtali eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessu símtali í Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Símtölum eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessum símtölum í Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-it/strings.xml b/java/com/android/dialer/app/res/values-it/strings.xml
index 9bd8cd3..9642751 100644
--- a/java/com/android/dialer/app/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/res/values-it/strings.xml
@@ -19,14 +19,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefono"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tastierino del telefono"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefono"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Cronologia chiamate"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Segnala numero sbagliato"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copia numero"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copia trascrizione"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blocca numero"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Sblocca numero"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifica numero prima di effettuare la chiamata"</string>
+    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifica numero prima di chiamare"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Cancella cronologia chiamate"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Elimina messaggi della segreteria"</string>
     <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mes vocali eliminati"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Cancellare la cronologia chiamate?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Verranno eliminate tutte le chiamate dalla cronologia"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Cancellazione cronologia chiamate…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefono"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chiamata persa"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chiamata di lavoro persa"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chiamate perse"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> messaggi in segreteria </item>
       <item quantity="one">Messaggio in segreteria</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Riproduci"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuovo messaggio vocale da <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossibile riprodurre i messaggi vocali"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Caricamento dei messaggi vocali…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archiviazione messaggio vocale…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossibile caricare i messaggi vocali"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Solo chiamate con segreteria"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Solo chiamate in arrivo"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Solo chiamate in uscita"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Solo chiamate perse"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"cerca"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"componi"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numero da comporre"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Avvia o interrompi riproduzione"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Attiva o disattiva vivavoce"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Cerca posizione di riproduzione"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Diminuisci velocità di riproduzione"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumenta velocità di riproduzione"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Cronologia chiamate"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Altre opzioni"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastierino"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostra solo in uscita"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostra solo in arrivo"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostra solo senza risposta"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Mostra solo messaggi vocali"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostra tutte le chiamate"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Aggiungi pausa 2 sec"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Aggiungi attesa"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Impostazioni"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulatore"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tutti i contatti"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usa tastierino per selezione a toni"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Torna alla chiamata in corso"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Aggiungi chiamata"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Chiamate in arrivo"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Riproduci messaggio vocale"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Visualizza <xliff:g id="NAME">%1$s</xliff:g> contatto"</string>
-    <string name="description_call" msgid="1532402285334775372">"Chiama <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea nuova scorciatoia UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Attivazione della modalità di azione collettiva"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Disttivazione della modalità di azione collettiva"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selezionato"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> deselezionato"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Dettagli contatto <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Dettagli di contatto del sospetto spammer: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chiamate."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videochiamata."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Invia SMS a <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Messaggio vocale non ascoltato"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Avvia la ricerca vocale"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Segreteria"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secondi"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"messaggio vocale"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"messaggi vocali"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sì"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Eliminare i <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selezionati?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annulla modalità di azione collettiva"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Elimina"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annulla"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selezionate"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Eliminare questi messaggi vocali? "</b>"</item>
+      <item quantity="one">"<b>"Eliminare questo messaggio vocale? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> alle ore <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Impossibile chiamare questo numero"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Per configurare la segreteria, seleziona Menu &gt; Impostazioni."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Per chiamare la segreteria, disattiva la modalità aereo."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Caricamento..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Caricamento da SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contatti SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nessuna app di contatti disponibile"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Ricerca vocale non disponibile"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Impossibile effettuare una telefonata perché l\'applicazione Telefono è stata disattivata."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cerca contatti"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Aggiungi numero/cerca contatti"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"La cronologia delle chiamate è vuota"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Fai una chiamata"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nessuna chiamata persa."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"La casella della segreteria è vuota."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostra solo i preferiti"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Cronologia chiamate"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Tutte"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perse"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Segreteria"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Composizione rapida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Cronologia chiamate"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contatti"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Segreteria"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Rimosso dai preferiti"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Annulla"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crea nuovo contatto"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Aggiungi a un contatto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Invia SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fai una videochiamata"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blocca numero"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nuove chiamate perse"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Nessun preferito disponibile nella Composizione rapida"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Aggiungi un preferito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Nessun contatto disponibile"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Aggiungi un contatto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tocca l\'immagine per visualizzare tutti i numeri oppure tieni premuto per cambiare l\'ordine"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Rimuovi"</string>
+    <string name="select_all" msgid="408601760696146245">"Seleziona tutto"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochiamata"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Invia un messaggio"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Dettagli chiamata"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Chiama <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochiamata <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ascolta il messaggio vocale di: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Riproduci i messaggi di <xliff:g id="NAMEORNUMBER">^1</xliff:g> in segreteria"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Metti in pausa i messaggi di <xliff:g id="NAMEORNUMBER">^1</xliff:g> in segreteria"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Elimina i messaggi di <xliff:g id="NAMEORNUMBER">^1</xliff:g> dalla segreteria"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nuovi messaggi vocali</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nuovo messaggio vocale</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crea contatto per <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Aggiungi <xliff:g id="NAMEORNUMBER">^1</xliff:g> al contatto esistente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Dettagli chiamata per <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Eliminato dalla cronologia chiamate"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Oggi"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ieri"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Meno recenti"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Elenco chiamate"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Attiva altoparlante."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Disattiva altoparlante."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Riproduci più velocemente."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Riproduci più lentamente."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Avvia o metti in pausa la riproduzione."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opzioni di visualizzazione"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Suoni e vibrazione"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chiamate"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocco delle chiamate"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Messaggi vocali"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Seleziona SIM per impostazioni messaggi vocali"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocco chiamate temporaneam. disattivato"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Il blocco chiamate è stato disattivato perché hai contattato servizi di emergenza da questo telefono nelle ultime 48 ore. Verrà riattivato automaticamente una volta trascorso il periodo di 48 ore."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa numeri"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Numeri bloccati"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> è già bloccato."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Account di chiamata"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Attiva"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Imposta autorizzazioni"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Per attivare la composizione rapida, attiva l\'autorizzazione Contatti."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Per accedere al registro chiamate, attiva l\'autorizzazione sul telefono."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Per accedere ai tuoi contatti, attiva l\'autorizzazione Contatti."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Per accedere alla segreteria, attiva l\'autorizzazione sul telefono."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Per fare una chiamata, attiva l\'autorizzazione sul telefono."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'app Telefono non dispone dell\'autorizzazione per modificare le impostazioni di sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> è offline e non può essere raggiunto"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Informazioni"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Trascritto da Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google sta trascrivendo…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Trascrizione non disponibile"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Visualizza"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Chiamata eliminata. Visualizza ed elimina gli allegati condivisi durante questa chiamata in Messaggi."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Chiamate eliminate. Visualizza ed elimina gli allegati condivisi durante queste chiamate in Messaggi."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-iw/strings.xml b/java/com/android/dialer/app/res/values-iw/strings.xml
index bb115e2..6186289 100644
--- a/java/com/android/dialer/app/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/res/values-iw/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"טלפון"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"לוח החיוג של הטלפון"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"טלפון"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"היסטוריית שיחות"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"דווח על מספר לא מדויק"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"העתק מספר"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"העתק תמלול"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"חסום מספר"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"בטל חסימת מספר"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ערוך את המספר לפני השיחה"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"נקה את היסטוריית השיחות"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"מחק דואר קולי"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"האם לנקות את היסטוריית השיחות?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"פעולה זו תמחק את כל השיחות מההיסטוריה שלך"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"מנקה היסטוריית שיחות…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"טלפון"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"שיחה שלא נענתה"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"שיחה עסקית שלא נענתה"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"שיחות שלא נענו"</string>
@@ -50,107 +45,68 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> הודעות דואר קולי </item>
       <item quantity="one">הודעת דואר קולי</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"הפעל"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"דואר קולי חדש מאת <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"לא ניתן היה להשמיע דואר קולי"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"טוען דואר קולי…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"מעביר את הדואר הקולי לארכיון..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"לא ניתן היה לטעון דואר קולי"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"שיחות עם דואר קולי בלבד"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"שיחות נכנסות בלבד"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"שיחות יוצאות בלבד"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"שיחות שלא נענו בלבד"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"חפש"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"חייג"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"מספר לחיוג"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"הפעל או הפסק הפעלה"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"הפעל או כבה את רמקול הטלפון"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"חפש מיקום בהפעלה"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"האט את מהירות ההפעלה"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"הגבר את מהירות ההפעלה"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"היסטוריית שיחות"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"אפשרויות נוספות"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"לוח חיוג"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"הצג רק שיחות יוצאות"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"הצג רק שיחות נכנסות"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"הצג רק שיחות שלא נענו"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"הצג הודעות דואר קולי בלבד"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"הצג את כל השיחות"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"הוסף השהיה של 2 שניות"</string>
-    <string name="add_wait" msgid="1177723010768282578">"הוסף המתנה"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"הגדרות"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"סימולטור"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"כל אנשי הקשר"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"השתמש במקלדת עם חיוג צלילים"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"חזור לשיחה פעילה"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"הוסף שיחה"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"שיחות נכנסות"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"הפעל דואר קולי"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"הצג את איש הקשר <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"התקשר אל <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"יצירת קיצור דרך לממשק החדש"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"עברת למצב של ביצוע פעולות בכמות גדולה"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"עזבת את המצב של ביצוע פעולות בכמות גדולה"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"בחרת את <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ביטלת את הבחירה של <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"פרטי יצירת קשר עבור <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"פרטי התקשרות לשיחה שחשודה כספאם <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> שיחות."</string>
     <string name="description_video_call" msgid="3738199365585751727">"שיחת וידאו."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"‏שלח SMS אל <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"דואר קולי שעדיין לא נשמע"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"התחל חיפוש קולי"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"התקשר אל <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"דואר קולי"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> דק\' <xliff:g id="SECONDS">%s</xliff:g> שנ\'"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ההודעה הקולית"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ההודעות הקוליות"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"כן"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"לא"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"האם למחוק את <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> שבחרת?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ביטול המצב של ביצוע פעולות בכמות גדולה"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"מחיקה"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ביטול"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> נבחרו"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="two">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="many">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="other">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
+      <item quantity="one">"<b>"האם למחוק את ההודעה הקולית הזו? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ב-<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"לא ניתן להתקשר אל המספר הזה"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"כדי להגדיר את הדואר הקולי, עבור אל \'תפריט &gt; הגדרות\'."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"כדי להתקשר לדואר קולי, קודם עליך להשבית את מצב הטיסה."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"טוען..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"‏טוען מכרטיס SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"‏אנשי קשר בכרטיס SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"אין אפליקציה זמינה עבור אנשי קשר"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"חיפוש קולי אינו זמין"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"לא ניתן לבצע שיחת טלפון מפני שאפליקציית הטלפון הושבתה."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"חפש אנשי קשר"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"הוסף מספר או חפש אנשי קשר"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"היסטוריית השיחות שלך ריקה"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"התקשר"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"אין שיחות שלא נענו."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"תיבת הדואר הקולי ריקה."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"הצג מועדפים בלבד"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"היסטוריית שיחות"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"הכל"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"שיחות שלא נענו"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"דואר קולי"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"חיוג מהיר"</string>
     <string name="tab_history" msgid="7420269368689503596">"היסטוריית שיחות"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"אנשי קשר"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"דואר קולי"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"הוסר מהמועדפים"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"בטל"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"התקשר אל <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"איש קשר חדש"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"הוסף לאיש קשר"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏שלח SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"בצע שיחת וידאו"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"חסום מספר"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> שיחות חדשות שלא נענו"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"עדיין לא הוגדר חיוג מהיר לאף איש קשר"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"הוסף פריט מועדף"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"עדיין אין לך אנשי קשר"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"הוסף איש קשר"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"גע בתמונה כדי להציג את כל המספרים או גע והחזק כדי לשנות את הסדר"</string>
     <string name="remove_contact" msgid="2353580570488923668">"הסר"</string>
+    <string name="select_all" msgid="408601760696146245">"בחירת הכל"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"שיחת וידאו"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"שלח הודעה"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"פרטי שיחה"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"התקשר אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"שיחת וידאו עם <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"האזן לדואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"השמע דואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"השהה דואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"מחק דואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> הודעות דואר קולי חדשות</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> הודעות דואר קולי חדשות</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> הודעות דואר קולי חדשות</item>
-      <item quantity="one">הודעת דואר קולי חדשה <xliff:g id="COUNT_0">%d</xliff:g></item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"צור איש קשר בשביל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"הוסף את <xliff:g id="NAMEORNUMBER">^1</xliff:g> לאיש קשר קיים"</string>
     <string name="description_details_action" msgid="2061866409737706174">"פרטי שיחה עבור <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"נמחקה מהיסטוריית השיחות"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"היום"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"אתמול"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ישנות יותר"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"רשימת שיחות"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"הפעל את הרמקול."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"כבה את הרמקול."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"הפעל מהר יותר."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"הפעל לאט יותר."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"התחל או השהה הפעלה."</string>
     <string name="display_options_title" msgid="3880091801055797975">"אפשרויות תצוגה"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"צלילים ורטט"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"שיחות"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"חסימת שיחות"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"דואר קולי"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"‏בחר כרטיס SIM להגדרות הדואר הקולי"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"חסימת השיחות מושבתת באופן זמני"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"חסימת השיחות הושבתה מפני שיצרת קשר מטלפון זה עם שירותי חירום במהלך 48 השעות האחרונות. הפונקציה תופעל מחדש באופן אוטומטי בתום 48 השעות."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"יבא מספרים"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"מספרים חסומים"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> כבר חסום."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"חשבונות לביצוע שיחות"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"הפעל"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"הגדר הרשאות"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"כדי להפעיל חיוג מהיר, הפעל את ההרשאה \'אנשי קשר\'."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"כדי לראות את יומן השיחות, הפעל את ההרשאה \'טלפון\'."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"כדי להציג את אנשי הקשר, הפעל את ההרשאה \'אנשי קשר\'."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"כדי לגשת לדואר הקולי, הפעל את ההרשאה \'טלפון\'."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"כדי לחפש באנשי הקשר, הפעל את ההרשאה \'אנשי קשר\'."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"כדי להתקשר, הפעל את ההרשאה \'טלפון\'."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"לאפליקציית הטלפון אין הרשאה לכתוב בהגדרות המערכת."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"ספאם"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"לא ניתן להתקשר כי המכשיר של <xliff:g id="NAME">%1$s</xliff:g> לא מחובר כרגע"</string>
     <string name="about_phone_label" msgid="582991354677973731">"מידע כללי"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏התעתוק בוצע על ידי Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"‏ההודעה מתומללת על ידי Google…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"התעתיק אינו זמין"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"הצג"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"השיחה נמחקה. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחה, עבור ל\'הודעות\'."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"השיחות נמחקו. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחות, עבור ל\'הודעות\'."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ja/strings.xml b/java/com/android/dialer/app/res/values-ja/strings.xml
index 63b15cb..5f92a8e 100644
--- a/java/com/android/dialer/app/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/res/values-ja/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"電話"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"スマートフォンのキーパッド"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"電話"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話履歴"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"不正確な番号を報告"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"番号をコピー"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"音声文字変換をコピー"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"番号をブロック"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"番号のブロックを解除"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"発信前に番号を編集"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"通話履歴を消去"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ボイスメールを削除"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"通話履歴を消去しますか？"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"消去すると、すべての通話が履歴から削除されます"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"通話履歴の消去中…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"電話"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"不在着信"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"仕事の通話の不在着信"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"不在着信"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>件のボイスメール</item>
       <item quantity="one">1件のボイスメール</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"再生"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>、<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>から新着ボイスメール"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ボイスメールを再生できませんでした"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ボイスメールを読み込んでいます…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ボイスメールをアーカイブしています…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ボイスメールを読み込めませんでした"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"ボイスメールのある着信のみ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"着信のみ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"発信のみ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"不在着信のみ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"（<xliff:g id="COUNT">%1$d</xliff:g>）<xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"検索"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"発信"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"発信番号"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"再生を開始または停止する"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"スピーカーフォンのON/OFFを切り替える"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"再生位置を探す"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"再生速度を下げる"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"再生速度を上げる"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話履歴"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"その他のオプション"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"キーパッド"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"発信のみを表示"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"着信のみを表示"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"不在着信のみを表示"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"ボイスメールのみ表示"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"すべての通話を表示"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2秒間の停止を追加"</string>
-    <string name="add_wait" msgid="1177723010768282578">"待機を追加"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"シミュレーション"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"すべての連絡先"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"プッシュホン式キーパッドを使う"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"通話に戻る"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"別の通話を追加"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"着信"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ボイスメールを再生"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g>の連絡先を表示"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g>に発信"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"新しいUIのショートカットを作成"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"一括操作モードを開始します"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"一括操作モードを終了しました"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> を選択しました"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> を選択解除しました"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>の連絡先の詳細"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"迷惑電話の疑いがある発信者 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> の連絡先の詳細"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"通話回数は<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>回。"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ビデオハングアウト"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>さんにSMSを送信"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"未再生のボイスメール"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"音声検索を開始"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g>に発信"</string>
     <string name="voicemail" msgid="8899540969000957954">"ボイスメール"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g>分<xliff:g id="SECONDS">%s</xliff:g>秒"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ボイスメール"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ボイスメール"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"はい"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"いいえ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"選択した<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>を削除しますか？"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"一括操作モードをキャンセルします"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"削除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"キャンセル"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> 件選択済み"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"これらのボイスメールを削除しますか？"</b>"</item>
+      <item quantity="one">"<b>"このボイスメールを削除しますか？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>、<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g> 分 <xliff:g id="SECONDS">%2$02d</xliff:g> 秒"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g>（<xliff:g id="DURATION">%2$s</xliff:g>）"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"この番号に電話できません"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ボイスメールを設定するには、[メニュー] &gt; [設定] の順に開いてください。"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"機内モードを OFF にしてからボイスメールを呼び出してください。"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"読み込んでいます..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI（端末識別番号）"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIMカードから読み取り中..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIMカードの連絡先"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"連絡先アプリがありません"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"音声検索を利用できません"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"電話アプリが無効になっているため発信できません。"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"連絡先を検索"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"番号を追加するか連絡先を検索"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"通話履歴はありません"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"発信"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"不在着信はありません。"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ボイスメール受信トレイは空です。"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"お気に入りのみを表示"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"通話履歴"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"すべて"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"不在着信"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ボイスメール"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"クイックアクセス"</string>
     <string name="tab_history" msgid="7420269368689503596">"通話履歴"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"連絡先"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ボイスメール"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"お気に入りから削除されました"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"元に戻す"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>に発信"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"新しい連絡先を作成"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"連絡先に追加"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMSを送信"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ビデオハングアウト"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"番号をブロック"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g>件の不在着信"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"クイックアクセスに登録済みの連絡先はまだありません"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"お気に入りを追加"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"連絡先はまだありません"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"連絡先を追加"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"画像をタップするとすべての番号が表示され、押し続けると番号を並べ替えることができます"</string>
     <string name="remove_contact" msgid="2353580570488923668">"削除"</string>
+    <string name="select_all" msgid="408601760696146245">"すべて選択"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ビデオハングアウト"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"メッセージを送信"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話の詳細"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>に発信します"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>にビデオハングアウト発信します。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>からのボイスメールを再生"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>からのボイスメールを再生"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>からのボイスメールを一時停止"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>からのボイスメールを削除"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>件の新着ボイスメール</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>件の新着ボイスメール</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>の連絡先を作成します"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"既存の連絡先に<xliff:g id="NAMEORNUMBER">^1</xliff:g>を追加します"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>の通話の詳細"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"通話履歴から削除しました"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"今日"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨日"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"以前の着信"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"通話リスト"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"スピーカーをONにします。"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"スピーカーをOFFにします。"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"速く再生します。"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"遅く再生します。"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"再生を開始または一時停止します。"</string>
     <string name="display_options_title" msgid="3880091801055797975">"表示オプション"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"音とバイブレーション"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"着信のブロック"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ボイスメール"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ボイスメール設定の変更を行う SIM の選択"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"着信のブロックは一時的にOFFです"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"このスマートフォンから緊急通報番号への発信が過去48時間以内に行われているため、着信のブロックは無効になっています。48時間経過すると、着信のブロックは自動的に有効になります。"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"番号をインポート"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ブロックした番号"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>は既にブロックしています。"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"通話アカウント"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ONにする"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"権限を設定"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"クイックアクセスを有効にするには、連絡先権限をONにしてください。"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"通話履歴を表示するには、電話権限をONにしてください。"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"連絡先を表示するには、連絡先権限をONにしてください。"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ボイスメールにアクセスするには、電話権限をONにしてください。"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"連絡先を検索するには、連絡先権限をONにしてください。"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"電話をかけるには、電話権限をONにしてください。"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"電話アプリにはシステム設定への書き込み権限がありません。"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"スパム"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> さんはオフラインのため、通話を受信できません"</string>
     <string name="about_phone_label" msgid="582991354677973731">"電話アプリについて"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"文字変換: Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google が文字に変換しています…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"文字変換を利用できません"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"表示"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ka/strings.xml b/java/com/android/dialer/app/res/values-ka/strings.xml
index ae89505..597082b 100644
--- a/java/com/android/dialer/app/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/res/values-ka/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ტელეფონი"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ტელეფონის კლავიატურა"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ტელეფონი"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"საუბრის ისტორია"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"არაზუსტი ნომრის შეტყობინება"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ნომრის კოპირება"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ტრანსკრიპტის კოპირება"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"ნომრის დაბლოკვა"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ნომრის განბლოკვა"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ნომრის რედაქტირება დარეკვამდე"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ზარის ისტორიის გასუფთავება"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ხმოვანი ფოსტის წაშლა"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"გასუფთავდეს ზარის ისტორია?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ეს წაშლის ყველა ზარს თქვენი ისტორიიდან"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"მიმდ. ზარ. ისტ. გასუფთავება…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"დარეკვა"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"გამოტოვებული ზარი"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"გამოტოვებული ზარი (სამსახური)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"გამოტოვებული ზარები"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ხმოვანი ფოსტა </item>
       <item quantity="one">ხმოვანი ფოსტა</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"დაკვრა"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ახალი ხმოვანი ფოსტა <xliff:g id="CALLER">%1$s</xliff:g>-ისგან"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ვერ ხორციელდება ხმოვანი ფოსტა ჩართვა"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ხმოვანი ფოსტა იტვირთება…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ხმოვანი ფოსტის დაარქივება…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ვერ ხორციელდება ხმოვანი ფოსტის ჩატვირთვა"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"მხოლოდ ზარები ხმოვანი ფოსტით"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"მხოლოდ შემომავალი ზარები"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"მხოლოდ გამავალი ზარები"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"მხოლოდ გამოტოვებული ზარები"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>-ში"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ძიება"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"დარეკვა"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ასაკრეფი ნომერი"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"დაკვრის შეჩერება ან გაშვება"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"სპიკერები შეგიძლიათ ჩართოთ და გამორთოთ."</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"დაკვრის პოზიციის მოძებნა"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"დაკვრის კოეფიციენტის შემცირება"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"დაკვრის კოეფიციენტის გაზრდა"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ზარების ისტორია"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"სხვა პარამეტრები"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"კლავიატურა"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"მხოლოდ გამავალის ჩვენება"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"მხოლოდ შემომავალის ჩვენება"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"მხოლოდ გამოტოვებულის ჩვენება"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"მხოლოდ ხმოვანი ფოსტის ჩვენება"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ყველა ზარის ჩვენება"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"ორწამიანი პაუზის დამატება"</string>
-    <string name="add_wait" msgid="1177723010768282578">"ლოდინის დამატება"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"პარამეტრები"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"სიმულატორი"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ყველა კონტაქტი"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ტონალური კლავიატურის გამოყენება"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"მიმდინარე ზარზე დაბრუნება"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ზარის დამატება"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"შემომავალი ზარები"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ხმოვანი ფოსტის ჩართვა"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"კონტაქტის <xliff:g id="NAME">%1$s</xliff:g> ნახვა"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g>-თან დარეკვა"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ახალი UI მალსახმობის შექმნა"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"მიმდინარეობს ერთიანი ქმედების რეჟიმში შესვლა"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ერთიანი ქმედების რეჟიმიდან გამოხვედით"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"არჩეულია <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის არჩევა გაუქმდა"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის კონტაქტის დეტალები"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"სავარაუდოდ სპამერი აბონენტის <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> საკონტაქტო დეტალები"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ზარი."</string>
     <string name="description_video_call" msgid="3738199365585751727">"ვიდეოზარი."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"გააგზავნეთ SMS <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"მოსასმენი ხმოვანი ფოსტა"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ხმოვანი ძიების დაწყება"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
     <string name="voicemail" msgid="8899540969000957954">"ხმოვანი ფოსტა"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> წმ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> მინ <xliff:g id="SECONDS">%s</xliff:g> წამ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ხმოვანი ფოსტა"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ხმოვანი ფოსტა"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"დიახ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"არა"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"გსურთ, წაშალოთ არჩეული <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ერთიანი ქმედების რეჟიმის გაუქმება"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"წაშლა"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"გაუქმება"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"არჩეულია <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"გსურთ ამ ხმოვანი შეტყობინებების წაშლა? "</b>"</item>
+      <item quantity="one">"<b>"გსურთ ამ ხმოვანი შეტყობინების წაშლა? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ვერ ხორციელდება ამ ნომერზე დარეკვა"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ხმოვანი ფოსტის დასაყენებლად გადადით: მენიუ &gt; პარამეტრები."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ხმოვან ფოსტასთან დასაკავშირებლად, პირველ რიგში, გამორთეთ თვითმფრინავის რეჟიმი."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"იტვირთება…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"იტვირთება SIM ბარათიდან…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM ბარათის კონტაქტები"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"კონტაქტების აპლიკაცია არ არის ხელმისაწვდომი"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ხმოვანი ძიება არ არის ხელმისაწვდომი"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"სატელეფონო ზარის განხორციელება ვერ ხერხდება, ვინაიდან ტელეფონის აპლიკაცია გაუქმებულია."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"კონტაქტებში ძიება"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"დაამატეთ ნომერი ან მოიძიეთ კონტაქტებიდან"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"თქვენი საუბრის ისტორია ცარიელია"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"დარეკვა"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"გამოტოვებული ზარები არ გაქვთ."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"თქვენი ხმოვანი ელფოსტის შემოსულები ცარიელია."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"მხოლოდ რჩეულების ჩვენება"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"საუბრის ისტორია"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ყველა"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"გამოტოვებული"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ხმოვანი ფოსტა"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"სწრაფი დარეკვა"</string>
     <string name="tab_history" msgid="7420269368689503596">"საუბრის ისტორია"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"კონტაქტები"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ხმოვანი ფოსტა"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"წაიშალა რჩეულებიდან"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"დაბრუნება"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ახალი კონტაქტის შექმნა"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"კონტაქტისადმი დამატება"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS-ის გაგზავნა"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ვიდეოზარის განხორციელება"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"ნომრის დაბლოკვა"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ახალი გაცდენილი ზარი"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"სწრაფი აკრეფისთვის რჩეულები ჯერ არ გყავთ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"რჩეული კონტაქტის დამატება"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"კონტაქტები ჯერ არ გაქვთ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"კონტაქტის დამატება"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ყველა ნომრის სანახავად შეეხეთ სურათს ან შეეხეთ და დააყოვნეთ მიმდევრობის შესაცვლელად"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ამოშლა"</string>
+    <string name="select_all" msgid="408601760696146245">"ყველას არჩევა"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ვიდეო ზარი"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"შეტყობინების გაგზავნა"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ზარის მონაცემები"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"დარეკვა <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ვიდეო ზარი <xliff:g id="NAMEORNUMBER">^1</xliff:g>-თან."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ის ხმოვანი ფოსტის მოსმენა"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-გან ხმოვანი ფოსტის მოსმენა"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-გან ხმოვანი ფოსტის დაპაუზება"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-გან ხმოვანი ფოსტის წაშლა"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ახალი ხმოვანი ფოსტა</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ახალი ხმოვანი ფოსტა</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ისთვის კონტაქტის შექმნა"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ის დამატება არსებულ კონტაქტზე"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ზარის დეტალები"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ზარის ისტორიიდან წაშლილი"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"დღეს"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"გუშინ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"უფრო ძველი"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ზარების სია"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"სპიკერის ჩართვა."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"სპიკერის გამორთვა."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"დაკვრის აჩქარება."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"დაკვრის შენელება."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"დაკვრის დაწყება ან პაუზა."</string>
     <string name="display_options_title" msgid="3880091801055797975">"ეკრანის პარამეტრები"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ხმა და ვიბრაცია"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ზარები"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ზარების დაბლოკვა"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ხმოვანი ფოსტა"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"აირჩ.SIM ხმოვ.ფოსტ.პარამ.-თვის"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ზარების დაბლოკვა დროებით გამოირთო"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ზარების დაბლოკვა გაითიშა, რადგან ბოლო 48 საათში ამ ტელეფონიდან საგანგებო სამსახურებს დაუკავშირდით. 48 საათის გასვლის შემდეგ ის ავტომატურად ჩაირთვება."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ნომრების იმპორტი"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"დაბლოკილი ნომრები"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> უკვე დაბლოკილია."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ანგარიშების გამოძახება"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ჩართვა"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ნებართვების დაყენება"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"სწრაფი აკრეფის გასააქტიურებლად, ჩართეთ კონტაქტების ნებართვა."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ზარების ჟურნალის სანახავად, ჩართეთ ტელეფონის ნებართვა."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"კონტაქტების სანახავად, ჩართეთ კონტაქტების ნებართვა."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ხმოვან ფოსტაზე წვდომისთვის, ჩართეთ ტელეფონის ნებართვა."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ზარის განსახორციელებლად, ჩართეთ ტელეფონის ნებართვა."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ტელეფონის აპს სისტემის პარამეტრებში ჩაწერის ნებართვა არ აქვს."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"სპამი"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ხაზგარეშეა და ვერ დაუკავშირდებით"</string>
     <string name="about_phone_label" msgid="582991354677973731">"აპის შესახებ"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ტრასკრიბ. შეასრულა Google-მა"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ტრანსკრიბირებას ასრულებს …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ტრანსკრიფტი მიუწვდომელია"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ნახვა"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ზარი წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ზარები წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-kk/strings.xml b/java/com/android/dialer/app/res/values-kk/strings.xml
index ba42386..0adc556 100644
--- a/java/com/android/dialer/app/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/res/values-kk/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефон пернетақтасы"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Телефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Қоңыраулар тарихы"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Қате нөмір туралы есеп беру"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Нөмірді көшіру"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Транскрипцияны көшіру"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Нөмірді бөгеу"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Нөмірге рұқсат беру"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Қоңырау алдында нөмірді өзгерту"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Қоңыраулар тарихын тазалау"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Дауыстық хабарды жою"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Қоңыраулар тарихын тазалау керек пе?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Бұл тарихтан барлық қоңырауларды жояды"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Қоңыраулар тарихы тазалануда…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Телефон"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Қабылданбаған қоңырау"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Өткізіп алынған жұмыс қоңырауы"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Қабылданбаған қоңыраулар"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> дауыстық хабар </item>
       <item quantity="one">Дауыстық хабар</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Ойнау"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> жіберген жаңа дауыс-хабар"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Дауыстық хабарды ойнату мүмкін болмады"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Дауыстық хабар жүктелуде…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Дауыстық пошта мұрағатталуда…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Дауыстық хабарды жүктеу мүмкін болмады"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Дауыс хабары бар қоңыраулар ғана"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Келген қоңыраулар ғана"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Шығыс қоңыраулары ғана"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Қабылданбаған қоңыраулар ғана"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"іздеу"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"теру"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"теретін нөмір"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Ойнату немесе ойнатуды тоқтату"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Спикерфонды қосу немесе өшіру"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Ойнату орнын іздеу"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Ойнату жылдамдығын азайту"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Ойнату жылдамдығын арттыру"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Қоңыраулар тарихы"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Басқа опциялар"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"пернетақта"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Шығыс қоңырауларды ғана көрсету"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Келгендерді ғана көрсету"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Қабылданбағандарды ғана көрсету"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Дауыс-хабарларын ғана көрсету"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Барлық қоңырауларды көрсету"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 сек үзіліс қосу"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Күтуді қосу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Параметрлер"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Барлық контактілер"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Сенсорлы әуенді пернетақта"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Қосылып тұрған қоңырауға оралу"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Қоңырау қосу"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Келген қоңыраулар"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Дауыс-хабарды ойнату"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> контактісін көру"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> нөміріне қоңырау шалу"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңа пайдаланушы интерфейсінің пернелер тіркесімін жасау"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Жаппай әрекет режиміне өту"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Жаппай әрекет режиімінен шығу"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> таңдалды"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> таңдауы алынды"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> контакт деректері"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Күдікті <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> спам қоңырау шалушының байланысу мәліметтері"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> қоңыраулар."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Бейне қоңырау."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Мынаған SMS жіберу: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Естілмеген дауыс-хабар"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Дауыс іздеуді бастау"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="voicemail" msgid="8899540969000957954">"Дауыстық пошта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"дауыстық хабар"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"дауыстық хабарлар"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Иә"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Жоқ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Таңдалған <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> хабарларын жою қажет пе?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Топтама әрекеттер режимін жабу"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жою"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жабу"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> таңдалды"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Осы дауыстық хабарларды жою қажет пе? "</b>"</item>
+      <item quantity="one">"<b>"Осы дауыстық хабарды жою қажет пе? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Бұл нөмірге қоңырау шалу мүмкін емес"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Дауыстық поштаны орнату үшін \"Mәзір &gt; Параметрлер\" тармағына өтіңіз."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Дауыстық поштаға қоңырау шалу үшін ұшақ режимін өшіру қажет."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Жүктелуде..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI (Халықаралық мобильдік құрылғы анықтағышы)"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID (ұялы жабдық анықтағыш)"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM картасынан жүктеу…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM картасының контактілері"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Контактілер қолданбасы қол жетімді емес"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Дауыс арқылы іздеу қол жетімді емес"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Телефон қоңырауын шалу мүмкін емес, өйткені «Телефон» қолданбасы өшірілген."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Контактілерді іздеу"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Нөмірді енгізіңіз немесе контактілерден іздеп табыңыз"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Қоңыраулар тарихы бос"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Қоңырау шалу"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Қабылданбаған қоңыраулар жоқ."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Дауыс поштасының \"Кіріс\" қалтасы бос."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Сүйіктілерді ғана көрсету"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Қоңырау тарихы"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Барлық"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Қабылданбаған"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Дауыстық хабар"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Жылдам теру"</string>
     <string name="tab_history" msgid="7420269368689503596">"Қоңыраулар тарихы"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контактілер"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Дауыстық хабар"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Сүйіктілерден алынған"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Кері орындау"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Жаңа контакт жасау"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Контактіге қосу"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS жіберу"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Бейне қоңырау шалу"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Нөмірді бөгеу"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> жаңа қабылданбаған қоңыраулар"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Жылдам теруде әлі ешкім жоқ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Таңдаулыны қосу"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Әлі ешқандай контактілер жоқ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Контакт қосу"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Барлық нөмірлерді көру үшін кескінді түртіңіз, ал ретін өзгерту үшін түртіп, ұстап тұрыңыз"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Алып тастау"</string>
+    <string name="select_all" msgid="408601760696146245">"Барлығын таңдау"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Бейне қоңырау"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Хабар жіберу"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Қоңырау мәліметтері"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> бейне қоңырау шалу."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дауыстық хабарын тыңдау"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дауыстық хабары ойнатылады"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дауыстық хабары кідіртіледі"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> жіберген дауыстық хабар жойылады"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жаңа дауыс поштасы</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жаңа дауыс поштасы</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үшін контакт жасау"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> бар контактіге қосу"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үшін қоңырау мәліметтері"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Қоңыраулар тарихынан жойылды"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Бүгін"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Кеше"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ескілеу"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Қоңыраулар тізімі"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Динамикті қосу."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Динамикті өшіру."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Тезірек ойнату."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Баяуырақ ойнату."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ойнатуды бастау немесе кідірту."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Көрсету опциялары"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Дыбыстар мен діріл"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Қоңыраулар"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Қоңырауларға тыйым салу"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Дауыстық хабар"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Дауыстық пошта параметрлері үшін SIM картасын таңдаңыз"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Қоңырауларға тыйым салу уақытша өшірулі"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Қоңырауларға тыйым салу өшірілді, өйткені сіз соңғы 48 сағат ішінде осы телефоннан төтенше қызметтерге хабарластыңыз. Ол 48 сағаттық кезең өткеннен кейін автоматты түрде қайта қосылады."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Нөмірлерді импорттау"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Бөгелген нөмірлер"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеліп қойылған."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Қоңырау шалу есептік жазбалары"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Қосу"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Рұқсаттар орнату"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Жылдам теруді қосу үшін \"Контактілер\" рұқсатын қосыңыз."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Қоңыраулар журналы көру үшін \"Телефон\" рұқсатын қосыңыз."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Контактілерді көру үшін \"Контактілер\" рұқсатын қосыңыз."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Дауыс поштасына қатынасу үшін \"Телефон\" рұқсатын қосыңыз."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Контактілерді іздеу үшін \"Контактілер\" рұқсаттарын қосыңыз."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Қоңырауды шалу үшін \"Телефон\" рұқсатын қосыңыз."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Телефон қолданбасында жүйелік параметрлерге жазуға рұқсат жоқ."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> желіден тыс және байланысу мүмкін емес"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Мәліметтер"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипцияны жасаған – Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google транскрипциясын жасап жатыр..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Tранскрипция жасау мүмкіндігі жоқ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Көру"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Қоңырау жойылды. Осы қоңырау кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Қоңыраулар жойылды. Осы қоңыраулар кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-km/strings.xml b/java/com/android/dialer/app/res/values-km/strings.xml
index bdc91cf..b55b9cc 100644
--- a/java/com/android/dialer/app/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/res/values-km/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ទូរស័ព្ទ"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"បន្ទះ​ចុច​លេខទូរសព្ទ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ទូរស័ព្ទ"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ប្រវត្តិ​ហៅ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"រាយការណ៍ពីលេខដែលមិនត្រឹមត្រូវ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ថតចម្លងលេខទូរស័ព្ទ"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ថតចម្លងសំណៅពីសារសម្លេង"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"រារាំងលេខ"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ឈប់រារាំងលេខ"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"កែ​លេខ​មុន​ពេល​ហៅ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ជម្រះប្រវត្តិហៅ"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"លុប​សារ​ជា​សំឡេង"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ជម្រះប្រវត្តិហៅ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"វានឹងលុបការហៅទាំងអស់ចេញពីប្រវត្តិរបស់អ្នក"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"កំពុងជម្រះប្រវត្តិហៅ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ទូរស័ព្ទ"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"ខកខាន​ទទួល"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"បានខកខានការហៅចូលពីកន្លែងការងារ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ខកខាន​ទទួល"</string>
@@ -48,107 +43,66 @@
       <item quantity="other">សារជាសម្លេង <xliff:g id="COUNT">%1$d</xliff:g> </item>
       <item quantity="one">សារជាសម្លេង</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ចាក់"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"សារ​ជា​សំឡេង​ថ្មី​ពី <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"មិនអាចចាក់សារជាសម្លេងបានទេ"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"កំពុងផ្ទុកសារជាសម្លេង…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"កំពុង​​រក្សាទុក​សារ​ជាសំឡេង​ក្នុង​ប័ណ្ណសារ..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"មិនអាចផ្ទុកសារជាសម្លេងបានទេ"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"តែ​ការ​ហៅ​ជា​សារ​សំឡេង"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"តែ​ការ​ហៅ​ចូល"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"តែ​ការ​ហៅ​ចេញ​ប៉ុណ្ណោះ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"តែ​លេខ​ខកខាន​ទទួល"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ស្វែងរក"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ចុច"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"លេខ​ដែល​ត្រូវ​ហៅ"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"ចាក់ ឬ​បញ្ឈប់​ការ​ចាក់​ឡើងវិញ"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"បិទ ឬ​បើក​អូប៉ាល័រទូរស័ព្ទ"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"រកមើល​ទីតាំង​ចាក់​ឡើងវិញ"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"បន្ថយ​អត្រា​ចាក់​ឡើង​វិញ"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"បង្កើន​អត្រា​ចាក់​ឡើងវិញ"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ប្រវត្តិហៅ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ជម្រើស​បន្ថែម"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"បន្ទះ​​ចុច​លេខ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"បង្ហាញ​តែ​ការ​ហៅ​ចេញ"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"បង្ហាញ​តែ​ការ​ហៅ​ចូល"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"បង្ហាញ​តែ​ការ​ខកខាន​ទទួល"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"បង្ហាញ​តែ​សារ​ជា​សំឡេង"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"បង្ហាញ​ការ​ហៅ​ទាំងអស់"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"បន្ថែម​ការ​ផ្អាក ២វិ."</string>
-    <string name="add_wait" msgid="1177723010768282578">"បញ្ចូល​ការ​រង់ចាំ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ការកំណត់"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"កម្មវិធីធ្វើ​ដូច​មែនទែន"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ទំនាក់ទំនង​ទាំងអស់"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ប្រើ​សំឡេង​ប៉ះ​បន្ទះ​លេខ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"កំពុង​ត្រឡប់​ទៅកាន់​ការ​ហៅ"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"បន្ថែម​ការ​ហៅ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ការ​ហៅ​ចូល"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ចាក់​សារ​ជា​សំឡេង"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"មើល​ទំ​នាក់ទំនង <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"ហៅ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"បង្កើត​ផ្លូវកាត់ UI ថ្មី"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ចូល​មុខងារ​សកម្មភាព​ច្រើន"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"បាន​ចាកចេញ​ពី​មុខងារ​សកម្មភាព​ច្រើន"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"បាន​ជ្រើសរើស <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"បាន​ដក​ការជ្រើសរើស <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់​អ្នក​ហៅ​ឥត​បាន​ការ​ដែល​សង្ស័យ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"ការ​ហៅ <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ។"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ការ​ហៅ​ជា​វីដេអូ​។"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"ផ្ញើសារ SMS ទៅ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"សារ​ជា​សំឡេង​ដែល​មិន​បាន​ឮ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ចាប់ផ្ដើម​ស្វែងរក​ជា​សំឡេង"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"ហៅ <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"សារ​ជា​សំឡេង"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> នាទី <xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"បាទ/ចាស"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ទេ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"លុប <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ដែល​បាន​ជ្រើសរើស?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"បោះបង់​មុខងារ​សកម្មភាព​ជា​ក្រុម"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"លុប"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"បោះបង់"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"បាន​ជ្រើសរើស <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"លុប​សារ​ជា​សំឡេង​ទាំងនេះ? "</b>"</item>
+      <item quantity="one">"<b>"លុប​សារ​ជា​សំឡេង​នេះ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"មិនអាចហៅលេខនេះបានទេ"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ដើម្បី​កំណត់​សារ​ជា​សំឡេង សូម​ចូល​ទៅ ម៉ឺនុយ &gt; ការកំណត់។"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ដើម្បី​ហៅ​សារ​ជា​សំឡេង ដំបូង​ត្រូវ​បិទ​របៀប​ពេល​ជិះ​យន្តហោះ។"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"កំពុង​ផ្ទុក..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"កំពុង​ផ្ទុក​ពី​ស៊ីម​កាត..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"ទំនាក់ទំនង​នៅ​ក្នុង​ស៊ីម​កាត"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"មិនមានកម្មវិធីទំនាក់ទំនងទេ"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ការស្វែងរកជាសម្លេងមិនមានទេ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"មិន​អាច​ហៅ​បាន​ទេ​ ព្រោះ​កម្មវិធី​ទូរស័ព្ទ​ត្រូវ​បាន​បិទ។"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"រក​ទំនាក់ទំនង"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"បន្ថែមលេខទូរស័ព្ទ ឬស្វែងរកទំនាក់ទំនង"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ប្រវត្តិហៅរបស់អ្នកទទេ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ហៅទូរសព្ទ"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"អ្នកមិនមានការខកខានទទួលទូរសព្ទទេ។"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ប្រអប់ទទួលសារជាសំឡេងរបស់អ្នកទទេ។"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"បង្ហាញ​តែ​​និយម​ប្រើ​ប៉ុណ្ណោះ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ប្រវត្តិ​ហៅ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ទាំង​អស់"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ខកខាន​ទទួល"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"សារ​ជា​សំឡេង"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"ហៅទូរស័ព្ទល្បឿនលឿន"</string>
     <string name="tab_history" msgid="7420269368689503596">"ប្រវត្តិហៅ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"ទំនាក់ទំនង"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"សារជាសំឡេង"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"បាន​លុប​ចេញពី​ទំនាក់ទំនង​ដែល​និយម​ប្រើ"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"មិនធ្វើវិញ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"ហៅ <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"បង្កើតទំនាក់ទំនងថ្មី"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"បន្ថែមទៅទំនាក់ទំនង"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ផ្ញើសារ SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ការ​ហៅ​ជា​វីដេអូ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"រារាំងលេខ"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"ខកខាន​ទទួល​ថ្មី <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"គ្មាននរណាម្នាក់នៅក្នុងការហៅរហ័សរបស់អ្នកនៅឡើយទេ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"បញ្ចូលសំណព្វ"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"អ្នកមិនទាន់មានទំនាក់ទំនងនៅឡើយទេ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"បន្ថែមទំនាក់ទំនង"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ប៉ះរូបភាពដើម្បីមើលលេខទាំងអស់ ឬប៉ះ &amp; សង្កត់ឲ្យជាប់ដើម្បីតម្រៀបឡើងវិញ"</string>
     <string name="remove_contact" msgid="2353580570488923668">"លុបចេញ"</string>
+    <string name="select_all" msgid="408601760696146245">"ជ្រើសរើស​​ទាំងអស់"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ហៅជាវីដេអូ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ផ្ញើសារ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ព័ត៌មានលម្អិតអំពីការហៅ"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"ហៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ហៅទៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ជាវីដេអូ។"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"ស្ដាប់​សារ​ជា​សំឡេង​ពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"ចាក់ការហៅជាសំឡេងពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"ផ្អាកសារជាសំឡេងពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"លុបសារជាសំឡេងពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other">សារជាសំឡេងថ្មី <xliff:g id="COUNT_1">%d</xliff:g></item>
-      <item quantity="one">សារជាសំឡេងថ្មី <xliff:g id="COUNT_0">%d</xliff:g></item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"បង្កើតទំនាក់ទំនងសម្រាប់ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"បន្ថែម <xliff:g id="NAMEORNUMBER">^1</xliff:g> ទៅទំនាក់ទំនងដែលមានស្រាប់"</string>
     <string name="description_details_action" msgid="2061866409737706174">"ព័ត៌មាន​លម្អិត​អំពីការហៅ​សម្រាប់ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"បានលុបចេញពីប្រវត្តិហៅ"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ថ្ងៃនេះ"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ម្សិលមិញ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ចាស់ៗ"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"បញ្ជីការហៅ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"បើក​អូប៉ាល័រ។"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"បិទ​អូប៉ាល័រ។"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"ចាក់​កាន់តែ​លឿន"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ចាក់​កាន់តែ​យឺត។"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ចាប់ផ្ដើម ឬ​ផ្អាក​ការ​ចាក់​ឡើងវិញ។"</string>
     <string name="display_options_title" msgid="3880091801055797975">"ជម្រើសបង្ហាញ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"សំឡេង និងរំញ័រ"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ការហៅ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ការរារាំងការហៅ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ជ្រើសរើស SIM សម្រាប់​ការកំណត់​សារ​ជា​សំឡេង"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ការរារាំងការហៅត្រូវបានបិទជាបណ្តោះអាសន្ន"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ការរារាំងការហៅត្រូវបានបិទដំណើរការ ដោយសារតែអ្នកបានទាក់ទងទៅសេវាអាសន្នចេញពីទូរស័ព្ទនេះក្នុងចន្លោះពេល 48 ម៉ោងកន្លងមកនេះ។ វានឹងបើកដំណើរការឡើងវិញ បន្ទាប់ពីរយៈពេល 48 ម៉ោងផុតកំណត់។"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"នាំចូលលេខ"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"លេខបានរារាំង"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ត្រូវបានទប់ស្កាត់រួចហើយ"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"គណនីហៅទូរសព្ទ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"បើក"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"កំណត់សិទ្ធិអនុញ្ញាត"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ដើម្បីបើកដំណើរការហៅរហ័ស សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ដើម្បីមើលកំណត់ហេតុហៅទូរស័ព្ទរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"ដើម្បីមើលទំនាក់ទំនងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ដើម្បីចូលដំណើរការសារជាសំឡេងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតទំនាក់ទំនង។"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ដើម្បីធ្វើការហៅទូរស័ព្ទ សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"កម្មវិធីទូរស័ព្ទមិនមានសិទ្ធិអនុញ្ញាតដើម្បីសរសេរការកំណត់ប្រព័ន្ធទេ។"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"សារ​ឥតបានការ"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> មិន​នៅ​លើ​អ៊ីនធឺណិត និង​មិន​អាច​ទាក់ទង​បាន​ទេ"</string>
     <string name="about_phone_label" msgid="582991354677973731">"អំពី"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"បាន​ធ្វើ​ប្រតិចារឹក​ដោយ Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google កំពុង​ធ្វើ​ប្រតិចារឹក..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"មិន​មាន​ប្រតិចារឹក​ទេ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"មើល"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នេះ​នៅ​ក្នុង Messages ។"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នៅ​ក្នុង Messages ។"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-kn/strings.xml b/java/com/android/dialer/app/res/values-kn/strings.xml
index dae544d..8e213c1 100644
--- a/java/com/android/dialer/app/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/res/values-kn/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ಫೋನ್"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ಫೋನ್ ಕೀಪ್ಯಾಡ್"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ಫೋನ್"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"ನಿಖರವಾಗಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ನಕಲಿಸಿ"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ಸಂಖ್ಯೆಯನ್ನು ಅನಿರ್ಬಂಧಿಸು"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ಕರೆ ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ಧ್ವನಿಮೇಲ್‌ ಅಳಿಸಿ"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸುವುದೇ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ಇದು ನಿಮ್ಮ ಇತಿಹಾಸದಿಂದ ಎಲ್ಲಾ ಕರೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ಫೋನ್"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ಮಿಸ್ಡ್‌ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ಪ್ಲೇ ಮಾಡು"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ಇವರಿಂದ ಹೊಸ ಧ್ವನಿಮೇಲ್‌"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ಧ್ವನಿಮೇಲ್‌ ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ಧ್ವನಿಮೇಲ್ ಆರ್ಕೈವ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"ಧ್ವನಿಮೇಲ್‌ ಕರೆಗಳು ಮಾತ್ರ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ಒಳಬರುವ ಕರೆಗಳು ಮಾತ್ರ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ಹೊರಹೋಗುವ ಕರೆಗಳು ಮಾತ್ರ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು ಮಾತ್ರ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ಹುಡುಕಾಟ"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ಡಯಲ್"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ಡಯಲ್‌ ಮಾಡಬೇಕಾದ ಸಂಖ್ಯೆ"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"ಪ್ಲೇಬ್ಯಾಕ್ ಅನ್ನು ಪ್ಲೇ ಮಾಡಿ ಅಥವಾ ನಿಲ್ಲಿಸಿ"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಸ್ವಿಚ್ ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡಿ"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"ಪ್ಲೇಬ್ಯಾಕ್ ಸ್ಥಾನವನ್ನು ಪಡೆಯಿರಿ"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ಪ್ಲೇಬ್ಯಾಕ್ ರೇಟ್ ಅನ್ನು ಕಡಿಮೆ ಮಾಡು"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"ಪ್ಲೇಬ್ಯಾಕ್ ರೇಟ್ ಅನ್ನು ಹೆಚ್ಚು ಮಾಡು"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ಕರೆ ಇತಿಹಾಸ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ಕೀ ಪ್ಯಾಡ್‌"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ಹೊರಹೋಗುವುದನ್ನು ಮಾತ್ರ ತೋರಿಸು"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ಒಳಬರುವುದನ್ನು ಮಾತ್ರ ತೋರಿಸು"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"ತಪ್ಪಿಹೋದದ್ದನ್ನು ಮಾತ್ರ ತೋರಿಸು"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಮಾತ್ರ ತೋರಿಸು"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ಎಲ್ಲಾ ಕರೆಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-ಸೆ ವಿರಾಮವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="add_wait" msgid="1177723010768282578">"ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ಸಿಮ್ಯುಲೇಟರ್"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ಸ್ಪರ್ಶ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ಕರೆಯನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ಒಳಬರುವ ಕರೆಗಳು"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ಧ್ವನಿಮೇಲ್‌ ಪ್ಲೇ ಮಾಡಿ"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ವೀಕ್ಷಿಸಿ"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ಹೊಸ UI ಶಾರ್ಟ್‌ಕಟ್ ರಚಿಸಿ"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್‌ಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್ ತೊರೆಯಲಾಗಿದೆ"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಆಯ್ಕೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರಿಗಾಗಿ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ಕರೆಗಳು."</string>
     <string name="description_video_call" msgid="3738199365585751727">"ವೀಡಿಯೊ ಕರೆ."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರಿಗೆ SMS ಕಳುಹಿಸಿ"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"ಆಲಿಸಲಾಗದ ಧ್ವನಿಮೇಲ್‌"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ಧ್ವನಿ ಹುಡುಕಾಟ ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="voicemail" msgid="8899540969000957954">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%s</xliff:g> ಸೆಕೆಂ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ಧ್ವನಿಮೇಲ್‌ಗಳು"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ಹೌದು"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ಇಲ್ಲ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ಆಯ್ಕೆ ಮಾಡಲಾದ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ಅನ್ನು ಅಳಿಸುವುದೇ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ಬ್ಯಾಚ್ ಕ್ರಿಯೆಗಳ ಮೋಡ್ ಅನ್ನು ರದ್ದುಮಾಡಿ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ಅಳಿಸಿ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
+      <item quantity="other">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ರಂದು <xliff:g id="TIME">%2$s</xliff:g> ಗಂಟೆಗೆ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ಈ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಗೆ ಹೋಗಿ."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ಧ್ವನಿ ಹುಡುಕಾಟ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿರುವುದರಿಂದ ಫೋನ್ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"ಸಂ. ಸೇರಿಸಿ ಅಥವಾ ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ನಿಮ್ಮ ಕರೆ ಇತಿಹಾಸ ಖಾಲಿಯಾಗಿದೆ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ಕರೆ ಮಾಡಿ"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ನೀವು ಯಾವುದೇ ಮಿಸ್ಡ್ ಕರೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಇನ್‌ಬಾಕ್ಸ್ ಖಾಲಿ ಇದೆ."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ಮೆಚ್ಚಿನವುಗಳನ್ನು ಮಾತ್ರ ತೋರಿಸು"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ಕರೆ ಇತಿಹಾಸ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ಎಲ್ಲಾ ಕರೆಗಳು"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ಧ್ವನಿಮೇಲ್"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"ಸ್ಪೀಡ್ ಡಯಲ್"</string>
     <string name="tab_history" msgid="7420269368689503596">"ಕರೆ ಇತಿಹಾಸ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ಮೆಚ್ಚಿನವುಗಳಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"ರದ್ದುಮಾಡಿ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸು"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ಸಂಪರ್ಕಕ್ಕೆ ಸೇರಿಸು"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS ಕಳುಹಿಸು"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ಹೊಸ ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ನಿಮ್ಮ ತ್ವರಿತ ಡಯಲ್‌ನಲ್ಲಿ ಇದುವರೆಗೆ ಯಾರೂ ಇಲ್ಲ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ನೀವು ಇನ್ನೂ ಯಾವುದೇ ಸಂಪರ್ಕಗಳನ್ನು ಹೊಂದಿಲ್ಲ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ಎಲ್ಲಾ ಸಂಖ್ಯೆಗಳನ್ನು ನೋಡಲು ಚಿತ್ರವನ್ನು ಸ್ಪರ್ಶಿಸಿ ಅಥವಾ ಮರುಕ್ರಮಗೊಳಿಸಲು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹೋಲ್ಡ್‌‌ ಮಾಡಿ"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ತೆಗೆದುಹಾಕು"</string>
+    <string name="select_all" msgid="408601760696146245">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ಕರೆಯ ವಿವರಗಳು"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ರಿಂದ ಧ್ವನಿಮೇಲ್ ಆಲಿಸಿ"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ರಿಂದ ಧ್ವನಿಮೇಲ್ ಪ್ಲೇ ಮಾಡಿ"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ನಿಂದ ಧ್ವನಿಮೇಲ್ ವಿರಾಮಗೊಳಿಸಿ"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ನಿಂದ ಧ್ವನಿಮೇಲ್ ಅಳಿಸಿ"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳು</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳು</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಿ"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಕ್ಕೆ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ಸೇರಿಸಿ"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ಸಂಪರ್ಕದ ವಿವರಗಳು"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ಕರೆ ಇತಿಹಾಸದಿಂದ ಅಳಿಸಲಾಗಿದೆ"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ಇಂದು"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ನಿನ್ನೆ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ಹಳೆಯದು"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ಕರೆಗಳ ಪಟ್ಟಿ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ಸ್ಪೀಕರ್ ಆನ್ ಮಾಡಿ."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ಸ್ಪೀಕರ್ ಆಫ್ ಮಾಡಿ."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"ವೇಗವಾಗಿ ಪ್ಲೇ ಮಾಡಿ."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ನಿಧಾನವಾಗಿ ಪ್ಲೇ ಮಾಡಿ."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ಪ್ಲೇಬ್ಯಾಕ್‌ ಪ್ರಾರಂಭಿಸಿ ಅಥವಾ ವಿರಾಮಗೊಳಿಸಿ."</string>
     <string name="display_options_title" msgid="3880091801055797975">"ಡಿಸ್‌ಪ್ಲೇ ಆಯ್ಕೆಗಳು"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ಕರೆಗಳು"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ಧ್ವನಿಮೇಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಸಿಮ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ ತಾತ್ಕಾಲಿಕ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ನೀವು ಕಳೆದ 48 ಗಂಟೆಗಳಲ್ಲಿ ಈ ಫೋನ್‌ನಿಂದ ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿರುವ ಕಾರಣದಿಂದ ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಒಮ್ಮೆ 48 ಗಂಟೆಗಳ ಅವಧಿಯು ಮುಕ್ತಾಯಗೊಂಡ ನಂತರ ಅದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದು."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ಸಂಖ್ಯೆಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳು"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ಈಗಾಗಲೇ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ಕರೆ ಮಾಡುವ ಖಾತೆಗಳು"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ಆನ್‌ ಮಾಡಿ"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ಅನುಮತಿಗಳನ್ನು ಹೊಂದಿಸು"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ವೇಗ ಡಯಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ವೀಕ್ಷಿಸಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪ್ರವೇಶಿಸಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ಕರೆ ಮಾಡಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಬರೆಯಲು ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"ಸ್ಪ್ಯಾಮ್"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ಆಫ್‌ಲೈನ್ ಆಗಿದ್ದಾರೆ ಮತ್ತು ಅವರನ್ನು ತಲುಪಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ಕುರಿತು"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ನಿಂದ ಲಿಪ್ಯಂತರ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ಲಿಪ್ಯಂತರ ಮಾಡುತ್ತಿದೆ …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ಪ್ರತಿಲಿಪಿ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ವೀಕ್ಷಿಸಿ"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ಕರೆ ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಯ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ಕರೆಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಗಳನ್ನು ಮಾಡುವ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ko/strings.xml b/java/com/android/dialer/app/res/values-ko/strings.xml
index 1850b6c..96cde6f 100644
--- a/java/com/android/dialer/app/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/res/values-ko/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"전화"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"휴대전화 키패드"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"휴대전화"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"통화 기록"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"잘못된 번호 신고하기"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"전화번호 복사"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"텍스트 변환 복사"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"번호 차단"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"번호 차단 해제"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"통화하기 전에 번호 수정"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"통화 기록 삭제"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"음성사서함 삭제"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"통화 기록을 삭제하시겠습니까?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"모든 통화가 기록에서 삭제됩니다."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"통화 기록을 삭제하는 중…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"전화"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"부재중 전화"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"부재중 업무 통화"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"부재중 전화"</string>
@@ -48,107 +43,66 @@
       <item quantity="other">음성메일 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
       <item quantity="one">음성메일</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"재생"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>님이 보낸 새 음성사서함"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"음성사서함을 재생할 수 없습니다."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"음성사서함 로드 중…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"음성사서함 보관처리 중…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"음성사서함을 로드할 수 없습니다."</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"음성사서함 메시지만"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"수신 전화만"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"발신 전화만"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"부재중 전화만"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"<xliff:g id="DATE">%2$s</xliff:g>에 통화 <xliff:g id="COUNT">%1$d</xliff:g>통"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"검색"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"전화걸기"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"전화를 걸 번호"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"재생 실행 또는 중지"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"스피커폰 켜고 끄기"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"재생 위치 찾기"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"재생 속도 낮추기"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"재생 속도 높이기"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"통화 기록"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"옵션 더보기"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"키패드"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"발신 전화만 표시"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"수신 전화만 표시"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"부재중 전화만 표시"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"음성사서함만 표시"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"모든 통화 표시"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2초 간 일시 정지 추가"</string>
-    <string name="add_wait" msgid="1177723010768282578">"대기 시간 추가"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"설정"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"시뮬레이터"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"모든 연락처"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"터치톤 키패드 사용"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"진행 중인 통화로 돌아가기"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"통화 추가"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"수신전화"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"음성사서함 재생"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g>님의 연락처 보기"</string>
-    <string name="description_call" msgid="1532402285334775372">"전화걸기: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"새 UI 바로가기 만들기"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"일괄 작업 모드 시작 중"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"일괄 작업 모드 종료됨"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 선택됨"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 선택 취소됨"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"스팸으로 의심되는 발신자 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"통화 횟수: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>번"</string>
     <string name="description_video_call" msgid="3738199365585751727">"화상 통화"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>님에게 SMS 보내기"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"듣지 않은 음성사서함"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"음성 검색 시작"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string>
     <string name="voicemail" msgid="8899540969000957954">"음성사서함"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g>초"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g>분 <xliff:g id="SECONDS">%s</xliff:g>초"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"음성사서함"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"음성사서함"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"예"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"아니요"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"선택한 <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>을(를) 삭제하시겠습니까?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"일괄 작업 모드 취소"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"삭제"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"취소"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>개 선택됨"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
+      <item quantity="one">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>분 <xliff:g id="SECONDS">%2$02d</xliff:g>초"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"이 번호로 전화를 걸 수 없습니다."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"음성사서함을 설정하려면 메뉴 &gt; 설정으로 이동하세요."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"음성사서함에 메시지를 남기려면 먼저 비행기 모드를 해제하세요."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"로드 중…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM 카드에서 로딩 중..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM 카드 주소록"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"사용할 수 있는 주소록 앱이 없습니다."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"음성검색이 지원되지 않습니다."</string>
-    <string name="call_not_available" msgid="7850148370757361155">"전화 애플리케이션을 사용 중지했으므로 전화를 걸 수 없습니다."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"주소록 검색"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"번호 추가 또는 연락처 검색"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"통화 기록이 비어있습니다."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"전화 걸기"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"부재중 전화가 없습니다."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"음성사서함 받은편지함이 비어 있습니다."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"즐겨찾는 연락처만 표시"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"통화 기록"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"전체"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"부재중 전화"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"음성사서함"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"단축번호"</string>
     <string name="tab_history" msgid="7420269368689503596">"통화 기록"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"주소록"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"음성사서함"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"즐겨찾기에서 삭제됨"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"실행취소"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"새 연락처 만들기"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"연락처에 추가"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS 보내기"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"화상 통화하기"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"번호 차단"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"새로운 부재중 전화 <xliff:g id="NUMBER">%s</xliff:g>건"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"아직 단축 다이얼이 설정된 연락처가 없습니다."</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"단축 다이얼 추가"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"아직 연락처가 없습니다."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"연락처 추가"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"이미지를 터치하여 모든 번호를 확인하거나 길게 터치하여 재정렬합니다."</string>
     <string name="remove_contact" msgid="2353580570488923668">"삭제"</string>
+    <string name="select_all" msgid="408601760696146245">"모두 선택"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"화상 통화"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"메시지 보내기"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"통화 세부정보"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 전화 걸기"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 화상 통화 걸기"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> 음성사서함 듣기"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에서 발신한 음성사서함 재생"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에서 발신한 음성사서함 일시중지"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에서 발신한 음성사서함 삭제"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other">새 음성사서함 <xliff:g id="COUNT_1">%d</xliff:g>개</item>
-      <item quantity="one">새 음성사서함 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> 연락처 만들기"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>님을 기존 연락처에 추가합니다."</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>의 통화 세부정보"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"통화 기록에서 삭제했습니다."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"오늘"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"어제"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"이전"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"통화 목록"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"스피커를 켭니다."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"스피커를 끕니다."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"더 빠르게 재생합니다."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"더 느리게 재생합니다."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"재생을 시작하거나 일시중지합니다."</string>
     <string name="display_options_title" msgid="3880091801055797975">"표시 옵션"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"소리 및 진동"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"통화"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"통화 차단"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"음성사서함"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"음성사서함 설정을 변경할 SIM 선택"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"통화 차단 기능이 일시적으로 중지됨"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"지난 48시간 이내에 이 휴대전화를 사용해 응급 서비스에 연락했으므로 통화 차단 기능이 중지되었습니다. 48시간이 지나면 통화 차단 기능이 자동으로 다시 사용 설정됩니다."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"번호 가져오기"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"차단된 번호"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>번은 이미 차단되었습니다."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"통화 계정"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"사용"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"권한 설정"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"단축번호를 사용하려면 주소록 권한을 사용하도록 설정하세요."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"통화 기록을 보려면 전화 권한을 사용하도록 설정하세요."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"주소록을 보려면 주소록 권한을 사용하도록 설정하세요."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"음성사서함에 액세스하려면 전화 권한을 사용하도록 설정하세요."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"주소록을 검색하려면 주소록 권한을 사용하도록 설정하세요."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"전화를 걸려면 전화 권한을 사용하도록 설정하세요."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"전화 앱은 시스템 설정에 쓸 수 있는 권한이 없습니다."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"스팸"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>님은 오프라인 상태이며 연락할 수 없습니다."</string>
     <string name="about_phone_label" msgid="582991354677973731">"정보"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"텍스트 변환 Google 제공"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google에서 텍스트 변환 중…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"텍스트 변환을 사용할 수 없음"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"보기"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"통화가 삭제되었습니다. 메시지에서 이 통화 중에 공유된 첨부파일을 확인하고 삭제하세요."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"통화가 삭제되었습니다. 메시지에서 통화 중에 공유된 첨부파일을 확인하고 삭제하세요."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ky/strings.xml b/java/com/android/dialer/app/res/values-ky/strings.xml
index 9e80e29..d0e2803 100644
--- a/java/com/android/dialer/app/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/res/values-ky/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефондун номер тергичи"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Телефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Чалуулар таржымалы"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Номер туура эмес"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Номерди көчүрүү"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Транскрипцияны көчүрүү"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Номерди бөгөттөө"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Номерди бөгөттөн чыгаруу"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Чалуудан мурун номерди түзөтүү"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Чалуулар таржымалын тазалоо"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Үн почтасын жок кылуу"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Чалуулар таржымалы тазалансынбы?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ушуну менен бул таржымалдагы бардык чалуулар жок болот"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Чалуулар таржымалы тазаланууда…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Телефон"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Кабыл алынбаган чалуу"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Кабыл алынбай калган чалуу (жумуш)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Кабыл алынбаган чалуулар"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Үн каты </item>
       <item quantity="one">Үн каты</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Угуу"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> жаңы үнкат калтырды"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Үн почтасы ойнолгон жок"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Үн почтасы жүктөлүүдө…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Үн каттары архивделүүдө…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Үн почтасы жүктөлгөн жок"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Үнкат чалуулары"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Кириш чалуулар"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Чыккан чалуулар"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Өткөзүлгөн чалуулар гана"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"издөө"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"терүү"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"терүү үчүн номер"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Ойнотууну иштетүү же токтотуу"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Катуу сүйлөткүчтү күйгүзүү же өчүрүү"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Ойнотуунун жайгашкан жерин издөө"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Ойнотуу ылдамдыгын жайлатуу"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Ойнотуу ылдамдыгын тездетүү"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Чалуулар таржымалы"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Көбүрөөк мүмкүнчүлүктөр"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"номер тергич"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Чыккан чалуу-ды гана көрсөтүү"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Кириш чалууларды гана көрсөтүү"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Өткөз. чалуу-ды гана көрсөтүү"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Үнкаттарды гана көрсөтүү"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Бардык чалууларды көрсөтүү"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-сек. тыныгууну кошуңуз"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Тыныгуу кошуу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Жөндөөлөр"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Бардык байланыштар"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Тоналдык терүү тактасын колдонуу"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Токтотулган чалууга кайтуу"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Чалууну кошуу"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Кирүүчү чалуулар"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Үнкатты угуу"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Байланышты кароо <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Чалуу <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңы интерфейс үчүн кыска жол түзүү"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Жапырт аракет режимине кирдиңиз"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Жапырт аракет режиминен чыктыңыз"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> объект тандалды"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> объект тандоодон чыгарылды"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> байланыш маалыматтары"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Спам деп шектелип жаткан чалуучунун байланыш маалыматы <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> чалуу."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видео чалуу."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> дегенге SMS жөнөтүү"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Угула элек үнкат"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Үн менен издеп баштоо"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Чалуу <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Үн почтасы"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мүн. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"үн почтасы"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"үн почталары"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ооба"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Жок"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Тандалган <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> жок кылынсынбы?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Жапырт аракет режимин жокко чыгаруу"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жок кылуу"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жокко чыгаруу"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> тандалды"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Бул үн почталар жок кылынсынбы? "</b>"</item>
+      <item quantity="one">"<b>"Бул үн почта жок кылынсынбы? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> саат <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Бул номурга чалуу мүмкүн болбой жатат"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Үн почтасын жөндөө үчүн Меню &gt; Жөндөөлөргө кириңиз."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Үн почтасын текшерүү үчүн, алгач Учак режимин өчүрүңүз."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Жүктөлүүдө…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM картадан жүктөлүүдө..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM картадагы байланыштар"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Жеткиликтүү байланыштар колдонмосу жок"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Үн менен издөө жеткиликтүү эмес"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Телефон колдонмосу өчүрүлгөндүктөн, чалуу мүмкүн болбой жатат."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Байланыштарды издөө"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Номер кошуңуз же байлнш издңз"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Чалуулар таржымалыңыз бош"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Чалуу"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Кабыл алынбаган чалуулар жок."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Үн почтаңыздын келген билдирүүлөр куржуну бош."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Тандамалдарды гана көрсөтүү"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Чалуулар таржымалы"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Бардыгы"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Кабыл алынбагандар"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Үнкат"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Тез терүү"</string>
     <string name="tab_history" msgid="7420269368689503596">"Чалуулар таржымалы"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Байланыштар"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Үн почтасы"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Тандамалдардан өчүрүлдү"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Кайтаруу"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Чалуу <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Жаңы байланыш түзүү"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Байланышка кошуу"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS жөнөтүү"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Видео түрүндө чалуу"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Номерди бөгөттөө"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> жаңы өткөзүлгөн чалуу"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Азырынча тез териле турган номерлер жок"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Сүйүктүү номер кошуу"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Азырынча бир дагы байланышыңыз жок"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Байланыш кошуу"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Бардык номерлерди көрүү үчүн, сүрөткө тийип коюңуз же коё бербей басып туруп иретин өзгөртсөңүз болот."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Алып салуу"</string>
+    <string name="select_all" msgid="408601760696146245">"Баарын тандоо"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео чалуу"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Билдирүү жөнөтүү"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Чалуунун чоо-жайы"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> видео чалуу."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үн катын угуу"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Үн почтасын <xliff:g id="NAMEORNUMBER">^1</xliff:g> дегенден ойнотуу"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Үн почтасын <xliff:g id="NAMEORNUMBER">^1</xliff:g> дегенден тындыруу"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Үн почтасын <xliff:g id="NAMEORNUMBER">^1</xliff:g> дегенден жок кылуу"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жаңы үн почтасы</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жаңы үн почтасы</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> номери үчүн байланыш түзүү"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> учурдагы байланышка кошуу"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу чоо-жайы"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Чалуулар таржымалынан жок кылынды"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Бүгүн"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Кечээ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Мурункураак"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Чалуулар тизмеси"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Катуу сүйлөткүч күйгүзүлгөн."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Катуу сүйлөткүч өчүрүлгөн."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Тезирээк ойнотуу."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Жайыраак ойнотуу."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ойнотуп баштоо же бир азга токтотуу"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Көрсөтүү параметрлери"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Үндөр жана дирилдөө"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Чалуулар"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Чалууларды бөгөттөө"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Үн почтасы"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Үн почтанын жөндөөлөрү үчүн SIM картаны тандаңыз"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Чалууну бөгөттөө убактылуу өчүрүлгөн"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Акыркы 48 саат ичинде бул телефондон өзгөчө кырдаал кызматына байланышкандыктан чалууну бөгөттөө өчүрүлдү. 48 сааттык мөөнөтү аяктагандан кийин ал автоматтык түрдө кайра иштетилет."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Номерлерди импорттоо"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Бөгөттөлгөн номерлер"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> мурунтан эле бөгөттөлгөн."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Чалуу каттоо эсептери"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Күйгүзүү"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Уруксаттарды берүү"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Тез терүүнү иштетүү үчүн, \"Байланыштар\" колдонмосуна уруксат бериңиз."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Чалуулар таржымалыңызды көрүү үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Байланыштар тизмесин көрүү үчүн, \"Байланыштар\" колдонмосуна уруксат бериңиз."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Үн почтаңызга кирүү үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Чалуу үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Телефон колдонмосунун Тутум жөндөөлөрүнө жазууга уруксаты жок."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> оффлайн режиминде болгондуктан, байланышууга болбойт"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Колдонмо жөнүндө"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google тарабынан чечмеленди"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Күтө туруңуз..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Чечмелөө жеткиликсиз."</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Карап көрүү"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Чалуу жок кылынды. Билдирүүлөр колдонмосунда чалуу убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Чалуулар жок кылынды. Билдирүүлөр колдонмосунда чалуулар убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lo/strings.xml b/java/com/android/dialer/app/res/values-lo/strings.xml
index 8284e8d..cecb843 100644
--- a/java/com/android/dialer/app/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/res/values-lo/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ໂທລະສັບ"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ແປ້ນກົດໂທລະສັບ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ໂທລະສັບ"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ປະຫວັດການໂທ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"ລາຍງານໝາຍເລກທີ່ບໍ່ຖືກຕ້ອງ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ອັດ​ສຳ​ເນົາ​ໝາຍເລກ"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ອັດ​ສຳ​ເນົາ​ການ​ກ່າຍ​ເປັນ​ໜັງ​ສື"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"ບ​ລັອກ​ໝາຍເລກ"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ປົດ​ບ​ລັອກ​ໝາຍເລກ"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ແກ້ໄຂໝາຍເລກກ່ອນໂທ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ລຶບຂໍ້ຄວາມສຽງ"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​ບໍ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ອັນ​ນີ້​ຈະ​ລຶບ​ທຸກ​ສາຍ​ໂທ​ຈາກ​ປະ​ຫວັດ​ຂອງ​ທ່ານ"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"ກຳ​ລັງ​ລຶບ​ປະ​ຫວັດ​ການ​ໂທ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ໂທລະສັບ"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ສາຍບໍ່ໄດ້ຮັບຈາກບ່ອນເຮັດວຽກ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມສຽງ </item>
       <item quantity="one">ຂໍ້ຄວາມສຽງ</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ຫຼິ້ນ"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ບໍ່ມີຂໍ້ຄວາມສຽງຈາກ <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ບໍ່​ສາ​ມາດ​ຫຼິ້ນ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ກຳ​ລັງ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ກຳລັງຈັດເກັບຂໍ້ຄວາມສຽງເຂົ້າແຟ້ມ…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ບໍ່​ສາ​ມາດ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"ເບີໂທຂໍ້ຄວາມສຽງເທົ່ານັ້ນ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ສາຍໂທເຂົ້າເທົ່ານັ້ນ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ເບີໂທອອກເທົ່ານັ້ນ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"ສະເພາະສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ຊອກຫາ"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ປຸ່ມໂທ"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ໝາຍເລກທີ່ຈະໂທ"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"​ຫຼິ້ນ ຫຼື​ຢຸດ​ການຫຼິ້ນ"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"​ປິດຫຼື​ເປີດ​ລຳ​ໂພງ​ມື​ຖື"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"​ຊອກ​ຫາ​ຕຳ​​ແໜ່ງ​ຫຼິ້ນ"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ຫຼ​ຸດ​ອັດ​ຕາ​ການຫຼິ້ນ"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"​ເພີ​່ມ​ອັດ​ຕາ​ການຫຼິ້ນ"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ປະຫວັດການໂທ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ແປ້ນກົດ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ສະແດງສະເພາະສາຍໂທອອກ"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ສະແດງສະເພາະສາຍໂທເຂົ້າ"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"ສະແດງສະເພາະສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"ສະແດງສະເພາະຂໍ້ຄວາມສຽງ"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ສະແດງການໂທທັງໝົດ"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"ເພີ່ມການຂັ້ນເວລາ 2 ວິນາທີ"</string>
-    <string name="add_wait" msgid="1177723010768282578">"ເພີ່ມການລໍຖ້າ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ການ​ຕັ້ງ​ຄ່າ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ຕົວຈຳລອງ"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ໃຊ້ປຸ່ມກົດສັນຍານສຽງ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ເພີ່ມການໂທ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ສາຍໂທເຂົ້າ"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ເປີດຂໍ້ຄວາມສຽງ"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"ເບິ່ງລາຍຊື່ຜູ່ຕິດຕໍ່ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"ໂທຫາ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ສ້າງປຸ່ມລັດສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ໃໝ່"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ກຳລັງເຂົ້າໂໝດຄຳສັ່ງຈຳນວນຫຼາຍ"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ອອກຈາກໂໝດຄຳສັ່ງຈຳນວນຫຼາຍແລ້ວ"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"ເລືອກ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ແລ້ວ"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ເຊົາເລືອກ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ແລ້ວ"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"ລາຍລະອຽດ​ລາຍຊື່​ຜູ່ຕິດຕໍ່​ສຳລັບ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"ລາຍລະອຽດການຕິດຕໍ່ສຳລັບຜູ້ໂທທີ່ສົງໄສວ່າເປັນສະແປມ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ການໂທ."</string>
     <string name="description_video_call" msgid="3738199365585751727">"ການ​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"ສົ່ງ SMS ຫາ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"ຂໍ້ຄວາມສຽງທີ່ຍັງບໍ່ໄດ້ຟັງ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ເລີ່ມການຊອກຫາດ້ວຍສຽງ"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"ໂທ​ຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ວິນາທີ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ນ​ທ <xliff:g id="SECONDS">%s</xliff:g> ວິ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ແມ່ນແລ້ວ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ບໍ່"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ລຶບ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ທີ່ເລືອກອອກໄປບໍ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ຍົກເລີກໂໝດຄຳສັ່ງເປັນຊຸດ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ລຶບ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ຍົກເລີກ"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"ເລືອກ <xliff:g id="NUMBER">%1$s</xliff:g> ລາຍການແລ້ວ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ລຶບຂໍ້ຄວາມສຽງເຫຼົ່ານີ້ບໍ? "</b>"</item>
+      <item quantity="one">"<b>"ລຶບຂໍ້ຄວາມສຽງນີ້ບໍ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ເວລາ <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ບໍ່​ສາ​ມາດ​ໂທ​ຫາ​ເບີ​ນີ້​ໄດ້"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ເພື່ອຕັ້ງຄ່າຂໍ້ຄວາມສຽງ, ໃຫ້ໄປທີ່ ເມນູ &gt; ການຕັ້ງຄ່າ."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ເພື່ອໂທຫາເບີຂໍ້ຄວາມສຽງ, ທ່ານຕ້ອງປິດໂໝດຢູ່ໃນຍົນກ່ອນ."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ກຳລັງໂຫລດ..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"ກຳລັງໂຫລດຈາກ SIM card..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"ລາຍຊື່ຜູ່ຕິດຕໍ່ SIM card"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"ບໍ່​ມີ​ແອັບຯ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ຢູ່"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ບໍ່​ມີ​ການ​ຊອກ​ຫາ​ດ້ວຍ​ສຽງ​ຢູ່"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ​້​ເນື່ອງ​ຈາກ​ແອັບ​ພ​ລິ​ເຄ​ຊັນ​ໂທ​ລະ​ສັບ​ຖືກ​ປິດ​ການ​ນຳ​ໃຊ້​ໄວ້."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ຊອກຫາລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"ເພີ່ມ​ເບີ​ໂທ​ລະ​ສັບ ຫຼື ຊອກ​ຫາ​ລາຍ​ຊື່​ຕິດ​ຕໍ່"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ປະ​ຫວັດ​ການ​ໂທ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"​ໂທ​ອອກ"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ທ່ານບໍ່ມີສາຍທີ່ບໍ່ໄດ້ຮັບ."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ກ່ອງເຂົ້າ​ຂໍ້​ຄວາມ​ສຽງ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ສະ​ແດງ​ສະເພາະລາຍການທີ່ນິຍົມເທົ່ານັ້ນ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ປະຫວັດການໂທ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ທັງໝົດ"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ຂໍ້ຄວາມສຽງ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"ການ​ໂທ​ດ່ວນ"</string>
     <string name="tab_history" msgid="7420269368689503596">"ປະຫວັດການໂທ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ລຶບອອກຈາກລາຍການທີ່ມັກແລ້ວ"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"ຍົກເລີກ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"ໂທ​ຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ເພີ່ມ​ໃສ່​ລາຍ​ຊື່"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ສົ່ງ SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"​ໂທ​ອອກ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"ບ​ລັອກ​ໝາຍ​ເລກ"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ສາຍທີ່ບໍ່ໄດ້ຮັບໃໝ່"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ບໍ່​ມີ​ຜູ້​ໃດ​ຢູ່​ໃນ​ການ​ໂທ​ດ່ວນ​ຂອງ​ທ່ານ​ເທື່ອ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ເພີ່ມ​ລາຍ​ການ​ທີ່​ມັກ"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ທ່ານ​ບໍ່​ມີ​ລາຍ​ຊື່​ໃດ​ເທື່ອ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ເພີ່ມ​ລາຍ​ຊື່"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ແຕະຮູບເພື່ອເບິ່ງເບີໂທທັງໝົດ ຫຼື ແຕະຄ້າງໄວ້ເພື່ອຈັດລຳດັບໃໝ່"</string>
     <string name="remove_contact" msgid="2353580570488923668">"​ລຶບ​ອອກ"</string>
+    <string name="select_all" msgid="408601760696146245">"ເລືອກທັງໝົດ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ສົ່ງຂໍ້ຄວາມ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ລາຍລະອຽດ​ການໂທ"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"ໂທ​ຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ການ​ໂທວິ​ດີ​ໂອ <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"​ຟັງ​ຂໍ້​ຄວາມ​ສຽງ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"ຫຼິ້ນຂໍ້ຄວາມສຽງຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"ຢຸດຂໍ້ຄວາມສຽງຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"ລຶບຂໍ້ຄວາມສຽງຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ຂໍ້​ຄວາມ​ສຽງ​ໃໝ່</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ຂໍ້​ຄວາມ​ສຽງ​ໃໝ່</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"ສ້າງ​ລາຍ​ຊື່​ສຳ​ລັບ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"ເພີ່ມ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ໃສ່​ລາຍ​ຊື່​ທີ່​ມີ​ຢູ່"</string>
     <string name="description_details_action" msgid="2061866409737706174">"ລາຍລະອຽດ​ການ​ໂທ​ສຳລັບ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ລຶບ​ຈາກ​ປະ​ຫວັດ​ການ​ໂທ​ແລ້ວ"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ມື້ນີ້"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ມື້​ວານ​ນີ້"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ເກົ່າກວ່າ"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ບັນ​ຊີ​ລາຍ​ຊື່​ໂທ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ເປີດ​ລຳໂພງ."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ປິດ​ລຳໂພງ."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"ຫຼິ້ນໄວຂຶ້ນ."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ຫຼິ້ນຊ້າລົງ."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ເລີ່ມຫຼືຢຸດ​ການ​ຫຼິ້ນຊົ່ວຄາວ."</string>
     <string name="display_options_title" msgid="3880091801055797975">"ຕົວເລືອກການສະແດງຜົນ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ສຽງ ແລະ ການສັ່ນ"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"​ການ​ໂທ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ການບລັອກສາຍ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ເລືອກຊິມສຳລັບການຕັ້ງຄ່າຂໍ້ຄວາມສຽງ"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ການບ​ລັອກ​ສາຍ​ໂທ​ປິດ​ຊົ່ວ​ຄາວ"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ການບ​ລັອກ​ສາຍ​ໂທ​ຖືກ​ປິດ​ໃຊ້​ງານ​ແລ້ວ ເພາະ​ວ່າ​ທ່ານ​ໄດ້​ຕິດ​ຕໍ່​ຫາ​ຝ່າຍ​ບໍ​ລິ​ການ​ສຸກ​ເສີນ​ຈາກ​ໂທ​ລະ​ສັບ​ນີ້​ພາຍ​ໃນ 48 ຊົ່ວ​ໂມງ​ສຸດ​ທ້າຍ. ມັນ​ຈະ​ຖືກ​ເປີດ​ໃຊ້​ງານ​ອີກ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ ເມື່ອ​ໝົດ​ໄລ​ຍະ 48 ຊົ່ວ​ໂມງ​ໄປ​ແລ້ວ."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ນຳ​ຕົວ​ເລກ​ເຂົ້າ"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ເບີໂທລະສັບທີ່ບລັອກໄວ້"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ຖືກ​ບ​ລັອກ​ແລ້ວ."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ບັນ​ຊີ​ໂທ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ເປີດ​"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ຕັ້ງ​ການ​ອະ​ນຸ​ຍາດ"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ເພື່ອ​ເປີດ​ໃຊ້​ງານ​ການໂທດ່ວນ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ລາຍ​ຊື່."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ເພື່ອ​ເບິ່ງ​ບັນ​ທຶກ​ການ​ໂທ​ຂອງ​ທ່ານ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"ເພື່ອ​ເບິ່ງ​ລາຍ​ຊື່​ຂອງ​ທ່ານ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ລາຍ​ຊື່"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ເພື່ອ​ເຂົ້າ​ຫາ​ຂໍ້​ຄວາມ​ສຽງ​ຂອງ​ທ່ານ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"ເພື່ອຄົ້ນຫາລາຍາຊື່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ເພື່ອ​ເຮັດການໂທ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ແອັບໂທລະສັບບໍ່ມີການອະນຸຍາດໃຫ້ຂຽນໃສ່ການຕັ້ງຄ່າລະບົບ."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"ສະແປມ"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ອອບລາຍຢູ່ ແລະ ບໍ່ສາມາດຕິດຕໍ່ຫາໄດ້"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ກ່ຽວກັບ"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ຖອດຂໍ້ຄວາມໂດຍ Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ກຳລັງຖອດຂໍ້ຄວາມ..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ບໍ່ມີການຖອດຂໍ້ຄວາມ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ເບິ່ງ"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທນີ້ຢູ່ Messages ໄດ້."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທຕ່າງໆຢູ່ Messages ໄດ້."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lt/strings.xml b/java/com/android/dialer/app/res/values-lt/strings.xml
index a346d5d..d68a473 100644
--- a/java/com/android/dialer/app/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/res/values-lt/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefonas"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefono klaviatūra"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefonas"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Skambučių istorija"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Pranešti apie netikslų numerį"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopijuoti numerį"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopijuoti transkribuotą tekstą"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokuoti numerį"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Panaikinti numerio blokavimą"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redaguoti numerį prieš skambinant"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Išvalyti skambučių istoriją"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ištrinti balso pašto pranešim."</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Išvalyti skambučių istoriją?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bus ištrinti visi skambučiai iš istorijos"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Išvaloma skambučių istorija..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefonas"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Praleistas skambutis"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Praleistas darbo skambutis"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Praleisti skambučiai"</string>
@@ -50,107 +45,68 @@
       <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimo </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimų </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Paleisti"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nauji b. pašto pran. iš <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nepavyko paleisti balso pašto pranešimo"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Įkeliamas balso pašto pranešimas..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archyvuojami balso pašto pranešimai…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nepavyko įkelti balso pašto pranešimo"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Tik skambučiai su balso paštu"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Tik gaunami skambučiai"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Tik siunčiami skambučiai"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Tik praleisti skambučiai"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ieškoti"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"rinkti numerį"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"renkamas numeris"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Paleisti arba sustabdyti atkūrimą"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Įjungti arba išjungti garsiakalbį"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Ieškoti atkūrimo pozicijos"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Sumažinti atkūrimo spartą"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Padidinti atkūrimo spartą"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Skambučių istorija"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Daugiau parinkčių"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatūra"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Rodyti tik išsiunčiamus"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Rodyti tik gaunamus"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Rodyti tik praleistus"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Rodyti tik balso pšt. praneš."</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Rodyti visus skambučius"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Pridėti 2 sek. pauzę"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Pridėti laukimą"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nustatymai"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simuliatorius"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Visi kontaktai"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Naudoti jutiklinę klaviatūrą"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Grįžti prie vykdomo skambučio"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Pridėti skambutį"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Gaunami skambučiai"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Paleisti balso pašto pranešimus"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Žiūrėti kontaktą <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Skambinti <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sukurti naują NS spart. klav."</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Įjungiamas masinių veiksmų režimas"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Masinių veiksmų režimas išjungtas"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Pasirinkta: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Pasirinkimas atšauktas: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Išsami kontaktinė informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Išsami kontaktinė įtartino skambintojo dėl šlamšto informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Skambučių: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Vaizdo skambutis."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Siųsti SMS <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Neklausytas balso pašto pranešimas"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Pradėti paiešką balsu"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Balso paštas"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"balso pašto praneš."</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"balso pašto praneš."</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Taip"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ištrinti pasir. <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Atšaukti masinių veiksmų režimą"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ištrinti"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atšaukti"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Pasirinkta: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="few">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="many">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+      <item quantity="other">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Negalima skambinti šiuo numeriu"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Jei norite nustatyti balso paštą, eikite į meniu &gt; „Nustatymai“."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Jei norite skambinti į balso paštą, išjunkite lėktuvo režimą."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Įkeliama..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Įkeliama iš SIM kortelės..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM kortelės adresatai"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nepasiekiama jokia kontaktų programa"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Paieška balsu nepasiekiama"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Negalima skambinti telefonu, nes Telefono programa išjungta."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Ieškoti adresatų"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Prid. nr. arba iešk. kontaktų"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Skambučių istorija yra tuščia"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Skambinti"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nėra jokių praleistų skambučių."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Balso pašto gautųjų aplankas yra tuščias."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Rodyti tik mėgstamiausius"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Skambučių istorija"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Visi"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Praleisti"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Balso paštas"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Spartusis rinkimas"</string>
     <string name="tab_history" msgid="7420269368689503596">"Skambučių istorija"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktai"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Balso paštas"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Pašalintas iš adresyno"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Anuliuoti"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Kurti naują kontaktą"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pridėti prie kontakto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Siųsti SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Atlikti vaizdo skambutį"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokuoti numerį"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Naujų praleistų skambučių: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Dar nieko neįtraukėte į sparčiojo rinkimo sąrašą"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pridėti mėgstamiausią"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Dar neturite kontaktų"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Pridėti kontaktą"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Palieskite vaizdą, kad peržiūrėtumėte visus numerius, arba palieskite ir palaikykite, kad pertvarkytumėte"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Pašalinti"</string>
+    <string name="select_all" msgid="408601760696146245">"Pasirinkti viską"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Vaizdo skambutis"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Siųsti pranešimą"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Išsami skambučio informacija"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Skambinti <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Vaizdo skambutis <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Klausyti balso pašto nuo <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Leisti balso pašto pranešimą iš <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pristabdyti balso pašto pranešimą iš <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Ištrinti balso pašto pranešimą iš <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> naujas balso pašto pranešimas</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nauji balso pašto pranešimai</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> naujo balso pašto pranešimo</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> naujų balso pašto pranešimų</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Sukurti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktą"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pridėti <xliff:g id="NAMEORNUMBER">^1</xliff:g> prie esamo kontakto"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Išsami skambučio informacija (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Ištrinta iš skambučių istorijos"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Šiandien"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Vakar"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Senesni"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Skambučių sąrašas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Įjungti garsiakalbį."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Išjungti garsiakalbį."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Leisti greičiau."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Leisti lėčiau."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pradėti arba pristabdyti atkūrimą."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Pateikties parinktys"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Garsai ir vibravimas"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Skambučiai"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Skambučių blokavimas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Balso paštas"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Pasir. balso pšt. nust. SIM k."</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Skamb. blokavimo funkcija laikinai išj."</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Skambučių blokavimo funkcija buvo išjungta, nes iš šio telefono buvote susisiekę su pagalbos tarnybomis per pastarąsias 48 val. Ši funkcija bus automatiškai įgalinta iš naujo, kai 48 val. laikotarpis pasibaigs."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importuoti numerius"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Užblokuoti numeriai"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> jau užblokuotas."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Skambinimo paskyros"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Įjungti"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Nustatyti leidimus"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Jei norite įgalinti spartųjį rinkimą, įjunkite Kontaktų programos leidimą."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Jei norite peržiūrėti skambučių žurnalą, įjunkite Telefono programos leidimą."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Jei norite peržiūrėti kontaktus, įjunkite Kontaktų programos leidimą."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Jei norite pasiekti balso paštą, įjunkite Telefono programos leidimą."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Jei norite paskambinti, įjunkite Telefono programos leidimą."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefono programa neturi leidimo keisti sistemos nustatymų."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Šlamštas"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> yra neprisijungęs (-usi) ir su juo (ja) negalima susisiekti"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Apie"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribavo „Google“"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"„Google“ transkribuoja..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Scenarijus nepasiekiamas"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Peržiūrėti"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Skambutis ištrintas. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per šį skambutį programoje „Messages“."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Skambučiai ištrinti. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per skambučius programoje „Messages“."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lv/strings.xml b/java/com/android/dialer/app/res/values-lv/strings.xml
index 808d7bf..e12ade0 100644
--- a/java/com/android/dialer/app/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/res/values-lv/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Tālrunis"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tālruņa cipartastatūra"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Zvanīt"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zvanu vēsture"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Ziņot par nepareizu numuru"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopēt numuru"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopēt transkripciju"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloķēt numuru"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Atbloķēt numuru"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Rediģēt numuru pirms zvanīšanas"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Dzēst zvanu vēsturi"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Dzēst balss pasta ziņojumu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vai dzēst zvanu vēsturi?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tiks dzēsti visi vēsturē saglabātie zvani."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Notiek zvanu vēstures dzēšana…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Tālruņa zvans"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Neatbildēts zvans"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Neatbildēts darba zvans"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Neatbildēti zvani"</string>
@@ -49,107 +44,67 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> balss pasta ziņojums </item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> balss pasta ziņojumi </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Atskaņot"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Jauns b. pasta ziņ. no: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nevarēja atskaņot balss pasta ziņojumu."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Notiek balss pasta ziņojumu ielāde…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Tiek arhivēts balss pasta ziņojums…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nevarēja ielādēt balss pasta ziņojumu."</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Tikai balss pasta zvani"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Tikai ienākošie zvani"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Tikai izejošie zvani"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Tikai neatbildētie zvani"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"meklēt"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"sastādīt numuru"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"sastādītais numurs"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Atskaņot vai apturēt atskaņošanu"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ieslēgt vai izslēgt mikrofonu ar skaļruni"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Meklēt atskaņošanas pozīciju"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Samazināt atskaņošanas ātrumu"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Palielināt atskaņošanas ātrumu"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zvanu vēsture"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Vairāk opciju"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"cipartastatūra"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Rādīt tikai izejošos zvanus"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Rādīt tikai ienākošos zvanus"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Rādīt tikai neatbildētos zvanus"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Rādīt tikai balss pasta ziņ."</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Rādīt visus zvanus"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Pievienot 2 sekundes ilgu pauzi"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Pievienot gaidīšanu"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Iestatījumi"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulators"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Visas kontaktpersonas"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Izmantot skārientoņu tastatūru"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Atgriezties pie pašreizējā zvana"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Pievienot zvanu"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Ienākošie zvani"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Atskaņot balss pasta ziņojumu"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Skatīt kontaktpersonu <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Zvanīt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Jaunās liet. saskarnes saīsne"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Tiek atvērts lielapjoma darbību režīms"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Tika aizvērts lielapjoma darbību režīms"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Atlasīt: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Noņemt atlasi: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktpersonas informācija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Nevēlama zvanītāja (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) kontaktinformācija"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> zvani."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videozvans"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Sūtīt īsziņu šai kontaktpersonai: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nenoklausīti balss pasta ziņojumi"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Sākt meklēšanu ar balsi"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Zvanīt: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Balss pasts"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"balss pasta ziņojums"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"balss pasta ziņojumi"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Jā"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nē"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vai dzēst atlasi: <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Iziet no grupas darbību režīma"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Dzēst"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atcelt"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Atlasīti: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="zero">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+      <item quantity="one">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+      <item quantity="other">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> plkst. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Uz šo numuru nevar piezvanīt."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Lai iestatītu balss pastu, pārejiet uz sadaļu Izvēlne &gt; Iestatījumi."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Lai piekļūtu balss pastam, vispirms izslēdziet lidojuma režīmu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Notiek ielāde..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Notiek ielāde no SIM kartes..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontaktpersonas SIM kartē"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nav pieejama neviena kontaktpersonu lietotne."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Meklēšana ar balsi nav pieejama."</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nevar veikt tālruņa zvanu, jo lietojumprogramma Tālrunis tika atspējota."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Meklēt kontaktpersonas"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Pievienojiet numuru vai meklējiet kontaktpersonas"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Jūsu zvanu vēsturē nav ierakstu."</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Zvanīt"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Jums nav neatbildētu zvanu."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Jūsu balss pasta iesūtne ir tukša."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Rādīt tikai izlasi"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Zvanu vēsture"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Visi"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Neatb."</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Balss p."</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Ātrie zvani"</string>
     <string name="tab_history" msgid="7420269368689503596">"Zvanu vēsture"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktpersonas"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Balss pasts"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Noņemts no izlases"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Atsaukt"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zvanīt: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izveidot jaunu kontaktpersonu"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pievienot kontaktpersonai"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Sūtīt īsziņu"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Veikt videozvanu"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloķēt numuru"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Jauni neatbildēti zvani: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Ātro zvanu sarakstā vēl nav nevienas kontaktpersonas."</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pievienot izlasei"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Jums vēl nav nevienas kontaktpersonas."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Pievienot kontaktpersonu"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Pieskarieties attēlam, lai skatītu visus numurus, vai pieskarieties attēlam un turiet to, lai veiktu pārkārtošanu."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Noņemt"</string>
+    <string name="select_all" msgid="408601760696146245">"Atlasīt visu"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videozvans"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Sūtīt ziņojumu"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Informācija par zvanu"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Zvanīt: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Zvaniet kontaktpersonai <xliff:g id="NAMEORNUMBER">^1</xliff:g>, izmantojot videozvanu."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Klausīties balss pasta ziņojumu no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Atskaņot balss pasta ziņojumu no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pārtraukt balss pasta ziņojuma atskaņošanu no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Dzēst balss pasta ziņojumu no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> jauni balss pasta ziņojumi</item>
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> jauns balss pasta ziņojums</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jauni balss pasta ziņojumi</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Izveidojiet kontaktpersonu, izmantojot vienumu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pievienojiet vienumu <xliff:g id="NAMEORNUMBER">^1</xliff:g> esošai kontaktpersonai."</string>
     <string name="description_details_action" msgid="2061866409737706174">"Zvanu informācija par šādu numuru: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Dzēsts no zvanu vēstures."</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Šodien"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Vakar"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Vecāki zvani"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Zvanu saraksts"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ieslēgt skaļruni."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Izslēgt skaļruni."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Atskaņot ātrāk."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Atskaņot lēnāk."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Sākt vai apturēt atskaņošanu."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Attēlojuma opcijas"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Skaņas un vibrācija"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Zvani"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zvanu bloķēšana"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Balss pasts"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"SIM — balss pasta iestatījumi"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Zvanu bloķēšana ir īslaicīgi izslēgta"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Zvanu bloķēšana ir atspējota, jo pēdējo 48 stundu laikā jūs sazinājāties ar ārkārtas palīdzības dienestiem, izmantojot šo tālruni. Zvanu bloķēšana tiks automātiski iespējota, tiklīdz beigsies 48 stundu periods."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importēt numurus"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Bloķētie numuri"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> jau ir bloķēts."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Zvanu konti"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ieslēgt"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Iestatīt atļaujas"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Lai iespējotu ātros zvanus, ieslēdziet atļauju Kontaktpersonas."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Lai skatītu zvanu žurnālu, ieslēdziet atļauju Tālrunis."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Lai skatītu kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Lai piekļūtu balss pastam, ieslēdziet atļauju Tālrunis."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Lai veiktu zvanu, ieslēdziet atļauju Tālrunis."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Tālruņa lietotnei nav atļaujas rakstīt sistēmas iestatījumos."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nevēlami zvani"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Lietotājs <xliff:g id="NAME">%1$s</xliff:g> ir bezsaistē un nav sasniedzams"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Par"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribēja: Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkribē…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkripcija nav pieejama"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Skatīt"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Zvans izdzēsts. Skatiet un dzēsiet pielikumus, kas kopīgoti šī zvana laikā, izmantojot lietotni Ziņojumi."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Zvani izdzēsti. Skatiet un dzēsiet pielikumus, kas kopīgoti šo zvanu laikā, izmantojot lietotni Ziņojumi."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mk/strings.xml b/java/com/android/dialer/app/res/values-mk/strings.xml
index 6d2e533..6e3512c 100644
--- a/java/com/android/dialer/app/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/res/values-mk/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Тастатура за бирање на телефон"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Телефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Историја на повици"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Пријави неточен број"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Копирај го бројот"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Копирај транскрипција"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Блокирај го бројот"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Одблокирај го бројот"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Уредете го бројот пред повикот"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Избришете историја на повици?"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Избришете ја говорната пошта"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Избришете историја на повици?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ова ќе ги избрише сите повици од историјата"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Се чисти историјата на повици…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Телефон"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуштен повик"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуштен работен повик"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуштени повици"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> говорна порака </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> говорни пораки </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Пушти"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова говорна пошта од <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Говорната пошта не можеше да се репродуцира"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Се вчитува говорната пошта…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Говорната пошта се архивира…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Говорната пошта не можеше да се вчита"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Само повици со говорна пошта"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Само дојдовни повици"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Само појдовни повици"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Само пропуштени повици"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"пребарај"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"бирај"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"број за бирање"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Пуштете или запрете репродукција"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Вклучете или исклучете интерфон"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Барајте позиција на репродукција"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Намалете брзина на репродукција"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Зголемете брзина на репродукција"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Историја на повици"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Повеќе опции"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"тастатура за бирање"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Прикажи само појдовни"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Прикажи само дојдовни"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Прикажи само пропуштени"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Прикажи само говорни пораки"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Прикажи ги сите повици"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Додај пауза од 2 сек"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Додај почекај"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Поставки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Сите контакти"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Користи тастатура со звуци на допир"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Врати се на повик во тек"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Додај повик"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Дојдовни повици"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Преслушај говорна пошта"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Прикажи контакт <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Повикај <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создај крат. за нов интерфејс"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Влегувате во режим на групно дејство"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Излеговте од режим на групно дејство"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Избрано е <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Поништен е изборот на <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Детали за контакт за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Детали за контакт за повици што се можен спам <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> повици."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видеоповик."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Испратете SMS до <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непреслушана говорна пошта"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Започни гласовно пребарување"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Повикај <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Говорна пошта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"говорна пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"говорни пораки"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Да се избришат избраните <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажи го режимот на групни дејства"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрани се <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Да се избришат говорните пораки? "</b>"</item>
+      <item quantity="other">"<b>"Да се избришат говорните пораки? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> во <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Бројот не може да се повика"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"За поставување говорна пошта, одете во Мени &gt; Поставки."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"За да се јавите во говорна пошта, прво исклучете Авионски режим."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Се вчитува..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Вчитување од SIM картичка..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Контакти од SIM картичка"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Не е достапна апликација за контакти"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовното пребарување не е достапно"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Не може да се воспостави телефонски повик, бидејќи апликацијата Телефон е оневозможена."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пребарај контакти"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Додајте број или побарајте контакти"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Историјата на повици е празна"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Повикај"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Немате пропуштени повици."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Приемното сандаче на говорната пошта е празно."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Прикажи само омилени"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Историја на повици"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Сите"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Пропуштени"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Говорна пошта"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Брзо бирање"</string>
     <string name="tab_history" msgid="7420269368689503596">"Историја на повици"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Говорна пошта"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Отстранет од омилени"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Врати"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Повикај <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Создај нов контакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додај на контакт"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Испрати SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Остварете видеоповик"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокирај го бројот"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> нови пропуштени повици"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Сè уште немате никого на брзо бирање"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додај омилено"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Сè уште немате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Додај контакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Допрете ја сликата за да ги видите сите броеви или допрете и држете за промена на редоследот"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Отстрани"</string>
+    <string name="select_all" msgid="408601760696146245">"Изберете ги сите"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеоповик"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Испрати порака"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Детали на повик"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Повикај <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеоповик до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Слушајте говорна пошта од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Пушти говорна порака од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Паузирај говорна порака од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Избриши говорна пошта од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> нова говорна порака</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> нови говорни пораки</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Создај контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Додај <xliff:g id="NAMEORNUMBER">^1</xliff:g> во постоечки контакт"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Информации на повикот за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Избришано од историјата на повици"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Денес"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Постари"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Список со повици"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Вклучете го звучникот."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Исклучете го звучникот."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Репродуцирајте побрзо."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Репродуцирајте побавно."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Запрете ја или паузирајте ја репродукцијата."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Опции за приказ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибрации"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Повици"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање повик"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"SIM за поставки за гов. пошта"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирањето повик е привремено исклучено"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирањето повици е исклучено бидејќи ја контактиравте службата за итни случаи од телефонов во изминатите 48 часа. Повторно ќе се овозможи автоматски откако ќе истече периодот од 48 часа."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези броеви"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Блокирани броеви"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> веќе е блокиран."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Сметки за повикување"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Вклучи"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Постави дозволи"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"За да овозможите брзо бирање, вклучете ја дозволата за контакти."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"За да ја видите евиденцијата на повици, вклучете ја дозволата за телефон."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"За да ги видите контактите, вклучете ја дозволата за контакти."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"За да пристапите кон говорната пошта, вклучете ја дозволата за телефон."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"За да ги пребарувате контактите, вклучете ги дозволите за контакти."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"За да воспоставите повик, вклучете ја дозволата за телефон."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Апликацијата на телефонот нема дозвола да пишува во поставките на системот."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Контактот <xliff:g id="NAME">%1$s</xliff:g> е офлајн и недостапен"</string>
     <string name="about_phone_label" msgid="582991354677973731">"За"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрибирано од Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google транскрибира…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Не е достапна транскрипција"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Прикажи"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Повикот е избришан. За преглед и бришење на прилозите споделени во текот на разговоров, одете во „Пораки“."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Повиците се избришани. За преглед и бришење на прилозите споделени во текот на разговорите, одете во „Пораки“."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ml/strings.xml b/java/com/android/dialer/app/res/values-ml/strings.xml
index 91accf4..444a4d5 100644
--- a/java/com/android/dialer/app/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/res/values-ml/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ഫോണ്‍"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ഫോൺ കീപാഡ്"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ഫോണ്‍"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"കോള്‍‌ ചരിത്രം"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"കൃത്യമല്ലാത്ത നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"നമ്പർ പകർത്തുക"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ട്രാൻസ്ക്രിപ്ഷൻ പകർത്തുക"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"നമ്പർ അൺബ്ലോക്കുചെയ്യുക"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"കോൾ ചെയ്യുംമുമ്പ് നമ്പർ എഡിറ്റുചെയ്യൂ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"കോൾ ചരിത്രം മായ്‌ക്കുക"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"വോയ്‌സ്മെയിൽ ഇല്ലാതാക്കുക"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"കോൾ ചരിത്രം മായ്‌ക്കണോ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ഇത് നിങ്ങളുടെ ചരിത്രത്തിൽ നിന്ന് എല്ലാ കോളുകളും ഇല്ലാതാക്കും"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"കോൾ ചരിത്രം മായ്‌ക്കുന്നു..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ഫോൺ"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"മിസ്ഡ് ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"മിസ്‌ഡ് കോളുകൾ"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> വോയ്‌സ്‌മെയിലുകൾ </item>
       <item quantity="one">വോയ്‌സ്‌മെയിൽ</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"പ്ലേ ചെയ്യുക"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> എന്നയാളിൽ നിന്നുള്ള പുതിയ വോയ്‌സ്‌മെയിൽ"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"വോയ്‌സ്‌മെയിൽ പ്‌ലേ ചെയ്യാനായില്ല"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യുന്നു..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"വോയ്‌സ്‌മെയിൽ ആർക്കൈവുചെയ്യുന്നു…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യാനായില്ല"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"വോയ്‌സ്മെയിൽ ഉള്ള കോളുകൾ മാത്രം"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ഇൻകമിംഗ് കോളുകൾ മാത്രം"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ഔട്ട്‌ഗോയിംഗ് കോളുകൾ മാത്രം"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"മിസ്‌ഡ് കോളുകൾ മാത്രം"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"തിരയുക"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ഡയൽ ചെയ്യുക"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ഡയൽ ചെയ്യാനുള്ള നമ്പർ"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"പ്ലേബാക്ക് പ്ലേ ചെയ്യുക അല്ലെങ്കിൽ നിർത്തുക"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"സ്‌പീക്കർ ഫോൺ ഓണാക്കുക അല്ലെങ്കിൽ ഓഫാക്കുക"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"പ്ലേബാക്ക് സ്ഥാനം തിരയുക"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"പ്ലേബാക്ക് നിരക്ക് കുറയ്‌ക്കുക"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"പ്ലേബാക്ക് നിരക്ക് വർദ്ധിപ്പിക്കുക"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"കോള്‍‌ ചരിത്രം"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"കീപാഡ്"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ഔട്ട്‌ഗോയിംഗ് മാത്രം കാണിക്കുക"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ഇൻ‌കമിംഗ് മാത്രം കാണിക്കുക"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"മിസ്‌ഡ് മാത്രം കാണിക്കുക"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"വോയ്‌സ്‌മെയിലുകൾ മാത്രം കാണിക്കുക"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"എല്ലാ കോളുകളും കാണിക്കുക"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 സെക്കൻഡ് താൽക്കാലികമായി നിർത്തൽ ചേർക്കുക"</string>
-    <string name="add_wait" msgid="1177723010768282578">"കാത്തിരിക്കൽ ചേർക്കുക"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ക്രമീകരണം"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"സിമുലേറ്റർ"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"കോൾ ചേർക്കുക"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ഇൻകമിംഗ് കോളുകൾ"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"വോയ്‌സ്‌മെയിൽ പ്ലേ ചെയ്യുക"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> എന്ന കോൺടാക്റ്റ് കാണുക"</string>
-    <string name="description_call" msgid="1532402285334775372">"വിളിക്കുക <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"പുതിയ UI കുറുക്കുവഴി സൃഷ്‌ടിക്കുക"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ബൾക്ക് പ്രവർത്തന മോഡിലേക്ക് പ്രവേശിക്കുന്നു"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ബൾക്ക് പ്രവർത്തന മോഡ് വിട്ടു"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> തിരഞ്ഞെടുത്തു"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> തിരഞ്ഞെടുത്തത് മാറ്റി"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> എന്നതിന്റെ കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"സംശയമുള്ള <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> സ്‌പാം കോളറിന്റെ കോൺടാക്‌റ്റ് വിശദാംശങ്ങൾ"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> കോളുകൾ."</string>
     <string name="description_video_call" msgid="3738199365585751727">"വീഡിയോ കോൾ."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാൾക്ക് SMS അയയ്‌ക്കുക"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"കേൾക്കാത്ത വോയ്‌സ്‌മെയിൽ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ശബ്ദ തിരയൽ ആരംഭിക്കുക"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"വിളിക്കുക <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> സെക്കൻഡ്"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> മി. <xliff:g id="SECONDS">%s</xliff:g> സെ."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"വോയ്‌സ്മെയിലുകൾ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"അതെ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ഇല്ല"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"തിരഞ്ഞെടുത്ത <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ഇല്ലാതാക്കണോ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"\'ബാച്ച് പ്രവർത്തനങ്ങൾ\' മോഡ് റദ്ദാക്കുക"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ഇല്ലാതാക്കുക"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"റദ്ദാക്കൂ"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> എണ്ണം തിരഞ്ഞെടുത്തു"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ഈ വോയ്‌സ്‌മെയിലുകൾ ഇല്ലാതാക്കണോ? "</b>"</item>
+      <item quantity="one">"<b>"ഈ വോയ്‌സ്‌മെയിൽ ഇല്ലാതാക്കണോ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>-ന്"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ഈ നമ്പറിലേക്ക് കോൾ ചെയ്യാനാവില്ല"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"വോയ്‌സ്‌മെയിൽ സജ്ജമാക്കാൻ, മെനു &gt; ക്രമീകരണം എന്നതിലേക്ക് പോകുക."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"വോയ്‌സ്‌മെയിൽ വിളിക്കാൻ ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ലോഡുചെയ്യുന്നു..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"സിം കാർഡിൽ നിന്നും ലോഡുചെയ്യുന്നു…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"സിം കാർഡ് കോൺടാക്റ്റുകൾ"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"കോൺടാക്റ്റ് അപ്ലിക്കേഷനൊന്നും ലഭ്യമല്ല"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"വോയ്‌സ് തിരയൽ ലഭ്യമല്ല"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ഫോൺ അപ്ലിക്കേഷൻ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ ഫോൺ കോൾ ചെയ്യാനാകില്ല."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"കോണ്‍‌ടാക്റ്റുകള്‍ തിരയുക"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"നമ്പർ ചേർക്കുക അല്ലെങ്കിൽ കോൺടാക്റ്റുകൾ തിരയുക"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"നിങ്ങളുടെ കോൾ ചരിത്രം ശൂന്യമാണ്"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ഒരു കോൾ ചെയ്യുക"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"നിങ്ങൾക്ക് മിസ്‌ഡ് കോളുകളൊന്നുമില്ല."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"നിങ്ങളുടെ വോയ്സ്മെയിൽ ഇൻബോക്സ് ശൂന്യമാണ്."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"പ്രിയപ്പെട്ടവ മാത്രം കാണിക്കുക"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"കോള്‍‌ ചരിത്രം"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"എല്ലാം"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"മിസ്‌ഡ്"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"വോയ്‌സ്‌മെയിൽ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"സ്‌പീഡ് ഡയൽ"</string>
     <string name="tab_history" msgid="7420269368689503596">"കോൾ ചരിത്രം"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"കോണ്‍ടാക്റ്റുകള്‍"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"പ്രിയപ്പെട്ടവയിൽ നിന്നും നീക്കംചെയ്‌തു"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"പഴയപടിയാക്കുക"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"വിളിക്കുക <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ഒരുകോൺടാക്റ്റിൽ ചേർക്കൂ"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS അയയ്ക്കുക"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"വീഡിയോ കോൾ ചെയ്യുക"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> പുതിയ മിസ്‌ഡ് കോളുകൾ"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ഇതുവരെ ആരും നിങ്ങളുടെ സ്പീഡ് ഡയലിൽ ഇല്ല"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"പ്രിയപ്പെട്ടത് ചേർക്കുക"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"നിങ്ങൾക്ക് ഇതുവരെയും കോൺടാക്റ്റുകൾ ഒന്നുമില്ല."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ഒരു കോണ്‍ടാക്റ്റ് ചേര്‍ക്കുക"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"എല്ലാ നമ്പറുകളും കാണാൻ ചിത്രം സ്‌പർശിക്കുക അല്ലെങ്കിൽ വീണ്ടും ക്രമീകരിക്കാൻ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="remove_contact" msgid="2353580570488923668">"നീക്കംചെയ്യുക"</string>
+    <string name="select_all" msgid="408601760696146245">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"വീഡിയോ കോള്‍"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"കോൾ വിശദാംശങ്ങൾ"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> വിളിക്കുക"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നതുമായി വീഡിയോ കോൾ നടത്തുക."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നയാളിൽ നിന്നുള്ള വോയ്‌സ്മെയിൽ കേൾക്കുക"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്ന നമ്പറിൽ/വ്യക്തിയിൽ നിന്നുള്ള വോയ്സ്‌മെയിൽ പ്ലേ ചെയ്യുക"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്ന നമ്പറിൽ/വ്യക്തിയിൽ നിന്നുള്ള വോയ്സ്‌മെയിൽ തൽക്കാലം നിർത്തുക"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്ന നമ്പറിൽ/വ്യക്തിയിൽ നിന്നുള്ള വോയ്സ്മെയിൽ ഇല്ലാതാക്കുക"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> പുതിയ വോയ്‌സ്‌മെയിലുകൾ</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> പുതിയ വോയ്‌സ്‌മെയിൽ</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നതിനായി കോൺടാക്റ്റ് സൃഷ്‌ടിക്കുക"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"നിലവിലുള്ള കോൺടാക്റ്റിലേക്ക് <xliff:g id="NAMEORNUMBER">^1</xliff:g> ചേർക്കുക"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നയാളുടെ കോൾ വിശദാംശങ്ങൾ"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"കോൾ ചരിത്രത്തിൽ നിന്ന് ഇല്ലാതാക്കി"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ഇന്ന്"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ഇന്നലെ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"പഴയത്"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"കോൾ ലിസ്‌റ്റ്"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"സ്‌പീക്കർ ഓണാക്കുക."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"സ്‌പീക്കർ ഓഫാക്കുക."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"വേഗത്തിൽ പ്ലേചെയ്യുക."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"കുറഞ്ഞവേഗതയിൽ പ്ലേചെയ്യുക."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"പ്ലേബാക്ക് ആരംഭിക്കുകയോ താൽക്കാലികമായി നിർത്തുകയോ ചെയ്യുക."</string>
     <string name="display_options_title" msgid="3880091801055797975">"ഡിസ്‌പ്ലേ ഓപ്‌ഷനുകൾ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ശബ്‌ദവും വൈബ്രേഷനും"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"കോളുകൾ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"കോൾ ബ്ലോക്കുചെയ്യൽ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"വോയ്സ് മെയില്‍"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"വോയ്‌സ്മെയിൽ ക്രമീകരണത്തിന്, സിം തിരഞ്ഞെടുക്കുക"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"കോൾ ബ്ലോക്കുചെയ്യൽ താൽക്കാലികമായി ഓഫാണ്"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"കഴിഞ്ഞ 48 മണിക്കൂറിനുള്ളിൽ നിങ്ങൾ ഈ ഫോണിൽ നിന്ന് അടിയന്തിര സേവനങ്ങളുമായി ബന്ധപ്പെട്ടതിനാൽ കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി. 48 മണിക്കൂർ സമയപരിധി കഴിഞ്ഞയുടൻ ഇത് സ്വയമേവ പ്രവർത്തനക്ഷമമാക്കപ്പെടും."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"നമ്പറുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ബ്ലോക്കുചെയ്ത നമ്പറുകൾ"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"ഇതിനകം തന്നെ <xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്തിരിക്കുന്നു"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"കോളിംഗ് അക്കൗണ്ട്"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ഓണാക്കുക"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"അനുമതികൾ സജ്ജമാക്കുക"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"സ്പീഡ് ഡയൽ പ്രവർത്തനക്ഷമാക്കുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"നിങ്ങളുടെ കോൾ ലോഗ് കാണുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ കാണുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ ആക്സസ് ചെയ്യുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"കോൾ വിളിക്കുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"സിസ്റ്റം ക്രമീകരണത്തിലേക്ക് എഴുതാൻ ഫോൺ ആപ്പിന് അനുമതിയില്ല."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"സ്‌പാം"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ഓഫ്‌ലൈനായതിനാൽ കോൾ ചെയ്യാനാവില്ല"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ആമുഖം"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ട്രാൻസ്‌ക്രൈബ് ചെയ്‌തത്"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google കേട്ടെഴുതുന്നു..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"കാണുക"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"കോൾ ഇല്ലാതാക്കി. ഈ കോൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"കോളുകൾ ഇല്ലാതാക്കി. ഈ കോളുകൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mn/strings.xml b/java/com/android/dialer/app/res/values-mn/strings.xml
index a07a826..016b129 100644
--- a/java/com/android/dialer/app/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/res/values-mn/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Гар утас"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Утасны товчлуур"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Утас"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Дуудлагын түүх"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Тохиромжгүй дугаарыг мэдээлэх"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Дугаар хуулах"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Галиглалыг хуулах"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Дугаар блоклох"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Дугаар блокноос гаргах"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Залгахын өмнө дугаар засах"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Дуудлагын түүхийг устгах уу?"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Дуут шууданг устгах"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Дуудлагын түүхийг устгах уу?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Энэ нь таны хийсэн бүх дуудлагыг түүхээс устгана."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Дуудлагын түүхийг устгаж байна..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Утас"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Аваагүй дуудлага"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Аваагүй албаны дуудлага"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Аваагүй дуудлага"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Дуут шуудан </item>
       <item quantity="one">Дуут шуудан</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Тоглуулах"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>-с ирсэн шинэ дуут шуудан"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Дуут шууданг тоглуулж чадсангүй"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Дуут шууданг ачаалж байна..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Дуут шууданг архивлаж байна..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Дуут шууданг ачаалж чадсангүй"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Зөвхөн дуут шуудантай дуудлагуудыг"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Зөвхөн ирсэн дуудлага"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Зөвхөн залгасан дуудлагуудыг"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Зөвхөн аваагүй дуудлагуудыг"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"хайх"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"залгах"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"залгах дугаар"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Тоглуулах эсхүл зогсоох"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Чанга яригчийг асаах буюу унтраах"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Тоглуулах байрлалыг хайх"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Тоглуулах хурдыг бууруулах"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Тоглуулах хурдыг нэмэгдүүлэх"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Дуудлагын түүх"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Нэмэлт сонголтууд"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Товчлуур"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Зөвхөн залгасан дуудлагуудыг харуулах"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Зөвхөн ирсэн дуудлагуудыг харуулах"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Зөвхөн аваагүй дуудлагуудыг харуулах"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Зөвхөн дуут шуудангуудыг харуулах"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Бүх дуудлагыг харуулах"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-сек зогсолт нэмэх"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Хүлээлт нэмэх"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Тохиргоо"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Бүх харилцагчид"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Хүрэлтээр дуугардаг гар ашиглах"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Үргэлжилж буй дуудлага руу буцах"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Дуудлага нэмэх"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Ирж буй дуудлага"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Дуут шууданг тоглуулах"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> харилцагчийг харах"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> руу залгах"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Шинэ UI үүсгэх товчлол"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Багц үйлдлийн горимд орж байна"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Багц үйлдлийн горимоос гарсан"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> сонгосон"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> сонголтыг болиулсан"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н харилцагчийн мэдээлэл"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Спам тараагч байж болзошгүй <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н дэлгэрэнгүй мэдээлэл"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> дуудлага."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видео дуудлага."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>-д мессеж илгээх"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Сонсоогүй дуут шуудан"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Дуун хайлтыг эхлүүлэх"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string>
     <string name="voicemail" msgid="8899540969000957954">"Дуут шуудан"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> минут <xliff:g id="SECONDS">%s</xliff:g> секунд"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"дуут шуудан"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"дуут шуудан"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Тийм"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Үгүй"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Сонгосон <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>-г устгах уу?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Багц үйлдлийн горимыг цуцлах"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Устгах"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Цуцлах"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> сонгосон"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Эдгээр дуут шууданг устгах уу? "</b>"</item>
+      <item quantity="one">"<b>"Энэ дуут шууданг устгах уу? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>-д"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Энэ дугаар луу залгах боломжгүй байна"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Дуут шууданг тохируулахын тулд Цэс &gt; Тохиргоо руу очно уу."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Дуут шуудан руу залгахын тулд эхлээд Нислэгийн горимыг идэвхгүй болгоно уу."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Ачааллаж байна..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM картаас уншиж байна…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM картны харилцагчид"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ямар ч харилцагчдын апликейшн байхгүй байна."</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Дуут хайлт хийх боломжгүй байна"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Утас аппликешныг идэвхгүйжүүлсэн тул утасны дуудлага хийх боломжгүй."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Харилцагчдаас хайх"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Дугаар нэмэх болон харилцагч хайх"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Таны дуудлагын түүх хоосон байна"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Дуудлага хийх"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Танд аваагүй дуудлага байхгүй байна."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Таны дуут шуудангийн хайрцаг хоосон байна."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Зөвхөн дуртайнуудыг харуулах"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Дуудлагын түүх"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Бүгд"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Аваагүй"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Дуут шуудан"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Түргэн залгалт"</string>
     <string name="tab_history" msgid="7420269368689503596">"Дуудлагын түүх"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Харилцагчид"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Дуут шуудан"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Дуртай жагсаалтаас хасав"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Буцаах"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Шинэ хаяг үүсгэх"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Харилцагчийн хаягт нэмэх"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Мессеж илгээх"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Видео дуудлага хийх"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Дугаар блоклох"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> шинэ аваагүй дуудлага"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Таны яаралтай залгах тохиргоон дээр одоогоор харилцагч байхгүй байна"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Таалагдсан хэсэгт нэмэх"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Танд одоогоор харилцагч байхгүй байна"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Харилцагч нэмэх"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Бүх дугаарыг харахын тулд зурганд хүрнэ үү эсвэл жагсаалтыг өөрчлөхийн тулд удаан дарна уу."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Хасах"</string>
+    <string name="select_all" msgid="408601760696146245">"Бүгдийг сонгох"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео дуудлага"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Зурвас илгээх"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Дуудлагын мэдээлэл"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> руу дуудлага хийх"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ын видео дуудлага."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-н дуут шууданг сонсох"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-н дуут шууданг тоглуулах"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-н дуут шууданг зогсоох"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-н дуут шууданг устгах"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> шинэ дуут шуудан</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> шинэ дуут шуудан</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-д харилцагч шинээр үүсгэх"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ыг одоогийн харилцагч руугаа нэмнэ"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дуудлагын дэлгэрэнгүй мэдээлэл"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Дуудлагын түүхээс устгагдсан"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Өнөөдөр"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Өчигдөр"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Хуучин"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Дуудлагын жагсаалт"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Чанга яригчийг асаах."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Чанга яригчийг унтраах."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Хурдан тоглуулах."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Удаан тоглуулах."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Тоглуулахыг эхлүүлэх буюу түр зогсоох."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Сонголтуудыг харуулах"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Дуу болон чичиргээ"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Дуудлага"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Дуудлага блоклох"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Дуут шуудан"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Дуут шуудангийн тохиргооны SIM"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Дуудлага блоклох тохиргоог түр хугацаагаар унтраасан"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Та сүүлийн 48 цагийн дотор энэ утсаар тусламжийн дуудлага хийсэн тул дуудлага блоклох тохиргоог идэвхгүй болгосон. Энэ тохиргоо нь 48 цагийн хугацаа дуусахад автоматаар идэвхэжнэ."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортын тоо"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Блоклосон дугаар"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>-г аль хэдийн блоклосон байна."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Дуудах бүртгэл"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Идэвхжүүлэх"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Зөвшөөрөл тохируулах"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Яаралтай дуудлагыг идэвхжүүлэхийн тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Дуудлагын жагсаалтыг харахын тулд утасны зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Харилцагчдаа харахын тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Дуут шууданд хандахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Харилцагчаа хайхын тулд, Харилцагчийн жагсаалтын зөвшөөрлийг идэвхжүүлнэ үү."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Залгахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Гар утасны апп-д системийн тохиргоо бичих зөвшөөрөл алга."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> офлайн, холбогдох боломжгүй байна"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Тухай"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google-с сийрүүлсэн"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google сийрүүлж байна..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Сийрүүлэг ашиглах боломжгүй"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Үзэх"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Дуудлагыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Дуудлагуудыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mr/strings.xml b/java/com/android/dialer/app/res/values-mr/strings.xml
index 5aca7a5..5f4110c 100644
--- a/java/com/android/dialer/app/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/res/values-mr/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"फोन"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फोन कीपॅड"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"फोन"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"कॉल इतिहास"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"चुकीच्या नंबरचा अहवाल द्या"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"नंबर कॉपी करा"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"प्रतिलेखन कॉपी करा"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"नंबर अवरोधित करा"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"नंबर अनावरोधित करा"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"कॉल करण्यापूर्वी नंबर संपादित करा"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"कॉल इतिहास साफ करा"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"व्हॉइसमेल हटवा"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कॉल इतिहास साफ करायचा?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"हे आपल्या कॉल इतिहासातून सर्व कॉल हटवेल"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"कॉल इतिहास साफ करत आहे…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"फोन"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"सुटलेला कॉल"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"कार्याचा कॉल चुकविला"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"सुटलेले कॉल"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> व्हॉइसमेल </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> व्हॉइसमेल </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"प्ले करा"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> कडील नवीन व्हॉइसमेल"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"व्हॉइसमेल प्ले करू शकलो नाही"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"व्हॉइसमेल लोड करत आहे…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"व्हॉइसमेल संग्रहित करीत आहे..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"व्हॉइसमेल लोड करू शकलो नाही"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"केवळ व्हॉइसमेल सह कॉल"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"केवळ येणारे कॉल"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"केवळ केले जाणारे कॉल"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"केवळ सुटलेले कॉल"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"शोधा"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"डायल करा"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"डायल करण्यासाठी नंबर"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"प्‍ले करा किंवा प्‍लेबॅक थांबवा"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्‍पीकरफोन चालू किंवा बंद करा"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"प्लेबॅक स्थान शोधतात"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"प्‍लेबॅक दर कमी करा"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"प्‍लेबॅक दर वाढवा"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"कॉल इतिहास"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"अधिक पर्याय"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"की पॅड"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"केवळ केले जाणारे दर्शवा"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"केवळ येणारे दर्शवा"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"केवळ सुटलेले दर्शवा"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"केवळ व्हॉइसमेल दर्शवा"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"सर्व कॉल दर्शवा"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-सेकंद विराम जोडा"</string>
-    <string name="add_wait" msgid="1177723010768282578">"प्रतीक्षा करा जोडा"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग्ज"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"सर्व संपर्क"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"स्‍पर्श टोन कीपॅडचा वापर करा"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"चालू असलेल्या कॉलवर परत जा"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"कॉल जोडा"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"येणारे कॉल"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"व्हॉइसमेल प्ले करा"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> संपर्क पहा"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ला कॉल  करा"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नवीन UI शॉर्टकट तयार करा"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"मोठ्या प्रमाणात क्रिया मोडमध्ये प्रवेश करीत आहे"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"मोठ्या प्रमाणात क्रिया मोड सोडत आहे"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> निवडले"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ची निवड रद्द केली"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"संशयास्पद स्पॅम कॉलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कॉल."</string>
     <string name="description_video_call" msgid="3738199365585751727">"व्हिडिओ कॉल."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> वर SMS पाठवा"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"न ऐकलेला व्हॉइसमेल"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"व्हॉइस शोध प्रारंभ करा"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ला कॉल  करा"</string>
     <string name="voicemail" msgid="8899540969000957954">"व्हॉइसमेल"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मिनिट <xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"व्हॉइसमेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"व्हॉइसमेल"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"होय"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"नाही"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"निवडलेले <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> हटवायचेे?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"बॅच क्रिया मोड रद्द करा"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटवा"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करा"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> निवडले"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"हा व्हॉइसमेल हटवायचा? "</b>"</item>
+      <item quantity="other">"<b>"हे व्हॉइसमेल हटवायचे? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> रोजी <xliff:g id="TIME">%2$s</xliff:g> वाजता"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"या नंबरवर कॉल करू शकत नाही"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"व्हॉइसमेल सेट करण्‍यासाठी, मेनू &gt; सेटिंग्‍ज वर जा."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"व्हॉइसमेलला कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"लोड करीत आहे..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"सिम कार्ड मधून लोड करीत आहे..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"सिम कार्ड संपर्क"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"कोणताही संपर्क अॅप उपलब्ध नाही"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"व्हॉइस शोध उपलब्ध नाही"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"फोन अनुप्रयोग अक्षम केला गेला असल्याने फोन कॉल करणे शक्य नाही."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"संपर्क शोधा"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"नंबर जोडा किंवा संपर्क शोधा"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"आपला कॉल इतिहास रिक्त आहे"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"एक कॉल करा"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"आपल्‍याकडे कोणतेही सुटलेले कॉल नाहीत."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"आपला व्हॉइसमेल इनबॉक्स रिक्त आहे."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"केवळ आवडीचे दर्शवा"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"कॉल इतिहास"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"सर्व"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"सुटलेले"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"व्हॉइसमेल"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"स्पीड डायल"</string>
     <string name="tab_history" msgid="7420269368689503596">"कॉल इतिहास"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"संपर्क"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"व्हॉइसमेल"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"आवडी मधून काढले"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"पूर्ववत करा"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ला कॉल  करा"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नवीन संपर्क तयार करा"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"संपर्कांमध्‍ये जोडा"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS पाठवा"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"व्‍हिडिओ कॉल करा"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"नंबर अवरोधित करा"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> नवीन सुटलेले कॉल"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"अद्याप आपल्‍या स्पीड डायलवर कोणीही नाही"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"एक आवडते जोडा"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"आपल्‍याकडे अद्याप कोणतेही संपर्क नाहीत"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"एक संपर्क जोडा"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"सर्व नंबर पाहण्यासाठी प्रतिमेस स्पर्श करा किंवा पुन्हा क्रम लावण्यासाठी स्पर्श करा आणि धरून ठेवा"</string>
     <string name="remove_contact" msgid="2353580570488923668">"काढा"</string>
+    <string name="select_all" msgid="408601760696146245">"सर्व निवडा"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"व्हिडिओ कॉल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"एक संदेश पाठवा"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कॉल तपशील"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वर कॉल करा"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"व्हिडिओ कॉल <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कडील व्हॉइसमेल ऐका"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कडील व्हॉइसमेल प्ले करा"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कडील व्हॉइसमेल ला विराम द्या"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वरील व्हॉइसमेल हटवा"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> नवीन व्हॉइसमेल</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> नवीन व्हॉइसमेल</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> साठी संपर्क तयार करा"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"विद्यमान संपर्कांमध्ये <xliff:g id="NAMEORNUMBER">^1</xliff:g> जोडा"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> साठी कॉल तपशील"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"कॉल इतिहासातून हटविले"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"काल"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"अधिक जुने"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"कॉल सूची"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पीकर चालू करा."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पीकर बंद करा."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"अधिक जलद प्ले करा."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"अधिक धीमे प्ले करा."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"प्लेबॅक प्रारंभ करा किंवा त्यास विराम द्या."</string>
     <string name="display_options_title" msgid="3880091801055797975">"प्रदर्शन पर्याय"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्वनी आणि कंपने"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरोधित करणे"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"व्हॉइसमेल"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"व्हॉइसमेल सेटिंग्जसाठी सिम निवडा"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरोधित करणे तात्पुरते बंद"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"आपण मागील 48 तासात या फोनवरून आणीबाणी सेवांशी संपर्क साधला असल्याने कॉल अवरोधित करणे अक्षम केले गेले आहे. एकदा 48 तासांचा कालावधी कालबाह्य झाला की ते स्वयंचलितपणे पुन्हा सक्षम केले जाईल."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर अायात करा"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"अवरोधित केलेले नंबर"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> आधीच अवरोधित केलेला आहे."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"कॉल करण्याची खाती"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"चालू करा"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"परवानग्या सेट करा"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"स्पीड डायल सक्षम करण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"आपला कॉल लॉग पाहण्‍यासाठी, फोन परवानगी चालू करा."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"आपले संपर्क पाहण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"आपल्‍या व्हॉइसमेलमध्‍ये प्रवेश करण्‍यासाठी, फोन परवानगी चालू करा."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"आपले संपर्क शोधण्‍यासाठी, संपर्क परवानग्या चालू करा."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"कॉल करण्यासाठी, फोन परवानगी चालू करा."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"फोन अॅपला सिस्टीम स‍ेटिंग्जमध्ये लिहिण्याची परवानगी नाही."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्पॅम"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ऑफलाइन आहे आणि त्यांच्याशी संपर्क साधू शकत नाही"</string>
     <string name="about_phone_label" msgid="582991354677973731">"बद्दल"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ने प्रतिलेखन केलेले"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google प्रतिलेखित करत आहे ..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"प्रतिलेखन उपलब्ध नाही"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"पहा"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"कॉल हटविला. या कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कॉल हटविला. कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ms/strings.xml b/java/com/android/dialer/app/res/values-ms/strings.xml
index 9dbe541..a00010e 100644
--- a/java/com/android/dialer/app/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/res/values-ms/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Pad Kekunci Telefon"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Sejarah panggilan"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Laporkan nombor yang tidak tepat"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Salin nombor"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Salin transkripsi"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Sekat nombor"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Nyahsekat nombor"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit nombor sebelum memanggil"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Kosongkan sejarah panggilan"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Padamkan mel suara"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Kosongkan sejarah panggilan?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tindakan ini akan memadamkan semua panggilan daripada sejarah anda"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Mengosongkan sejarah panggilan..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Panggilan tidak dijawab"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Panggilan terlepas daripada tempat kerja"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Panggilan terlepas"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Mel suara </item>
       <item quantity="one">Mel suara</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Main"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Mel suara baharu daripada <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Tidak dapat memainkan mel suara"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Memuatkan mel suara..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Mengarkib mel suara…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Tidak dapat memuatkan mel suara"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Panggilan dengan mel suara sahaja"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Panggilan masuk sahaja"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Panggilan keluar sahaja"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Panggilan terlepas sahaja"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"cari"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"dail"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nombor untuk didail"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Mainkan atau berhenti main balik"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Hidupkan atau matikan pembesar suara"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Dapatkan kedudukan main balik"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Kurangkan kadar main balik"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Tingkatkan kadar main balik"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Sejarah panggilan"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Lagi pilihan"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"pad kekunci"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Tunjuk panggilan keluar shj"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Tunjuk panggilan masuk shj"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Tunjuk panggilan terlepas shj"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Tunjukkan mel suara sahaja"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Tunjukkan semua panggilan"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Tambah jeda 2 saat"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Tambah penungguan"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Tetapan"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Semua kenalan"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gunakan pad kekunci nada sentuh"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kembali ke panggilan yang sedang berlangsung"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Tambah panggilan"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Panggilan masuk"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Mainkan mel suara"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Lihat kenalan <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Panggil <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baharu"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Memasuki mod tindakan pukal"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Meninggalkan mod tindakan pukal"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dipilih"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dinyahpilih"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Butiran hubungan untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Butiran hubungan pemanggil spam yang disyaki <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Panggilan video."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Hantar SMS kepada <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Mel suara belum didengar"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Mulakan carian suara"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Mel suara"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> saat"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> saat"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mel suara"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mel suara"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ya"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Tidak"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Padam <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> yang dipilih?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Batalkan mod tindakan kelompok"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Padam"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Padamkan mel suara ini? "</b>"</item>
+      <item quantity="one">"<b>"Padamkan mel suara ini? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pada <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Tidak dapat menghubungi nombor ini"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Untuk menyediakan mel suara, pergi ke Menu &gt; Tetapan."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Untuk memanggil mel suara, matikan mod Pesawat terlebih dahulu."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Memuatkan…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Memuatkan dari kad SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kenalan kad SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Tiada apl kenalan tersedia"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Carian suara tidak tersedia"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Tidak boleh membuat panggilan telefon kerana aplikasi Telefon telah dilumpuhkan."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cari dalam kenalan"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Tambahkn no. atau cari kenalan"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Sejarah panggilan anda kosong"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Buat panggilan"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Anda tiada panggilan terlepas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Peti masuk mel suara anda kosong."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Tunjukkan kegemaran sahaja"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Sejarah Panggilan"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Semua"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Tidak dijawab"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mel suara"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Dail laju"</string>
     <string name="tab_history" msgid="7420269368689503596">"Sejarah Panggilan"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kenalan"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Mel suara"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Dialih keluar daripada kegemaran"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Buat asal"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Buat kenalan baharu"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Tambahkan pada kenalan"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Hantar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Buat panggilan video"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Sekat nombor"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> panggilan terlepas baharu"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Belum ada sesiapa pada dail pantas anda"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tambahkan kegemaran"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Anda belum mempunyai sebarang kenalan"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Tambahkan kenalan"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Sentuh imej untuk melihat semua nombor atau sentuh &amp; tahan untuk menyusun semula"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Alih keluar"</string>
+    <string name="select_all" msgid="408601760696146245">"Pilih semua"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Hantar mesej"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Butiran panggilan"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Panggil <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Panggilan video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dengar mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Mainkan mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Jeda mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Padamkan mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mel suara baharu</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> mel suara baharu</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Buat kenalan untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Tambahkan <xliff:g id="NAMEORNUMBER">^1</xliff:g> pada kenalan yang sedia ada"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Butiran panggilan untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Dipadamkan dari sejarah panggilan"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hari ini"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Semalam"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Lebih lama"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Senarai panggilan"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hidupkan pembesar suara."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Matikan pembesar suara."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Main lebih cepat."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Main lebih perlahan."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Mulakan atau jeda main balik."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Pilihan paparan"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Bunyi dan getaran"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Panggilan"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Sekatan panggilan"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Mel suara"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Pilih SIM untuk tetapan mel suara"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Sekatan panggilan dimatikan sementara"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Sekatan panggilan telah dilumpuhkan kerana anda menghubungi perkhidmatan kecemasan daripada telefon ini dalam masa 48 jam yang lalu. Ciri ini akan didayakan semula secara automatik apabila tempoh 48 jam berakhir."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import nombor"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Nombor yang disekat"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> sudah disekat."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Akaun panggilan"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Hidupkan"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Tetapkan kebenaran"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Untuk mendayakan dail laju, hidupkan kebenaran Kenalan."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Untuk melihat log panggilan anda, hidupkan kebenaran Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Untuk melihat kenalan anda, hidupkan kebenaran Kenalan."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Untuk mengakses mel suara anda, hidupkan kebenaran Telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Untuk mencari kenalan anda, hidupkan kebenaran Kenalan."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Untuk membuat panggilan, hidupkan kebenaran Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Apl telefon tiada kebenaran untuk menulis ke tetapan sistem."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> di luar talian dan tidak dapat dihubungi"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Perihal"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Ditranskripsikan oleh Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google sedang mentranskripsi…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkrip tidak tersedia"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Lihat"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan ini dalam Mesej."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan dalam Mesej."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-my/strings.xml b/java/com/android/dialer/app/res/values-my/strings.xml
index 2b51b20..204eda5 100644
--- a/java/com/android/dialer/app/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/res/values-my/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ဖုန်း"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ဖုန်းခလုတ်ခုံ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ဖုန်း"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ခေါ်ဆိုမှု မှတ်တမ်း"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"မမှန်ကန်သည့် နံပါတ်အား သတင်းပို့ပါ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"နံပါတ်ကိုကူးရန်"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"အသံမှစာအဖြစ်ဘာသာပြန်ခြင်းကို ကူးရန်"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"နံပါတ်ကို ပိတ်ရန်"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"နံပါတ်ကို ဖွင့်မည်"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"မခေါ်ဆိုမီ နံပါတ်ကိုတည်းဖြတ်ရန်"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ခေါ်ဆိုမှု မှတ်တမ်း ရှင်းရန်"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"အသံပို့စာ အားဖျက်ရန်"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ခေါ်ဆိုမှု မှတ်တမ်းကို ဖယ်ရှားရမလား။"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ဒါက သင့် မှတ်တမ်းထဲက ခေါ်ဆိုမှုများ  အားလုံးကို ဖျက်ပစ်မည်"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"ခေါ်ဆိုမှု မှတ်တမ်းကို ရှင်းနေ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ဖုန်း"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"လွတ်သွားသည့် အလုပ်ဆိုင်ရာ ခ​ေါ်ဆိုမှု"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"လွတ်သွားသော ခေါ်ဆိုမှုများ"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> အသံမေးလ်များ </item>
       <item quantity="one"> အသံမေးလ်</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"နားထောင်သည်"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ဆီမှ အသံစာ အသစ်"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"အသံမေးလ်ကို ဖွင့်မပေးနိုင်ခဲ့"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"အသံမေးလ်ကို တင်ပေးနေ…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"အသံစာတိုကို သိမ်းနေသည်..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"အသံမေးလ်ကို တင်မပေးနိုင်ခဲ့"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"အသံမေးလ်ပါသော အဝင်ခေါ်ဆိုမှုများသာ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"အဝင်ဖုန်းသာ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"အထွက်ခေါ်ဆိုမှုများသာ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"လွတ်သွားသော ဖုန်းသာ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ရှာဖွေရန်"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ဖုန်းခေါ်ခြင်း"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ခေါ်ရန် နံပါတ်"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"ပြန်ဖွင့်ပြမှုကို ဖွင့်ရန် သို့မဟုတ် ရပ်ရန်"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"စပီကာဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ရန်"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"အသံပြန်ဖွင့်ရေး နေရာကို ရှာရန်"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ပြန်ဖွင့်မှု နှုန်းကို လျှော့ချရန်"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"ပြန်ဖွင့်မှု နှုန်းကို မြှင့်ရန်"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ခေါ်ဆိုမှုမှတ်တမ်း"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ပိုမိုရွေးချယ်စရာများ"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ခလုတ်ခုံ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"အထွက်ခေါ်ဆိုခြင်းများသာပြပါ"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"အဝင်ခေါ်ဆိုမှုသာ ပြပါ"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"လွတ်သွားသော ခေါ်ဆိုမှုများသာပြပါ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"အသံပို့စာများသာ ပြပါ"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ဖုန်းခေါ်မှုအားလုံးပြရန်"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"၂စက္ကန့်ရပ်ဆိုင်းရန် ထည့်ပါ"</string>
-    <string name="add_wait" msgid="1177723010768282578">"စောင့်ဆိုင်းခြင်း ထည့်ပါ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ဆက်တင်များ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"အသစ်ကဲ့သို့ တုပသည့်စနစ်"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"လိပ်စာများအားလုံး"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"touch tone ကီးခလုတ် ကိုအသုံးပြုပါ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ဖုန်းပြန်ခေါ်မှု ပြုလုပ်နေစဉ်"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"အဝင်ခေါ်ဆိုမှုများ"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"အသံပို့စာ နားထောင်ရန်"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> လိပ်စာကြည့်ရန်"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ကိုခေါ်ပါ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"UI ဖြတ်လမ်းလင့်ခ်အသစ် လုပ်ရန်"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်ကို ထည့်သွင်းခြင်း"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်မှ ထွက်လိုက်သည်"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"ရွေးချယ်ထားသော <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"မရွေးချယ်ထားသော <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ရဲ့ အဆက်အသွယ် အသေးစိတ်"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"သံသယဖြစ်ဖွယ်စပမ်းခေါ်ဆိုသူ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> အတွက် အဆက်အသွယ်အသေးစိတ်"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ခါ"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>ထံသို့  SMS ပို့ရန်"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"မနားထောင်ရသေးသော အသံပို့စာ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"အသံဖွင့်ရှာဖွေမှု စရန်"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="voicemail" msgid="8899540969000957954">"အသံစာပို့စနစ်"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"အသံမေးလ်"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"အသံမေးလ်များ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yes"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"No"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ရွေးထားသော <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ကို ဖျက်လိုပါသလား။"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်များမုဒ်ကိ ပယ်ဖျက်ရန်"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ဖျက်ပါ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"မလုပ်တော့"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ရွေးချယ်ထားသည်"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ဤအသံမေးလ်များကို ဖျက်မလား။ "</b>"</item>
+      <item quantity="one">"<b>"ဤအသံမေးလ်ကို ဖျက်မလား။ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ၌"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ဒီနံပါတ်ကို မခေါ်ဆိုနိုင်ပါ"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"အသံမေးလ်စနစ်ကိုသတ်မှတ်ရန် မီနူးမှတစ်ဆင့် ဆက်တင်များသို့သွားပါ။"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"အသံမေးလ်ခေါ်ဆိုနိုင်ရန် လေယာဉ်ပျံပေါ်သုံးစနစ်ကို ပိတ်ပါ။"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ဖွင့်နေစဉ်"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEIDနံပါတ်"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"ဆင်းမ်ကဒ်မှ ဖွင့်နေပါသည်..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"ဆင်းမ်ကဒ်မှ အဆက်အသွယ်များ"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"အဆက်အသွယ်များ app မရှိ"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"အသံဖြင့် ရှာဖွေမှု မရှိ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ဖုန်း အပလီကေးရှင်းကို ပိတ်ထား၍ ဖုန်း ခေါ်ဆိုမှု မပြုလုပ်နိုင်ခဲ့ပါ။"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"အဆက်အသွယ်များရှာပါ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"နံပါတ်ပေါင်းထည့်ပါ သို့မဟုတ် အဆက်အသွယ်များ ရှာဖွေပါ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"သင့်ခေါ်ဆိုမှတ်တမ်းတွင် ဘာမှမရှိပါ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ဖုန်းခေါ်ရန်"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"သင့်တွင် လွတ်သွားသည့်ခေါ်ဆိုမှုများ မရှိပါ။"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"သင့်အသံမေးလ် စာတိုက်ပုံးတွင် ဘာမှမရှိပါ။"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"အနှစ်သက်ဆုံးများသာ ပြပါ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ယခင်ခေါ်ဆိုမှုများ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"အားလုံး"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"လွတ်သွားသော"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"အသံစာ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"အမြန် နံပါတ်လှည့်မှု"</string>
     <string name="tab_history" msgid="7420269368689503596">"ခေါ်ဆိုမှု မှတ်တမ်း"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"အဆက်အသွယ်များ"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"အသံမေးလ်"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"အနှစ်သက်ဆုံးများထဲမှာ ထုတ်လိုက်ပါပြီ"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"နောက်ပြန်လုပ်ပါ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"အဆက်အသွယ် အသစ် ဖန်တီးရန်"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"အဆက်အသွယ်သို့ ပေါင်းထည့်ရန်"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"စာတို ပို့ရန်"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ဗီဒီယို ဖုန်းခေါ်ရန်"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"နံပါတ်ကို ပိတ်ဆို့ရန်"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"လွတ်သွားသောဖုန်း <xliff:g id="NUMBER">%s</xliff:g> ခါ"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"သင်၏အမြန်ခေါ်စာရင်းတွင် မည်သူမျှ မရှိသေးပါ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"အနှစ်သက်ဆုံးတစ်ခု ထည့်ရန်"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"သင့်တွင် မည်သည့်အဆက်အသွယ်မျှ မရှိသေးပါ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"အဆက်အသွယ်တစ်ယောက် ထည့်မည်"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"နံပါတ်အားလုံးကိုကြည့်ရန် ပုံကိုထိပါ (သို့) ပြန်စီရန် ထိပြီးဖိထားပါ"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ဖယ်ရှာခြင်း"</string>
+    <string name="select_all" msgid="408601760696146245">"အားလုံးကို ရွေးချယ်ပါ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"စာ တစ်စောင် ပို့ပါ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ဖုန်းခေါ်မှု အသေးစိတ်အချက်အလက်"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အားခေါ်ရန်"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ကိုဗီဒီယိုခေါ်ဆိုမည်။"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ထံမှ အသံစာကို နားထောင်ရန်"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> မှ အသံအသုံးပြုစာအား ဖွင့်ပါ"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> မှ အသံအသုံးပြုစာအား ရပ်ပါ"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> မှ အသံအသုံးပြုစာအား ဖျက်ပါ"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"> အသံသုံးပို့စာ အသစ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
-      <item quantity="one"> အသံသုံးပို့စာ အသစ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အတွက် အဆက်အသွယ် ဖန်တီးမည်"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အားလက်ရှိ အဆက်အသွယ်သို့ ပေါင်းထည့်မည်"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၏ ခေါ်ဆိုမှု အသေးစိတ်များ"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ခေါ်ဆိုမှု မှတ်တမ်းထဲမှ ဖျက်ပစ်ခဲ့"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ယနေ့"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"မနေ့က"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ပိုဟောင်းသော"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ခေါ်ဆိုမှုများ စာရင်း"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"စပီကာကို ဖွင့်ပါ။"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"စပီကာကို ပိတ်ပါ။"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"ပိုမြန်စွာ ကစားရန်"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ပိုနှေးစွာ ကစားရန်"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ဖွင့်မှု စတင် သို့မဟုတ် ဆိုင်းငံ့ရန်"</string>
     <string name="display_options_title" msgid="3880091801055797975">"ပြသမှုအတွက်ရွေးစရာများ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"အသံများနှင့် တုန်ခါမှု"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ခေါ်ဆိုမှုများ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ခေါ်ဆိုမှု ပိတ်ဆို့ခြင်း"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"အသံမေးလ်"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"အသံမေးလ်ဆက်တင်အတွက် SIM ရွေးပါ"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ခေါ်ဆိုမှုပိတ်ဆို့ခြင်း ယာယီပိတ်ထားသည်"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"သင်သည် လွန်ခဲ့သည့် ၄၈ နာရီအတွင်း ဤဖုန်းဖြင့် အရေးပေါ်ဌာနကိုဖုန်း ခေါ်ဆိုခဲ့သောကြောင့် ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ဖြုတ်ထားသည်။ ၄၈ နာရီကျော်လွန်သည်နှင့် ၎င်းကိုအလိုအလျောက် ပြန်ဖွင့်ပေးပါမည်။"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"နံပါတ်များ သွင်းရန်"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ပိတ်ထားသည့် နံပါတ်များ"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> အားပိတ်ဆို့ထားပြီးပါပြီ။"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ခေါ်ဆိုသော အကောင့်များ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ဖွင့်ထားရန်"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ခွင့်ပြုချက်များ သတ်မှတ်မည်"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"မြန်နှုန်းမြင့်ဖုန်းခေါ်ဆိုမှုကို ဖွင့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ခေါ်ဆိုမှုမှတ်တမ်းကို ကြည့်ရန်၊ ဖုန်းခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"အဆက်အသွယ်များကိုကြည့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"အသံမေးလ်ကိုအသုံးပြုရန်၊ ဖုန်းခွင့်ပြုချက်ကိုဖွင့်ပါ။"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"သင့်အဆက်အသွယ်များကို ရှာဖွေရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်များကို ဖွင့်ပါ။"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ဖုန်းခေါ်ဆိုရန်၊ ဖုန်းခွင့်ပြုချက်ကိုဖွင့်ပါ။"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ဖုန်း အက်ပ်ဆီတွင် စနစ် ဆက်တင်များသို့ ရေးသားခွင့် မရှိပါ။"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"စပမ်း"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> သည် အော့ဖ်လိုင်းဖြစ်နေသောကြောင့် ဆက်သွယ်၍ မရနိုင်ပါ"</string>
     <string name="about_phone_label" msgid="582991354677973731">"အကြောင်း"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ၏ စာသားမှတ်တမ်း"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google က ကူးယူနေသည်…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"စာသားမှတ်တမ်း မရရှိနိုင်ပါ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ကြည့်ရန်"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုအတောအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုများအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-nb/strings.xml b/java/com/android/dialer/app/res/values-nb/strings.xml
index d92edc6..2c0965c 100644
--- a/java/com/android/dialer/app/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/res/values-nb/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anropslogg"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Rapportér feil nummer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transkripsjonen"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokkér nummeret"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Opphev blokkeringen av nummeret"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Endre nummeret før du ringer"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Slett anropsloggen"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slett talepost"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du slette anropsloggen?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette sletter alle anrop fra loggen"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Sletter anropsloggen …"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Ring"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Tapt anrop"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Tapt jobbanrop"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Tapte anrop"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talemeldinger </item>
       <item quantity="one">talemelding</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Spill av"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny talemelding fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Kunne ikke spille av talepost"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Laster inn talepost …"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arkiverer taleposten …"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kunne ikke laste inn taleposten"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Bare anrop som gikk til talepostkasse"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Bare innkommende anrop"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Bare utgående anrop"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Bare ubesvarte anrop"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"søk"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ring"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ring til"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Spill av eller stopp avspillingen"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå høyttaleren på eller av"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Søk etter avspillingsposisjon"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reduser avspillingshastigheten"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Øk avspillingshastigheten"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anropslogg"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere alternativer"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Tastatur"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Vis bare utgående"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Vis bare innkommende"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Vis bare tapte"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Vis bare talemeldinger"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Vis alle samtaler"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Legg til pause på 2 sek."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Legg til Vent"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Bruk tonetastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Gå tilbake til aktiv samtale"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Legg til en samtale"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Innkommende samtaler"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Spill av talemelding"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Se kontakten <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ring <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Starter massehandlingsmodus"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingsmodus er avsluttet"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Du har valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Du har valgt bort <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetaljer for den potensielt useriøse oppringeren <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtaler."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videoanrop."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send SMS til <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Ikke avspilt talepost"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøk"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talepost"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talepost"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Slett markert <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
+      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Kan ikke ringe dette nummeret"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Laster inn …"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Henter fra SIM-kort…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakter på SIM-kort"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ingen kontaktapper er tilgjengelige"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøk er ikke tilgjengelig"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Kan ikke ringe fordi Telefon-appen er deaktivert."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søk i kontakter"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Legg til nummer eller søk etter kontakter"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Anropsloggen er tom"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Start en samtale"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen tapte anrop."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talepostkassen din er tom."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Vis bare favoritter"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Anropslogg"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarte"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Talemeldinger"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigvalg"</string>
     <string name="tab_history" msgid="7420269368689503596">"Anropslogg"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Talepostkasse"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Fjernet fra favoritter"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Angre"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opprett ny kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Legg til for en kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Start en videosamtale"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkér nummeret"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nye tapte anrop"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen på hurtigoppringning ennå"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Legg til en favoritt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Legg til en kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Trykk på bildet for å se alle numrene, eller trykk og hold for å omorganisere"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
+    <string name="select_all" msgid="408601760696146245">"Velg alle"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Spill av talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Sett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g> på pause"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Slett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nye taleposter</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ny talepost</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opprett kontakt for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Legg <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontakt"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Samtaledetaljer for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Slettet fra anropsloggen"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Eldre"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Anropsliste"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på høyttaleren."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå av høyttaleren."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Spill av raskere."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Spill av saktere."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start eller stopp avspillingen."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativer"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyder og vibrasjon"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Velg SIM for talepostinnstillinger"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokkerte numre"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokkert."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Ringekontoer"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Slå på"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Angi tillatelser"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"For å slå på hurtigoppringning, slå på Kontakter-tillatelsen."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"For å se samtaleloggen din, slå på Telefon-tillatelsen."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"For å se kontaktene dine, slå på Kontakter-tillatelsen."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"For å få tilgang til talepostkassen, slå på Telefon-tillatelsen."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"For å ringe, slå på Telefon-tillatelsen."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nettsøppel"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er frakoblet og kan ikke nås"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribert av Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkriberer …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Ingen transkripsjon"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Se"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger."</string>
 </resources>
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 90a3016..5a7d0c6 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"फोन"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फोनको किप्याड"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"फोन"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"कल इतिहास"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"गलत नम्बर रिपोर्ट गर्नुहोस्"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"नम्बर प्रतिलिपि गर्नुहोस्"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ट्रान्सक्रिप्शनको प्रतिलिपि बनाउँनुहोस्"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"नम्बरलाई रोक्नुहोस्"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"नम्बर माथिको रोक हटाउनुहोस्"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"कल गर्न अगाडि नम्बर सम्पादन गर्नुहोस्"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"कल इतिहास हटाउनुहोस्"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"भ्वाइसमेल हटाउनुहोस्"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कल इतिहास मेटाउने हो?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"यस कार्यले तपाईँको इतिहासबाट सबै कल मेट्नेछ"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"कल इतिहास हाटउँदै..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"फोन"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"छुटेका कल"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"छुटेको कार्यको कल"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"छुटेका कलहरू"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> भ्वाइसमेलहरू </item>
       <item quantity="one">भ्वाइसमेल</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"बजाउनुहोस्"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> बाट नयाँ भ्वाइसमेल"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"भ्वाइस मेललाई बजाउन सकिएन"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"भ्वाइस मेल लोड हुँदै ..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"भ्वाइस मेलको अभिलेख राख्दै..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"भ्वाइस मेललाई लोड गर्न सकिएन"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"भ्वाइसमेलका साथ मात्र कल गर्नुहोस्"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"आगमन कलहरू मात्र"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"बहिर्गमन कलहरू मात्र"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"छुटेका कलहरू मात्र"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"खोजी गर्नुहोस्"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"डायल"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"डायल गर्न संख्या"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"प्लेब्याक चलाउनुहोस वा रोक्नुहोस्"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्पीकरफोन खोल्नुहोस् वा बन्द गर्नुहोस्"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"प्लेब्याक स्थिति खोज्नुहोस्"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"प्लेब्याक दर कम गर्नुहोस्"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"प्लेब्याक दर बढाउनुहोस्"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"कलको इतिहास"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"थप विकल्पहरू"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"किप्याड"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"बहिर्गमन मात्र देखाउनुहोस्"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"आगमन कल मात्र देखाउनुहोस्"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"छुटेकाहरू मात्र देखाउनुहोस्"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"भ्वाइसमेलहरू मात्र देखाउनुहोस्"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"सबै कलहरू देखाउनुहोस्"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"२ सेकन्डको रोकाइ थप्नुहोस्"</string>
-    <string name="add_wait" msgid="1177723010768282578">"पर्खाइ थप्नुहोस्"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिङ्हरू"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"सबै सम्पर्कहरू"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"स्पर्श टोन किप्याडको प्रयोग गर्नुहोस्"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"हुदै गरेको कलमा फर्कनुहोस्"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"कल थप्नुहोस्"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"आगमन कलहरू"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"भ्वाइसमेल बजाउनुहोस्"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> सम्पर्क हेर्नुहोस्"</string>
-    <string name="description_call" msgid="1532402285334775372">"कल <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नयाँ UI सर्टकट सिर्जना गर्ने"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"बल्क कारबाही सम्बन्धी मोडमा प्रवेश गर्दै"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"बल्क कारबाही सम्बन्धी मोड छोडियो"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> चयन गरियो"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> चयन हटाइयो"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को लागि सम्पर्क विवरणहरू"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"शंकास्पद स्प्याम कलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का सम्पर्क सम्बन्धी विवरणहरू"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कल।"</string>
     <string name="description_video_call" msgid="3738199365585751727">"भिडियो कल।"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>लाई SMS पठाउनुहोस्"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"नसुनिएका भ्वाइसमेल"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"आवाज खोजी सुरु गर्नुहोस्"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> कल गर्नुहोस्"</string>
     <string name="voicemail" msgid="8899540969000957954">"भ्वाइसमेल"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> सेकेन्ड"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> मिनेट <xliff:g id="SECONDS">%s</xliff:g> सकेन्ड"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"भ्वाइस मेल"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"भ्वाइस मेलहरू"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"हो"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"होइन"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"चयन गरिएका <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> लाई मेटाउने हो?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ब्याच सम्बन्धी कारबाहीको मोडलाई रद्द गर्नुहोस्"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"मेट्नुहोस्"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द गर्नुहोस्"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयन गरियो"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"यी भ्वाइस मेलहरू मेट्ने हो? "</b>"</item>
+      <item quantity="one">"<b>"यो भ्वाइस मेल मेट्ने हो? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> मा <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"यस नम्बरलाई कल गर्न सकिंदैन"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"भ्वाइसमेल सेट गर्न मेनु &gt; सेटिङहरूमा जानुहोस्।"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"भ्वाइसमेल कल गर्न पहिले हवाइजहाज मोडलाई निष्क्रिय पार्नुहोस्।"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"लोड हुँदै..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM कार्डबाट लोड हुँदै"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM कार्ड सम्पर्कहरू"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"कुनै पनि सम्पर्क अनुप्रयोग उपलब्ध छैन"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"आवाज खोजी उपलब्ध छैन"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"फोन अनुप्रयोग असक्षम गरिएकोले फोन गर्न सकिँदैन।"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"सम्पर्कहरू खोज्नुहोस्"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"नम्बर थप्नुहोस् वा सम्पर्कहरू खोज्नुहोस्"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"तपाईँको कल इतिहास खाली छ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"कल गर्नुहोस्"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"तपाईँसँग कुनै पनि छुटेका कलहरू छैनन्।"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"तपाईँको भ्वाइस मेल खाली छ।"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"मनपर्ने मात्र देखाउनुहोस्"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"कल इतिहास"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"सबै"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"छुटेको"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"द्रूत डायल"</string>
     <string name="tab_history" msgid="7420269368689503596">"कल इतिहास"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"सम्पर्कहरू"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"भ्वाइसमेल"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"मनपर्नेहरूबाट हटाइयो"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"अनडु गर्नुहोस्"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> कल गर्नुहोस्"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"सम्पर्कमा थप्नुहोस्"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS पठाउनुहोस्"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"भिडियो कल बनाउनुहोस्"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"नम्बरलाई निषेध गर्नुहोस्"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> नयाँ छुटेका कलहरु"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"तपाईँको स्पिड डायलमा अझसम्म कोही छैन"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"एक मनपर्ने थप्नुहोस्"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"तपाईँसँग अझसम्म कुनै सम्पर्कहरू छैनन्"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"एउटा सम्पर्क थप्नुहोस्"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"सबै नम्बरहरू हेर्न छविलाई छुनुहोस् वा पुन:क्रमबद्ध गर्न छोइराख्नुहोस्"</string>
     <string name="remove_contact" msgid="2353580570488923668">"हटाउँनुहोस्"</string>
+    <string name="select_all" msgid="408601760696146245">"सबैलाई चयन गर्नुहोस्"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"भिडियो कल"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"सन्देश पठाउनुहोस्"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"कल विवरणहरु"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कल गर्नुहोस्"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> भिडियो कल गर्नुहोस्।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> बाट भ्वाइसमेल सुन्नुहोस्"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> बाट भ्वाइस मेल बजाउनुहोस्"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> बाट भ्वाइस मेल रोक्नुहोस्"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> बाट भ्वाइस मेल मेटाउनुहोस्"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> नयाँ भ्वाइस मेलहरू</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> नयाँ भ्वाइस मेल</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का लागि नयाँ सम्पर्क बनाउँनुहोस्"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"विद्यमान सम्पर्कमा <xliff:g id="NAMEORNUMBER">^1</xliff:g> थप्नुहोस्"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का लागि कल विवरणहरू"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"कल इतिहासबाट मेटाइयो"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"हिजो"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"अझ पुरानो"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"कल सूची"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पिकर खोल्नुहोस्।"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पिकर बन्द गर्नुहोस्।"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"छिटो चलाउनुहोस्।"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ढिलो चलाउनुहोस्।"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"दोहर्याउने सुरु गर्नुहोस् वा रोक्नुहोस्।"</string>
     <string name="display_options_title" msgid="3880091801055797975">"विकल्पहरू प्रदर्शन गर्नुहोस्"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्वनि र कम्पन"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"कलहरू"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कल रोक्दै"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"भ्वाइस मेल"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"भ्वाइस मेल सेटिङ गर्न SIM छान्ने"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कल अवरुद्ध अस्थायी रुपमा निष्क्रिय"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नम्बरहरू आयात गर्नुहोस्"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"रोकिएका नम्बरहरू"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> पहिले नै रोकिएको छ।"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"खाता कलिङ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"सक्रिय पार्नुहोस्"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"अनुमतिहरू सेट गर्नुहोस्"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"तीव्र डायल सक्षम गर्न, सम्पर्क अनुमति सक्षम गर्नुहोस्।"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"आफ्नो कल लग हेर्न, फोन अनुमति सक्रिय गर्नुहोस्।"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"आफ्नो सम्पर्क हेर्न सम्पर्क अनुमति सक्रिय गर्नुहोस्।"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"आफ्नो भ्वाइस मेल पहुँच गर्न, फोन अनुमति सक्रिय गर्नुहोस्"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"तपाईँको सम्पर्कहरू खोज गर्न सम्पर्क अनुमतिहरू सक्रिय गर्नुहोस्।"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"कल गर्न फोन अनुमति सक्रिय गर्नुहोस्।"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"प्रणाली सेटिङहरूमा लेख्न फोन अनुप्रयोगसँग अनुमति छैन।"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्प्याम"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> अफलाइन हुनुहुन्छ र वहाँलाई भेट्न सकिँदैन"</string>
     <string name="about_phone_label" msgid="582991354677973731">"बारेमा"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google द्वारा ट्रान्सक्राइब गरिएको"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ले ट्रान्सक्राइब गर्दैछ …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ट्रान्स्क्रिप्ट उपलब्ध छैन"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"हेर्नुहोस्"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"कल मेटाइयो। Messages मा गरिएको यो कलका क्रममा समावेश गरी आदान-प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कलहरू मेटाइए। Messages मा गरिएका कलहरूमा समावेश गरी आदान-प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-nl/strings.xml b/java/com/android/dialer/app/res/values-nl/strings.xml
index 5f41b80..0e3c0c0 100644
--- a/java/com/android/dialer/app/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/res/values-nl/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefoon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Toetsenblok van telefoon"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefoon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Oproepgeschiedenis"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Onjuist nummer melden"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Nummer kopiëren"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Transcriptie kopiëren"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Nummer blokkeren"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Blokkeren van nummer opheffen"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Nummer bewerken vóór bellen"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Oproepgeschiedenis wissen"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Voicemail verwijderen"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Oproepgeschiedenis wissen?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Hiermee worden alle oproepen uit je geschiedenis verwijderd"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Oproepgeschiedenis wissen…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefoon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Gemiste oproep"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Gemiste zakelijke oproep"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Gemiste oproepen"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> voicemails </item>
       <item quantity="one">Voicemail</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Afspelen"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nieuwe voicemail van <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Kan voicemail niet afspelen"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Voicemail laden…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Voicemail archiveren…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kan voicemail niet laden"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Alleen oproepen met voicemail"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Alleen inkomende oproepen"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Alleen uitgaande oproepen"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Alleen gemiste oproepen"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"zoeken"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"bellen"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nummer om te bellen"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Afspelen starten of stoppen"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Luidsprekertelefoon in- of uitschakelen"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Afspeelpositie zoeken"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Afspeelsnelheid verlagen"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Afspeelsnelheid verhogen"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Oproepgeschiedenis"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Meer opties"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"toetsenblok"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Alleen uitgaand weergeven"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Alleen inkomend weergeven"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Alleen gemist weergeven"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Alleen voicemails weergeven"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Alle oproepen weergeven"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Pauze van 2 seconden toevoegen"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Wachten toevoegen"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Instellingen"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle contacten"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Toetsen voor toonkiezen gebruiken"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Terug naar actief gesprek"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Oproep toevoegen"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Inkomende oproepen"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Voicemail afspelen"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Contact <xliff:g id="NAME">%1$s</xliff:g> bekijken"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> bellen"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Snelkoppeling voor nieuwe UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Modus voor bulkacties openen"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Modus voor bulkacties verlaten"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> geselecteerd"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Selectie van <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> opgeheven"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Contactgegevens voor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Contactgegevens voor vermoedelijke spambeller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> telefoongesprekken."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videogesprek."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Sms verzenden naar <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Niet-beluisterde voicemail"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Gesproken zoekopdracht"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
     <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"voicemails"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nee"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Geselecteerde <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> verwijderen?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus voor batchacties annuleren"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Verwijderen"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuleren"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> geselecteerd"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Deze voicemails verwijderen? "</b>"</item>
+      <item quantity="one">"<b>"Deze voicemail verwijderen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Kan dit nummer niet bellen"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Voor het instellen van voicemail ga je naar Menu &gt; Instellingen."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Als je je voicemail wilt bellen, moet je eerst de Vliegtuigmodus uitschakelen."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Laden..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI-nummer"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Laden vanaf SIM-kaart..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contacten op SIM-kaart"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Geen app voor contacten beschikbaar"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Gesproken zoekopdracht niet beschikbaar"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Kan niet bellen omdat de Telefoon-app is uitgeschakeld."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Contacten zoeken"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Voeg nummer toe of zoek contacten"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Je oproepgeschiedenis is leeg"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Bellen"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Je hebt geen gemiste oproepen."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Je voicemail-inbox is leeg."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Alleen favorieten weergeven"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Oproepgeschiedenis"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Gemist"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Snelkeuze"</string>
     <string name="tab_history" msgid="7420269368689503596">"Oproepgeschiedenis"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contacten"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Verwijderd uit favorieten"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Ongedaan maken"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Nieuw contact maken"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Toevoegen aan een contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Sms verzenden"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videogesprek starten"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nummer blokkeren"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nieuwe gemiste oproepen"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Er staat nog niemand in je snelkeuzelijst"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Een favoriet toevoegen"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Je hebt nog geen contacten"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Contact toevoegen"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tik op de afbeelding om alle nummers te bekijken of tik op de afbeelding en houd vast om opnieuw te rangschikken"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Verwijderen"</string>
+    <string name="select_all" msgid="408601760696146245">"Alles selecteren"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videogesprek"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Een bericht verzenden"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Oproepdetails"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bellen"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videogesprek <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Voicemail beluisteren van <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Voicemail van <xliff:g id="NAMEORNUMBER">^1</xliff:g> afspelen"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Voicemail van <xliff:g id="NAMEORNUMBER">^1</xliff:g> onderbreken"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Voicemail van <xliff:g id="NAMEORNUMBER">^1</xliff:g> verwijderen"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nieuwe voicemails</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nieuwe voicemail</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Contact maken voor <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> toevoegen aan bestaand contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Oproepgegevens voor <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Verwijderd uit oproepgeschiedenis"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Vandaag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gisteren"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Ouder"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lijst met oproepen"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Luidspreker inschakelen."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Luidspreker uitschakelen."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Sneller afspelen."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Langzamer afspelen."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Afspelen starten of onderbreken."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Weergaveopties"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Geluiden en trillingen"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Oproepen"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepen blokkeren"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Selecteer simkaart voor voicemail"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering tijdelijk uitgeschakeld"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is uitgeschakeld omdat je in de afgelopen 48 uur contact met de noodhulpdiensten hebt opgenomen via deze telefoon. De functie wordt automatisch weer ingeschakeld nadat de periode van 48 uur is verstreken."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummers importeren"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Geblokkeerde nummers"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is al geblokkeerd."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Oproepaccounts"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Inschakelen"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Toestemmingen instellen"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Als je de snelkeuzefunctie wilt inschakelen, schakel je de machtiging voor Contacten in."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Als je je gesprekkenlijst wilt bekijken, schakel je de machtiging voor Telefoon in."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Als je je contacten wilt bekijken, schakel je de machtiging voor Contacten in."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Als je je voicemail wilt beluisteren, schakel je de machtiging voor Telefoon in."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Als je naar contacten wilt zoeken, schakel je de contacttoestemming in."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Als je iemand wilt bellen, schakel je de machtiging voor Telefoon in."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefoon-app heeft geen toestemming om systeeminstellingen te schrijven."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline en kan niet worden bereikt"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Over"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Getranscribeerd door Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Bezig met transcriberen…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcript niet beschikbaar"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Weergeven"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Gesprek verwijderd. Bijlagen die in dit gesprek zijn gedeeld, kun je bekijken en verwijderen via Berichten."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Gesprekken verwijderd. Bijlagen die in deze gesprekken zijn gedeeld, kun je bekijken en verwijderen via Berichten."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-no/strings.xml b/java/com/android/dialer/app/res/values-no/strings.xml
index d92edc6..2c0965c 100644
--- a/java/com/android/dialer/app/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/res/values-no/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anropslogg"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Rapportér feil nummer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transkripsjonen"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokkér nummeret"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Opphev blokkeringen av nummeret"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Endre nummeret før du ringer"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Slett anropsloggen"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slett talepost"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du slette anropsloggen?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette sletter alle anrop fra loggen"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Sletter anropsloggen …"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Ring"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Tapt anrop"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Tapt jobbanrop"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Tapte anrop"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talemeldinger </item>
       <item quantity="one">talemelding</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Spill av"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny talemelding fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Kunne ikke spille av talepost"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Laster inn talepost …"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arkiverer taleposten …"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kunne ikke laste inn taleposten"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Bare anrop som gikk til talepostkasse"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Bare innkommende anrop"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Bare utgående anrop"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Bare ubesvarte anrop"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"søk"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ring"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ring til"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Spill av eller stopp avspillingen"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå høyttaleren på eller av"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Søk etter avspillingsposisjon"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reduser avspillingshastigheten"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Øk avspillingshastigheten"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anropslogg"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere alternativer"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Tastatur"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Vis bare utgående"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Vis bare innkommende"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Vis bare tapte"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Vis bare talemeldinger"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Vis alle samtaler"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Legg til pause på 2 sek."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Legg til Vent"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alle kontakter"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Bruk tonetastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Gå tilbake til aktiv samtale"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Legg til en samtale"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Innkommende samtaler"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Spill av talemelding"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Se kontakten <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ring <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Starter massehandlingsmodus"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingsmodus er avsluttet"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Du har valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Du har valgt bort <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetaljer for den potensielt useriøse oppringeren <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtaler."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videoanrop."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Send SMS til <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Ikke avspilt talepost"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøk"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"talepost"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"talepost"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nei"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Slett markert <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
+      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Kan ikke ringe dette nummeret"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Laster inn …"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Henter fra SIM-kort…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakter på SIM-kort"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ingen kontaktapper er tilgjengelige"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøk er ikke tilgjengelig"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Kan ikke ringe fordi Telefon-appen er deaktivert."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søk i kontakter"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Legg til nummer eller søk etter kontakter"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Anropsloggen er tom"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Start en samtale"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen tapte anrop."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talepostkassen din er tom."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Vis bare favoritter"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Anropslogg"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarte"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Talemeldinger"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigvalg"</string>
     <string name="tab_history" msgid="7420269368689503596">"Anropslogg"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Talepostkasse"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Fjernet fra favoritter"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Angre"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opprett ny kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Legg til for en kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Start en videosamtale"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkér nummeret"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nye tapte anrop"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen på hurtigoppringning ennå"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Legg til en favoritt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Legg til en kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Trykk på bildet for å se alle numrene, eller trykk og hold for å omorganisere"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
+    <string name="select_all" msgid="408601760696146245">"Velg alle"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Spill av talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Sett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g> på pause"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Slett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nye taleposter</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ny talepost</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opprett kontakt for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Legg <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontakt"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Samtaledetaljer for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Slettet fra anropsloggen"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Eldre"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Anropsliste"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på høyttaleren."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå av høyttaleren."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Spill av raskere."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Spill av saktere."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start eller stopp avspillingen."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativer"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyder og vibrasjon"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Velg SIM for talepostinnstillinger"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokkerte numre"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokkert."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Ringekontoer"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Slå på"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Angi tillatelser"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"For å slå på hurtigoppringning, slå på Kontakter-tillatelsen."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"For å se samtaleloggen din, slå på Telefon-tillatelsen."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"For å se kontaktene dine, slå på Kontakter-tillatelsen."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"For å få tilgang til talepostkassen, slå på Telefon-tillatelsen."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"For å ringe, slå på Telefon-tillatelsen."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nettsøppel"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er frakoblet og kan ikke nås"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribert av Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkriberer …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Ingen transkripsjon"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Se"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pa/strings.xml b/java/com/android/dialer/app/res/values-pa/strings.xml
index 76d4b9b..31b2a27 100644
--- a/java/com/android/dialer/app/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/res/values-pa/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ਫ਼ੋਨ"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ਫ਼ੋਨ ਕੀਪੈਡ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ਫੋਨ"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"ਨੰਬਰ ਕਾਪੀ ਕਰੋ"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ਲਿਪੀ ਬਦਲਣਾ ਕਾਪੀ ਕਰੋ"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"ਨੰਬਰ ਨੂੰ ਅਨਬਲੌਕ ਕਰੋ"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਓ"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ਵੌਇਸਮੇਲ ਮਿਟਾਓ"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ਕੀ ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ਇਹ ਤੁਹਾਡੇ ਇਤਿਹਾਸ ਤੋਂ ਸਾਰੀਆਂ ਕਾਲਾਂ ਮਿਟਾ ਦੇਵੇਗਾ"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"ਕਾਲ ਇਤਿਹਾਸ ਹਟਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ਫੋਨ"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"ਮਿਸਡ ਕਾਲ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ਕੰਮ ਨਾਲ ਸਬੰਧਿਤ ਖੁੰਝੀ ਕਾਲ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ਮਿਸ ਹੋਈਆਂ ਕਾਲਾਂ"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ਵੌਇਸਮੇਲਾਂ </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ਵੌਇਸਮੇਲਾਂ </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ਪਲੇ ਕਰੋ"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ਦੀ ਨਵੀਂ ਵੌਇਸਮੇਲ"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ਵੌਇਸਮੇਲ ਪਲੇ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"ਵੌਇਸਮੇਲ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"ਵੌਇਸਮੇਲ ਪੁਰਾਲੇਖਬੱਧ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ਵੌਇਸਮੇਲ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"ਕੇਵਲ ਵੌਇਸਮੇਲ ਵਾਲੀਆਂ ਕਾਲਾਂ"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ਕੇਵਲ ਇਨਕਮਿੰਗ ਕਾਲਾਂ"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"ਕੇਵਲ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"ਕੇਵਲ ਮਿਸਡ ਕਾਲਾਂ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ਖੋਜੋ"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ਡਾਇਲ ਕਰੋ"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ਡਾਇਲ ਕਰਨ ਲਈ ਨੰਬਰ"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"ਪਲੇਬੈਕ ਪਲੇ ਕਰੋ ਜਾਂ ਰੋਕੋ"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"ਸਪੀਕਰਫੋਨ ਨੂੰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"ਪਲੇਬੈਕ ਪੋਜੀਸ਼ਨ ਖੋਜੋ"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ਪਲੇਬੈਕ ਰੇਟ ਘਟਾਓ"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"ਪਲੇਬੈਕ ਰੇਟ ਵਧਾਓ"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ਕਾਲ ਇਤਿਹਾਸ"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ਹੋਰ ਚੋਣਾਂ"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ਕੀ-ਪੈਡ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"ਕੇਵਲ ਆਊਟਗੋਇੰਗ ਦਿਖਾਓ"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ਕੇਵਲ ਇਨਕਮਿੰਗ ਦਿਖਾਓ"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"ਕੇਵਲ ਮਿਸਡ ਦਿਖਾਓ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"ਕੇਵਲ ਵੌਇਸਮੇਲਾਂ ਦਿਖਾਓ"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"ਸਾਰੀਆਂ ਕਾਲਾਂ ਦਿਖਾਓ"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-ਸਕਿੰਟ ਦਾ ਪੌਜ ਜੋੜੋ"</string>
-    <string name="add_wait" msgid="1177723010768282578">"ਉਡੀਕ ਜੋੜੋ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"ਸਿਮੁਲੇਟਰ"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ਟਚ ਟੋਨ ਕੀਪੈਡ ਵਰਤੋ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ਕਾਲ ਜੋੜੋ"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ਇਨਕਮਿੰਗ ਕਾਲਾਂ"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"ਵੌਇਸਮੇਲ ਪਲੇ ਕਰੋ"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"ਸੰਪਰਕ <xliff:g id="NAME">%1$s</xliff:g> ਦੇਖੋ"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ਨਵਾਂ UI ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਨੂੰ ਛੱਡਿਆ"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕੀਤਾ ਗਿਆ"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ਕਾਲਾਂ।"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ਵੀਡੀਓ ਕਾਲ।"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ SMS ਭੇਜੋ"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"ਅਣਸੁਣੀ ਵੌਇਸਮੇਲ"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"ਵੌਇਸ ਖੋਜ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="voicemail" msgid="8899540969000957954">"ਵੌਇਸਮੇਲ"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ਵੌਇਸਮੇਲਾਂ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ਹਾਂ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ਨਹੀਂ"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ਕੀ ਚੁਣੀ(ਆਂ) ਹੋਈ(ਆਂ) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ਬੈਚ ਕਾਰਵਾਈਆਂ ਮੋਡ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ਮਿਟਾਓ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ਰੱਦ ਕਰੋ"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"ਕੀ ਇਸ ਵੌਇਸਮੇਲ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
+      <item quantity="other">"<b>"ਕੀ ਇਹਨਾਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ਨੂੰ <xliff:g id="TIME">%2$s</xliff:g> ਵਜੇ"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ਇਸ ਨੰਬਰ ਤੇ ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"ਵੌਇਸਮੇਲ ਸਥਾਪਤ ਕਰਨ ਲਈ, ਮੀਨੂ &gt; ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"ਵੌਇਸਮੇਲ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM ਕਾਰਡ ਵਿੱਚੋਂ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM ਕਾਰਡ ਸੰਪਰਕ"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"ਕੋਈ ਸੰਪਰਕ ਐਪ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"ਵੌਇਸ ਖੋਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ਇੱਕ ਫੋਨ ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਫੋਨ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ।"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ਸੰਪਰਕ ਖੋਜੋ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"ਨੰਬਰ ਜੋੜੋ ਜਾਂ ਸੰਪਰਕ ਖੋਜੋ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਖਾਲੀ ਹੈ"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ਇੱਕ ਕਾਲ ਕਰੋ"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਵੀ ਖੁੰਝੀਆਂ ਕਾਲਾਂ ਨਹੀਂ ਹਨ।"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ਤੁਹਾਡਾ ਵੌਇਸਮੇਲ ਇਨਬਾਕਸ ਖਾਲੀ ਹੈ।"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ਕੇਵਲ ਮਨਪਸੰਦ ਦਿਖਾਓ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ਕਾਲ ਇਤਿਹਾਸ"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ਸਭ"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ਮਿਸਡ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ਵੌਇਸਮੇਲ"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"ਸਪੀਡ ਡਾਇਲ"</string>
     <string name="tab_history" msgid="7420269368689503596">"ਕਾਲ ਇਤਿਹਾਸ"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"ਸੰਪਰਕ"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ਵੌਇਸਮੇਲ"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ਮਨਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਇਆ ਗਿਆ"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"ਪਹਿਲਾਂ ਵਰਗਾ ਕਰੋ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ਕਿਸੇ ਸੰਪਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS ਭੇਜੋ"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ਵੀਡੀਓ ਕਾਲ ਕਰੋ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ਨਵੀਆਂ ਮਿਸਡ ਕਾਲਾਂ"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ਅਜੇ ਤੁਹਾਡੇ ਸਪੀਡ ਡਾਇਲ \'ਤੇ ਕੋਈ ਵੀ ਵਿਅਕਤੀ ਨਹੀਂ ਹੈ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ਕੋਈ ਮਨਪਸੰਦ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ਤੁਹਾਡੇ ਕੋਲ ਅਜੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ਕੋਈ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"ਸਾਰੇ ਨੰਬਰਾਂ ਨੂੰ ਵੇਖਣ ਲਈ ਚਿਤਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ ਜਾਂ ਦੁਬਾਰਾ ਕ੍ਰਮਬੱਧ ਕਰਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ਹਟਾਓ"</string>
+    <string name="select_all" msgid="408601760696146245">"ਸਭ ਚੁਣੋ"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ਕਾਲ ਵੇਰਵੇ"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"ਵੀਡੀਓ ਕਾਲ <xliff:g id="NAMEORNUMBER">^1</xliff:g>।"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਦੀ ਵੌਇਸਮੇਲ ਚੁਣੋ"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਤੋਂ ਵੌਇਸਮੇਲ ਪਲੇ ਕਰੋ"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਤੋਂ ਵੌਇਸਮੇਲ ਰੋਕੋ"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਤੋਂ ਵੌਇਸਮੇਲ ਮਿਟਾਓ"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਲਈ ਸੰਪਰਕ ਬਣਾਓ"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਮੌਜੂਦਾ ਸੰਪਰਕ ਵਿੱਚ ਜੋੜੋ"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਲਈ ਕਾਲ ਵੇਰਵੇ"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ਕਾਲ ਇਤਿਹਾਸ ਵਿੱਚੋਂ ਮਿਟਾਇਆ ਗਿਆ"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ਅੱਜ"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ਕੱਲ੍ਹ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"ਪੁਰਾਣੇ"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ਕਾਲਸ ਸੂਚੀ"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ਸਪੀਕਰ ਬੰਦ ਕਰੋ।"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"ਵੱਧ ਤੇਜ਼ ਪਲੇ ਕਰੋ।"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"ਵੱਧ ਹੌਲੀ ਪਲੇ ਕਰੋ।"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ਪਲੇਬੈਕ ਚਾਲੂ ਕਰੋ ਜਾਂ ਰੋਕੋ।"</string>
     <string name="display_options_title" msgid="3880091801055797975">"ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ਕਾਲਾਂ"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ਕਾਲ ਬਲੌਕ ਕਰਨਾ"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"ਵੌਇਸਮੇਲ ਸੈਟਿੰਗਾਂ ਲਈ SIM ਚੁਣੋ"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ਕਾਲ ਬਲੌਕਿੰਗ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੈ"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ਕਾਲ ਬਲੌਕਿੰਗ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਇਸ ਫੋਨ ਦੁਆਰਾ ਪਿਛਲੇ 48 ਘੰਟਿਆਂ ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਇਹ 48 ਘੰਟਿਆਂ ਦਾ ਸਮਾਂ ਪੂਰਾ ਹੋਣ ਤੇੋਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕਲੀ ਮੁੜ-ਸਮਰੱਥ ਹੋ ਜਾਵੇਗੀ।"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ਆਯਾਤ ਨੰਬਰ"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰ"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ਪਹਿਲਾਂ ਹੀ ਬਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ਕਾਲਿੰਗ ਖਾਤੇ"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ਚਾਲੂ ਕਰੋ"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ਅਨੁਮਤੀਆਂ ਸੈੱਟ ਕਰੋ"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"ਸਪੀਡ ਡਾਇਲ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ, ਸੰਪਰਕ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ਆਪਣਾ ਕਾਲ ਲੌਗ ਵੇਖਣ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਸੰਪਰਕ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ਆਪਣੀ ਵੌਇਸਮੇਲ ਐਕਸੈਸ ਕਰਨ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਦੀ ਖੋਜ ਕਰਨ ਲਈ,, ਸੰਪਰਕ ਅਨੁਮਤੀਆਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ਕਾਲ ਕਰਨ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ਫ਼ੋਨ ਐਪ ਦੇ ਕੋਲ ਸਿਸਟਮ ਸੈਟਿੰਗਜ਼ ਵਿੱਚ ਲਿੱਖਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"ਸਪੈਮ"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ਔਫਲਾਈਨ ਹੈ ਅਤੇ ਉਸ \'ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ਇਸ ਬਾਰੇ"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ਇਹ ਟ੍ਰਾਂਸਕ੍ਰਾਈਬ Google ਵੱਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ਵੱਲੋਂ ਪ੍ਰਤਿਲਿਪੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ਟ੍ਰਾਂਸਕ੍ਰਿਪਟ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ਦੇਖੋ"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ਕਾਲ ਮਿਟਾਈ ਗਈ। ਇਸ ਕਾਲ ਦੌਰਾਨ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ਕਾਲ ਮਿਟਾਈ ਗਈ। ਕਾਲਾਂ ਦੌਰਾਨ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pl/strings.xml b/java/com/android/dialer/app/res/values-pl/strings.xml
index 76adfe5..f650286 100644
--- a/java/com/android/dialer/app/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/res/values-pl/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klawiatura telefonu"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historia połączeń"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Zgłoś niedokładny numer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiuj numer"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiuj zapis"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Zablokuj numer"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Odblokuj numer"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edytuj numer przed połączeniem"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Wyczyść historię połączeń"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Usuń pocztę głosową"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Wyczyścić historię połączeń?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Spowoduje to usunięcie wszystkich połączeń z historii."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Czyszczę historię połączeń…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Nieodebrane połączenie"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Nieodebrane połączenie (praca)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Nieodebrane połączenia"</string>
@@ -50,107 +45,68 @@
       <item quantity="other"> Wiadomości głosowe: <xliff:g id="COUNT">%1$d</xliff:g> </item>
       <item quantity="one">Wiadomość głosowa</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Odtwórz"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nowa poczta głosowa od: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nie można odtworzyć wiadomości głosowej"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Wczytuję zawartość poczty głosowej…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archiwizuję pocztę głosową…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nie można wczytać zawartości poczty głosowej"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Tylko połączenia z pocztą głosową"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Tylko połączenia przychodzące"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Tylko połączenia wychodzące"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Tylko połączenia nieodebrane"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"szukaj"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"wybierz numer"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numer do wybrania"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Uruchom lub zatrzymaj odtwarzanie"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Włącz lub wyłącz tryb głośnomówiący"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Szukaj pozycji odtwarzania"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Zmniejsz szybkość odtwarzania"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Zwiększ szybkość odtwarzania"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historia połączeń"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Więcej opcji"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klawiatura"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Pokaż tylko wychodzące"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Pokaż tylko przychodzące"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Pokaż tylko nieodebrane"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Pokaż tylko pocztę głosową"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Pokaż wszystkie połączenia"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Dodaj 2-sekundową pauzę"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Dodaj oczekiwanie"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ustawienia"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Symulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Wszystkie kontakty"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Użyj klawiatury tonowej"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Wróć do aktywnego połączenia"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Dodaj połączenie"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Połączenia przychodzące"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Odtwórz pocztę głosową"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Wyświetl kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Zadzwoń do: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Utwórz skrót do nowego interfejsu"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Włączono tryb działań zbiorczych"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Wyłączono tryb działań zbiorczych"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Wybrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Anulowano wybór: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Szczegóły kontaktu: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Szczegóły kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, który jest podejrzany o spam"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Połączenia: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Rozmowa wideo."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Wyślij SMS-a do: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nieodsłuchana poczta głosowa"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Wyszukiwanie głosowe"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Poczta głosowa"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"wiadomości głosowe"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"wiadomości głosowe"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Tak"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nie"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Usunąć wybrane <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anuluj tryb działań zbiorczych"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Usuń"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anuluj"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Wybrane: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="many">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="other">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
+      <item quantity="one">"<b>"Usunąć tę wiadomość głosową? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nie można zadzwonić pod ten numer"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Aby skonfigurować pocztę głosową, otwórz Menu &gt; Ustawienia."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Aby połączyć się z pocztą głosową, najpierw wyłącz tryb samolotowy."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Wczytuję…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"Numer MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Wczytuję z karty SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakty z karty SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nie jest dostępna aplikacja do obsługi kontaktów"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Wyszukiwanie głosowe jest niedostępne"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nie można zadzwonić, ponieważ aplikacja Telefon została wyłączona."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Przeszukuj kontakty"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Dodaj numer lub wyszukaj kontakty"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Twoja historia połączeń jest pusta"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Zadzwoń"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nie masz nieodebranych połączeń."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Skrzynka odbiorcza poczty głosowej jest pusta."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Pokaż tylko ulubione"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historia połączeń"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Wszystkie"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Nieodebrane"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Poczta gł."</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Szybkie wybieranie"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historia połączeń"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Poczta głosowa"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Usunięto z ulubionych"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Cofnij"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Utwórz nowy kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj do kontaktu"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Wyślij SMS-a"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Rozmowa wideo"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Zablokuj numer"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Nowe nieodebrane połączenia: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Lista szybkiego wybierania jest pusta"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj do ulubionych"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Nie masz jeszcze żadnych kontaktów"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Dodaj kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Kliknij obraz, by zobaczyć wszystkie numery, lub kliknij go i przytrzymaj, by zmienić kolejność"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Usuń"</string>
+    <string name="select_all" msgid="408601760696146245">"Zaznacz wszystkie"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Rozmowa wideo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Wyślij wiadomość"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Szczegóły połączenia"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Zadzwoń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Rozpocznij rozmowę wideo z: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Posłuchaj wiadomości głosowej od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Odtwórz wiadomości głosowe od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Wstrzymaj odtwarzanie wiadomości głosowych od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Usuń wiadomości głosowe od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nowe wiadomości głosowe</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> nowych wiadomości głosowych</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nowej wiadomości głosowej</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nowa wiadomość głosowa</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Utwórz kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodaj: <xliff:g id="NAMEORNUMBER">^1</xliff:g> do istniejącego kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Szczegóły połączeń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Usunięto z historii połączeń"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Dzisiaj"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Wczoraj"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Starsze"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista połączeń"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Włącz głośnik."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Wyłącz głośnik."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Odtwarzaj szybciej."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Odtwarzaj wolniej."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Rozpocznij lub wstrzymaj odtwarzanie."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opcje wyświetlania"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Dźwięki i wibracje"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Połączenia"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokowanie połączeń"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Poczta głosowa"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Wybierz kartę SIM, aby zmienić ustawienia poczty głosowej"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokada połączeń tymczasowo wyłączona"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokada połączeń została wyłączona, ponieważ w ciągu ostatnich 48 godzin dzwoniono z tego telefonu na numer alarmowy. Blokada zostanie automatycznie przywrócona po upływie 48 godzin."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Zaimportuj numery"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Zablokowane numery"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> jest już zablokowany."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Konta telefoniczne"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Włącz"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Ustaw uprawnienia"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Aby włączyć szybkie wybieranie, włącz uprawnienie Kontakty."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Aby zobaczyć swój rejestr połączeń, włącz uprawnienie Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Aby zobaczyć swoje kontakty, włącz uprawnienie Kontakty."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Aby uzyskać dostęp do poczty głosowej, włącz uprawnienie Telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Aby wyszukać kontakty, włącz uprawnienia Kontakty."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Aby nawiązać połączenie, włącz uprawnienie Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacja Telefon nie ma uprawnień do zapisu w ustawieniach systemowych."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Użytkownik <xliff:g id="NAME">%1$s</xliff:g> jest offline i nie można się z nim skontaktować"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Informacje"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkrypcja: Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google tworzy transkrypcję…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkrypcja niedostępna"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Wyświetl"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Połączenie zostało usunięte. Załączniki udostępnione podczas tego połączenia możesz wyświetlić i usunąć w Wiadomościach."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Połączenia zostały usunięte. Załączniki udostępnione podczas połączeń możesz wyświetlić i usunąć w Wiadomościach."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
index 780ca07..1bf38d0 100644
--- a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do smartphone"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informar número incorreto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Excluir mensagem de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta ação excluirá todas as chamadas do seu histórico"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Limpando histórico de chamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Smartphone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho perdida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproduzir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova mensagem de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi possível repr. correio de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Carregando correio de voz..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arquivando correio de voz..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi possível carregar correio de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Somente chamadas com correio de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Somente chamadas recebidas"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Somente chamadas de saída"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Somente chamadas perdidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pesquisar"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"discar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número para discagem"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Iniciar ou interromper a reprodução"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o vivavoz"</string>
+    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o viva-voz"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Procurar posição de reprodução"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reduzir a taxa de reprodução"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar a taxa de reprodução"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar apenas enviadas"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar apenas recebidas"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar apenas perdidas"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Exibir apenas mensagens de voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas as chamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Adicionar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contatos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado multifrequencial"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Retornar para a chamada em espera"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Ad. cham."</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Chamadas recebidas"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproduzir mensagem de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Visualizar contato <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ligar para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de ação em massa"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saindo do modo de ação em massa"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes do contato do autor da chamada suspeito de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Enviar SMS para <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nova mensagem de voz"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correios de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Excluir a seleção de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Não é possível ligar para este número"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Carregando…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Carregando do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contatos do cartão SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nenhum app de contatos disponível"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"A pesquisa por voz não está disponível"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Não é possível fazer uma chamada porque o app Telefone foi desativado."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contatos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Adicionar número ou pesquisar contatos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Seu histórico de chamadas está vazio"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Fazer uma chamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Você não tem chamadas perdidas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sua caixa de entrada de correio de voz está vazia."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar somente favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Correio de voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Discagem rápida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Histórico de chamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contatos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removido dos favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Desfazer"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contato"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contato"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> novas chamadas perdidas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não há ninguém na sua discagem rápida"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar favorito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Adicionar um contato"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toque na imagem para ver todos os números ou toque e segure para reordenar"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
+    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproduzir correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausar correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Excluir correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> novos correios de voz</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novos correios de voz</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contato para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a um contato já existente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Excluída do histórico de chamadas"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Antiga"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de chamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ative o alto-falante."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desative o alto-falante."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reprodução mais rápida."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reprodução mais lenta."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicie ou pause a reprodução."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opções de exibição"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Selecionar SIM p/ config correio voz"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"O número <xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ativar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Definir permissões"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a discagem rápida, ative a permissão para o app Contatos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver seu registro de chamadas, ative a permissão para o app Telefone."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para acessar seu correio de voz, ative a permissão para o app Telefone."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para fazer uma chamada, ative a permissão para o app Telefone."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está off-line e não é possível entrar em contato"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Sobre"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"O Google está transcrevendo..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcrição indisponível"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
index 95fa75c..af6dc1e 100644
--- a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telemóvel"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do telemóvel"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Denunciar número incorreto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de ligar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar correio de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Todas as chamadas serão eliminadas do histórico"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"A limpar histórico de chamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telemóvel"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada não atendida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho não atendida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas não atendidas"</string>
@@ -45,110 +40,69 @@
     <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número do correio de voz desconhecido"</string>
     <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
+      <item quantity="one">Mensagem de correio de voz</item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensagens de correio de voz </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproduzir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova msg de correio de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi poss. reprod. o correio de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"A carregar o correio de voz..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"A arquivar mensagem de correio de voz…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi poss. carregar o correio de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Apenas chamadas com correio de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Apenas chamadas recebidas"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Apenas chamadas efetuadas"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Apenas chamadas não atendidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pesquisar"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"marcar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número a marcar"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Reproduzir ou interromper a reprodução"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o altifalante"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Procurar a posição da reprodução"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Diminuir a velocidade de reprodução"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar a velocidade de reprodução"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar apenas cham. efetuadas"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar apenas cham. recebidas"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar apenas cham. n. atend."</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Mostrar apenas msgs corr. voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas as chamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Adicionar pausa de 2 seg."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Definições"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contactos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Utilizar teclado numérico com tons de toque"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Voltar à chamada em curso"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Adicionar chamada"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Chamadas recebidas"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproduzir mensagem de correio de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ver o contacto <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ligar a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar novo atalho de IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"A entrar no modo de ação em massa…"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saiu do modo de ação em massa"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contacto para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes de contacto para um autor de chamadas de spam suspeito: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Enviar SMS para <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Mensagem de correio de voz ainda não ouvida"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> seg."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mensagem de correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mensagens de correio de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Pretende eliminar a(s) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selecionada(s)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selecionada(s)"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Pretende eliminar esta mensagem de correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Pretende eliminar estas mensagens de correio de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Não é possível ligar para este número"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar o correio de voz, aceda a Menu &gt; Definições."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para efetuar uma chamada para o correio de voz, desative primeiro o modo de avião."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"A carregar…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"A carregar a partir do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contactos no cartão SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Não existe nenhuma aplicação de contactos disponível"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Pesquisa por voz não disponível"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Não é possível efetuar uma chamada porque a aplicação Telefone foi desativada."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contactos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Adic. n.º ou pesq. contactos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"O seu histórico de chamadas está vazio"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Efetuar uma chamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Não tem chamadas não atendidas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"A caixa de entrada do correio de voz está vazia."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar apenas os favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Não atendidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Corr. Voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Marcação rápida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Histórico de Chamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removido dos favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Anular"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contacto"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contacto"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> chamadas não atendidas novas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não tem ninguém na marcação rápida"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar um favorito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Ainda não tem nenhum contacto"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Adicionar um contacto"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toque na imagem para ver todos os números ou toque sem soltar para reordenar"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
+    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Telefonar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Fazer videochamada com <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir o correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproduzir mensagem de correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Colocar a mensagem de correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g> em pausa"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Eliminar mensagem de correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> new voicemails</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novas mensagens de correio de voz</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> ao contacto existente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamadas de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Eliminado do histórico de chamadas"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Mais antigas"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de chamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ligar altifalante."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desligar altifalante"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reproduzir mais rápido."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reproduzir mais lento."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar ou interromper a reprodução."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opções de visualização"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Selecionar SIM p/ correio de voz"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas tempor. desativado"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque contactou os serviços de emergência a partir deste telemóvel nas últimas 48 horas. O bloqueio será automaticamente reativado assim que expirar o período de 48 horas."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ativar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Definir autorizações"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a marcação rápida, ative a autorização Contactos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver o registo de chamadas, ative a autorização Telemóvel."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver os seus contactos, ative a autorização Contactos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para aceder ao correio de voz, ative a autorização Telemóvel."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar os seus contactos, ative as autorizações Contactos."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para efetuar uma chamada, ative a autorização Telemóvel."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A aplicação Telefone não tem autorização para gravar nas definições do sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está offline e não pode ser contactado"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"O Google está a transcrever…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcrição não disponível"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi eliminada. Veja e elimine os anexos partilhados durante esta chamada na aplicação Mensagens."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram eliminadas. Veja e elimine os anexos partilhados durante as chamadas na aplicação Mensagens."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt/strings.xml b/java/com/android/dialer/app/res/values-pt/strings.xml
index 780ca07..1bf38d0 100644
--- a/java/com/android/dialer/app/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefone"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do smartphone"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefone"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Informar número incorreto"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Bloquear número"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Desbloquear número"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Excluir mensagem de voz"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta ação excluirá todas as chamadas do seu histórico"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Limpando histórico de chamadas…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Smartphone"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho perdida"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Reproduzir"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova mensagem de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi possível repr. correio de voz"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Carregando correio de voz..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arquivando correio de voz..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi possível carregar correio de voz"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Somente chamadas com correio de voz"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Somente chamadas recebidas"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Somente chamadas de saída"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Somente chamadas perdidas"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"pesquisar"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"discar"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"número para discagem"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Iniciar ou interromper a reprodução"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o vivavoz"</string>
+    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o viva-voz"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Procurar posição de reprodução"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reduzir a taxa de reprodução"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Aumentar a taxa de reprodução"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Mostrar apenas enviadas"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Mostrar apenas recebidas"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Mostrar apenas perdidas"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Exibir apenas mensagens de voz"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Mostrar todas as chamadas"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Adicionar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Adicionar espera"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Todos os contatos"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Usar teclado multifrequencial"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Retornar para a chamada em espera"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Ad. cham."</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Chamadas recebidas"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Reproduzir mensagem de voz"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Visualizar contato <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ligar para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de ação em massa"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saindo do modo de ação em massa"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes do contato do autor da chamada suspeito de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Enviar SMS para <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nova mensagem de voz"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> seg"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"correio de voz"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"correios de voz"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Sim"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Não"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Excluir a seleção de <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
+      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Não é possível ligar para este número"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Carregando…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Carregando do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Contatos do cartão SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nenhum app de contatos disponível"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"A pesquisa por voz não está disponível"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Não é possível fazer uma chamada porque o app Telefone foi desativado."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contatos"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Adicionar número ou pesquisar contatos"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Seu histórico de chamadas está vazio"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Fazer uma chamada"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Você não tem chamadas perdidas."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sua caixa de entrada de correio de voz está vazia."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mostrar somente favoritos"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Correio de voz"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Discagem rápida"</string>
     <string name="tab_history" msgid="7420269368689503596">"Histórico de chamadas"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Contatos"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Removido dos favoritos"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Desfazer"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contato"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contato"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> novas chamadas perdidas"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não há ninguém na sua discagem rápida"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar favorito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Adicionar um contato"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Toque na imagem para ver todos os números ou toque e segure para reordenar"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
+    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Reproduzir correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausar correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Excluir correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> novos correios de voz</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> novos correios de voz</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contato para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a um contato já existente"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Excluída do histórico de chamadas"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Antiga"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de chamadas"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ative o alto-falante."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desative o alto-falante."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Reprodução mais rápida."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Reprodução mais lenta."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicie ou pause a reprodução."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opções de exibição"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Selecionar SIM p/ config correio voz"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"O número <xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Ativar"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Definir permissões"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a discagem rápida, ative a permissão para o app Contatos."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver seu registro de chamadas, ative a permissão para o app Telefone."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Para acessar seu correio de voz, ative a permissão para o app Telefone."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Para fazer uma chamada, ative a permissão para o app Telefone."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está off-line e não é possível entrar em contato"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Sobre"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"O Google está transcrevendo..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcrição indisponível"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ro/strings.xml b/java/com/android/dialer/app/res/values-ro/strings.xml
index 725ff4a..b6adfe7 100644
--- a/java/com/android/dialer/app/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/res/values-ro/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tastatura telefonului"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Istoricul apelurilor"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Raportați numărul ca incorect"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Copiați numărul"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Copiați transcrierea"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blocați numărul"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Deblocați numărul"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modificați numărul înainte de apelare"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Ștergeți istoricul apelurilor"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ștergeți mesajul vocal"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Ștergeți istoricul apelurilor?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Vor fi șterse toate apelurile din istoric"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Se șterge istoricul apelurilor…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Apel nepreluat"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Apel de serviciu nepreluat"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Apeluri nepreluate"</string>
@@ -49,107 +44,67 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> de mesaje vocale </item>
       <item quantity="one">Mesaj vocal</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Redați"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Mesaj vocal nou de la <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Nu s-a putut reda mesageria vocală"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Se încarcă mesageria vocală…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Se arhivează mesajul vocal…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nu s-a putut încărca mesageria vocală"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Numai apelurile cu mesaje vocale"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Numai apelurile primite"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Numai apelurile efectuate"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Numai apelurile nepreluate"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"căutare"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"apelare"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numărul de apelat"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Porniți sau opriți redarea"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activați sau dezactivați difuzorul"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Căutați poziția de redare"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Reduceți viteza redării"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Măriți viteza redării"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Istoricul apelurilor"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mai multe opțiuni"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatură"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Numai apelurile efectuate"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Numai apelurile primite"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Numai apelurile nepreluate"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Afișați numai mesajele vocale"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Afișați toate apelurile"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Adăugați o pauză de 2 secunde"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Adăugați interval de așteptare"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Setări"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Toată agenda"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tastatura tactilă cu sunet"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Reveniți la apelul în curs"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Adăugați un apel"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Apeluri de intrare"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Redați mesajul vocal"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Afișați persoana din agendă <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Apelați <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Creați comandă rapidă IU nouă"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Se intră în modul acțiune în bloc"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ați ieșit din modul acțiune în bloc"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"S-a selectat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"S-a deselectat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detalii de contact pentru <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalii de contact pentru apelantul suspectat de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (de) apeluri."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Apel video."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Trimiteți SMS la <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Mesaje vocale neascultate"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Începeți căutarea vocală"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Mesagerie vocală"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> secunde"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"mesagerie vocală"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mesaje vocale"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nu"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Ștergeți cele <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> selectate?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulați modul de acțiuni în lot"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ștergeți"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulați"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selectate"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
+      <item quantity="other">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
+      <item quantity="one">"<b>"Ștergeți acest mesaj vocal? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> la <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Nu puteți apela acest număr"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Pentru a configura mesageria vocală, accesați Meniu &gt; Setări."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Pentru a apela mesageria vocală, mai întâi dezactivați modul Avion."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Se încarcă..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Se încarcă de pe cardul SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Persoanele din agendă de pe cardul SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nu este disponibilă nicio aplicație pentru agendă"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Căutarea vocală nu este disponibilă"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nu se poate efectua un apel telefonic, deoarece aplicația Telefon a fost dezactivată."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Căutați în Agendă"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Adăugați număr/căutați contacte"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Istoricul apelurilor este gol"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Apelați"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nu aveți niciun apel nepreluat."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Nu există mesaje primite în mesageria vocală."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Afișați numai preferate"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Istoricul apelurilor"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Toate"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Nepreluate"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Mesagerie vocală"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Apelare rapidă"</string>
     <string name="tab_history" msgid="7420269368689503596">"Istoricul apelurilor"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Agendă"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Mesagerie vocală"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"S-a eliminat din preferate"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Anulați"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Creați o intrare nouă"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adăugați la o intrare"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Trimiteți SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Inițiați un apel video"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blocați numărul"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> apeluri nepreluate noi"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Nicio persoană de contact setată pentru apelarea rapidă"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adăugați o persoană de contact preferată"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Nu aveți încă persoane de contact"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Adăugați o persoană de contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Atingeți imaginea pentru a vedea toate numerele sau atingeți lung pentru reordonare"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Eliminați"</string>
+    <string name="select_all" msgid="408601760696146245">"Selectați tot"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Apel video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Trimiteți un mesaj"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detaliile apelului"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Apelați <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Apelați video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Ascultați mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Redați mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Întrerupeți mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Ștergeți mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> mesaje vocale noi</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de mesaje vocale noi</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> mesaj vocal nou</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Creați o persoană de contact pentru <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adăugați <xliff:g id="NAMEORNUMBER">^1</xliff:g> la o persoană de contact existentă"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detaliile apelului pentru <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"S-a șters din istoricul apelurilor"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Astăzi"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ieri"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Mai vechi"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista de apeluri"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Porniți difuzorul."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Opriți difuzorul."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Jucați mai repede."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Jucați mai lent."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Porniți sau întrerupeți redarea."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opțiuni de afișare"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sunete și vibrații"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Apeluri"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocarea apelurilor"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Mesagerie vocală"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Selectați SIM pt. mesageria vocală"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocarea apelurilor e dezactivată temporar"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blocarea apelurilor a fost dezactivată, deoarece ați contactat serviciile de urgență de pe acest telefon în ultimele 48 de ore. Funcția va fi reactivată automat după ce perioada de 48 de ore va expira."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importați numere"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Numere blocate"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> este deja blocat."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Conturi pentru apelare"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Activați"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Setați permisiunile"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Pentru a activa apelarea rapidă, activați permisiunea Agendă."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Pentru a vedea jurnalul de apeluri, activați permisiunea Telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Pentru a vedea persoanele de contact, activați permisiunea Agendă."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Pentru a accesa mesageria vocală, activați permisiunea Telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Pentru a căuta în persoanele de contact, activați permisiunea Agendă."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Pentru a apela, activați permisiunea Telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplicația Telefon nu are permisiunea să modifice setările de sistem."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> este offline și nu poate fi contactat(ă)"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Despre"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcris de Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transcrie…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transcrierea nu e disponibilă"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Afișați"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Apelul a fost șters. Afișați și ștergeți atașamentele trimise în timpul acestui apel în Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Apelurile au fost șterse. Afișați și ștergeți atașamentele trimise în timpul apelurilor în Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ru/strings.xml b/java/com/android/dialer/app/res/values-ru/strings.xml
index 557832b..950f9f8 100644
--- a/java/com/android/dialer/app/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/res/values-ru/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Набор номера"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Кнопки"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Журнал звонков."</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Ошибка в номере"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Скопировать номер"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Скопировать транскрипцию"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Заблокировать номер"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Разблокировать номер"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Изменить номер и позвонить"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Очистить журнал звонков"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Удалить голосовое сообщение"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Очистить журнал звонков?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Журнал звонков будет удален."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Очистка журнала звонков…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Вызов"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропущенный вызов"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропущенный звонок (работа)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропущенные вызовы"</string>
@@ -50,107 +45,68 @@
       <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> голосовых сообщений </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> голосового сообщения </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Прослушать"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Новое гол. сообщение: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Не удалось воспроизвести сообщения"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Загрузка сообщений…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Архивирование…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не удалось загрузить голосовую почту"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Только звонки с голосовой почтой"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Только входящие звонки"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Только исходящие звонки"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Только пропущенные звонки"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"поиск"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"набор номера"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"набираемый номер"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Начать или остановить воспроизведение"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Включить или отключить громкую связь"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Выбрать позицию для воспроизведения"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Уменьшить скорость воспроизведения"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Увеличить скорость воспроизведения"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Журнал звонков"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Ещё"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавиатура"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Исходящие"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Входящие"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Пропущенные"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Показать голосовые сообщения"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Все вызовы"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Добавить двухсекундную паузу"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Добавить паузу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Все контакты"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Панель тонального набора"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Вернуться к текущему вызову"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Добавить вызов"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Входящие вызовы"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Прослушать голосовую почту"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Просмотреть данные: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Вызов: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создать ярлык для нового интерфейса"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Вы вошли в режим массового действия"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Вы вышли из режима массового действия"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Выбран объект <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Выбор объекта <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> отменен"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (подозрение на спам)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Вызовов: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видеовстреча"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Отправить SMS пользователю <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непрослушанные сообщения голосовой почты"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Начать голосовой поиск"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Голосовая почта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"голосовое сообщение"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"голосовые сообщения"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Нет"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Удалить <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Отмена режима массового действия"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Удалить"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отмена"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрано: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="few">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="many">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+      <item quantity="other">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"На этот номер нельзя позвонить."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Чтобы настроить голосовую почту, выберите \"Меню &gt; Настройки\"."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Сначала отключите режим полета."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Загрузка..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Загрузка с SIM-карты…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Контакты на SIM-карте"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Нет приложения для работы с контактами"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Голосовой поиск недоступен"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Нельзя совершать телефонные звонки, поскольку приложение \"Телефон\" отключено."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Поиск в контактах"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Найдите контакт или введите номер"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"В журнале пока нет звонков"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Вызов"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Нет пропущенных звонков"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Нет входящих голосовых сообщений"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Только часто используемые"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Журнал звонков"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Все"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Пропущенные"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Г. почта"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Быстрый набор"</string>
     <string name="tab_history" msgid="7420269368689503596">"Журнал звонков"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контакты"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Голосовая почта"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Контакт удален из избранных"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Отмена"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Создать контакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Добавить к контакту"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Отправить SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Начать видеовстречу"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблокировать номер"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Пропущенных вызовов: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Нет номеров для быстрого набора"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Настроить быстрый набор"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Нет контактов"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Добавить контакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Коснитесь изображения, чтобы увидеть все номера, или нажмите и удерживайте, чтобы изменить порядок"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Удалить"</string>
+    <string name="select_all" msgid="408601760696146245">"Выбрать все"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеовстреча"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Отправить сообщение"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Сведения о вызове"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Позвонить: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Видеовстреча: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушать сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Прослушать голосовое сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Приостановить голосовое сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Удалить голосовое сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> новое голосовое сообщение</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> новых голосовых сообщения</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> новых голосовых сообщений</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> нового голосового сообщения</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Добавить контакт: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Добавить \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\" к контакту"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – сведения о вызове"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Вызов удален из журнала"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Сегодня"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Предыдущие записи"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Вызовы"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Включить динамик."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Выключить динамик."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Увеличить скорость воспроизведения."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Уменьшить скорость воспроизведения."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Начать или приостановить воспроизведение."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Отображение контактов"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуки и вибрация"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Вызовы"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокировка вызовов"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосовая почта"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Выбор SIM-карты для настроек голосовой почты"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокировка вызовов временно отключена"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокировка вызовов отключена, поскольку вы недавно набирали номер экстренной службы. Когда с момента звонка пройдет 48 часов, эта функция включится автоматически."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортировать номера"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Заблокированные номера"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> уже заблокирован."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Аккаунты для звонков"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Включить"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Задать разрешения"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Чтобы настроить быстрый набор, предоставьте приложению разрешение \"Контакты\"."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Чтобы открыть список вызовов, предоставьте приложению разрешение \"Телефон\"."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Чтобы открыть список контактов, предоставьте приложению разрешение \"Контакты\"."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Чтобы получить доступ к голосовой почте, предоставьте приложению разрешение \"Телефон\"."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Для поиска контактов включите разрешение \"Контакты\"."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Чтобы позвонить, предоставьте приложению разрешение \"Телефон\"."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"У приложения \"Телефон\" нет разрешения на изменение системных настроек."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> сейчас офлайн и не ответит на вызов"</string>
     <string name="about_phone_label" msgid="582991354677973731">"О приложении"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Расшифровано Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Подождите…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Транскрипция недоступна"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Посмотреть"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Вызов удален. Посмотреть и удалить прикрепленные к нему файлы можно в приложении \"Сообщения\"."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Вызовы удалены. Посмотреть и удалить прикрепленные к ним файлы можно в приложении \"Сообщения\"."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-si/strings.xml b/java/com/android/dialer/app/res/values-si/strings.xml
index 329d89e..6e32bc8 100644
--- a/java/com/android/dialer/app/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/res/values-si/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"දුරකථනය"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"දුරකථන යතුරු පුවරුව"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"දුරකථනය"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"වැරදි අංකය වාර්තා කරන්න"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"අංකය පිටපත් කරන්න"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"පිටපත් කිරීම පිටපත් කරන්න"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"අංකය අවහිර කරන්න"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"අංකය අවහිර නොකරන්න"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"ඇමතුමට පෙර අංකය සංස්කරණය"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ඇමතුම් ඉතිහාසය හිස් කරන්න"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"හඬ තැපෑල මකන්න"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ඇමතුම් ඉතිහාසය හිස් කරන්නද?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"මෙය ඔබේ ඉතිහාසයෙන් සියලු ඇමතුම් මකනු ඇත"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"ඇමතුම් ඉතිහාසය හිස් කරමින්…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"දුරකථනය"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"මඟ හැරුණු ඇමතුම"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"මග හැරුණ කාර්යාල ඇමතුම"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"මඟ හැරුණු ඇමතුම්"</string>
@@ -48,107 +43,66 @@
       <item quantity="one">හඬ තැපැල් <xliff:g id="COUNT">%1$d</xliff:g> </item>
       <item quantity="other">හඬ තැපැල් <xliff:g id="COUNT">%1$d</xliff:g> </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ධාවනය කරන්න"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> වෙතින් නව හඬ තැපැලක්"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"හඬ තැපෑල වාදනය කිරීමට නොහැකි විය"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"හඬ තැපෑල ප්‍රවේශනය වෙමින්…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"හඬ තැපෑල සංරක්ෂණය කරමින්…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"හඬ තැපෑල ප්‍රවේශනය කිරීමට නොහැකි විය"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"හඬ තැපෑල සහිත ඇමතුම් පමණි"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"එන ඇමතුම් පමණි"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"පිටතට යන ඇමතුම් පමණි"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"මඟ හැරුණු ඇමතුම් පමණි"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"සෙවීම"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"අමතන්න"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ඇමතීමට අංකය"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Playback ධාවනය කරන්න හෝ නවත්වන්න"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"ස්පීකර්ෆෝන් ක්‍රියා කරන්න හෝ නොකරන්න"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Playback ස්ථානය සොයාබලන්න"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Playback අනුපාතය අඩුවේ"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Playback අනුපාතය වැඩිවේ"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ඇමතුම් ඉතිහාසය"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"තවත් විකල්ප"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"යතුරු පුවරුව"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"පිටතට යන ඒවා පමණක් පෙන්වන්න"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"එන ඒවා පමණක් පෙන්වන්න"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"මඟ හැරුණු ඒවා පමණක් පෙන්වන්න"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"හඬ තැපැල් පමණක් පෙන්වන්න"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"සියලු ඇමතුම් පෙන්වන්න"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"තත්පර 2 ක විරාමයක් එක් කරන්න"</string>
-    <string name="add_wait" msgid="1177723010768282578">"රැඳී සිටීම එක් කරන්න"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"සැකසීම්"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"සමාකෘතිය"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"සියලුම සම්බන්ධතා"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ස්පර්ශ නාද යතුරුපෑඩය භාවිතා කරන්න"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"පවතින ඇමතුමට නැවත යන්න"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"ඇමතුමක් එක් කරන්න"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"එන ඇමතුම්"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"හඬ තැපෑල ධාවනය කිරීම"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> සම්බන්ධතාවය බලන්න"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> අමතන්න"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"නව UI කෙටිමග තනන්න"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"තොග ක්‍රියා ප්‍රකාරය ඇතුළු කරමින්"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"තොග ක්‍රියා ප්‍රකාරය හැර යන ලදී"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> තෝරා ගන්නා ලදී"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> තෝරා ගැනීම ඉවත් කරන ලදී"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"සැකසහිත අයාචිත තැපැල්කරු <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"ඇමතුම් <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"වීඩියෝ ඇමතුම."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g> වෙත SMS යවන්න"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"අසා නොමැති හඬ තැපෑල"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"හඬ සෙවීම අරඹන්න"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> අමතන්න"</string>
     <string name="voicemail" msgid="8899540969000957954">"හඬ තැපෑල"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"මිනි <xliff:g id="MINUTES">%s</xliff:g> තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"හඬ තැපෑල"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"හඬ තැපැල්"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ඔව්"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"නැත"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"තෝරා ගත් <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> මකන්නද?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"කාණ්ඩ ක්‍රියා ප්‍රකාරය අවලංගු කරන්න"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"මකන්න"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"අවලංගු කරන්න"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> තෝරා ගන්නා ලදි"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
+      <item quantity="other">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> දින <xliff:g id="TIME">%2$s</xliff:g>ට"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"මෙම අංකයට ඇමතිය නොහැකිය"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"හඬ තැපෑල පිහිටුවීමට, මෙනුව &gt; සැකසීම් වෙත යන්න."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"හඬ තැපෑල ඇමතීමට, මුලින්ම ගුවන්යානා ප්‍රකාරය වසන්න."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"පූරණය වෙමින්..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM පතෙන් පූරණය කරමින්…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM පත් සම්බන්ධතා"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"සබඳතා යෙදුමක් ලබාගත නොහැකිය"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"හඬ සෙවුම ලබාගත නොහැකිය"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"දුරකථන යෙදුම අබල කර ඇති නිසා දුරකථන ඇමතුම ලබාගැනීම කළ නොහැක."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"සම්බන්ධතා සෙවීම"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"අංකය එක් කරන්න හෝ සම්බන්ධතා සොයන්න"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ඔබගේ ඇමතුම් ඉතිහාසය හිස්ය"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ඇමතුමක් සිදු කරන්න"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"ඔබට මඟ හැරුණු ඇමතුම් නැත."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"ඔබේ හඬ තැපැල් එන ලිපි හිස්ය."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ප්‍රියතමයන් පමණක් පෙන්වන්න"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ඇමතුම් ඉතිහාසය"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"සියලු"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"මග හැරුණේය"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"හඬ තැපෑල"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"වේග ඩයල් කිරීම"</string>
     <string name="tab_history" msgid="7420269368689503596">"ඇමතුම් ඉතිහාසය"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"සම්බන්ධතා"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"හඬ තැපෑල"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ප්‍රියතමයන්ගෙන් ඉවත් කරන්න"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"අස් කරන්න"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> අමතන්න"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"නව සම්බන්ධතාවයක් සාදන්න"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"සම්බන්ධතාවකට එක් කරන්න"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS යවන්න"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"වීඩියෝ ඇමතුමක් ලබාගන්න"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"අංකය අවහිර කරන්න"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"නව මඟ හැරුණු ඇමතුම් <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ඔබගේ වේග ඩයල් එකේ තවමත් කවුරුවත් නැහැ"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ප්‍රියතම ලෙස එක් කරන්න"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"ඔබ තවමත් සම්බන්ධතා නැහැ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"සම්බන්ධතාවයක් එක් කරන්න"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"සියලු අංක බැලීමට රූපය ස්පර්ශ කරන්න නැතහොත් නැවත අනුපිළිවෙළට සැකසීමට ස්පර්ශ කර අල්ලාගෙන සිටින්න"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ඉවත් කරන්න"</string>
+    <string name="select_all" msgid="408601760696146245">"සියල්ල තෝරන්න"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"වීඩියෝ ඇමතුම"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"පණිවිඩයක් යවන්න"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"ඇමතුම් විස්තර"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> අමතන්න"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>. වීඩියෝ ඇමතුම"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> වෙතින් හඬ තැපෑලට සවන් දෙන්න"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> වෙතින් වන හඬ තැපෑල ධාවනය කරන්න"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> වෙතින් වන හඬ තැපෑල විරාම කරන්න"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> වෙතින් වන හඬ තැපෑල මකන්න"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one">නව හඬ තැපැල් <xliff:g id="COUNT_1">%d</xliff:g></item>
-      <item quantity="other">නව හඬ තැපැල් <xliff:g id="COUNT_1">%d</xliff:g></item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> සඳහා සම්බන්ධතාවක් සාදන්න"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"පවතින සම්බන්ධතාව වෙත <xliff:g id="NAMEORNUMBER">^1</xliff:g> එක් කරන්න"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ඇමතුම් ඉතිහාසයෙන් මකන ලදී"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"අද"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"ඊයේ"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"වඩා පරණ"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"ඇමතුම් ලැයිස්තුව"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ශබ්දවාහිනී සක්‍රිය කරන්න."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ශබ්දවාහිනී අක්‍රිය කරන්න."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"වේගයෙන් ධාවනය කරන්න."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"හෙමින් ධාවනය කරන්න."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"නැවත ධාවනයෙදී ආරම්භ කරන්න හෝ විරාමය කරන්න."</string>
     <string name="display_options_title" msgid="3880091801055797975">"විකල්ප පෙන්වන්න"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ශබ්ද සහ කම්පන"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"ඇමතුම්"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ඇමතුම් අවහිර කිරීම"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"හඬ තැපෑල"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"හඬ තැපැල් සැකසීම්වලට SIM තෝර."</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ඇමතුම් අවහිර කිරීම තාවකාලිකව අක්‍රියයි"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ඔබ පසුගිය පැය 48 ඇතුළත මෙම දුරකථනයෙන් හදිසි අවස්ථා සේවා ඇමතූ බැව්න් ඇමතුම් අවහිර කිරීම අබල කර ඇත. පැය 48ක කාල සීමාව ඉකුත් වූ විට එය ස්වයංක්‍රියව යළි සබල කෙරේ."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"අංක ආයාත කරන්න"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"අවහිර කළ අංක"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> දැනටමත් අවහිර කර ඇත."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"ගිණුම් ඇමතීම"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ක්‍රියාත්මක කරන්න"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"අවසර සකසන්න"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"වේග ඩයල් කිරීම සබල කිරීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"ඔබේ ඇමතුම් ලොගය බැලීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"ඔබේ සම්බන්ධතා බැලීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"ඔබේ හඬ තැපෑල වෙත ප්‍රවේශ වීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"ඇමතුමක් ලබා ගැනීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"දුරකථන යෙදුමට පද්ධති සැකසීම් වෙත ලිවීමට අවසර නැත."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"අයාචිත තැපෑල"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> නොබැඳි අතර ළඟා වීමට නොහැකිය"</string>
     <string name="about_phone_label" msgid="582991354677973731">"ගැන"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google මගින් පිටපත් කරන ලදී"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google පිටපත් කරමින් සිටී..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"අනුපිටපතක් නොමැත"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"බලන්න"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම් අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sk/strings.xml b/java/com/android/dialer/app/res/values-sk/strings.xml
index 60b63d5..ebed279 100644
--- a/java/com/android/dialer/app/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/res/values-sk/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefón"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klávesnica telefónu"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefón"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"História hovorov"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Nahlásiť nesprávne číslo"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopírovať číslo"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopírovať prepis"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokovať číslo"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Zrušiť blokovanie čísla"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Pred volaním upraviť číslo"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Vymazať históriu hovorov"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Odstrániť hlasovú správu"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Chcete vymazať históriu hovorov?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Týmto z histórie odstránite všetky hovory."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Vymazáva sa história hovorov..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefón"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Zmeškaný hovor"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zmeškaný pracovný hovor"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Zmeškané hovory"</string>
@@ -50,107 +45,68 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> odkazov v hlasovej schránke </item>
       <item quantity="one">Odkaz v hlasovej schránke</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Prehrať"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nová hlasová správa – <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Hlasovú schránku sa nepodarilo prehrať"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Načítava sa hlasová schránka…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Archivuje sa hlasová správa…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hlasovú schránku sa nepodarilo načítať"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Iba volania do hlasovej schránky"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Iba prichádzajúce hovory"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Iba odchádzajúce hovory"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Iba zmeškané hovory"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"hľadať"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"vytáčanie"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"číslo, ktoré chcete vytočiť"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Spustiť alebo zastaviť prehrávanie"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Zapnúť alebo vypnúť reproduktor"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Hľadať pozíciu prehrávania"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Znížiť počet snímok za sekundu"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Zvýšiť počet snímok za sekundu"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"História hovorov"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Ďalšie možnosti"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klávesnica"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Zobraziť len odchádzajúce"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Zobraziť len prichádzajúce"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Zobraziť len zmeškané"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Zobraziť len hlasové správy"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Zobraziť všetky hovory"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Pridať dvojsekundovú pauzu"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Pridať čakanie"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavenia"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Všetky kontakty"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Použiť dotykovú tónovú klávesnicu"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Návrat k prebiehajúcemu hovoru"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Pridať hovor"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Prichádzajúce hovory"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Prehrať hlasovú správu"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Zobraziť kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Zavolať kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vyt. skratku na nové rozhranie"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Vstupuje sa do režimu hromadných akcií"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Odišli ste z režimu hromadných akcií"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> bola vybraná"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Výber položky <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> bol zrušený"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti kontaktu pre <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Podrobnosti kontaktu pri podozrení, že volajúci <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> je šíriteľ spamu"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Počet volaní: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videohovor"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Poslať SMS kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Nevypočutá hlasová správa"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Spustenie hlasového vyhľadávania"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Volať <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Hlasová schránka"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"hlasová správa"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"hlasové správy"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Áno"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nie"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Chcete odstrániť vybraté položky (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušiť režim hromadných akcií"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Odstrániť"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušiť"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybraté: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="few">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="many">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="other">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
+      <item quantity="one">"<b>"Chcete odstrániť túto hlasovú správu? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Na toto číslo nie je možné volať"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Ak chcete nastaviť hlasovú schránku, prejdite na ponuku &gt; Nastavenia."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Ak chcete volať hlasovú schránku, najprv vypnite režim v lietadle."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Načítava sa…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Prebieha načítavanie z SIM karty..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakty na SIM karte"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nie je k dispozícii žiadna aplikácia na kontakty"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Hlasové vyhľadávanie nie je k dispozícii"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Nie je možné volať, pretože aplikácia Telefón bola deaktivovaná."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Hľadať v kontaktoch"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Pridajte číslo / vyhľadajte v kontaktoch"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"História hovorov je prázdna"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Zavolať"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemáte žiadne zmeškané hovory."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hlasová schránka je prázdna."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Zobraziť iba obľúbené"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"História hovorov"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Všetky"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Zmeškané"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Schránka"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Rýchla voľba"</string>
     <string name="tab_history" msgid="7420269368689503596">"História hovorov"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Hlasová schránka"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Odstránené z obľúbených"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Späť"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Volať <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Vytvoriť nový kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pridať ku kontaktu"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Odoslať SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uskutočniť videohovor"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokovať číslo"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Nové zmeškané hovory: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"V rýchlej voľbe zatiaľ nemáte žiadny kontakt"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pridať obľúbený kontakt"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Zatiaľ nemáte žiadne kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Pridať kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Klepnutím na obrázok môžete zobraziť všetky čísla. Pridržaním obrázka môžete zmeniť poradie."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Odstrániť"</string>
+    <string name="select_all" msgid="408601760696146245">"Vybrať všetko"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Odoslať správu"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Zavolať kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Spustiť videohovor s kontaktom <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Vypočuť si správu v hlasovej schránke od používateľa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Prehrať hlasovú schránku kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pozastaviť hlasovú schránku kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Odstrániť hlasovú schránku kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> nové odkazy v hlasovej schránke</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> nového odkazu v hlasovej schránke</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nových odkazov v hlasovej schránke</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nový odkaz v hlasovej schránke</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Vytvoriť kontakt pre <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pridať údaj <xliff:g id="NAMEORNUMBER">^1</xliff:g> ku kontaktu"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti hovoru pre kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Odstránené z histórie hovorov"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Dnes"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včera"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Staršie"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Zoznam hovorov"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Zapnúť reproduktor"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vypnúť reproduktor"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Prehrať rýchlejšie"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Prehrať pomalšie"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Spustiť alebo pozastaviť prehrávanie"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Možnosti zobrazenia"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuky a vibrovanie"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Hovory"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokovanie hovorov"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Vyberte SIM na nastavenia hlasovej schránky"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokovanie hovorov je dočasne vypnuté"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pretože ste z tohto telefónu počas posledných 48 hodín volali na tiesňovú linku, blokovanie hovorov bolo vypnuté. Po uplynutí 48 hodín sa automaticky znova zapne."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovať čísla"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokované čísla"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je už blokované."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Telefónne účty"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Zapnúť"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Nastaviť povolenia"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Ak chcete aktivovať rýchlu voľbu, zapnite povolenie Kontakty."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Ak si chcete zobraziť denník hovorov, zapnite povolenie Telefón."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Ak si chcete zobraziť kontakty, zapnite povolenie Kontakty."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Ak chcete používať hlasovú schránku, zapnite povolenie Telefón."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Ak chcete hľadať kontakty, zapnite povolenie Kontakty."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Ak chcete volať, zapnite povolenie Telefón."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefónna aplikácia nemá povolenie na zápis do nastavení systému."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> je offline a nedá sa zastihnúť"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Informácie"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prepísané Googlom"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google prepisuje…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Prepis nie je k dispozícii"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Zobraziť"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Hovor bol odstránený. Prílohy zdieľané počas neho si môžete pozrieť a odstrániť v aplikácii Správy."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hovory boli odstránené. Prílohy zdieľané počas nich si môžete pozrieť a odstrániť v aplikácii Správy."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sl/strings.xml b/java/com/android/dialer/app/res/values-sl/strings.xml
index b46b99a..520d003 100644
--- a/java/com/android/dialer/app/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/res/values-sl/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tipkovnica telefona"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zgodovina klicev"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Prijavi netočno številko"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiranje številke"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj prepis"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blokiranje številke"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Odblokiranje telefonske številke"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Urejanje številke pred klicem"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Izbriši zgodovino klicev"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Brisanje sporočil iz odzivnika"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite izbrisati zgodovino klicev?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"S tem boste iz zgodovine izbrisali vse klice"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Izbris zgodovine klicev …"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefoniranje"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Neodgovorjeni klic"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zgrešen delovni klic"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Neodgovorjeni klici"</string>
@@ -50,107 +45,68 @@
       <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> sporočila v odzivniku </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> sporočil v odzivniku </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Predvajaj"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova glasovna pošta od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Sporočil v odzivniku ni mogoče predv."</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Nalaganje sporočil v odzivniku …"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arhiviranje sporočila v odzivniku …"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Sporočil v odzivniku ni mogoče naložiti"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Samo klici z odzivnikom"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Samo dohodni klici"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Samo odhodni klici"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Samo neodgovorjeni klici"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"iskanje"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"klicanje"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"številka, ki bo poklicana"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Začetek ali konec predvajanja"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Vklop ali izklop zvočnika"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Iskanje položaja predvajanja"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Zmanjšanje hitrosti predvajanja"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Povečanje hitrosti predvajanja"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zgodovina klicev"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Več možnosti"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tipkovnica"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Pokaži samo odhodne"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Pokaži samo dohodne"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Pokaži samo neodgovorjene"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Pokaži samo spor. glasovne pošte"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Pokaži vse klice"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Dodaj 2 sekundi premora"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Dodaj premor"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavitve"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Vsi stiki"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Uporabi številčnico za tonsko klicanje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Nazaj na klic, ki poteka"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Dodaj klic"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Dohodni klici"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Predvajanje sporočil glasovne pošte"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Ogled stika <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Pokliči <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ustvari bliž. za novi up. vm."</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Prehod v način množičnega dejanja"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Prehod iz načina množičnega dejanja"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Izbrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Preklican izbor: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti stika za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Podrobnosti stika za domnevnega neželenega klicatelja <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Št. klicev: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videoklic."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Pošlji SMS prejemniku <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Neodprta glasovna pošta"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Začni glasovno iskanje"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Glasovna pošta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"sporočilo v odzivniku"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"sporočila v odzivniku"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Da"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ne"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Želite izbrisati <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Prekliči način množičnega dejanja"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Prekliči"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Št. izbranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="two">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="few">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+      <item quantity="other">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ob <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Te številke ni mogoče klicati"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Če želite nastaviti odzivnik, pojdite v »Meni« &gt; »Nastavitve«."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Če želite poklicati odzivnik, najprej izklopite način za letalo."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Nalaganje …"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Nalaganje s kartice SIM ..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Stiki na kartici SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Ni aplikacije za stike"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno iskanje ni na voljo"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Ni mogoče opraviti telefonskega klica, ker je aplikacija Telefon onemogočena."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Iskanje stikov"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte št. ali iščite med st."</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Zgodovina klicev je prazna"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Klicanje"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nimate neodgovorjenih klicev."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Vaša mapa s sporočili v odzivniku je prazna."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Pokaži samo priljubljene"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Zgodovina klicev"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Vsi"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Neodgovorjeni"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Odzivnik"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hitro izbiranje"</string>
     <string name="tab_history" msgid="7420269368689503596">"Zgodovina klicev"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Stiki"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Odzivnik"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Odstranjeno iz priljubljenih"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Razveljavi"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ustvari nov stik"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj stiku"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošlji SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Opravi videoklic"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj številko"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Št. novih zgrešenih klicev: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Na seznamu za hitro klicanje nimate še nikogar"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodajte priljubljenega"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Nimate še stikov"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Dodajte stik"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Dotaknite se slike, da prikažete vse številke, ali pa se je dotaknite in pridržite, da spremenite vrstni red."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Odstrani"</string>
+    <string name="select_all" msgid="408601760696146245">"Izberi vse"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoklic"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošljite sporočilo"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti klica"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Klicanje: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Videoklic: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Poslušajte sporočilo v odzivniku od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Predvajanje sporočil v odzivniku od osebe/številke <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Zaustavitev prejemanja sporočil v odzivnik od osebe/številke <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Brisanje sporočil iz odzivnika od osebe/številke <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> sporočilo v odzivniku</item>
-      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> sporočili v odzivniku</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> sporočila v odzivniku</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> sporočil v odzivniku</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Ustvarjanja stika za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodajanje tega obstoječemu stiku: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti klica za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Izbrisano iz zgodovine klicev"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Danes"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včeraj"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Starejši"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Seznam klicev"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Vklopi zvočnik."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Izklopi zvočnik."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Predvajaj hitreje."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Predvajaj počasneje."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Začni ali zaustavi predvajanje."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Možnosti prikaza"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvoki in vibriranje"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Klici"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje klicev"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Odzivnik"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Izberi SIM za nast. odzivnika"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje klicev je začasno izklopljeno"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje klicev je onemogočeno, ker ste se v zadnjih 48 urah s tem telefonom obrnili na nujno pomoč. Ko 48-urno obdobje poteče, bo blokiranje klicev samodejno znova omogočeno."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz številk"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blokirane številke"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Telefonska številka <xliff:g id="NUMBER">%1$s</xliff:g> je že blokirana."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Računi za klicanje"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Vklop"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Nastavi dovoljenja"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Če želite omogočiti hitro klicanje, vklopite dovoljenje za stike."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Če si želite ogledati dnevnik klicev, vklopite dovoljenje za telefon."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Če si želite ogledati stike, vklopite dovoljenje za stike."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Če želite dostopati do sporočil v odzivniku, vklopite dovoljenje za telefon."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Če želite iskati po stikih, vklopite dovoljenje za stike."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Če želite klicati, vklopite dovoljenje za telefon."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nima dovoljenja za pisanje v sistemske nastavitve."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Vsiljena pošta"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Oseba <xliff:g id="NAME">%1$s</xliff:g> nima vzpostavljene povezave in ni dosegljiva"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Vizitka"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prepis je zagotovil Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google ustvarja prepis …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Prepis ni na voljo"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Klic je izbrisan. Priloge, ki so bile dane v skupno rabo v tem klicu, si lahko ogledate in izbrišete v aplikaciji Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Klici so izbrisani. Priloge, ki so bile dane v skupno rabo v teh klicih, si lahko ogledate in izbrišete v aplikaciji Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sq/strings.xml b/java/com/android/dialer/app/res/values-sq/strings.xml
index 6a274fc..dab7954 100644
--- a/java/com/android/dialer/app/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/res/values-sq/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefoni"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Blloku i tasteve i telefonit"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefoni"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historiku i telefonatave"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Raporto numrin e pasaktë"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopjo numrin"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopjo transkriptimin"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blloko numrin"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Zhblloko numrin"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redakto numrin para telefonatës"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Pastro historikun e telefonatave"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Fshije postën zanore"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Të pastrohet historiku i telefonatave?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Kjo do të fshijë të gjitha telefonatat nga historiku yt"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Po pastron historikun e telefonatave…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefoni"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Telefonatë e humbur"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Telefonatë pune e humbur"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Telefonata të humbura"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> posta zanore </item>
       <item quantity="one"> postë zanore</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Luaj"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Postë e re zanore nga <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Posta zanore nuk mund të luhej"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Po ngarkon postën zanore…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Po arkivon postën zanore..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Posta zanore nuk mund të ngarkohej"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Vetëm telefonatat me mesazhe zanore"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Vetëm telefonatat hyrëse"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Vetëm telefonatat dalëse"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Vetëm telefonatat e humbura"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"kërko"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"formo numrin"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numri për t\'u formuar"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Luaj ose ndalo luajtjen"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Aktivizo ose çaktivizo altoparlantin"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Kërko pozicionin e luajtjes"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Ule shpejtësinë e luajtjes"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Rrite shpejtësinë e luajtjes"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historiku i telefonatave"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Opsione të tjera"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"blloku i tasteve"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Shfaq vetëm dalëset"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Shfaq vetëm hyrëset"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Shfaq vetëm të humburat"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Shfaq vetëm postën zanore"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Shfaqi të gjitha telefonatat"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Shto një ndërprerje 2-sekondëshe"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Shto një pritje"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Cilësimet"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simuluesi"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Të gjitha kontaktet"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Përdor bllokun e tasteve"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Kthehu te telefonata"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Shto një telefonatë"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Telefonatat hyrëse"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Luaj postën zanore"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Shiko kontaktin <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Telefono <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Krijo një shkurtore për ndërfaqen e re të përdoruesit"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Po hyn në modalitetin e veprimit në masë"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"U largove nga modaliteti i veprimit në masë"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"U zgjodh <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Zgjedhja e <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> u anulua"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Detajet e kontaktit për <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Detajet e kontaktit për telefonuesin e dyshuar si të padëshiruar <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> telefonata."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Telefonatë me video."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Dërgo SMS te <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Postë zanore e padëgjuar"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Nis kërkimin me zë"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Telefono <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Posta zanore"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min. e <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"posta zanore"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"postat zanore"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Po"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Jo"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Të fshihen <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> të zgjedhura?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulo modalitetin e veprimeve në grup"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Fshi"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulo"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> të zgjedhura"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Të fshihen këto posta zanore? "</b>"</item>
+      <item quantity="one">"<b>"Të fshihet kjo postë zanore? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> në <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Ky numër nuk mund të telefonohet"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Për të konfiguruar postën zanore, shko te \"Menyja\" &gt; \"Cilësimet\"."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Për të shtuar një postë zanore, në fillim çaktivizo modalitetin \"në aeroplan\"."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Po ngarkon..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Po ngarkon nga karta SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontaktet e kartës SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Nuk mund të përdoret asnjë aplikacion për kontaktet"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Kërkimi me zë nuk mundësohet"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefonata nuk mund të bëhet sepse aplikacioni \"Telefoni\" është i çaktivizuar."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kërko për kontakte"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Shto një numër ose kërko te kontaktet"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Historiku i telefonatave është bosh"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Bëj një telefonatë"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Nuk ke thirrje të humbura."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kutia hyrëse e postës tënde zanore është bosh."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Shfaq vetëm të preferuarat"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historiku i telefonatave"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Të gjitha"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Të humbura"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Posta zanore"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Telefonatë e shpejtë"</string>
     <string name="tab_history" msgid="7420269368689503596">"Historiku i telefonatave"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktet"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Posta zanore"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"U hoq nga të preferuarat"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Zhbëj"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telefono <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Krijo një kontakt të ri"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Shto te një kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Dërgo SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Bëj një telefonatë me video"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blloko numrin"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> telefonata të reja të humbura"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Askush nuk është ende në thirrjen tënde të shpejtuar"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Shto një të preferuar"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Nuk ke ende kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Shto një kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Prek imazhin për të parë të gjithë numrat ose mbaje të shtypur për ta pozicionuar përsëri"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Hiq"</string>
+    <string name="select_all" msgid="408601760696146245">"Zgjidh të gjitha"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Telefonatë me video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Dërgo një mesazh"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Detajet e telefonatës"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Telefono <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Telefono me video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Dëgjo postën zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Luaj postën zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Ndërprit postën zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Fshi postën zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> posta të reja zanore</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> postë e re zanore</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Krijo një kontakt për <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Shtoje <xliff:g id="NAMEORNUMBER">^1</xliff:g> te një kontakt ekzistues"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Detajet e telefonatës për <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"U fshi nga historiku i telefonatave"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Sot"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dje"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Më të vjetra"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Lista e telefonatave"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktivizo altoparlantin."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Çaktivizo altoparlantin."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Luaj më shpejt."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Luaj më ngadalë."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Nis ose ndërprit luajtjen."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Opsionet e paraqitjes"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Tingujt dhe dridhjet"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Telefonatat"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bllokimi i telefonatave"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Posta zanore"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Zgjidh SIM për postën zanore"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bllokimi i telefonatave është përkohësisht joaktiv"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Bllokimi i telefonatave është çaktivizuar sepse kontaktove me shërbimet e urgjencës nga ky telefon brenda 48 orëve të fundit. Ai do të riaktivizohet automatikisht pas skadimit të periudhës prej 48 orë."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importo numrat"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Numrat e bllokuar"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> është i bllokuar tashmë."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Llogaritë e telefonatave"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktivizo"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Cakto lejet"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Për të aktivizuar thirrjen e shpejtuar, aktivizo lejen e Kontakteve."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Për të parë evidencën e telefonatave, aktivizo lejen e Telefonit."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Për të parë kontaktet, aktivizo lejen e Kontakteve."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Për të pasur qasje në postën zanore, aktivizo lejen e Telefonit."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Për të kërkuar kontaktet, aktivizo lejet e Kontakteve"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Për të kryer një telefonatë, aktivizo lejen e Telefonit."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacionet e telefonit nuk kanë leje të shkruajnë në cilësimet e sistemit."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"E bezdisshme"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> është jashtë linje dhe nuk mund të kontaktohet"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Rreth"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkriptuar nga Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google po transkripton..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkripti nuk ofrohet"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Shiko"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sr/strings.xml b/java/com/android/dialer/app/res/values-sr/strings.xml
index 0def958..e9a6b24 100644
--- a/java/com/android/dialer/app/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/res/values-sr/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефонска тастатура"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Телефон"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Историја позива"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Пријави нетачан број"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Копирај број"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Копирај транскрипцију"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Блокирај број"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Деблокирај број"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Измени број пре позива"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Обриши историју позива"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Избриши говорну поруку"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Желите да обришете историју позива?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ово ће избрисати све позиве из историје"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Брише се историја позива…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Телефон"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуштен позив"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуштен позив за Work"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуштени позиви"</string>
@@ -49,107 +44,67 @@
       <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> говорне поруке </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> говорних порука </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Пусти"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова говорна порука од <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Пуштање говорне поште није успело"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Говорна пошта се учитава…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Говорна пошта се архивира…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Учитавање говорне поште није успело"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Само позиви са говорном поштом"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Само долазни позиви"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Само одлазни позиви"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Само пропуштени позиви"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"претражи"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"бирање"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"број за бирање"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Покретање или заустављање репродукције"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Укључивање или искључивање спикерфона"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Тражење позиције у репродукцији"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Смањивање брзине репродукције"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Повећавање брзине репродукције"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Историја позива"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Још опција"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"тастатура"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Прикажи само одлазне"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Прикажи само долазне"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Прикажи само пропуштене"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Прикажи само говорне поруке"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Прикажи све позиве"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Додај паузу од 2 секунде"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Додај чекање"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Подешавања"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Сви контакти"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Употребите бројчаник за тонско бирање"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Врати се на позив који је у току"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Додај позив"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Долазни позиви"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Пуштање говорне поште"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Прикажи контакт <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Позови <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Направите пречицу за нови UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Улазите у режим групних радњи"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Изашли сте из режима групних радњи"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Изабрано је <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Опозван је избор <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Детаљи о контакту за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Контакт информације потенцијалног непожељног позиваоца <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> позива."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Видео позив."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Слање SMS-а за <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непреслушана говорна пошта"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Покретање гласовне претраге"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Говорна пошта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"говорну поруку"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"говорне поруке"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Да"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Не"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Желите ли да избришете изабрану(е) <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажите режим групних радњи"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Изабраних: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+      <item quantity="few">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+      <item quantity="other">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Није могуће позвати овај број"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Да бисте подесили говорну пошту, идите у Мени &gt; Подешавања."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Да бисте позвали говорну пошту, прво искључите режим рада у авиону."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Учитава се…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Учитава се са SIM картице…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Контакти на SIM картици"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Нема доступне апликације за контакте"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовна претрага није доступна"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Није могуће упутити телефонски позив јер је апликација Телефон онемогућена."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Претражи контакте"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Додајте број или претражите контакте"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Историја позива је празна"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Позови"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Немате ниједан пропуштен позив."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Пријемно сандуче говорне поште је празно."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Прикажи само омиљене"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Историја позива"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Сви"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Пропуштени"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Говорна пошта"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Брзо бирање"</string>
     <string name="tab_history" msgid="7420269368689503596">"Историја позива"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Говорна пошта"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Уклоњено је из омиљених"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Опозови"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Направи нови контакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додај у контакт"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Пошаљи SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Упути видео позив"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокирај број"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Нових пропуштених позива: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Немате ниједан контакт на брзом бирању"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додај омиљен контакт"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Још увек немате ниједан контакт"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Додај контакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Додирните слику да бисте видели све бројеве или додирните и задржите да бисте им променили распоред"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Уклони"</string>
+    <string name="select_all" msgid="408601760696146245">"Изабери све"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео позив"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Пошаљи поруку"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Детаљи позива"</string>
@@ -165,26 +120,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Позови <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Упутите видео позив контакту <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Пусти говорну пошту од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Репродукуј говорну пошту контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Паузирај говорну пошту контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Избриши говорну пошту контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> нова порука говорне поште</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> нове поруке говорне поште</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> нових порука говорне поште</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Направите контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Додајте <xliff:g id="NAMEORNUMBER">^1</xliff:g> постојећем контакту"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Детаљи позива за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Избрисано из историје позива"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Данас"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Јуче"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Старији"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Листа позива"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Укључите звучник."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Искључите звучник."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Бржа репродукција."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Спорија репродукција."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Започните или паузирајте репродукцију."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Опције приказа"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибрација"</string>
@@ -201,7 +144,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Позиви"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање позива"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Избор SIM-а – подешав. гов. поште"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирање позива је привремено искључено"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирање позива је онемогућено зато што сте контактирали службе за помоћ у хитним случајевима са овог телефона у последњих 48 сати. Аутоматски ће бити поново омогућено када истекне период од 48 сати."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези бројеве"</string>
@@ -215,12 +157,8 @@
     <string name="block_list" msgid="4701585783411870782">"Блокирани бројеви"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> је већ блокиран."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Налози за позивање"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Укључи"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Подеси дозволе"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Да бисте омогућили брзо бирање, укључите дозволу за Контакте."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Да бисте видели евиденцију позива, укључите дозволу за Телефон."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Да бисте видели контакте, укључите дозволу за Контакте."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Да бисте приступили говорној пошти, укључите дозволу за Телефон."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Да бисте претражили контакте, укључите дозволе за Контакте."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Да бисте упутили позив, укључите дозволу за Телефон."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Апликација Телефон нема дозволу за уписивање у системска подешавања."</string>
@@ -232,4 +170,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Непожељан"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> је офлајн и не можете да га/је контактирате"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Основни подаци"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипт је направио Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google прави транскрипт…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Транскрипт није доступан"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Прикажи"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Позив је избрисан. Прегледајте и избришите прилоге дељене током овог позива у Messages-у."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Позиви су избрисани. Прегледајте и избришите прилоге дељене током позива у Messages-у."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sv/strings.xml b/java/com/android/dialer/app/res/values-sv/strings.xml
index 75aa731..86217cd 100644
--- a/java/com/android/dialer/app/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/res/values-sv/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonens knappsats"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Samtalshistorik"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Rapportera fel nummer"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopiera nummer"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopiera transkription"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Blockera nummer"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Häv blockeringen av numret"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redigera nummer före samtal"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Rensa samtalshistorik"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Radera röstmeddelande"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vill du rensa samtalshistoriken?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Alla samtal raderas från historiken"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Rensar samtalshistoriken ..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Ringa"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missat samtal"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missat jobbsamtal"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missade samtal"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> röstmeddelanden </item>
       <item quantity="one">röstmeddelande</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Spela upp"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nytt röstmeddelande från <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Det gick inte att spela upp röstmeddelandet"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Läser in röstmeddelande ..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Arkiverar röstmeddelande ..."</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Det gick inte att läsa in röstmeddelandet"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Endast samtal med röstmeddelande"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Endast inkommande samtal"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Endast utgående samtal"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Endast missade samtal"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"sök"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ring upp"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nummer att ringa"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Starta eller stoppa uppspelning"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå på eller av högtalartelefon"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Sök uppspelningsläge"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Minska uppspelningshastighet"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Öka uppspelningshastighet"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Samtalshistorik"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Fler alternativ"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"knappsats"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Visa endast utgående samtal"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Visa endast inkommande samtal"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Visa endast missade samtal"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Visa bara röstmeddelanden"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Visa alla samtal"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Lägg till en paus på 2 sek."</string>
-    <string name="add_wait" msgid="1177723010768282578">"Lägg till väntetid"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Inställningar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Alla kontakter"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Använd tonvalstelefon"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Återvänd till pågående samtal"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Lägg t. samt."</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Inkommande samtal"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Spela upp röstmeddelande"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Visa kontakten <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ring <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skapa genväg till anv.gränssn."</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Öppnar läget för massåtgärd"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Stängde läget för massåtgärd"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Markerade <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Avmarkerade <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Kontaktuppgifter för <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktuppgifter för misstänkt spamsamtal <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtal."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Videosamtal."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Skicka sms till <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Ej hört röstmeddelande"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Starta röstsökning"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Röstbrevlåda"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sekund"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"röstbrevlåda"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"röstmeddelanden"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ja"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Nej"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Vill du radera markerade <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt läget för massåtgärd"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Radera"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> har markerats"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Vill du ta bort dessa röstmeddelanden? "</b>"</item>
+      <item quantity="one">"<b>"Vill du ta bort det här röstmeddelandet? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Det går inte att ringa det här numret"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Välj Meny &gt; Inställningar om du vill konfigurera röstbrevlådan."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Om du vill ringa röstbrevlådan måste du först inaktivera flygplansläget."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Läser in …"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI-kod"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Läser in från SIM-kort…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Kontakter från SIM-kort"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Det finns inga appar för kontakter"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Röstsökning är inte tillgänglig"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Det går inte att ringa eftersom appen Telefon har inaktiverats."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Sök efter kontakter"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Ange nummer eller kontakt"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Samtalshistoriken är tom"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Ring ett samtal"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har inga missade samtal."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Din röstbrevlåda är tom."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Visa endast favoriter"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Samtalshistorik"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Alla"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Missade"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Röstbrevlåda"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Kortnummer"</string>
     <string name="tab_history" msgid="7420269368689503596">"Samtalshistorik"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Röstbrevlåda"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Borttagen från favoriter"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Ångra"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Skapa ny kontakt"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lägg till i kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Skicka sms"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Ring videosamtal"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blockera nummer"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> nya missade samtal"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen kontakt som snabbval ännu"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lägg till en favorit"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Du har inga kontakter ännu"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Lägg till en kontakt"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tryck på bilden för att visa alla nummer eller tryck länge för att ändra ordningen"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Ta bort"</string>
+    <string name="select_all" msgid="408601760696146245">"Markera alla"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Videosamtal"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Skicka ett meddelande"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Samtalsinfo"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Ring videosamtal till <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lyssna på ett röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Spela upp röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Pausa röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Radera röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nya röstmeddelanden</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nytt röstmeddelande</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Skapa en kontakt för <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Lägg till <xliff:g id="NAMEORNUMBER">^1</xliff:g> i befintliga kontakter"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Samtalsinformation för <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Har raderats från samtalshistoriken"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Äldre"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Samtalslista"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på högtalaren."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Stäng av högtalaren."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Spela upp snabbare."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Spela upp långsammare."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Starta eller pausa uppspelning."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativ"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ljud och vibration"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Samtal"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Samtalsblockering"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Röstbrevlåda"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Välj SIM för röstbrevlåda"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blockeringen har inaktiverats tillfälligt"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Samtalsblockering har inaktiverats eftersom du ringde ett larmnummer från den här mobilen under de senaste 48 timmarna. Blockeringen aktiveras igen när 48 timmar har gått."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importera nummer"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Blockerade nummer"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> är redan blockerat."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Konton för samtal"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aktivera"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Ange behörigheter"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Du måste aktivera behörigheten Kontakter för att kunna använda snabbuppringning."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Du måste aktivera behörigheten Telefon för att kunna visa samtalsloggen."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Du måste aktivera behörigheten Kontakter för att kunna visa kontakterna."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Du måste aktivera behörigheten Telefon för att kunna komma åt röstmeddelanden."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Aktivera behörigheter för Kontakter om du vill söka bland kontakterna."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Du måste aktivera behörigheten Telefon för att kunna ringa."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har inte skrivbehörighet i systeminställningarna."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> är offline och går inte att nå"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkriberat av Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkriberar …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkription inte tillgänglig"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Visa"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Samtalet har raderats. Visa och radera bilagor som delats under samtalet i Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Samtalen har raderats. Visa och radera bilagor som delats under samtal i Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sw/strings.xml b/java/com/android/dialer/app/res/values-sw/strings.xml
index d3b8392..2eca65e 100644
--- a/java/com/android/dialer/app/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/res/values-sw/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Simu"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Vitufe vya Simu"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Simu"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Rekodi ya simu zilizopigwa"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Ripoti nambari isiyo sahihi"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Nakili nambari"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Nakili unukuzi"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Zuia nambari"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Ondolea nambari kizuizi"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Badilisha nambari kabla ya kupiga simu"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Futa rekodi ya simu zilizopigwa"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Futa ujumbe wa sauti"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Rekodi ya simu zilizopigwa ifutwe?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Hatua hii itafuta rekodi yote ya simu"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Inafuta rekodi ya simu zilizopigwa..."</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Simu"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Simu uliyokosa"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Simu ya kazini ambayo hukujibu"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Simu zisizojibiwa"</string>
@@ -48,107 +43,66 @@
       <item quantity="other">Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa sauti </item>
       <item quantity="one">Ujumbe wa sauti</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Cheza"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Barua mpya ya sauti kutoka <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Haikuweza kucheza ujumbe wa sauti"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Inapakia ujumbe wa sauti..."</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ujumbe unawekwa kwenye kumbukumbu…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Haikuweza kupakia ujumbe wa sauti"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Simu zilizo na ujumbe wa sauti tu"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Simu zinazoingia tu"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Simu zinazotoka tu"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Simu zisizojibiwa tu"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"tafuta"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"piga simu"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"nambari ya kupiga"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Cheza au usimamishe uchezaji wa ujumbe wa sauti"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Washa au uzime spika ya simu"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Tafuta sehemu ya kucheza ujumbe wa sauti"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Punguza kasi ya kucheza ujumbe wa sauti"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Ongeza kasi ya kucheza ujumbe wa sauti"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Rekodi ya simu zilizopigwa"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Chaguo zaidi"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"vitufe vya simu"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Onyesha zinazotoka pekee"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Onyesha zinazoingia pekee"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Onyesha zilizokosa kupokewa pekee"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Onyesha barua za sauti pekee"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Onyesha simu zote"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Ongeza usitishaji wa sekunde 2"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Ongeza kusubiri"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Mipangilio"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Kielelezo"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Anwani zote"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tumia kibao cha kuchapa cha sauti na kugusa"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Rudi kwa simu inayoendelea"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Ongeza simu"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Simu zinazoingia"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Sikiliza ujumbe wa sauti"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Angalia anwani <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Pigia <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Unda Mkato Mpya wa Kiolesura"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Unaingia katika hali ya kutekeleza vitendo vingi"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Umeondoka katika hali ya kutekeleza vitendo vingi"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Umeteua <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Umebatilisha uteuzi wa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Maelezo ya <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Maelezo ya mawasiliano ya anayeshukiwa kupiga simu taka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Simu <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Hangout ya video."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Tuma SMS kwa <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Barua sauti ambayo haijasikizwa"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Anza kutafuta kwa kutamka"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Ujumbe wa sauti"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"Sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"Dak <xliff:g id="MINUTES">%s</xliff:g> sek <xliff:g id="SECONDS">%s</xliff:g>"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ujumbe wa sauti"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ujumbe wa sauti"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ndiyo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hapana"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Je, ungependa kufuta <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> uliochagua?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ghairi hali ya kutekeleza vitendo vingi"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Futa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ghairi"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> zimechaguliwa"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Je, unataka kufuta kila ujumbe wa sauti ulioonyeshwa? "</b>"</item>
+      <item quantity="one">"<b>"Je, unataka kufuta ujumbe huu wa sauti? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> saa <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Haiwezi kupiga simu kwa nambari hii"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Ili kuweka mipangilio ya ujumbe wa sauti, nenda kwenye Menyu &gt; Mipangilio."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Ili usikilize ujumbe wa sauti, kwanza zima Hali ya Ndegeni."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Inapakia…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Inapakia kutoka SIM kadi..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Anwani za SIM kadi"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Hakuna programu za mawasiliano zinazopatikana"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Kutafuta kwa kutamka hakupatikani"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Haiwezi kupiga simu kwa sababu programu ya Simu imezimwa."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Tafuta anwani"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Ongeza nambari au utafute anwani"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Rekodi yako ya simu zilizopigwa haina chochote"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Piga simu"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Huna simu ulizokosa kupokea"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kikasha chako cha ujumbe wa sauti hakina ujumbe."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Onyesha zinazopendwa tu"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Historia ya Simu"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Zote"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Ambazo hazikupokewa"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Ujumbe wa sauti"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Unaowasiliana nao zaidi"</string>
     <string name="tab_history" msgid="7420269368689503596">"Rekodi ya Simu Zilizopigwa"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Anwani zote"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Ujumbe wa sauti"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Imeondolowa kwenye vipendwa"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Tendua"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ongeza anwani mpya"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ongeza kwenye anwani"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Tuma SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Piga Hangout ya video"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Zuia nambari"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Simu <xliff:g id="NUMBER">%s</xliff:g> za karibuni ambazo hazikujibiwa"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Hakuna mtu aliye katika orodha yako ya watu unaowasiliana nao zaidi"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ongeza anwani unazopenda zaidi"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Bado huna anwani zozote"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Ongeza anwani"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Gusa picha ili uone nambari zote ama uguse na kushikilia ili upange upya"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Ondoa"</string>
+    <string name="select_all" msgid="408601760696146245">"Chagua zote"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Hangout ya Video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Tuma SMS"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Maelezo ya simu"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Piga simu kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Hangout ya video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Sikiliza ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Cheza ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Sitisha ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Futa ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other">Ujumbe <xliff:g id="COUNT_1">%d</xliff:g> mpya wa sauti</item>
-      <item quantity="one">Ujumbe <xliff:g id="COUNT_0">%d</xliff:g> mpya wa sauti</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Unda anwani ya <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ongeza <xliff:g id="NAMEORNUMBER">^1</xliff:g> kwenye anwani iliyopo"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Maelezo ya simu ya <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Ilifutwa kutoka rekodi ya simu zilizopigwa"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Leo"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jana"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Nzee zaidi"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Orodha ya simu"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Washa spika."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Zima spika."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Cheza kwa kasi zaidi."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Cheza polepole."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Anzisha au usitishe kucheza."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Chaguo za kuonyesha"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sauti na mtetemo"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Simu zilizopigwa"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kuzuia simu"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Ujumbe wa sauti"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Chagua SIM ya mipangilio ya ujumbe wa sauti"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kuzuia simu kumezimwa kwa muda"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kipengele cha kuzuia simu kimezimwa kwa sababu uliwasiliana na huduma za dharura kwenye simu hii ndani ya saa 48 zilizopita. Kipengele hiki kitawashwa kiotomatiki baada ya kipindi cha saa 48 kumalizika."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Leta nambari"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Nambari zilizozuiwa"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> tayari imezuiwa."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Akaunti za simu"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Washa"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Weka ruhusa"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Ili kuwasha kipengele cha unaowasiliana nao zaidi, washa ruhusa ya Anwani."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Ili uone rekodi yako ya nambari za simu, washa ruhusa ya Simu."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Ili uone anwani zako, washa ruhusa ya Anwani."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Ili ufikie ujumbe wako wa sauti, washa ruhusa ya Simu."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Ili utafute anwani zako, washa ruhusa za Anwani."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Ili upige simu, washa ruhusa ya Simu."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Programu ya simu haina ruhusa ya kuandika kwenye mipangilio ya mfumo."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Taka"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> hayuko mtandaoni na hapatikani"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Kuhusu"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Unukuzi umefanywa na Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google inanukuu …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Nukuu haipatikani"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Angalia"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo haya ya simu katika Programu ya Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo ya simu katika Programu ya Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ta/strings.xml b/java/com/android/dialer/app/res/values-ta/strings.xml
index afb852b..6c2e64e 100644
--- a/java/com/android/dialer/app/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/res/values-ta/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ஃபோன்"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ஃபோன் விசைத்தளம்"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ஃபோன்"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"அழைப்பு பதிவு"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"தவறான எண் எனப் புகாரளி"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"எண்ணை நகலெடு"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"டிரான்ஸ்கிரிப்ஷனை நகலெடு"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"எண்ணைத் தடு"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"எண்ணை அனுமதி"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"அழைக்கும் முன் எண்ணை மாற்று"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"அழைப்பு வரலாற்றை அழி"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"குரலஞ்சலை நீக்கு"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"அழைப்பு பதிவை அழிக்கவா?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"பதிவிலிருந்து எல்லா அழைப்புகளும் நீக்கப்படும்"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"அழைப்பு வரலாற்றை அழிக்கிறது…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ஃபோன்"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"தவறிய அழைப்பு"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"தவறிய அழைப்பு (பணி)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"தவறிய அழைப்புகள்"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> குரலஞ்சல்கள் </item>
       <item quantity="one">குரலஞ்சல்</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"இயக்கு"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> இன் புதிய குரலஞ்சல்"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"குரலஞ்சலை இயக்க முடியவில்லை"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"குரலஞ்சலை ஏற்றுகிறது…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"குரலஞ்சலைக் காப்பகப்படுத்துகிறது…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"குரலஞ்சலை ஏற்ற முடியவில்லை"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"குரலஞ்சலுடனான அழைப்புகள் மட்டும்"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"உள்வரும் அழைப்புகள் மட்டும்"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"வெளிச்செல்லும் அழைப்புகள் மட்டும்"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"தவறிய அழைப்புகள் மட்டும்"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"தேடு"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"டயல்"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"டயல் செய்வதற்கான எண்"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"பிளேபேக்கை இயக்கு அல்லது நிறுத்து"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"ஸ்பீக்கர்போனை இயக்கு அல்லது முடக்கு"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"பிளேபேக் நிலையைத் தேடு"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"பிளேபேக் விகிதத்தைக் குறை"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"பிளேபேக் விகிதத்தை அதிகரி"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"அழைப்பு வரலாறு"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"மேலும் விருப்பங்கள்"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"விசைத்தளம்"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"வெளிச்செல்லுவதை மட்டும் காட்டு"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"உள்வருவதை மட்டும் காட்டு"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"தவறியதை மட்டும் காட்டு"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"குரலஞ்சல்களை மட்டும் காட்டு"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"எல்லா அழைப்புகளையும் காட்டு"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-வினாடி இடைநிறுத்தத்தைச் சேர்"</string>
-    <string name="add_wait" msgid="1177723010768282578">"காத்திருப்பைச் சேர்"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"அமைப்பு"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"சிமுலேட்டர்"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"எல்லா தொடர்புகளும்"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"டச் டோன் விசைப்பலகையைப் பயன்படுத்தவும்"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"செயலிலுள்ள அழைப்பிற்குத் திரும்பு"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"அழைப்பைச் சேர்"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"உள்வரும் அழைப்புகள்"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"குரலஞ்சலை இயக்கு"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> தொடர்பைக் காட்டு"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> ஐ அழை"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"புதிய UI குறுக்குவழியை உருவாக்கு"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"மொத்தச் செயல் பயன்முறையில் நுழைகிறீர்கள்"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"மொத்தச் செயல் பயன்முறையிலிருந்து வெளியேறிவிட்டீர்கள்"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"தேர்ந்தெடுத்த <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"தேர்வுநீக்கிய <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> க்கான தொடர்பு விவரங்கள்"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர் <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>க்கான தொடர்பு விவரங்கள்"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> அழைப்புகள்."</string>
     <string name="description_video_call" msgid="3738199365585751727">"வீடியோ அழைப்பு."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>க்கு SMS அனுப்பு"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"கேட்கப்படாத குரலஞ்சல்"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"குரல் தேடலைத் தொடங்கு"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> ஐ அழை"</string>
     <string name="voicemail" msgid="8899540969000957954">"குரலஞ்சல்"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> வி"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> நிமிடம் <xliff:g id="SECONDS">%s</xliff:g> வினாடி"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"குரலஞ்சல்"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"குரலஞ்சல்கள்"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ஆம்"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"வேண்டாம்"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"தேர்ந்தெடுத்த <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ஐ நீக்கவா?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"தொகுப்புச் செயல்கள் பயன்முறையை ரத்துசெய்யும்"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"நீக்கு"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ரத்துசெய்"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டன"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"இந்தக் குரலஞ்சல்களை நீக்கவா? "</b>"</item>
+      <item quantity="one">"<b>"இந்தக் குரலஞ்சலை நீக்கவா? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> அன்று <xliff:g id="TIME">%2$s</xliff:g> மணிக்கு"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"இந்த எண்ணை அழைக்க முடியாது"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"குரலஞ்சலை அமைக்க, மெனு &gt; அமைப்புகள் என்பதற்குச் செல்லவும்."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"குரலஞ்சலை அழைப்பதற்கு, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"ஏற்றுகிறது..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"சிம் கார்டிலிருந்து ஏற்றுகிறது…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"சிம் கார்டின் தொடர்புகள்"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"தொடர்புகள் பயன்பாடு எதுவுமில்லை"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"குரல் தேடல் இல்லை"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Phone பயன்பாடு முடக்கப்பட்டுள்ளதால், ஃபோன் அழைப்பைச் செய்ய முடியாது."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"தொடர்புகளைத் தேடு"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"எண்ணைச் சேர்க்கவும் அல்லது தொடர்புகளில் தேடவும்"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"அழைப்பு வரலாறு காலியாக உள்ளது"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"அழை"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"தவறிய அழைப்புகள் இல்லை."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"குரலஞ்சல் இன்பாக்ஸ் காலியாக உள்ளது."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"பிடித்தவற்றை மட்டும் காட்டு"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"அழைப்பு பட்டியல்"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"எல்லாம்"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"தவறியவை"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"குரலஞ்சல்"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"விரைவு டயல்"</string>
     <string name="tab_history" msgid="7420269368689503596">"அழைப்பு வரலாறு"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"தொடர்புகள்"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"குரலஞ்சல்"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"பிடித்தவற்றிலிருந்து அகற்றப்பட்டது"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"செயல்தவிர்"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ஐ அழை"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"புதிய தொடர்பை உருவாக்கு"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"தொடர்பில் சேர்"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS அனுப்பு"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"வீடியோவில் அழை"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"எண்ணைத் தடு"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> புதிய தவறிய அழைப்புகள்"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"இன்னும் விரைவு டயலில் யாரையும் சேர்க்கவில்லை"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"முக்கியமானவர்களைச் சேர்"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"இதுவரை எந்தத் தொடர்புகளும் இல்லை"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ஒரு தொடர்பைச் சேர்க்கவும்"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"எல்லா எண்களையும் பார்க்க, படத்தைத் தொடவும் அல்லது மறுவரிசைப்படுத்த, தொட்டுப் பிடித்திருக்கவும்"</string>
     <string name="remove_contact" msgid="2353580570488923668">"அகற்று"</string>
+    <string name="select_all" msgid="408601760696146245">"அனைத்தையும் தேர்ந்தெடு"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"வீடியோ அழைப்பு"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"செய்தி அனுப்பவும்"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"அழைப்பு விவரங்கள்"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ அழை"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ வீடியோவில் அழைக்கும்."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் குரலஞ்சலைக் கேள்"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் குரலஞ்சலை இயக்கும்"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் குரலஞ்சலை இடைநிறுத்தும்"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் குரலஞ்சலை நீக்கும்"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> புதிய குரலஞ்சல்கள்</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> புதிய குரலஞ்சல்</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>க்கான தொடர்பை உருவாக்கும்"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"இருக்கும் தொடர்பில் <xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐச் சேர்க்கும்"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் அழைப்பு விவரங்கள்"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"அழைப்பு வரலாற்றிலிருந்து நீக்கப்பட்டது"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"இன்று"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"நேற்று"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"பழையது"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"அழைப்புகள் பட்டியல்"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"ஸ்பீக்கரை இயக்கு."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ஸ்பீக்கரை முடக்கு."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"வேகமாக இயக்கு."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"மெதுவாக இயக்கு."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"பிளேபேக்கைத் தொடங்கு அல்லது இடைநிறுத்து."</string>
     <string name="display_options_title" msgid="3880091801055797975">"காட்சி விருப்பத்தேர்வு"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ஒலிகளும் அதிர்வும்"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"அழைப்புகள்"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"அழைப்புத் தடுப்பு"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"குரலஞ்சல்"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"குரலஞ்சல் அமைப்பிற்கு, சிம் தேர்வுசெய்க"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"அழைப்புத் தடுப்பு அம்சம் தற்காலிகமாக முடக்கப்பட்டுள்ளது"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"கடந்த 48 மணிநேரத்தில், இந்த ஃபோனிலிருந்து அவசர அழைப்பு எண்ணைத் தொடர்புகொண்டதால் அழைப்புத் தடுப்பு அம்சம் முடக்கப்பட்டுள்ளது. 48 மணிநேரம் கழித்து, இந்த அம்சம் தானாகவே மீண்டும் இயக்கப்படும்."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"எண்களை இறக்கு"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"தடுக்கப்பட்ட எண்கள்"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ஏற்கனவே தடுக்கப்பட்டுள்ளது."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"அழைப்பு கணக்குகள்"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"இயக்கு"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"அனுமதிகளை அமை"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"விரைவு டயலை இயக்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"அழைப்புப் பதிவைப் பார்க்க, ஃபோன் அனுமதியை இயக்கவும்."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"தொடர்புகளைப் பார்க்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"குரலஞ்சலை அணுக, ஃபோன் அனுமதியை இயக்கவும்."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"தொடர்புகளைத் தேட, தொடர்புகள் அனுமதிகளை இயக்கவும்."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"அழைக்க, ஃபோன் அனுமதியை இயக்கவும்."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"முறைமை அமைப்புகளில் எழுதுவதற்கான அனுமதி ஃபோன் பயன்பாட்டுக்கு இல்லை."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"ஸ்பேம்"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ஆஃப்லைனில் உள்ளதால், தொடர்புகொள்ள முடியாது"</string>
     <string name="about_phone_label" msgid="582991354677973731">"அறிமுகம்"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google டிரான்ஸ்கிரைப் செய்தது"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google டிரான்ஸ்கிரைப் செய்கிறது …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"டிரான்ஸ்கிரிப்ட் இல்லை"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"காட்டு"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"அழைப்பு நீக்கப்பட்டது. இந்த அழைப்பின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"அழைப்புகள் நீக்கப்பட்டன. அழைப்புகளின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-te/strings.xml b/java/com/android/dialer/app/res/values-te/strings.xml
index ffc046f..1404197 100644
--- a/java/com/android/dialer/app/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/res/values-te/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"ఫోన్"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ఫోన్ కీప్యాడ్"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"ఫోన్"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"కాల్ చరిత్ర"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"సరికాని నంబర్‌ను నివేదించు"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"నంబర్‌ను కాపీ చేయి"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"లిప్యంతరీకరణను కాపీ చేయి"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"నంబర్‌ను బ్లాక్ చేయి"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"నంబర్‌ను అన్‌బ్లాక్ చేయి"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"కాల్ చేయడానికి ముందు నంబర్‌ను సవరించు"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"కాల్ చరిత్రను క్లియర్ చేయి"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"వాయిస్ మెయిల్‌ను తొలగించు"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"కాల్ చరిత్రను తీసివేయాలా?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"దీని వలన మీ చరిత్ర నుండి అన్ని కాల్‌లు తొలగించబడతాయి"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"కాల్ చరిత్రను క్లియర్ చేస్తోంది…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"ఫోన్"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"మిస్డ్ కార్యాలయ కాల్"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"మిస్డ్ కాల్‌లు"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> వాయిస్ మెయిల్‌లు </item>
       <item quantity="one">వాయిస్ మెయిల్</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"ప్లే చేయి"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> నుండి కొత్త వాయిస్ మెయిల్"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"వాయిస్ మెయిల్‌ను ప్లే చేయడం సాధ్యపడలేదు"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"వాయిస్ మెయిల్‌ను లోడ్ చేస్తోంది…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"వాయిస్ మెయిల్‌ను ఆర్కైవ్ చేస్తోంది…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"వాయిస్ మెయిల్‌ను లోడ్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"వాయిస్ మెయిల్ కాల్‌లు మాత్రమే"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"ఇన్‌కమింగ్ కాల్‌లు మాత్రమే"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"అవుట్‌గోయింగ్ కాల్‌లు మాత్రమే"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"సమాధానం ఇవ్వని కాల్‌లు మాత్రమే"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"శోధించు"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"డయల్ చేయి"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"డయల్ చేయాల్సిన నంబర్"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"ప్లేబ్యాక్‌ని ప్లే చేయి లేదా ఆపివేయి"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"స్పీకర్‌ఫోన్‌ను స్విచ్ ఆన్ లేదా స్విచ్ ఆఫ్ చేయి"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"ప్లేబ్యాక్ స్థానాన్ని కావాల్సిన చోటుకి జరపండి"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ప్లేబ్యాక్ రేటుని తగ్గించు"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"ప్లేబ్యాక్ రేటుని పెంచు"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"కాల్ చరిత్ర"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"మరిన్ని ఎంపికలు"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"కీ ప్యాడ్"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"అవుట్‌గోయింగ్ మాత్రమే చూపు"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"ఇన్‌కమింగ్ మాత్రమే చూపు"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"సమాధానం ఇవ్వనివి మాత్రమే చూపు"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"వాయిస్ మెయిల్‌లు మాత్రమే చూపు"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"అన్ని కాల్‌లను చూపు"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2-సెకన్ల పాజ్‌ను జోడించండి"</string>
-    <string name="add_wait" msgid="1177723010768282578">"నిరీక్షణ సమయాన్ని జోడించు"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"సెట్టింగ్‌లు"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"సిములేటర్"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"అన్ని పరిచయాలు"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"టచ్ టోన్ కీప్యాడ్‌ను ఉపయోగించండి"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"ప్రోగ్రెస్‌లో ఉన్న కాల్‌కు వెళ్లు"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"కాల్‌ను జోడించు"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"ఇన్‌కమింగ్ కాల్‌లు"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"వాయిస్ మెయిల్ ప్లే చేయండి"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> పరిచయాన్ని వీక్షించండి"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g>కు కాల్ చేయి"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"కొత్త UI సత్వరమార్గం సృష్టించు"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"బల్క్ చర్య మోడ్‌లోకి ప్రవేశిస్తున్నారు"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"బల్క్ చర్య మోడ్ నుండి నిష్క్రమించారు"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ఎంచుకోబడింది"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ఎంపిక తీసివేయబడింది"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> యొక్క సంప్రదింపు వివరాలు"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"అనుమానాస్పద స్పామ్ కాలర్ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> సంప్రదింపు వివరాలు"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> కాల్‌లు."</string>
     <string name="description_video_call" msgid="3738199365585751727">"వీడియో కాల్."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>కి SMS పంపు"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"వినని వాయిస్ మెయిల్"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"వాయిస్ శోధనను ప్రారంభించండి"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g>కు కాల్ చేయి"</string>
     <string name="voicemail" msgid="8899540969000957954">"వాయిస్ మెయిల్"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> నిమి <xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"వాయిస్ మెయిల్"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"వాయిస్ మెయిల్‌లు"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"అవును"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"వద్దు"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ఎంచుకున్న <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ను తొలగించాలా?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"సమూహ చర్యల మోడ్‌ను రద్దు చేస్తుంది"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"తొలగించు"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"రద్దు చేయి"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ఎంచుకోబడ్డాయి"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ఈ వాయిస్ మెయిల్‌లను తొలగించాలా? "</b>"</item>
+      <item quantity="one">"<b>"ఈ వాయిస్ మెయిల్‌ను తొలగించాలా? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>కి"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ఈ నంబర్‌కు కాల్ చేయలేరు"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"వాయిస్ మెయిల్ సెటప్ చేయడానికి, మెను &gt; సెట్టింగ్‌లకు వెళ్లండి."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"వాయిస్ మెయిల్‌కు కాల్ చేయడానికి, ముందుగా ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"లోడ్ చేస్తోంది…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"సిమ్ కార్డు నుండి లోడ్ చేస్తోంది…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"సిమ్ కార్డు పరిచయాలు"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"పరిచయాల అనువర్తనం ఏదీ అందుబాటులో లేదు"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"వాయిస్ శోధన అందుబాటులో లేదు"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ఫోన్ అనువర్తనం నిలిపివేయబడినందున ఫోన్ కాల్ చేయలేరు."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"పరిచయాలను శోధించు"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"నంబర్ జోడించండి లేదా పరిచయాల్లో శోధించండి"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"మీ కాల్ చరిత్ర ఖాళీగా ఉంది"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"కాల్ చేయి"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"మీరు సమాధానమివ్వని కాల్‌లు ఏవీ కలిగి లేరు."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"మీ వాయిస్‌మెయిల్ ఇన్‌బాక్స్ ఖాళీగా ఉంది."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"ఇష్టమైనవాటిని మాత్రమే చూపు"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"కాల్ చరిత్ర"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"అన్నీ"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"సమాధానం ఇవ్వనవి"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"వాయిస్ మెయిల్"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"స్పీడ్ డయల్"</string>
     <string name="tab_history" msgid="7420269368689503596">"కాల్ చరిత్ర"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"పరిచయాలు"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"వాయిస్ మెయిల్"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ఇష్టమైనవాటి నుండి తీసివేయబడింది"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"చర్య రద్దు చేయి"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>కు కాల్ చేయి"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"కొత్త పరిచయాన్ని సృష్టించు"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"పరిచయానికి జోడించు"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS పంపు"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"వీడియో కాల్ చేయండి"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"నంబర్‌ను బ్లాక్ చేయి"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> కొత్త సమాధానం ఇవ్వని కాల్‌లు"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"మీ స్పీడ్ డయల్‌లో ఇంకా ఎవరూ లేరు"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ఇష్టమైన వారిని జోడించండి"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"మీకు ఇప్పటికీ పరిచయాలేవీ లేవు"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"పరిచయాన్ని జోడించండి"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"అన్ని నంబర్‌లను చూడటానికి చిత్రాన్ని తాకండి లేదా క్రమం మార్చడానికి తాకి, కాసేపు అలాగే ఉంచండి"</string>
     <string name="remove_contact" msgid="2353580570488923668">"తీసివేయి"</string>
+    <string name="select_all" msgid="408601760696146245">"అన్నీ ఎంచుకోండి"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"వీడియో కాల్"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"సందేశాన్ని పంపు"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"కాల్ వివరాలు"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి కాల్ చేయి"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి వీడియో కాల్."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వచ్చిన వాయిస్ మెయిల్‌ను వినండి"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వచ్చిన వాయిస్ మెయిల్‌ను ప్లే చేయండి"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వచ్చిన వాయిస్ మెయిల్‌ను పాజ్ చేయండి"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వచ్చిన వాయిస్ మెయిల్‌ను తొలగించండి"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> కొత్త వాయిస్‌మెయిల్‌లు</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> కొత్త వాయిస్‌మెయిల్</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> కోసం పరిచయాన్ని సృష్టించండి"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ని ఇప్పటికే ఉన్న పరిచయానికి జోడించండి"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> యొక్క కాల్ వివరాలు"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"కాల్ చరిత్ర నుండి తొలగించబడింది"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ఈ రోజు"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"నిన్న"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"పాతది"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"కాల్‌ల జాబితా"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"స్పీకర్‌ను ఆన్ చేయి."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"స్పీకర్‌ను ఆఫ్ చేయి."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"వేగంగా ప్లే చేయి."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"నెమ్మదిగా ప్లే చేయి."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ప్లేబ్యాక్‌ను ప్రారంభించు లేదా పాజ్ చేయి."</string>
     <string name="display_options_title" msgid="3880091801055797975">"ప్రదర్శన ఎంపికలు"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ధ్వనులు మరియు వైబ్రేషన్"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"కాల్‌లు"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"కాల్ బ్లాక్ చేయడం"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"వాయిస్ మెయిల్"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"వాయిస్ మెయిల్ సెట్టింగ్‌ల కోసం SIM ఎంచుకోండి"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"కాల్ బ్లాకింగ్ తాత్కాలికంగా ఆఫ్ అయ్యింది"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"మీరు గత 48 గంటల వ్యవధిలో ఈ ఫోన్ నుండి అత్యవసర సేవలను సంప్రదించినందున కాల్ బ్లాకింగ్ నిలిపివేయబడింది. 48 గంటల వ్యవధి ముగిసిన తర్వాత ఇది స్వయంచాలకంగా పునఃప్రారంభించబడుతుంది."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"నంబర్‌లను దిగుమతి చేయి"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ఇప్పటికే బ్లాక్ చేయబడింది."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"కాల్ చేసే ఖాతాలు"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"ఆన్ చేయి"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"అనుమతులను సెట్ చేయి"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"స్పీడ్ డయల్‌ను ప్రారంభించడానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"మీ కాల్ లాగ్‌ను చూడటానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"మీ పరిచయాలను చూడటానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"మీ వాయిస్ మెయిల్‌ను ప్రాప్యత చేయడానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"కాల్ చేయడానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"సిస్టమ్ సెట్టింగ్‌లకు వ్రాయడం కోసం ఫోన్ అనువర్తనానికి అనుమతి లేదు."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"స్పామ్"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ఆఫ్‌లైన్‌లో ఉన్నందున వారిని చేరుకోవడం సాధ్యపడదు"</string>
     <string name="about_phone_label" msgid="582991354677973731">"పరిచయం"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google లిప్యంతరీకరించింది"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google లిప్యంతరీకరిస్తోంది …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"లిప్యంతరీకరణ అందుబాటులో లేదు"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"వీక్షించండి"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"కాల్ తొలగించబడింది. ఈ కాల్‌లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"కాల్ తొలగించబడింది. కాల్‌ల్లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-th/strings.xml b/java/com/android/dialer/app/res/values-th/strings.xml
index 13916a5..22c752c 100644
--- a/java/com/android/dialer/app/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/res/values-th/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"โทรศัพท์"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ปุ่มกดโทรศัพท์"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"โทรศัพท์"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"ประวัติการโทร"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"รายงานหมายเลขที่ไม่ถูกต้อง"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"คัดลอกหมายเลข"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"คัดลอกการถอดเสียงเป็นคำ"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"บล็อกหมายเลข"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"เลิกบล็อกหมายเลข"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"แก้ไขหมายเลขก่อนโทร"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"ล้างประวัติการโทร"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ลบข้อความเสียง"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ล้างประวัติการโทรไหม"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"การดำเนินการนี้จะลบการโทรทั้งหมดออกจากประวัติของคุณ"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"กำลังล้างประวัติการโทร…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"โทรศัพท์"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"สายที่ไม่ได้รับ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"มีสายจากที่ทำงานที่ไม่ได้รับ"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"สายที่ไม่ได้รับ"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ข้อความเสียง </item>
       <item quantity="one">ข้อความเสียง</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"เล่น"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ข้อความเสียงใหม่จาก <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"ไม่สามารถเล่นข้อความเสียงได้"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"กำลังโหลดข้อความเสียง…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"กำลังเก็บข้อความเสียง…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ไม่สามารถโหลดข้อความเสียงได้"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"เฉพาะสายที่มีข้อความเสียง"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"เฉพาะสายเรียกเข้า"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"เฉพาะสายโทรออก"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"เฉพาะสายที่ไม่ได้รับ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ค้นหา"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"หมุนหมายเลข"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"หมายเลขที่จะโทร"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"เล่นหรือหยุดเล่น"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"เปิดหรือปิดลำโพง"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"ค้นหาตำแหน่งการเล่น"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"ลดอัตราการเล่น"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"เพิ่มอัตราการเล่น"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"ประวัติการโทร"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"ตัวเลือกเพิ่มเติม"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ปุ่มกด"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"แสดงสายที่โทรออกเท่านั้น"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"แสดงสายโทรเข้าเท่านั้น"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"แสดงสายที่ไม่ได้รับเท่านั้น"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"แสดงเฉพาะข้อความเสียง"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"แสดงการโทรทั้งหมด"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"เพิ่มช่วงคั่น 2 วินาที"</string>
-    <string name="add_wait" msgid="1177723010768282578">"เพิ่มการรอ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"การตั้งค่า"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"เครื่องมือจำลอง"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"รายชื่อติดต่อทั้งหมด"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ใช้ปุ่มกดสัญญาณเสียง"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"กลับไปคุยสายต่อ"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"เพิ่มการโทร"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"สายโทรเข้า"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"เล่นข้อความเสียง"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"ดูรายชื่อติดต่อ <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"โทรหา <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"สร้างทางลัด UI ใหม่"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"กำลังเข้าสู่โหมดการดำเนินการแบบกลุ่ม"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ออกจากโหมดการทำงานแบบกลุ่มแล้ว"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"เลือก <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> แล้ว"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ยกเลิกการเลือก <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> แล้ว"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"รายละเอียดรายชื่อติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"รายละเอียดการติดต่อของผู้โทรที่สงสัยว่าจะเป็นสแปม <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> สาย"</string>
     <string name="description_video_call" msgid="3738199365585751727">"แฮงเอาท์วิดีโอ"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"ส่ง SMS ไปยัง <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"ข้อความเสียงที่ยังไม่ได้ฟัง"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"เริ่มต้นการค้นหาด้วยเสียง"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"ข้อความเสียง"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> นาที <xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ข้อความเสียง"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ข้อความเสียง"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ใช่"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"ไม่"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"ลบ<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>ที่เลือกหรือไม่"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ยกเลิกโหมดการทำงานแบบกลุ่ม"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ลบ"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ยกเลิก"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"เลือกไว้ <xliff:g id="NUMBER">%1$s</xliff:g> รายการ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ลบข้อความเสียงเหล่านี้ไหม "</b>"</item>
+      <item quantity="one">"<b>"ลบข้อความเสียงนี้ไหม "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"วันที่ <xliff:g id="DATE">%1$s</xliff:g> เวลา <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"ไม่สามารถโทรไปยังหมายเลขนี้"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"เมื่อต้องการตั้งค่าข้อความเสียง ให้ไปที่เมนู &gt; การตั้งค่า"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"หากต้องการฟังข้อความเสียง ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"กำลังโหลด..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"กำลังโหลดจากซิมการ์ด…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"รายชื่อบนซิมการ์ด"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"ไม่มีแอปรายชื่อติดต่อที่พร้อมใช้งาน"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"การค้นหาด้วยเสียงไม่พร้อมใช้งาน"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"ไม่สามารถโทรศัพท์ได้เนื่องจากแอปพลิเคชันโทรศัพท์ถูกปิดใช้งาน"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ค้นหารายชื่อติดต่อ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"เพิ่มหมายเลขหรือค้นหาผู้ติดต่อ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"ประวัติการโทรว่างเปล่า"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"โทรออก"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"คุณไม่มีสายที่ไม่ได้รับ"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"กล่องข้อความเสียงว่างเปล่า"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"แสดงเฉพาะรายชื่อที่ชื่นชอบ"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"ประวัติการโทร"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"ทั้งหมด"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"ไม่ได้รับ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"ข้อความเสียง"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"การโทรด่วน"</string>
     <string name="tab_history" msgid="7420269368689503596">"ประวัติการโทร"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"รายชื่อติดต่อ"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"ข้อความเสียง"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"ลบจากรายการโปรด"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"เลิกทำ"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"สร้างรายชื่อติดต่อใหม่"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"เพิ่มในรายชื่อติดต่อ"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ส่ง SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ใช้แฮงเอาท์วิดีโอ"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"บล็อกหมายเลข"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"สายที่ไม่ได้รับใหม่ <xliff:g id="NUMBER">%s</xliff:g> สาย"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"ยังไม่ได้กำหนดผู้ใดในการโทรด่วน"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"เพิ่มรายการโปรด"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"คุณยังไม่มีรายชื่อติดต่อ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"เพิ่มรายชื่อติดต่อ"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"แตะรูปภาพเพื่อดูหมายเลขทั้งหมด หรือแตะค้างไว้เพื่อจัดเรียงใหม่"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ลบ"</string>
+    <string name="select_all" msgid="408601760696146245">"เลือกทั้งหมด"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"แฮงเอาท์วิดีโอ"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"ส่งข้อความ"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"รายละเอียดการโทร"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"โทรไปที่ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"เรียกแฮงเอาท์วิดีโอไปยัง <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"ฟังข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"เล่นข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"หยุดข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g> ชั่วคราว"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"ลบข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ข้อความเสียงใหม่</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ข้อความเสียงใหม่</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"สร้างรายชื่อติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"เพิ่ม <xliff:g id="NAMEORNUMBER">^1</xliff:g> ไปยังรายชื่อติดต่อที่มีอยู่"</string>
     <string name="description_details_action" msgid="2061866409737706174">"รายละเอียดการโทรสำหรับ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"ลบออกจากประวัติการโทรแล้ว"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"วันนี้"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"เมื่อวานนี้"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"เก่ากว่า"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"รายการโทร"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"เปิดลำโพง"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"ปิดลำโพง"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"เล่นเร็วขึ้น"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"เล่นช้าลง"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"เริ่มหรือหยุดเล่นชั่วคราว"</string>
     <string name="display_options_title" msgid="3880091801055797975">"ตัวเลือกการแสดง"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"เสียงและการสั่น"</string>
@@ -199,9 +142,8 @@
     <string name="call_settings_label" msgid="7824611757200960807">"การโทร"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"การบล็อกสายเรียกเข้า"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"ข้อความเสียง"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"เลือกซิมสำหรับการตั้งค่าข้อความเสียง"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"การบล็อกสายเรียกเข้าปิดชั่วคราว"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ระบบปิดใช้การบล็อกสายเรียกเข้าเนื่องจากคุณติดต่อบริการฉุกเฉินจากโทรศัพท์เครื่องนี้ภายใน 48 ชั่วโมงที่ผ่านมา ระบบจะเปิดใช้คุณลักษณะนี้อีกครั้งโดยอัตโนมัติเมื่อครบ 48 ชั่วโมง"</string>
+    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ระบบปิดใช้การบล็อกสายเรียกเข้าเนื่องจากคุณติดต่อบริการฉุกเฉินจากโทรศัพท์เครื่องนี้ภายใน 48 ชั่วโมงที่ผ่านมา ระบบจะเปิดใช้ฟีเจอร์นี้อีกครั้งโดยอัตโนมัติเมื่อครบ 48 ชั่วโมง"</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>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"หมายเลขที่ถูกบล็อก"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ถูกบล็อกอยู่แล้ว"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"บัญชีการโทร"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"เปิด"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"ตั้งค่าสิทธิ์"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"หากต้องการเปิดใช้การโทรด่วน ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"หากต้องการดูประวัติการโทร ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"หากต้องการดูรายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"หากต้องการเข้าถึงข้อความเสียง ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"หากต้องการโทรออก ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"แอปโทรศัพท์ไม่ได้รับอนุญาตให้เขียนไปยังการตั้งค่าระบบ"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"สแปม"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ออฟไลน์อยู่และไม่สามารถติดต่อได้"</string>
     <string name="about_phone_label" msgid="582991354677973731">"เกี่ยวกับ"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ถอดเสียงโดย Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google กำลังถอดเสียง..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"การถอดเสียงไม่พร้อมใช้งาน"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"ดู"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรนี้ใน Messages"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรใน Messages"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-tl/strings.xml b/java/com/android/dialer/app/res/values-tl/strings.xml
index cc44cb5..02fdeaa 100644
--- a/java/com/android/dialer/app/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/res/values-tl/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telepono"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Keypad ng Telepono"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telepono"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"History ng tawag"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Iulat ang hindi wastong numero"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopyahin ang numero"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopyahin ang transkripsyon"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"I-block ang numero"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Alisin sa pagkaka-block ang numero"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"I-edit ang numero bago tumawag"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"I-clear ang history ng tawag"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"I-delete ang voicemail"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"I-clear ang history ng tawag?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Idi-delete nito ang lahat ng tawag mula sa iyong history"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Kini-clear ang history ng tawag…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telepono"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Hindi nasagot na tawag"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Hindi nasagot na tawag sa trabaho"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Mga hindi nasagot na tawag"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemail </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> na Voicemail </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"I-play"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Bagong voicemail mula kay <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Hindi ma-play ang voicemail"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Nilo-load ang voicemail…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ina-archive ang voicemail…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hindi ma-load ang voicemail"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Mga tawag lang na may voicemail"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Mga papasok na tawag lang"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Mga papalabas na tawag lang"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Mga hindi nasagot na tawag lang"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"maghanap"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"Mag-dial"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"numerong ida-dial"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"I-play o ihinto ang playback"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"I-on o i-off ang speakerphone"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Hanapin ang posisyon ng playback"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Bagalan ang playback"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Bilisan ang playback"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"History ng tawag"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Higit pang mga pagpipilian"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"keypad"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Ipakita lang ang papalabas"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Ipakita lang ang paparating"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Ipakita lang ang hindi nasagot"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Ipakita lamang ang mga voicemail"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Ipakita ang lahat ng tawag"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Magdagdag ng pag-pause na 2-seg"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Magdagdag ng paghihintay"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Mga Setting"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Lahat ng mga contact"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Gumamit ng touch tone na keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Bumalik sa kasalukuyang tawag"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Mag-add: tawag"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Mga paparating na tawag"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"I-play ang voicemail"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Tingnan ang contact na si <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Tawagan si <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Gawa ng Shortcut ng Bagong UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Pumapasok sa bulk action mode"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Umalis sa bulk action mode"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Napili <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Inalis sa pagkakapili <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Mga detalye sa pakikipag-ugnayan para kay/sa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Mga detalye sa pakikipag-ugnayan para sa pinaghihinalaang spam na tumatawag<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (na) tawag."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Magpadala ng SMS kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Hindi pa naririnig na voicemail"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Simulan ang paghahanap gamit ang boses"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Tumawag sa <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"voicemail"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"mga voicemail"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Oo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hindi"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"I-delete ang napiling <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselahin ang batch actions mode"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"I-delete"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselahin"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ang napili"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
+      <item quantity="other">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ng <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Hindi matawagan ang numerong ito"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Upang mag-set up ng voicemail, pumunta sa Menu &gt; Mga Setting."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Upang tumawag sa voicemail, i-off muna ang Airplane mode."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Naglo-load…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Naglo-load mula sa SIM card…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Mga contact sa SIM card"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Walang available na app ng mga contact"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Hindi available ang paghahanap gamit ang boses"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Hindi makagawa ng tawag sa telepono dahil naka-disable ang application na Telepono."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Maghanap ng mga contact"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Magdagdag ng numero, maghanap sa contact"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Walang laman ang iyong history ng tawag"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Tumawag"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Wala kang mga hindi nasagot na tawag."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Walang laman ang iyong voicemail inbox."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Mga paborito lang ang ipakita"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"History ng Tawag"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Lahat"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Di nasagot"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Voicemail"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
     <string name="tab_history" msgid="7420269368689503596">"History ng Tawag"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Mga Contact"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Inalis sa mga paborito"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"I-undo"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Tumawag sa <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Gumawa ng bagong contact"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Idagdag sa isang contact"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Magpadala ng SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Gumawa ng video call"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"I-block ang numero"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> (na) bagong hindi nasagot na tawag"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Wala pang tao sa iyong speed dial"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Magdagdag ng paborito"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Wala ka pang sinumang mga contact"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Magdagdag ng contact"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Pindutin ang larawan upang makita ang lahat ng numero o pindutin nang matagal upang ayusing muli"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Alisin"</string>
+    <string name="select_all" msgid="408601760696146245">"Piliin lahat"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Mag-video call"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Magpadala ng mensahe"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Mga detalye ng tawag"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Tawagan ang/si <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"I-video call si/ang <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Makinig sa voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"I-play ang voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"I-pause ang voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"I-delete ang voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> bagong voicemail</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na bagong voicemail</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Gumawa ng contact para kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Idagdag si/ang <xliff:g id="NAMEORNUMBER">^1</xliff:g> sa umiiral nang contact"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Mga detalye ng tawag para sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Na-delete mula sa history ng tawag"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Ngayon"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kahapon"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Mas Luma"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Listahan ng mga tawag"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"I-on ang speaker."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"I-off ang speaker."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Mag-play nang mas mabilis."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Mag-play nang mas mabagal."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Simulan o i-pause ang pag-playback."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Mga display option"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Tunog at pag-vibrate"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Mga Tawag"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pagba-block ng tawag"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Pili ng SIM para sa voicemail"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Pansamantalang na-off ang call blocking"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Na-disable ang pagba-block ng tawag dahil nakipag-ugnayan ka sa mga pang-emergency na serbisyo mula sa teleponong ito sa nakalipas na 48 oras. Awtomatiko itong muling i-enable kapag nag-expire na ang 48 oras."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"I-import ang mga numero"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Mga naka-block na numero"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Naka-block na ang <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Account sa pagtawag"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"I-on"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Magtakda ng mga pahintulot"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Upang i-enable ang speed dial, i-on ang pahintulot ng Mga Contact."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Upang makita ang iyong log ng tawag, i-on ang pahintulot ng Telepono."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Upang makita ang iyong mga contact, i-on ang pahintulot ng Mga Contact."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Upang ma-access ang iyong voicemail, i-on ang pahintulot ng Telepono."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Upang hanapin ang iyong mga contact, i-on ang mga pahintulot sa Mga Contact."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Upang tumawag, i-on ang pahintulot ng Telepono."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Walang pahintulot ang app ng Telepono na mag-write sa mga setting ng system."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"Offline si <xliff:g id="NAME">%1$s</xliff:g> at hindi makontak"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Tungkol dito"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Na-transcribe ng Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Nagta-transcribe ang Google …"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Hindi available ang transcript"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Tingnan"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Dinelete ang tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa tawag na ito sa Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Dinelete ang mga tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa mga tawag sa Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-tr/strings.xml b/java/com/android/dialer/app/res/values-tr/strings.xml
index 2f6f704..d49f118 100644
--- a/java/com/android/dialer/app/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/res/values-tr/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon Tuş Takımı"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Telefon"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Çağrı geçmişi"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Hatalı numarayı bildir"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Numarayı kopyala"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Çeviri yazıyı kopyala"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Numarayı engelle"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Numaranın engellemesini kaldır"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Telefon etmeden önce numarayı düzenle"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Çağrı geçmişini temizle"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Sesli mesajı sil"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Çağrı geçmişi temizlensin mi?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bu işlem, geçmişinizdeki tüm çağrıları silecek"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Çağrı geçmişi temizleniyor…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Telefon"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Cevapsız çağrı"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"İşle ilgili cevapsız çağrı"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Cevapsız çağrılar"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Sesli Mesaj </item>
       <item quantity="one">Sesli Mesaj</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Oynat"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Yeni sesli mesj gönderen: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Sesli mesaj oynatılamadı"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Sesli mesaj yükleniyor…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Sesli mesaj arşivleniyor…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Sesli mesaj yüklenemedi"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Yalnızca sesli mesaj içeren çağrılar"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Yalnızca gelen çağrılar"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Yalnızca giden çağrılar"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Yalnızca cevapsız çağrılar"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"ara"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"çevir"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"çevrilecek numara"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Oynatmayı başlat veya durdur"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Hoperlörü aç veya kapat"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Oynatma konumunu ayarla"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Oynatma hızını azalt"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Oynatma hızını artır"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Çağrı geçmişi"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Diğer seçenekler"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tuş takımı"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Yalnızca gidenleri göster"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Yalnızca gelenleri göster"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Yalnızca cevapsızları göster"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Yalnızca sesli msajları göster"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Tüm çağrıları göster"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 saniyelik duraklama ekle"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Bekleme ekle"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simülatör"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tüm kişiler"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Telefon tuş takımını kullan"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Çağrıya dön"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Çağrı ekle"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Gelen çağrılar"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Sesli mesajı oynat"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Kişiyi görüntüle: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Ara: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kull. Arayüzü Kısayolu Oluştur"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Toplu işlem moduna giriliyor"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Toplu işlem modundan çıkıldı"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Seçildi: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Seçimi kaldırıldı: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> için kişi ayrıntıları"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Spam olduğundan şüphelenilen arayanın (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) kişi ayrıntıları"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> çağrı."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video görüşmesi."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Şuraya SMS gönder: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Dinlenilmemiş sesli mesaj"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Sesli arama başlat"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Çağrı yap: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Sesli Mesaj"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> sn."</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> dk. <xliff:g id="SECONDS">%s</xliff:g> sn."</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"sesli mesaj"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"sesli mesajlar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Evet"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Hayır"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Seçili <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> silinsin mi?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Toplu işlemler modu iptal edilir"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Sil"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"İptal"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> öğe seçildi"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu sesli mesajlar silinsin mi? "</b>"</item>
+      <item quantity="one">"<b>"Bu sesli mesaj silinsin mi? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Bu numara aranamaz"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Sesli mesajı yapılandırmak için Menü &gt; Ayarlar\'a gidin."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Sesli mesaja çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Yükleniyor..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM karttan yükleniyor..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM kart kişileri"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Kullanılabilir rehber uygulaması yok"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Sesli arama kullanılamaz"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefon uygulaması devre dışı bırakıldığından telefon edilemiyor."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kişilerde ara"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Numara ekleyin veya kişi arayın"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Çağrı geçmişiniz boş"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Telefon et"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Cevapsız çağrınız yok."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sesli mesaj gelen kutunuz boş."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Yalnızca favori kişileri göster"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Çağrı Geçmişi"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Tümü"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Cevapsız"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Sesli Mesaj"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Hızlı arama"</string>
     <string name="tab_history" msgid="7420269368689503596">"Çağrı Geçmişi"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kişiler"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Sesli mesaj"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Favorilerden kaldırıldı"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Geri al"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Çağrı yap: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yeni kişi oluştur"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Bir kişiye ekle"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS gönder"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Video görüşmesi yap"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Numarayı engelle"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> yeni cevapsız çağrı"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Hızlı arama listenizde henüz kimse yok"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Favori ekle"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Henüz kayıtlı kişi yok"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Kişi ekle"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Tüm numaraları görmek için resme dokunun veya yeniden sıralamak için dokunup basılı tutun"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Kaldır"</string>
+    <string name="select_all" msgid="408601760696146245">"Tümünü seç"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video görüşmesi"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"İleti gönder"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Çağrı ayrıntıları"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Telefon et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ile video görüşmesi yap."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Şu numaradan gelen sesli mesajı dinle: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tarafından kaydedilmiş sesli mesajı çal"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tarafından kaydedilmiş sesli mesajı duraklat"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tarafından kaydedilmiş sesli mesajı sil"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yeni sesli mesaj</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yeni sesli mesaj</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> için kişi oluştur"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bilgisini mevcut kişiye ekle"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> için çağrı ayrıntıları"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Çağrı geçmişinden silindi"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Bugün"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dün"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Daha eski"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Çağrı listesi"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hoparlörü açın."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Hoparlörü kapatın."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Daha hızlı çalın."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Daha yavaş çalın."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Çalmayı başlatın veya duraklatın."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Görüntüleme seçenekleri"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ses ve titreşim"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Çağrılar"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Çağrı engelleme"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Sesli mesaj"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Sesli mesaj ayarl. için SIM seçin"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrı engelleme geçici olarak kapalı"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat içinde bu telefondan acil servislerle iletişimde bulunduğunuz için çağrı engelleme modu devre dışı bırakıldı. 48 saatlik süre dolduktan sonra çağrı engelleme modu otomatik olarak tekrar etkinleştirilecektir."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Numaraları içe aktar"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Engellenen numaralar"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon zaten engellendi."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Çağrı hesapları"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Aç"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"İzinleri ayarla"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Hızlı aramayı etkinleştirmek için Kişiler iznini açın."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Çağrı günlüğünüzü görmek için Telefon iznini açın."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kişilerinizi görmek için Kişiler iznini açın."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Sesli mesajınıza erişmek için Telefon iznini açın."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kişilerinizde arama yapmak için Kişiler izinlerini açın."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Telefon etmek için Telefon iznini açın."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon uygulamasının sistem ayarlarına yazma izni yok."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> çevrimdışı olduğundan ulaşılamıyor"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Hakkında"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Çeviri yazı Google\'a aittir"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google çeviri yazı oluşturuyor…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Çeviri yazı yok"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Göster"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Çağrı silindi. Bu çağrı sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Çağrılar silindi. Çağrılar sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-uk/strings.xml b/java/com/android/dialer/app/res/values-uk/strings.xml
index 9a79012..cbfe014 100644
--- a/java/com/android/dialer/app/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/res/values-uk/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Клавіатура телефона"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Тел."</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Історія дзвінків"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Повідомити про неправильний номер"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Копіювати номер"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Копіювати транскрипцію"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Заблокувати номер"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Розблокувати номер"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Редагувати номер перед викликом"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Очистити історію дзвінків"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Видалити голосову пошту"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Очистити історію дзвінків?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"З історії буде видалено всі дзвінки"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Очищення історії дзвінків…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Номер телефону"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропущений виклик"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропущений дзвінок на робочий телефон"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропущені виклики"</string>
@@ -50,107 +45,68 @@
       <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> голосових повідомлень </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> голосових повідомлень </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Відтворити"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова голосова пошта від <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Не вдалося відтворити голосову пошту"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Завантаження голосової пошти…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Архівування голосової пошти…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не вдалося завантажити голосову пошту"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Лише виклики з голосовою поштою"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Лише вхідні виклики"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Лише вихідні виклики"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Лише пропущені виклики"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"пошук"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"дзвонити"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"номер для набору"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Почати або зупинити відтворення"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Увімкнути або вимкнути гучний зв’язок"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Шукати місце відтворення"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Зменшити швидкість відтворення"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Збільшити швидкість відтворення"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Історія викликів"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Інші варіанти"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавіатура"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Показувати лише вихідні"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Показувати лише вхідні"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Показувати лише пропущені"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Показувати лише голосову пошту"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Показувати всі виклики"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Додати 2-сек. паузу"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Додати паузу"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Налаштування"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Усі контакти"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Використовувати тональний набір"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Повернутися до поточного виклику"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Додати виклик"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Вхідні виклики"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Відтворити голосову пошту"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Переглянути контакт <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Набрати <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Створити ярлик для нової дії"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Перехід у режим масових дій"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ви вийшли з режиму масових дій"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Вибрано користувача <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Скасовано вибір користувача <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Відомості про контакт <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Відомості про підозрілого абонента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (може бути спамом)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"Викликів: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Відеодзвінок."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Надіслати SMS контакту <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Непрослухана голосова пошта"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Розпочати голосовий пошук"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Подзвонити на <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Голосова пошта"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"голосова пошта"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"голосова пошта"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Так"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Ні"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Видалити вибране (<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>)?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасувати режим масових дій"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Видалити"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасувати"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Вибрано <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="few">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="many">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+      <item quantity="other">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> о <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Не можна телефонувати на цей номер"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Щоб установити параметри голосової пошти, відкрийте \"Меню\" та виберіть \"Налаштування\"."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Щоб перевірити голосову пошту, спочатку вимкніть режим польоту."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Завантаження..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Завантаж. із SIM-карти…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Контакти SIM-карти"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Немає додатка з контактами"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Голосовий пошук недоступний"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Не вдається здійснити дзвінок, оскільки додаток Телефон вимкнено."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пошук контактів"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Введіть або знайдіть номер"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Немає історії дзвінків"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Телефонувати"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Немає пропущених дзвінків."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Немає голосової пошти."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Показати лише вибрані"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Історія викликів"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Усі"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Пропущені"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Голосова пошта"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Швидкий набір"</string>
     <string name="tab_history" msgid="7420269368689503596">"Історія дзвінків"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Голосова пошта"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Вилучено з вибраного"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Відмінити"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Подзвонити на <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Створити контакт"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додати в контакти"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Надіслати SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Здійснити відеодзвінок"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблокувати номер"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"Нових пропущених дзвінків: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Немає номерів для швидкого набору"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додати номер"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Ще немає контактів"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Додати контакт"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Торкніться зображення, щоб побачити всі номери, або натисніть і утримуйте, щоб змінити порядок."</string>
     <string name="remove_contact" msgid="2353580570488923668">"Видалити"</string>
+    <string name="select_all" msgid="408601760696146245">"Вибрати все"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Відеодзвінок"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Надіслати повідомлення"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Деталі виклику"</string>
@@ -166,27 +122,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Телефонувати: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Запросити контакт <xliff:g id="NAMEORNUMBER">^1</xliff:g> на відеодзвінок."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Слухати голосову пошту: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: слухати голосову пошту"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: призупинити голосову пошту"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: видалити голосову пошту"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> нове повідомлення голосової пошти</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> нові повідомлення голосової пошти</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> нових повідомлень голосової пошти</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> нового повідомлення голосової пошти</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: створити контакт"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: додати до наявного контакта"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: деталі виклику"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Видалено з історії дзвінків"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Сьогодні"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Учора"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Старіші"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Список дзвінків"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Увімкнути динамік."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Вимкнути динамік."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Відтворювати швидше."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Відтворювати повільніше."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Почати або призупинити відтворення."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Параметри відображення"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуки та вібрація"</string>
@@ -203,7 +146,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Дзвінки"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокування викликів"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосова пошта"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Виберіть SIM-карту для гол. пошти"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокування дзвінків тимчасово вимкнено"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокування дзвінків вимкнено, оскільки ви зверталися з цього телефона в екстрені служби протягом останніх 48 годин. Ця функція автоматично ввімкнеться, коли мине 48 годин."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпортувати номери"</string>
@@ -217,12 +159,8 @@
     <string name="block_list" msgid="4701585783411870782">"Заблоковані номери"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> уже заблоковано."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Обл. записи для дзвінків"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Увімкнути"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Налаштувати дозволи"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Щоб активувати швидкий набір, увімкніть дозвіл \"Контакти\"."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Щоб переглянути журнал викликів, увімкніть дозвіл \"Телефон\"."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Щоб переглянути контакти, увімкніть дозвіл \"Контакти\"."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Щоб користуватися голосовою поштою, увімкніть дозвіл \"Телефон\"."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Щоб шукати контакти, увімкніть дозвіл \"Контакти\"."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Щоб зателефонувати, увімкніть дозвіл \"Телефон\"."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Додаток Телефон не має дозволу змінювати системні налаштування."</string>
@@ -234,4 +172,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> не в мережі, неможливо встановити зв’язок"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Про додаток"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипція від Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google транскрибує…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Транскрипція недоступна"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Переглянути"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Виклик видалено. Переглянути й видалити файли, надіслані під час цього виклику, можна в Повідомленнях."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Виклики видалено. Переглянути й видалити файли, надіслані під час цих викликів, можна в Повідомленнях."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ur/strings.xml b/java/com/android/dialer/app/res/values-ur/strings.xml
index 2519871..d0ad5d2 100644
--- a/java/com/android/dialer/app/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/res/values-ur/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"فون"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"فون کی پیڈ"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"فون"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"کال کی سرگزشت"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"غلط نمبر کی رپورٹ کریں"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"نمبر کاپی کریں"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"ٹرانسکرپشن کاپی کریں"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"نمبر مسدود کریں"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"نمبر غیر مسدود کریں"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"کال کرنے سے پہلے نمبر میں ترمیم کریں"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"کال کی سرگزشت صاف کریں"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"صوتی میل حذف کریں"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"کال کی سرگزشت صاف کریں؟"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"یہ آپ کی سرگزشت سے سبھی کالز کو حذف کر دے گا"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"کال کی سرگزشت صاف کی جا رہی ہے…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"فون"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"چھوٹی ہوئی کال"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"کام سے متعلق چھوٹی ہوئی کال"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"چھوٹی ہوئی کالیں"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> صوتی میلز </item>
       <item quantity="one">صوتی میل</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"چلائیں"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> کی جانب سے نیا صوتی میل"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"صوتی میل نہیں چلا سکا"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"صوتی میل لوڈ ہو رہا ہے…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"صوتی میل آرکائیو ہو رہی ہے…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"صوتی میل لوڈ نہیں کیا جا سکا"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"صرف صوتی میل والی کالیں"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"صرف آنے والی کالیں"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"صرف باہر جانے والی کالیں"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"صرف چھوٹی ہوئی کالیں"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"تلاش کریں"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"ڈائل کریں"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"ڈائل کرنے کیلئے نمبر"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"پلے بیک چلائیں یا روکیں"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"اسپیکر فون آن یا آف کریں"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"پلے بیک پوزیشن طلب کریں"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"پلے بیک کی شرح گھٹائیں"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"پلے بیک کی شرح بڑھائیں"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"کال کی سرگزشت"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"مزید اختیارات"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"کی پیڈ"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"صرف باہر جانے والی دکھائیں"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"صرف آنے والی دکھائیں"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"صرف چھوٹی ہوئی دکھائیں"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"صرف صوتی میلز دکھائیں"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"سبھی کالیں دکھائیں"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 سیکنڈ کا توقف شامل کریں"</string>
-    <string name="add_wait" msgid="1177723010768282578">"انتظار شامل کریں"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"ترتیبات"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"سبھی رابطے"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"ٹچ ٹون کی پیڈ کا استعمال کریں"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"جاری کال پر واپس لوٹیں"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"کال شامل کریں"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"آنے والی کالیں"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"صوتی میل چلائیں"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"رابطہ <xliff:g id="NAME">%1$s</xliff:g> دیکھیں"</string>
-    <string name="description_call" msgid="1532402285334775372">"<xliff:g id="NAME">%1$s</xliff:g> کو کال کریں"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"‏نیا UI شارٹ کٹ تخلیق کریں"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"بلک کاروائی موڈ میں داخل ہو رہا ہے"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"بلک کاروائی موڈ چھوڑ دیا"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"منتخب کردہ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"غیر منتخب کردہ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> کیلئے رابطہ کی تفصیلات"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"مشتبہ سپام کالر کی رابطہ تفصیلات <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> کالیں۔"</string>
     <string name="description_video_call" msgid="3738199365585751727">"ویڈیو کال۔"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"‏<xliff:g id="NAME">%1$s</xliff:g> پر SMS بھیجیں"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"نہ سنا ہوا صوتی میل"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"صوتی تلاش شروع کریں"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"<xliff:g id="NUMBER">%s</xliff:g> کو کال کریں"</string>
     <string name="voicemail" msgid="8899540969000957954">"صوتی میل"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> منٹ <xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"صوتی میل"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"صوتی میلز"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"ہاں"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"نہیں"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"منتخب کردہ <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> حذف کریں؟"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"بیچ کاروائی موڈ منسوخ کریں"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف کریں"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"منسوخ کریں"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> منتخب کردہ"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"ان صوتی میلز کو حذف کریں؟ "</b>"</item>
+      <item quantity="one">"<b>"اس صوتی میل کو حذف کریں؟ "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> بوقت <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"اس نمبر پر کال نہیں کر سکتے ہیں"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"صوتی میل سیٹ اپ کرنے کیلئے، مینو &gt; ترتیبات پر جائیں۔"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"صوتی میل کو کال کرنے کیلئے، پہلے ہوائی جہاز موڈ آف کریں۔"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"لوڈ ہو رہا ہے…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"‏SIM کارڈ سے لوڈ ہو رہا ہے…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"‏SIM کارڈ کے رابطے"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"رابطوں کی کوئی ایپ دستیاب نہیں ہے"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"صوتی تلاش دستیاب نہیں ہے"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"فون کال نہیں کی جا سکتی ہے کیونکہ فون ایپلیکیشن کو غیر فعال کر دیا گیا ہے۔"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"رابطے تلاش کریں"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"نمبر شامل کریں یا رابطے تلاش کریں"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"آپ کی کال کی سرگزشت خالی ہے"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"ایک کال کریں"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"آپ کے پاس کوئی چھوٹی ہوئی کالز نہیں ہیں۔"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"آپ کا صوتی میل ان باکس خالی ہے۔"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"صرف پسندیدہ دکھائیں"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"کال کی سرگزشت"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"سبھی"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"چھوٹی ہوئی"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"صوتی میل"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"اسپیڈ ڈائل"</string>
     <string name="tab_history" msgid="7420269368689503596">"کال کی سرگزشت"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"رابطے"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"صوتی میل"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"پسندیدہ سے ہٹا دیا گیا"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"کالعدم کریں"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> کو کال کریں"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"نیا رابطہ بنائیں"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"رابطے میں شامل کریں"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏SMS بھیجیں"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ویڈیو کال کریں"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"نمبر مسدود کریں"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> نئی چھوٹی ہوئی کالیں"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"آپ کے اسپیڈ ڈائل پر ابھی تک کوئی نہیں ہے"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ایک پسندیدہ شامل کریں"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"آپ کے پاس ابھی تک کوئی رابطے نہیں ہیں"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"ایک رابطہ شامل کریں"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"سبھی نمبرز دیکھنے کیلئے تصویر ٹچ کریں یا دوبارہ ترتیب دینے کیلئے ٹچ کریں اور پکڑے رہیں"</string>
     <string name="remove_contact" msgid="2353580570488923668">"ہٹائیں"</string>
+    <string name="select_all" msgid="408601760696146245">"سبھی کو منتخب کریں"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"ویڈیو کال"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"پیغام بھیجیں"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"کال کی تفصیلات"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو کال کریں"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو ویڈیو کال کریں۔"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> سے صوتی میل سنیں"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> سے صوتی میل چلائیں"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> سے صوتی میل موقوف کریں"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> سے صوتی میل حذف کریں"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> نئی صوتی میلز</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> نئی صوتی میل </item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کیلئے رابطہ بنائیں"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو موجودہ رابطہ میں شامل کریں"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کیلئے کال کی تفصیلات"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"کال کی سرگزشت سے حذف کر دیا گیا"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"ﺁﺝ"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"گزشتہ کل"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"قدیم تر"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"کالز کی فہرست"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"اسپیکر کو آن کر دیں۔"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"اسپیکر کو آف کر دیں۔"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"تیزی سے چلائیں۔"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"آہستہ چلائیں۔"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"پلے بیک شروع یا موقوف کریں۔"</string>
     <string name="display_options_title" msgid="3880091801055797975">"ڈسپلے کے اختیارات"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"آوازیں اور وائبریشن"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"کالز"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"کال مسدود کرنا"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"صوتی میل"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"‏صوتی میل سیٹنگز کیلئے SIM منتخب کریں"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"کال مسدود کرنا عارضی طور پر آف ہے"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"کال مسدود کرنا غیر فعال کر دیا گیا ہے کیونکہ آپ نے پچھلے 48 گھنٹوں میں اس فون سے ہنگامی سروسز کے ساتھ رابطہ کیا تھا۔ جب 48 گھنٹے کا دورانیہ ختم ہوگا تو یہ خودکار طور پر دوبارہ فعال ہو جائے گا۔"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"نمبرز درآمد کریں"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"مسدود کردہ نمبرز"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> پہلے ہی مسدود ہے۔"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"کالنگ اکاؤنٹس"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"آن کریں"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"اجازتیں طے کریں"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"اسپیڈ ڈائل کو فعال کرنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"اپنا کال لاگ دیکھنے کیلئے فون کی اجازت آن کریں۔"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"اپنے رابطے دیکھنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"اپنی صوتی میل تک رسائی کیلئے فون کی اجازت آن کریں۔"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"اپنے رابطوں کو تلاش کرنے کیلئے رابطوں کی اجازتیں آن کریں۔"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"کال کرنے کیلئے فون کی اجازت آن کریں۔"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"فون ایپ کے پاس سسٹم ترتیبات کو لکھنے کی اجازت نہیں ہے۔"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"سپام"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> آف لائن ہے اور اس تک پہنچا نہیں جا سکتا"</string>
     <string name="about_phone_label" msgid="582991354677973731">"تفصیل"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏Google کی جانب سے ٹرانسکرائب کردہ"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"‏Google نقل حرفی کر رہا ہے…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"ٹرانسکرپٹ دستیاب نہیں ہے"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"دیکھیں"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"کال حذف ہو گئی۔ اس کال کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"کالیں حذف ہو گئیں۔ کالوں کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string>
 </resources>
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 705cae7..4e55577 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon klaviaturasi"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Raqam tergich"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Chaqiruvlar tarixi"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Raqam noto‘g‘ri aniqlandi"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Raqamdan nusxa olish"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Transkripsiyadan nusxa olish"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Raqamni bloklash"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Raqamni blokdan chiqarish"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Tahrirlash va telefon qilish"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Qo‘ng‘iroqlar tarixini tozalash"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ovozli xabarni o‘chirish"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Qo‘ng‘iroqlar tarixi tozalansinmi?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Barcha qo‘ng‘iroqlar tarixi o‘chib ketadi."</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Qo‘ng‘iroqlar tarixi tozalanmoqda…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Chaqiruv"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Javobsiz chaqiruv"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Javobsiz chaqiruv (ish)"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Javobsiz chaqiruvlar"</string>
@@ -48,112 +43,71 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ta ovozli xabar </item>
       <item quantity="one">Ovozli xabar</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Tinglash"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>dan yangi ovozli xabar"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Ovozli xabarni eshitib bo‘lmadi"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Ovozli xabar yuklanmoqda…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ovozli pochta arxivlanmoqda…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ovozli xabarni yuklab bo‘lmadi"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Faqat ovozli xabar qo‘ng‘iroqlari"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Faqat kiruvchi qo‘ng‘iroqlar"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Faqat chiquvchi qo‘ng‘iroqlar"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Faqat javobsiz chaqiruvlar"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"qidiruv"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"terish"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"terish uchun raqam"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Ijroni boshlash yoki to‘xtatish"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Karnayni yoqish yoki o‘chirish"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Ijro vaziyatini qidirish"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Ijro tezligini kamaytirish"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Ijro tezligini oshirish"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Chaqiruvlar tarixi"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Boshqa parametrlar"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatura"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Chiquvchi qo‘ng‘-ni ko‘rsatish"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Kiruvchi qo‘n-larni ko‘rsatish"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Javobsiz qo‘n-larni ko‘rsatish"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Ovozli xabarlarni ko‘rsatish"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Barcha qo‘n-larni ko‘rsatish"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"2 soniyalik pauza qo‘shish"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Kutishni qo‘shish"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Sozlamalar"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Simulyator"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Barcha kontaktlar"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Tovushli raqam tergich"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Amaldagi chaqiruvga qaytish"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Chaqiruv qo‘shish"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Kiruvchi qo‘ng‘iroqlar"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Ovozli xabarni eshitish"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"<xliff:g id="NAME">%1$s</xliff:g> kontaktini ko‘rish"</string>
-    <string name="description_call" msgid="1532402285334775372">"Qo‘ng‘iroq: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yangi interfeys uchun yorliq"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Yoppasiga bajariladigan amallar rejimiga o‘tilmoqda"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Yoppasiga bajariladigan amallar rejimidan chiqib ketildi"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tanlandi"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tanlovi bekor qilindi"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> uchun kontakt ma’lumotlari"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> abonentining ma’lumotlari (spam deb taxmin qilinmoqda)"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ta qo‘ng‘iroq."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Video qo‘ng‘iroq."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"<xliff:g id="NAME">%1$s</xliff:g>ga SMS yuborish"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Ochilmagan ovozli xabar"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Ovozli qidiruvni boshlash"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Qo‘ng‘iroq: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Ovozli pochta"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> soniya"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> daq <xliff:g id="SECONDS">%s</xliff:g> son"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ovozli xabar"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ovozli xabarlar"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Ha"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Yo‘q"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Tanlangan <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> o‘chirib tashlansinmi?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Yoppasiga bajariladigan amallar rejimini bekor qilish"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"O‘chirish"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Bekor qilish"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Tanlandi: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Bu ovozli xabarlar o‘chirib tashlansinmi? "</b>"</item>
+      <item quantity="one">"<b>"Bu ovozli xabar o‘chirib tashlansinmi? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Bu raqamga qo‘ng‘iroq qilib bo‘lmaydi"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Ovozli pochtani sozlab olish uchun Menyu &gt; Sozlamalarga o‘ting."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Ovozli pochtaga qo‘ng‘iroq qilish uchun avval Parvoz rejimini o‘chiring."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Yuklanmoqda…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"SIM kartadan yuklanmoqda…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM karta kontaktlari"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Hech qanday kontakt ilovasi yo‘q"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Ovozli qidiruv mavjud emas"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Telefon ilovasi o‘chirib qo‘yilgani sababli telefon qo‘ng‘iroqlarini amalga oshirib bo‘lmaydi."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kontaktlar ichidan qidirish"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Raqam qo‘shish yoki kontaktlardan qidirish"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Chaqiruvlar tarixida hech narsa yo‘q"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Telefon qilish"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Hech qanday javobsiz chaqiruv yo‘q."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sizning ovozli pochta qutingiz bo‘m-bo‘sh."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Faqat saralar ko‘rsatilsin"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Chaqiruvlar tarixi"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Hammasi"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Javobsiz"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Ovozli pochta"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Tezkor terish"</string>
     <string name="tab_history" msgid="7420269368689503596">"Chaqiruvlar tarixi"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktlar"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Ovozli pochta"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Tanlanganlardan o‘chirilgan"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Bekor qilish"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Qo‘ng‘iroq: <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yangi kontakt yaratish"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Mavjud kontaktga saqlash"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS yuborish"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videoqo‘ng‘iroq qilish"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Raqamni bloklash"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> ta javobsiz chaqiruv"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Tezkor terish uchun hech kim yo‘q"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tezkor raqam terishni sozlang"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Sizda hali hech qanday kontakt yo‘q"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Yangi kontakt qo‘shing"</string>
-    <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="select_all" msgid="408601760696146245">"Hammasini tanlash"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Video qo‘ng‘iroq"</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>
+    <string name="call_log_action_call" msgid="682724094251540583">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_incoming_missed_call" msgid="8292535799379230029">"Javobsiz chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_incoming_answered_call" msgid="3920182963103160610">"Qo‘ng‘iroqqa javob berildi: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_unread_voicemail" msgid="145170985013419170">"O‘qilmagan ovozli xabar (<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)."</string>
@@ -161,28 +115,17 @@
     <string name="description_outgoing_call" msgid="543952487882919924">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
     <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
+    <string name="description_call_action" msgid="4042796498169106545">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Video qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktidan kelgan ovozli xabarni tinglash"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tomonidan yuborilgan ovozli xabarni eshitish"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tomonidan yuborilgan ovozli xabarni pauza qilish"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tomonidan yuborilgan ovozli xabarni o‘chirish"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta yangi ovozli xabar</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta yangi ovozli xabar</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Yangi kontakt yaratish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Mavjud kontaktlarga qo‘shish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – qo‘ng‘iroq tafsilotlari"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Qo‘ng‘iroqlar tarixidan o‘chirib tashlandi"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Bugun"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kecha"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Eskiroq"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Qo‘ng‘iroqlar ro‘yxati"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Karnayni yoqish."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Karnayni o‘chirib qo‘yish."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Tezro ijro etish."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Sekinroq ijro etish."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ijroni boshlash yoki to‘xtatish"</string>
     <string name="display_options_title" msgid="3880091801055797975">"Kontaktlarning ko‘rinishi"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ovoz va tebranish"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Chaqiruvlar"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Chaqiruvlarni bloklash"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Ovozli pochta"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Ovozli pochta uchun SIM karta"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Qo‘ng‘iroqlarni bloklash o‘chirilgan"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oxirgi 48 soat ichida ushbu telefon orqali favqulodda xizmatlar bilan bog‘lanilganligi uchun qo‘ng‘iroqlarni bloklash o‘chirib qo‘yildi. 48 soatlik muddat tugagandan so‘ng bu avtomatik qayta yoqiladi."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Raqamlarni import qilish"</string>
@@ -213,14 +155,10 @@
     <string name="block_list" msgid="4701585783411870782">"Bloklangan raqamlar"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami allaqachon bloklangan."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Chaqiruv uchun hisoblar"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Yoqish"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Ruxsatnomalarni sozlash"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Tezkor raqam terish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Qo‘ng‘iroqlaringiz ro‘yxatini ko‘rish uchun “Telefon” ruxsatnomasini yoqing."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Kontaktlaringizni ko‘rish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Ovozli pochtaga kirish uchun “Telefon” ruxsatnomasini yoqing."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Qo‘ng‘iroq qilish uchun “Telefon” ruxsatnomasini yoqing."</string>
+    <string name="permission_place_call" msgid="8686908130349369423">"Chaqiruv uchun “Telefon” ruxsatnomasini yoqing."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon ilovasida tizim sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
     <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloklandi"</string>
     <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloklash/spam deb belgilash"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> hozir oflayn va u bilan bog‘lanishning imkoni yo‘q"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Ilova haqida"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google tomon. trans-ya qilindi"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google transkripsiya qilmoqda…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Transkripsiya mavjud emas"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Ko‘rish"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Chaqiruv o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroq davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Chaqiruvlar o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroqlar davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-vi/strings.xml b/java/com/android/dialer/app/res/values-vi/strings.xml
index 5a60e0a..5780179 100644
--- a/java/com/android/dialer/app/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/res/values-vi/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Điện thoại"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Bàn phím điện thoại"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Điện thoại"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Nhật ký cuộc gọi"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Báo cáo số không chính xác"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Sao chép số"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Sao chép bản ghi âm"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Chặn số"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Bỏ chặn số"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Chỉnh sửa số trước khi gọi"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Xóa nhật ký cuộc gọi"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Xóa thư thoại"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Xóa nhật ký cuộc gọi?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Thao tác này sẽ xóa tất cả cuộc gọi khỏi nhật ký của bạn"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Đang xóa nhật ký cuộc gọi…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Điện thoại"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Cuộc gọi nhỡ"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Cuộc gọi nhỡ về công việc"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Cuộc gọi nhỡ"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Thư thoại </item>
       <item quantity="one">Thư thoại</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Phát"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Thư thoại mới từ <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Không thể phát thư thoại"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Đang tải thư thoại…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Đang lưu trữ thư thoại…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Không thể tải thư thoại"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Chỉ cuộc gọi có thư thoại"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Chỉ cuộc gọi đến"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Chỉ cuộc gọi đi"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Chỉ cuộc gọi nhỡ"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"tìm kiếm"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"quay số"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"số để quay"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Phát hoặc dừng phát lại"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Bật hoặc tắt loa ngoài"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Tìm kiếm vị trí phát lại"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Giảm tốc độ phát lại"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Tăng tốc độ phát lại"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Nhật ký cuộc gọi"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Tùy chọn khác"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"bàn phím"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Chỉ hiển thị cuộc gọi đi"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Chỉ hiển thị cuộc gọi đến"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Chỉ hiển thị cuộc gọi nhỡ"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Chỉ hiển thị thư thoại"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Hiển thị tất cả cuộc gọi"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Thêm 2 giây dừng"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Thêm chờ"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Cài đặt"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Trình mô phỏng"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Tất cả liên hệ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Sử dụng bàn phím số cảm ứng có âm"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Quay lại cuộc gọi đang thực hiện"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Thêm cuộc gọi"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Cuộc gọi đến"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Phát thư thoại"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Xem thông tin liên hệ của <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Gọi <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Tạo phím tắt giao diện người dùng mới"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Truy cập chế độ tác vụ hàng loạt"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Đã rời khỏi chế độ tác vụ hàng loạt"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Đã chọn <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Đã bỏ chọn <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Chi tiết liên lạc cho <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Chi tiết liên hệ cho người gọi điện spam đáng ngờ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> cuộc gọi."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Gọi điện video."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Gửi SMS cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"Thư thoại chưa nghe"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Bắt đầu tìm kiếm bằng giọng nói"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Thư thoại"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> giây"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> phút <xliff:g id="SECONDS">%s</xliff:g> giây"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"thư thoại"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"thư thoại"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Có"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Không"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Xóa <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g> đã chọn?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hủy chế độ tác vụ hàng loạt"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Xóa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hủy"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Đã chọn <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"Xóa các thư thoại này? "</b>"</item>
+      <item quantity="one">"<b>"Xóa thư thoại này? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> lúc <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Không thể gọi số này"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Để thiết lập thư thoại, chuyển tới Menu &gt; Cài đặt."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Để gọi thư thoại, trước tiên hãy tắt chế độ trên Máy bay."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Đang tải…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Đang tải từ thẻ SIM…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Danh bạ trên thẻ SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Không có ứng dụng danh bạ"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Không có tính năng tìm kiếm bằng giọng nói"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Không thể thực hiện cuộc gọi điện thoại vì ứng dụng Điện thoại đã bị tắt."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Tìm kiếm trong danh bạ"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Thêm số hoặc tìm kiếm danh bạ"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Nhật ký cuộc gọi của bạn trống"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Gọi điện"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Bạn không có cuộc gọi nhỡ nào."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hộp thư thoại đến của bạn trống."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Chỉ hiển thị liên hệ ưa thích"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Nhật ký cuộc gọi"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Tất cả"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Bị nhỡ"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Thư thoại"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Quay số nhanh"</string>
     <string name="tab_history" msgid="7420269368689503596">"Nhật ký cuộc gọi"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Danh bạ"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Thư thoại"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Đã xóa khỏi liên hệ yêu thích"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Hoàn tác"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Tạo liên hệ mới"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Thêm vào liên hệ"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Gửi SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Gọi điện video"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Chặn số"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> cuộc gọi nhỡ mới"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Chưa có ai trong danh bạ quay số nhanh của bạn"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Thêm liên hệ quay số nhanh yêu thích"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Bạn chưa có bất kỳ liên hệ nào"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Thêm liên hệ"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Chạm vào hình ảnh để xem tất cả các số hoặc chạm và giữ để sắp xếp lại"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Xóa"</string>
+    <string name="select_all" msgid="408601760696146245">"Chọn tất cả"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Cuộc gọi điện video"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Gửi tin nhắn"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Chi tiết cuộc gọi"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Gọi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Gọi điện video cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Nghe thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Phát thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Tạm dừng thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Xóa thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> thư thoại mới</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> thư thoại mới</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Tạo địa chỉ liên hệ cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Thêm <xliff:g id="NAMEORNUMBER">^1</xliff:g> vào địa chỉ liên hệ hiện có"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Chi tiết cuộc gọi cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Đã xóa khỏi nhật ký cuộc gọi"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Hôm nay"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hôm qua"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Cũ hơn"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Danh sách cuộc gọi"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Bật loa."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Tắt loa."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Phát nhanh hơn."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Phát chậm hơn."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Bắt đầu hoặc tạm dừng phát lại."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Tùy chọn hiển thị"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Âm thanh và rung"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Cuộc gọi"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Chặn cuộc gọi"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Thư thoại"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Chọn SIM cho cài đặt thư thoại"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tạm thời tắt chặn cuộc gọi"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Tính năng chặn cuộc gọi đã bị tắt vì bạn đã liên hệ với dịch vụ khẩn cấp từ điện thoại này trong vòng 48 giờ qua. Tính năng này sẽ được bật lại tự động sau khi khoảng thời gian 48 giờ kết thúc."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nhập số"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Số bị chặn"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> đã bị chặn."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Tài khoản gọi"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Bật"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Đặt quyền"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Để bật quay số nhanh, bật quyền đối với Danh bạ."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Để xem nhật ký cuộc gọi của bạn, bật quyền đối với Điện thoại."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Để xem danh bạ của bạn, bật quyền đối với Danh bạ."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Để truy cập thư thoại của bạn, bật quyền đối với Điện thoại."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Để thực hiện cuộc gọi, bật quyền đối với Điện thoại."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Ứng dụng Điện thoại không có quyền ghi vào cài đặt hệ thống."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ngoại tuyến và không liên hệ được"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Giới thiệu"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Do Google phiên âm"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google đang phiên âm ..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Bản phiên âm không sẵn có"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Xem"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong cuộc gọi này trong Messages."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong các cuộc gọi này trong Messages."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
index 98abc39..84aa06d 100644
--- a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"电话"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"电话拨号键盘"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"拨号"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"通话记录"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"报告错误的号码"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"复制号码"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"复制转录内容"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"屏蔽号码"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"取消屏蔽号码"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"拨打之前修改号码"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"清除通话记录"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"删除语音邮件"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"要清除通话记录吗？"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"这会删除您的所有通话记录"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通话记录…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"打电话"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接电话"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接工作来电"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接电话"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 封语音邮件</item>
       <item quantity="one">1 封语音邮件</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"播放"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>，<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"来自<xliff:g id="CALLER">%1$s</xliff:g>的新语音邮件"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"无法播放语音邮件"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"正在加载语音邮件…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"正在归档语音邮件…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"无法加载语音邮件"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"只显示语音信箱留言"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"只显示来电"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"只显示外拨电话"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"只显示未接来电"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"搜索"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"拨号"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"要拨打的号码"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"开始或停止播放"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"打开或关闭扬声器"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"拖动到播放位置"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"减慢播放速度"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"加快播放速度"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"通话记录"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多选项"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"拨号键盘"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"仅显示外拨电话"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"只显示来电"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"只显示未接来电"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"只显示语音邮件"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"显示所有通话"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"延长暂停时间2秒"</string>
-    <string name="add_wait" msgid="1177723010768282578">"延长等待时间"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"设置"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模拟器"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"所有联系人"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用按键式键盘"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回正在进行的通话"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"添加通话"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"来电"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"播放语音邮件"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"查看联系人<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"呼叫<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"创建可在新界面中使用的快捷键"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"正在进入批量操作模式"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已退出批量操作模式"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已选择 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消选择 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>的详细联系信息"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"疑似骚扰电话来电者“<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>”的详细联系信息"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>次通话。"</string>
     <string name="description_video_call" msgid="3738199365585751727">"视频通话。"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"向<xliff:g id="NAME">%1$s</xliff:g>发送短信"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"未收听的语音邮件"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"开始语音搜索"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"语音信箱"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分钟 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"语音邮件"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"语音邮件"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要删除所选的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>吗？"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"删除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已选择 <xliff:g id="NUMBER">%1$s</xliff:g> 封"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要删除这些语音邮件吗？"</b>"</item>
+      <item quantity="one">"<b>"要删除这封语音邮件吗？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"无法拨打此号码"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"要设置语音信箱，请转到“菜单”&gt;“设置”。"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"要呼叫语音信箱，请先关闭飞行模式。"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"正在加载..."</string>
-    <string name="imei" msgid="5214505934662768308">"移动通信国际识别码"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"正从 SIM 卡中加载..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM卡联系人"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"没有可用的通讯录应用"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"无法使用语音搜索"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"“电话”应用已被停用，因此无法拨打电话。"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜索联系人"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"添加号码或搜索联系人"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"您没有任何通话记录"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"拨打电话"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"您没有任何未接电话。"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"您未收到任何语音邮件。"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"仅显示收藏的联系人"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"通话记录"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"未接电话"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"语音邮件"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"快速拨号"</string>
     <string name="tab_history" msgid="7420269368689503596">"通话记录"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"通讯录"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"语音邮件"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"已从收藏中移除"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"撤消"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"新建联系人"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"添加到联系人"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"发送短信"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"发起视频通话"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"屏蔽号码"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g>个新的未接电话"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"尚未给任何联系人设定快速拨号"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"添加常用联系人"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"您还没有任何联系人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"添加联系人"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"触摸图片可查看所有号码，触摸并按住可重新排序"</string>
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
+    <string name="select_all" msgid="408601760696146245">"全选"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"视频通话"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"发送短信"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通话详情"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"呼叫<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"与<xliff:g id="NAMEORNUMBER">^1</xliff:g>进行视频通话。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"听取来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>的语音邮件"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"播放来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>的语音邮件"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"暂停来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>的语音邮件"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"删除来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>的语音邮件"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 封新的语音邮件</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 封新的语音邮件</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"为<xliff:g id="NAMEORNUMBER">^1</xliff:g>创建联系人信息"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"将<xliff:g id="NAMEORNUMBER">^1</xliff:g>添加到现有联系人"</string>
     <string name="description_details_action" msgid="2061866409737706174">"与<xliff:g id="NAMEORNUMBER">^1</xliff:g>的通话详情"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"已从通话记录中删除"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"更早"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"通话清单"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"打开扬声器。"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"关闭扬声器。"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"快放。"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"慢放。"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"开始或暂停播放。"</string>
     <string name="display_options_title" msgid="3880091801055797975">"显示选项"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"提示音和振动"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"通话"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"来电屏蔽"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"语音邮件"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"选择要更改其语音信箱设置的 SIM 卡"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"来电拦截功能已暂时关闭"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"来电拦截功能已停用，因为您在过去 48 小时内使用该手机拨打了紧急服务电话。系统会在 48 小时的期限结束后自动重新启用该功能。"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"导入号码"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"已屏蔽的号码"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> 已被屏蔽。"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"通话帐号"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"开启"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"设置权限"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"要启用快速拨号功能，请开启“通讯录”权限。"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"要查看您的通话记录，请开启“电话”权限。"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"要查看您的联系人，请开启“通讯录”权限。"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"要使用您的语音信箱，请开启“电话”权限。"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"要搜索您的联系人，请开启“通讯录”权限。"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"要拨打电话，请开启“电话”权限。"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"电话应用不具备写入系统设置的权限。"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"骚扰电话号码"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>不在线，无法接通"</string>
     <string name="about_phone_label" msgid="582991354677973731">"应用信息"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"由 Google 转录"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google 正在转录…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"转录失败"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"通话已删除。请前往“信息”应用查看和删除通过此通话分享的附件。"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"通话已删除。请前往“信息”应用查看和删除通过通话分享的附件。"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
index 2a96ce0..54f14bc 100644
--- a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"手機"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"手機小鍵盤"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"電話"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話記錄"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"報告錯誤號碼"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"複製號碼"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"複製內容轉錄"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"封鎖號碼"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"解除封鎖號碼"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"致電前編輯號碼"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"清除通話記錄"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"刪除留言"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"要清除通話記錄嗎？"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"這會刪除所有通話記錄"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通話記錄…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"撥打電話"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接來電"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接工作來電"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接來電"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個留言</item>
       <item quantity="one">留言</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"播放"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> ， <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"來自<xliff:g id="CALLER">%1$s</xliff:g>的新語音留言"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"無法播放留言"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"正在載入留言…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"正在封存留言…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"無法載入留言"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"只顯示有留言的來電"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"只顯示來電"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"只顯示撥出電話"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"只顯示未接來電"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"（ <xliff:g id="COUNT">%1$d</xliff:g> ） <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"搜尋"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"撥號"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"致電號碼"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"播放或停止播放"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"開啟或關閉揚聲器"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"指定播放位置"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"減慢播放速度"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"加快播放速度"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話記錄"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多選項"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"小鍵盤"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"只顯示撥出電話"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"只顯示來電"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"只顯示未接來電"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"僅顯示語音留言"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"顯示所有通話"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"新增 2 秒暫停功能"</string>
-    <string name="add_wait" msgid="1177723010768282578">"新增插播功能"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模擬器"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"所有聯絡人"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用觸控音頻按鍵"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回進行中的通話"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"新增通話"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"來電"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"播放語音留言"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"查看聯絡人<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"打電話給<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新使用者介面捷徑"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"正在進入大量操作模式"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已離開大量操作模式"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已選取<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消選取<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡人詳細資料"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"疑似垃圾來電者 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 的聯絡人詳細資料"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次通話次數。"</string>
     <string name="description_video_call" msgid="3738199365585751727">"視像通話。"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"向 <xliff:g id="NAME">%1$s</xliff:g> 傳送短訊"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"未聽取的語音留言"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"開始語音搜尋"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"留言"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"留言"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"留言"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要刪除所選的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>嗎？"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要刪除這些留言嗎？"</b>"</item>
+      <item quantity="one">"<b>"要刪除此留言嗎？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"無法撥打這個電話號碼"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"若要設定留言信箱，請前往 [選單] &gt; [設定]。"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"若要致電留言信箱，請先關閉飛行模式。"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"正在載入..."</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"正在從 SIM 卡載入..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM 卡聯絡人"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"沒有可用的聯絡人應用程式"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"無法使用語音搜尋"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"由於「電話」應用程式已停用，因此無法打電話。"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜尋聯絡人"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"新增號碼或搜尋聯絡人"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"沒有通話記錄"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"撥號"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"您沒有未接來電。"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"您的留言信箱沒有留言。"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"只顯示我的最愛"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"通話記錄"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"未接來電"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"留言信箱"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"快速撥號"</string>
     <string name="tab_history" msgid="7420269368689503596">"通話記錄"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"聯絡人"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"留言信箱"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"已從「我的最愛」中移除"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"復原"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"建立新聯絡人"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"加至現有聯絡人資料"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"傳送短訊"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"進行視像通話"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"封鎖號碼"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> 個新的未接來電"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"快速撥號名單中沒有聯絡人"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"新增常用聯絡人"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"暫時沒有聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"新增聯絡人"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"輕觸圖片以查看所有電話號碼，或輕觸並按住圖片以重新排序"</string>
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
+    <string name="select_all" msgid="408601760696146245">"全選"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"視像通話"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送訊息"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話詳情"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"致電 <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"與<xliff:g id="NAMEORNUMBER">^1</xliff:g>進行視像通話。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"收聽來自「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的留言信箱"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"播放來自 <xliff:g id="NAMEORNUMBER">^1</xliff:g> 的語音留言"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"暫停來自 <xliff:g id="NAMEORNUMBER">^1</xliff:g> 的語音留言"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"刪除來自 <xliff:g id="NAMEORNUMBER">^1</xliff:g> 的語音留言"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>個新留言</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>個新留言</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"為<xliff:g id="NAMEORNUMBER">^1</xliff:g>建立聯絡人"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"加入<xliff:g id="NAMEORNUMBER">^1</xliff:g>至現有的聯絡人"</string>
     <string name="description_details_action" msgid="2061866409737706174">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的通話詳情"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"已從通話記錄中刪除"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"較早"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"通話清單"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"開啟揚聲器。"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"關閉揚聲器。"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"加快播放速度。"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"放慢播放速度。"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"開始或暫停播放。"</string>
     <string name="display_options_title" msgid="3880091801055797975">"顯示選項"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"聲音和震動"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"留言"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"為留言設定選擇 SIM"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"暫時關閉來電封鎖功能"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"您在過去 48 小時內曾經使用此手機聯絡緊急服務，因此來電封鎖功能已停用。系統會在 48 小時期限結束後自動重新啟用功能。"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入號碼"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"已封鎖的號碼"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>。"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"通話帳戶"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"開放權限"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"設定權限"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"如要啟用快速撥號功能，請開放「通訊錄」權限。"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"如要查看通話記錄，請開放「手機」權限。"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"如要查看聯絡人，請開放「通訊錄」權限。"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"如要存取留言信箱，請開放「手機」權限。"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"如要搜尋聯絡人，請開啟「通訊錄」權限。"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"如要撥打電話，請開放「手機」權限。"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"手機應用程式沒有系統設定的寫入權限。"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"垃圾號碼"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>已離線，無法取得聯繫"</string>
     <string name="about_phone_label" msgid="582991354677973731">"關於"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"已由 Google 轉錄"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google 正在轉錄…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"找不到轉錄文字"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"已刪除通話。在「訊息」中查看及刪除此通話期間所分享的附件。"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"已刪除通話。在「訊息」中查看及刪除通話期間所分享的附件。"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
index 9174521..d35b2dc 100644
--- a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"電話"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"電話撥號鍵盤"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"電話"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話紀錄"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"回報號碼錯誤"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"複製號碼"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"複製留言轉錄內容"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"封鎖號碼"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"解除封鎖號碼"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"撥打前編輯號碼"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"清除通話紀錄"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"刪除語音留言"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"清除通話紀錄？"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"這項操作會將所有通話從您的紀錄中刪除"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通話紀錄…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"撥打電話"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接來電"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接公司來電"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接來電"</string>
@@ -48,107 +43,66 @@
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> 則語音留言</item>
       <item quantity="one">語音留言</item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"播放"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>、<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"最新語音留言者：<xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"無法播放語音留言"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"正在載入語音留言…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"正在封存語音留言…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"無法載入語音留言"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"僅顯示語音信箱留言"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"僅顯示來電"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"僅顯示已撥電話"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"僅顯示未接來電"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"搜尋"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"撥號"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"撥號號碼"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"播放或停止播放"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"切換擴音器開關"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"指定播放時間點"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"降低播放速率"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"提高播放速率"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話紀錄"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多選項"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"撥號鍵盤"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"僅顯示撥出電話"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"僅顯示來電"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"僅顯示未接來電"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"僅顯示語音留言"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"顯示所有通話"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"暫停時間延長 2 秒"</string>
-    <string name="add_wait" msgid="1177723010768282578">"延長等待時間"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"模擬工具"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"所有聯絡人"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"使用觸控音按鍵"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"返回進行中的通話"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"新增通話"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"來電"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"播放語音留言"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"查看聯絡人<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"撥電話給<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新版 UI 捷徑"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"已進入大量操作模式"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已離開大量操作模式"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已選取：<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消選取：<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡詳細資料"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"可疑的騷擾/廣告電話來電者 (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) 的聯絡資訊"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"通話 <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次。"</string>
     <string name="description_video_call" msgid="3738199365585751727">"視訊通話。"</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"傳送簡訊給<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"未聽取的語音留言"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"開始進行語音搜尋"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"語音留言"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"語音留言"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"語音留言"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"是"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"否"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"要刪除選取的<xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>嗎？"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批次操作模式"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="other">"<b>"要刪除這些語音留言嗎？"</b>"</item>
+      <item quantity="one">"<b>"要刪除這則語音留言嗎？"</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"無法撥打這個號碼"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"如要設定語音信箱，請前往 [選單] &gt; [設定]。"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"如要聽取語音留言，請先關閉飛航模式。"</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"載入中…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"從  SIM 卡讀取中…"</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"SIM 卡聯絡人"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"沒有可用的聯絡人應用程式"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"無法使用語音搜尋"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"「電話」應用程式已遭停用，因此無法撥打電話。"</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜尋聯絡人"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"新增號碼或搜尋聯絡人"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"沒有任何通話紀錄"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"撥打電話"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"您沒有任何未接來電。"</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"您沒有任何語音留言。"</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"只顯示我的收藏"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"通話紀錄"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"未接來電"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"語音留言"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"快速撥號"</string>
     <string name="tab_history" msgid="7420269368689503596">"通話紀錄"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"聯絡人"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"語音信箱"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"已從常用聯絡人移除"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"復原"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"建立新聯絡人"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"新增至聯絡人"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"傳送簡訊"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"進行視訊通話"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"封鎖號碼"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> 通新的未接來電"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"您的快速撥號功能尚未設定任何聯絡人"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"新增常用聯絡人"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"您尚未加入任何聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"新增聯絡人"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"輕觸圖片即可查看所有號碼，按住則可重新排序"</string>
     <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
+    <string name="select_all" msgid="408601760696146245">"全選"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"視訊通話"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送簡訊"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"通話詳細資料"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"撥號給「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」視訊通話。"</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"聽取「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的語音留言"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"播放來自「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的語音留言"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"暫停來自「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的語音留言"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"刪除來自「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的語音留言"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 則新的語音留言</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 則新的語音留言</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"建立「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的聯絡人資訊"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"將「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」新增到現有的聯絡人"</string>
     <string name="description_details_action" msgid="2061866409737706174">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」通話的詳細資料"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"已從通話紀錄中刪除"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"較舊"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"通話清單"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"開啟喇叭。"</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"關閉喇叭。"</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"加快播放速度。"</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"放慢播放速度。"</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"開始或暫停播放。"</string>
     <string name="display_options_title" msgid="3880091801055797975">"顯示選項"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"音效與振動"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"語音留言"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"選取 SIM 卡以變更語音信箱設定"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"來電封鎖功能已暫時關閉"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"由於您曾在過去 48 小時內使用這支手機撥打緊急服務電話，因此來電封鎖功能已停用。此功能停用達 48 小時後，將由系統自動重新啟用。"</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入電話號碼"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"已封鎖的號碼"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> 已在封鎖清單中。"</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"通話帳戶"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"開啟"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"設定權限"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"如要啟用快速撥號，請開啟「聯絡人」存取權限。"</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"如要查看您的通話紀錄，請開啟「電話」存取權限。"</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"如要查看您的聯絡人，請開啟「聯絡人」存取權限。"</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"如要存取您的語音信箱，請開啟「電話」存取權限。"</string>
     <string name="permission_no_search" msgid="2424710404207193826">"如要搜尋您的聯絡人，請開啟「聯絡人」存取權限。"</string>
     <string name="permission_place_call" msgid="8686908130349369423">"如要撥打電話，請開啟「電話」存取權限。"</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"電話應用程式的權限不足，無法寫入系統設定。"</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"騷擾/廣告電話"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>已離線，無法接聽來電"</string>
     <string name="about_phone_label" msgid="582991354677973731">"關於"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"由 Google 轉錄"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"Google 正在轉錄…"</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"無法轉錄"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"已刪除這筆通話紀錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。"</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"已刪除這些通話紀錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。"</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zu/strings.xml b/java/com/android/dialer/app/res/values-zu/strings.xml
index 9c8a6b8..9818c28 100644
--- a/java/com/android/dialer/app/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/res/values-zu/strings.xml
@@ -19,13 +19,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="2202739481132958990">"Ifoni"</string>
     <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Ikhiphedi yefoni"</string>
-    <string name="dialerIconLabel" msgid="3422916015542176907">"Ifoni"</string>
     <string name="callHistoryIconLabel" msgid="7493268743411968630">"Umlando wekholi"</string>
-    <string name="action_report_number" msgid="7231442711369737797">"Bika inombolo engalungile"</string>
     <string name="action_copy_number_text" msgid="832682558551502319">"Kopisha inombolo"</string>
     <string name="copy_transcript_text" msgid="937904189017310829">"Kopisha ukukhiphela"</string>
-    <string name="action_block_number" msgid="3669819840999705278">"Vimba inombolo"</string>
-    <string name="action_unblock_number" msgid="6583611581996402004">"Vulela inombolo"</string>
     <string name="action_edit_number_before_call" msgid="8017492815878473837">"Hlela inombolo ngaphambi kwekholi"</string>
     <string name="call_log_delete_all" msgid="7852970926906523784">"Sula umlando wekholi"</string>
     <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Susa ivoyisimeyili"</string>
@@ -34,7 +30,6 @@
     <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Sula umlando wekholi?"</string>
     <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Lokhu kuzosusa wonke amakholi kusukela kumlando wakho"</string>
     <string name="clearCallLogProgress_title" msgid="995004835687361977">"Isula umlando wekholi…"</string>
-    <string name="userCallActivityLabel" product="default" msgid="9198964841862577505">"Ifoni"</string>
     <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ikholi ekulahlekele"</string>
     <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ugeje ikholi yomsebenzi"</string>
     <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Amakholi akuphuthele"</string>
@@ -48,107 +43,66 @@
       <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Amavoyisimeyili </item>
       <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Amavoyisimeyili </item>
     </plurals>
-    <string name="notification_action_voicemail_play" msgid="5156500902796354071">"Dlala"</string>
     <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
     <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"I-imeyli entsha esuka ku <xliff:g id="CALLER">%1$s</xliff:g>"</string>
     <string name="voicemail_playback_error" msgid="4384373852257757295">"Ayikwazanga ukudlala ivoyisimeyili"</string>
     <string name="voicemail_fetching_content" msgid="572320120918636014">"Ilayisha ivoyisimeyili…"</string>
-    <string name="voicemail_archiving_content" msgid="2415183864104922185">"Ifaka kungobo yomlando yevoyisimeyili…"</string>
     <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ayikwazi ukulayisha ivoyisimeyili"</string>
-    <string name="call_log_voicemail_header" msgid="5799424860394542726">"Amakholi anevoyisimeyili kuphela"</string>
-    <string name="call_log_incoming_header" msgid="1158753168119845168">"Amakholi angenayo kuphela"</string>
-    <string name="call_log_outgoing_header" msgid="149333910997122683">"Amakholi aphumayo kuphela"</string>
-    <string name="call_log_missed_header" msgid="6491707499211289630">"Amakholi agejiwe kuphela"</string>
     <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_search_button" msgid="4515570469584782176">"sesha"</string>
-    <string name="description_dial_button" msgid="699794433224646027">"dayela"</string>
-    <string name="description_digits_edittext" msgid="8908702618098485186">"inombolo okumele uyidayele"</string>
-    <string name="description_playback_start_stop" msgid="5320452461700750120">"Dlala noma misa ukudlala"</string>
     <string name="description_playback_speakerphone" msgid="4852027754869750227">"Vula noma vala isipikha sefoni"</string>
     <string name="description_playback_seek" msgid="1340910573254132520">"Funa indawo yokudlala"</string>
-    <string name="description_rate_decrease" msgid="5053221110217704199">"Yehlisa isilinganiso sokudlala"</string>
-    <string name="description_rate_increase" msgid="4372206363557406700">"Yenyusa isilinganiso sokudlala"</string>
     <string name="action_menu_call_history_description" msgid="8829135306925008546">"Umlando wekholi"</string>
     <string name="action_menu_overflow_description" msgid="7648679686746517341">"Izinketho eziningi"</string>
     <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ikhiphedi"</string>
-    <string name="menu_show_outgoing_only" msgid="6941420328999801171">"Bonisa eziphumayo kuphela"</string>
-    <string name="menu_show_incoming_only" msgid="6018600870504685564">"Bonisa okungenayo kuphela"</string>
-    <string name="menu_show_missed_only" msgid="2266983597575047192">"Bonisa okugejiwe kuphela"</string>
-    <string name="menu_show_voicemails_only" msgid="1114917855179284592">"Bonisa ama-imeyli ezwi kuphela"</string>
-    <string name="menu_show_all_calls" msgid="220054502052344488">"Bonisa zonke izingcingo ezenziwe"</string>
-    <string name="add_2sec_pause" msgid="3417815038173424525">"Faka ukumisa okwesikhashana kwamasekhondi angu-2"</string>
-    <string name="add_wait" msgid="1177723010768282578">"Yengeza ukulinda"</string>
     <string name="dialer_settings_label" msgid="4980176284150290175">"Izilungiselelo"</string>
     <string name="simulator_submenu_label" msgid="186156287346615267">"Isilingisi"</string>
-    <string name="menu_allContacts" msgid="8544950176866640863">"Bonke othintana nabo"</string>
-    <string name="dialer_useDtmfDialpad" msgid="3919115408138798484">"Sebenzisa ikhiphedi yethoni yokuthinta"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3487191628252824117">"Buyela kukholi eqhubekayo"</string>
-    <string name="dialer_addAnotherCall" msgid="3132945651710234674">"Yengeza ikholi"</string>
-    <string name="actionIncomingCall" msgid="891346596090030558">"Amakholi angenayo"</string>
-    <string name="description_call_log_play_button" msgid="2349845005022431438">"Dlala i-imeyli yezwi"</string>
-    <string name="description_view_contact" msgid="3940984937384372665">"Bheka oxhumana naye <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call" msgid="1532402285334775372">"Shayela <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Dala isinqamuleli esisha se-UI"</string>
+    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Kungenwa kumodi yesenzo senqwaba"</string>
+    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ishiye imodi yesenzo senqwaba"</string>
+    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Kukhethwe i-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Akukhethiwe i-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_contact_details" msgid="3341280873855253464">"Imininingwane yokuxhumana ka-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_spam_contact_details" msgid="5592578752881528368">"Imininingwane yokuxhumana yofonayo ongugaxekile osolwayo <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
     <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> amakholi."</string>
     <string name="description_video_call" msgid="3738199365585751727">"Ikholi yevidiyo."</string>
-    <string name="description_send_text_message" msgid="8450269896765568596">"Thumela i-SMS ku-<xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="description_call_log_unheard_voicemail" msgid="2258821530650350303">"I-imeyli yezwi engazwakalanga"</string>
     <string name="description_start_voice_search" msgid="8380022725973015261">"Qalisa ukusesha ngezwi"</string>
-    <string name="menu_callNumber" msgid="1540773545517152514">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="voicemail" msgid="8899540969000957954">"Ivoyisimeyili"</string>
-    <string name="callDetailsShortDurationFormat" msgid="8517030531054801588">"<xliff:g id="SECONDS">%s</xliff:g> isekhondi"</string>
-    <string name="callDetailsDurationFormat" msgid="6826204822350034578">"<xliff:g id="MINUTES">%s</xliff:g> amaminithi <xliff:g id="SECONDS">%s</xliff:g> amasekhondi"</string>
-    <string name="voicemailMultiSelectVoicemail" msgid="7792569522692927527">"ivoyisimeyili"</string>
-    <string name="voicemailMultiSelectVoicemails" msgid="3901723179158415509">"ama-meyli ezwi"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5904880853422397390">"Yebo"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="7340110543555172665">"Cha"</string>
-    <string name="voicemailMultiSelectDialogTitle" msgid="150612124416146690">"Susa okukhethiwe <xliff:g id="VOICEMAILORVOICEMAILS">%1$s</xliff:g>?"</string>
+    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Khansela imodi lezenzo zeqoqo"</string>
+    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Susa"</string>
+    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Khansela"</string>
+    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Engu-<xliff:g id="NUMBER">%1$s</xliff:g> ekhethiwe"</string>
+    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
+      <item quantity="one">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
+      <item quantity="other">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
+    </plurals>
     <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
     <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ngo-<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="6317935773274628316">"Ayikwazi ukushayela le nombolo"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="6437173108290752604">"Ukuze umise ivoyisimeyili, iya kokuthi Imenyu &gt; Izilungiselelo."</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1044988101597862159">"Ukushayela ivoyisimeyili, vala kuqala imodi Yendiza."</string>
-    <string name="contact_list_loading" msgid="7919825236309749352">"Iyalayisha…"</string>
-    <string name="imei" msgid="5214505934662768308">"IMEI"</string>
-    <string name="meid" msgid="3333779521535224028">"I-MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="6205424276735652071">"Ilayisha kusuka ekhadini le-SIM..."</string>
-    <string name="simContacts_title" msgid="7961069730386378887">"Othintana nabo bekhadi le-SIM"</string>
-    <string name="add_contact_not_available" msgid="7065884447935173347">"Alukho uhlelo lokusebenza loxhumana nabo olutholakalayo"</string>
     <string name="voice_search_not_available" msgid="6546240433719732905">"Usesho lwezwi alutholakali"</string>
-    <string name="call_not_available" msgid="7850148370757361155">"Ayikwazi ukwenza ikholi yefoni ngoba uhlelo lokusebenza lwefoni likhutshaziwe."</string>
     <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Sesha othintana nabo"</string>
     <string name="block_number_search_hint" msgid="5377706079015099416">"Engeza inombolo noma useshe oxhumana nabo"</string>
     <string name="call_log_all_empty" msgid="3955572868518162004">"Umlando wakho wekholi awunalutho"</string>
     <string name="call_log_all_empty_action" msgid="852218280136243014">"Yenza ikholi"</string>
     <string name="call_log_missed_empty" msgid="7094936030845062214">"Awunawo amakholi aphuthelwe."</string>
     <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ibhokisi lokungenayo kwakho levoyisimeyili alinalutho."</string>
-    <string name="show_favorites_only" msgid="8089163582448737837">"Bonisa izintandokazi kuphela"</string>
     <string name="call_log_activity_title" msgid="1275242727244945527">"Umlando wekholi"</string>
     <string name="call_log_all_title" msgid="6042262422192020327">"Konke"</string>
     <string name="call_log_missed_title" msgid="17254005889268015">"Phuthelwe"</string>
-    <string name="call_log_voicemail_title" msgid="6504826963256437971">"Ivoyisimeyili"</string>
     <string name="tab_speed_dial" msgid="6616404752227561075">"Ukudayela okusheshayo"</string>
     <string name="tab_history" msgid="7420269368689503596">"Umlando wekholi"</string>
     <string name="tab_all_contacts" msgid="5531733977693943015">"Oxhumana nabo"</string>
     <string name="tab_voicemail" msgid="2458548090088316246">"Ivoyisimeyili"</string>
-    <string name="favorite_hidden" msgid="1077010324849831399">"Kukhishiwe kusuka kuzintandokazi"</string>
-    <string name="favorite_hidden_undo" msgid="5660280521854875320">"Hlehlisa"</string>
     <string name="search_shortcut_call_number" msgid="8847918845036880688">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Dala oxhumana naye omusha"</string>
     <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Engeza koxhumana naye"</string>
     <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Thumela i-SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Yenza ikholi yevidiyo"</string>
     <string name="search_shortcut_block_number" msgid="4587283230665805776">"Vimba inombolo"</string>
-    <string name="num_missed_calls" msgid="5171791753696317082">"<xliff:g id="NUMBER">%s</xliff:g> amakholi amasha owaphuthelwe"</string>
     <string name="speed_dial_empty" msgid="3346406399966039505">"Akekho umuntu osekudayeleni kwakho okusheshayo okwamanje"</string>
     <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Engeza intandokazi"</string>
-    <string name="all_contacts_empty" msgid="243071567853617177">"Awunabo oxhumana nabo okwamanje"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="2907328217206743952">"Engeza oxhumana naye"</string>
-    <string name="contact_tooltip" msgid="8871614660967439999">"Thinta isithombe ukuze ubone zonke izinombolo noma thinta bese ubambe ukuze uhlele kabusha"</string>
     <string name="remove_contact" msgid="2353580570488923668">"Susa"</string>
+    <string name="select_all" msgid="408601760696146245">"Khetha konke"</string>
     <string name="call_log_action_video_call" msgid="7565549950343850819">"Ikholi yevidiyo"</string>
     <string name="call_log_action_send_message" msgid="6948727362660115554">"Thumela umlayezo"</string>
     <string name="call_log_action_details" msgid="2091370737371449501">"Imininingwane yekholi"</string>
@@ -164,25 +118,14 @@
     <string name="description_call_action" msgid="4042796498169106545">"Shayela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_video_call_action" msgid="1237090968588659650">"Ikholi yevidiyo ka-<xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="3290143432403538524">"Lalela ivoyisimeyili esuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="737337291418966183">"Dlala ivoyisimeyili kusuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="2400610579956333661">"Misa okwesikhashana ivoyisimeyili kusuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_delete" msgid="5305509366448404410">"Sula ivoyisimeyili kusuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="7562208210097630839">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amavoyisimeyili amasha</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amavoyisimeyili amasha</item>
-    </plurals>
     <string name="description_create_new_contact_action" msgid="1928282350281564130">"Dalela oxhumana naye u-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Engeza u-<xliff:g id="NAMEORNUMBER">^1</xliff:g> koxhumana naye okhona"</string>
     <string name="description_details_action" msgid="2061866409737706174">"Imininingwane yekholi ye-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="toast_entry_removed" msgid="6821678859297454838">"Isusiwe kusukela kumlando wekholi"</string>
     <string name="call_log_header_today" msgid="1576119097475845293">"Namhlanje"</string>
     <string name="call_log_header_yesterday" msgid="5616077776205329563">"Izolo"</string>
     <string name="call_log_header_other" msgid="4940676886254217644">"Okudala"</string>
-    <string name="call_detail_list_header" msgid="1174040565810083473">"Uhlu lwamakholi"</string>
     <string name="voicemail_speaker_on" msgid="3151333608926996668">"Vula isipikha."</string>
     <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vala isipikha."</string>
-    <string name="voicemail_play_faster" msgid="2742012169751409677">"Dala ngokushesha."</string>
-    <string name="voicemail_play_slower" msgid="868588128301087884">"Dlala ngokungasheshi."</string>
     <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Qala noma misa isikhashana ukudlala."</string>
     <string name="display_options_title" msgid="3880091801055797975">"Izinketho zokubukeka"</string>
     <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Imisindo nokudlidliza"</string>
@@ -199,7 +142,6 @@
     <string name="call_settings_label" msgid="7824611757200960807">"Amakholi"</string>
     <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Ukuvimbela ikholi"</string>
     <string name="voicemail_settings_label" msgid="4594299554519920570">"Ivoyisimeyili"</string>
-    <string name="voicemail_settings_select_sim_title" msgid="129296966967476845">"Khetha i-SIM yezilungiselelo zevoyisimeyili"</string>
     <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Ukuvimbela ikholi kuvalwe isikhashana"</string>
     <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Ukuvimbela ikholi kukhutshaziwe ngoba uxhumane nabosizo oluphuthumayo kusukela kule foni phakathi kwamahora angu-48 wokugcina. Kuzophinda kunikwe amandla ngokuzenzakalela uma sokuphele isikhathi samahora angu-48."</string>
     <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ngenisa izinombolo"</string>
@@ -213,12 +155,8 @@
     <string name="block_list" msgid="4701585783411870782">"Izinombolo ezivinjiwe"</string>
     <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> isivinjiwe kakade."</string>
     <string name="phone_account_settings_label" msgid="8372485478006965920">"Ama-akhawunti wokushaya"</string>
-    <string name="permission_single_turn_on" msgid="8014796118294187894">"Vula"</string>
-    <string name="permission_multiple_turn_on" msgid="5679888820253829400">"Setha izimvume"</string>
     <string name="permission_no_speeddial" msgid="8487215628510596753">"Nika amandla ukudayela okusheshayo, vula imvume yoxhumana nabo."</string>
     <string name="permission_no_calllog" msgid="4053705651238775784">"Ukuze ubone irekhodi lakho lamakholi, vuma imvume yefoni."</string>
-    <string name="permission_no_contacts" msgid="8995025765862026771">"Ukuze ubone oxhumana nabo, vula imvume yoxhumana nabo."</string>
-    <string name="permission_no_voicemail" msgid="1908142679289209291">"Ukuze ufinyelele ivoyisimeyili, vula imvume yefoni."</string>
     <string name="permission_no_search" msgid="2424710404207193826">"Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo."</string>
     <string name="permission_place_call" msgid="8686908130349369423">"Ukuze ubeke ikholi, vula imvume yefoni."</string>
     <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Uhlelo lokusebenza lefoni alinayo imvume yokubhalela kuzilungiselelo zesistimu."</string>
@@ -230,4 +168,10 @@
     <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ugaxekile"</string>
     <string name="call_composer_connection_failed" msgid="6776461585447831242">"U-<xliff:g id="NAME">%1$s</xliff:g> akaxhunyiwe kwi-inthanethi futhi akakwazi ukufinyelelwa"</string>
     <string name="about_phone_label" msgid="582991354677973731">"Mayelana"</string>
+    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Kubhalwe ngokuloba i-Google"</string>
+    <string name="voicemail_transcription_in_progress" msgid="7487903595413945308">"I-Google ibhala ngokuloba..."</string>
+    <string name="voicemail_transcription_failed" msgid="8492006288177649340">"Ukubhalwa ngokuloba akutholakali"</string>
+    <string name="view_conversation" msgid="7895904782094119702">"Buka"</string>
+    <string name="ec_data_deleted" msgid="4794880345545827107">"Ikholi isusiwe. Buka uphinde ususe okunamathiselwe ku-imeyili okwabiwe ngesikhathi sale kholi kumilayezo."</string>
+    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Amakholi asusiwe. Buka uphinde ususe okunamathiselwe kwi-imeyili okwabiwe ngesikhathi samakholi kumilayezo."</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/animation_constants.xml b/java/com/android/dialer/app/res/values/animation_constants.xml
index 91230cd..4029e77 100644
--- a/java/com/android/dialer/app/res/values/animation_constants.xml
+++ b/java/com/android/dialer/app/res/values/animation_constants.xml
@@ -16,15 +16,4 @@
   -->
 <resources>
   <integer name="fade_duration">300</integer>
-
-  <!-- Swipe constants -->
-  <integer name="swipe_escape_velocity">100</integer>
-  <integer name="escape_animation_duration">200</integer>
-  <integer name="max_escape_animation_duration">400</integer>
-  <integer name="max_dismiss_velocity">2000</integer>
-  <integer name="snap_animation_duration">350</integer>
-  <integer name="swipe_scroll_slop">2</integer>
-  <dimen name="min_swipe">0dip</dimen>
-  <dimen name="min_vert">10dip</dimen>
-  <dimen name="min_lock">20dip</dimen>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml
index cf6b926..f1f5002 100644
--- a/java/com/android/dialer/app/res/values/colors.xml
+++ b/java/com/android/dialer/app/res/values/colors.xml
@@ -15,9 +15,6 @@
 -->
 
 <resources>
-  <color name="dialer_red_highlight_color">#ff1744</color>
-
-  <color name="dialer_button_text_color">#fff</color>
   <color name="dialer_flat_button_text_color">@color/dialer_theme_color</color>
 
   <!-- Color for the setting text. -->
@@ -26,7 +23,6 @@
   <color name="setting_secondary_color">@color/dialer_secondary_text_color</color>
   <color name="setting_disabled_color">#aaaaaa</color>
   <color name="setting_background_color">#ffffff</color>
-  <color name="setting_button_color">#eee</color>
 
   <!-- 54% black -->
   <color name="call_log_icon_tint">#8a000000</color>
@@ -36,6 +32,8 @@
   <color name="call_log_detail_color">#8a000000</color>
   <!-- 87% black -->
   <color name="call_log_voicemail_transcript_color">#de000000</color>
+  <!-- 54% black -->
+  <color name="call_log_voicemail_transcript_branding_color">#8a000000</color>
   <!-- 70% black -->
   <color name="call_log_action_color">#b3000000</color>
   <!-- 54% black -->
@@ -52,41 +50,21 @@
   <!-- Colour of voicemail progress bar to the left of position indicator. -->
   <color name="voicemail_playback_seek_bar_already_played">@color/dialer_theme_color</color>
 
-  <!-- Background color of new dialer activity -->
-  <color name="background_dialer_light">#fafafa</color>
   <!-- Background color for search results and call details -->
   <color name="background_dialer_results">#f9f9f9</color>
-  <color name="background_dialer_call_log">@color/background_dialer_light</color>
-
-  <!-- Color of the 1dp divider that separates favorites -->
-  <color name="favorite_contacts_separator_color">#d0d0d0</color>
 
   <!-- Color of the contact name in favorite tiles -->
   <color name="contact_tile_name_color">#ffffff</color>
 
   <color name="contact_list_name_text_color">@color/dialer_primary_text_color</color>
 
-  <!-- Undo dialogue color -->
-  <color name="undo_dialogue_text_color">#4d4d4d</color>
-
-  <color name="empty_list_text_color">#b2b2b2</color>
-
   <color name="remove_text_color">#ffffff</color>
 
   <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
   <color name="remove_highlighted_text_color">#FF3F3B</color>
 
-  <!-- Color of the bottom border below the contacts grid on the main dialer screen. -->
-  <color name="contacts_grid_bottom_border_color">#16000000</color>
-
-  <!-- Color of actions in expanded call log entries.  This text color represents actions such
-       as call back, play voicemail, etc. -->
-  <color name="call_log_action_text">@color/dialer_theme_color</color>
-
   <color name="dialer_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
 
-  <color name="floating_action_button_touch_tint">#80ffffff</color>
-
   <color name="call_log_action_divider">#eeeeee</color>
   <color name="divider_line_color">#D8D8D8</color>
 
@@ -97,11 +75,7 @@
   <color name="blocked_number_background">#FFFFFF</color>
   <color name="blocked_number_block_color">#F44336</color>
   <color name="blocked_number_header_color">@color/dialer_theme_color</color>
-  <color name="blocked_number_disabled_emergency_header_color">#616161</color>
   <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
   <color name="add_blocked_number_icon_color">#bdbdbd</color>
-  <!-- Grey 700 -->
-  <color name="call_detail_footer_text_color">#616161</color>
-  <color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color>
 
 </resources>
diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml
index 7da29c7..5f252ee 100644
--- a/java/com/android/dialer/app/res/values/dimens.xml
+++ b/java/com/android/dialer/app/res/values/dimens.xml
@@ -14,9 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="button_horizontal_padding">16dp</dimen>
-  <dimen name="divider_line_thickness">1dp</dimen>
 
   <!--
         Drag to remove view (in dp because it is used in conjunction with a statically
@@ -24,42 +23,22 @@
   -->
   <dimen name="remove_text_size">16dp</dimen>
 
+  <!-- Select All/Multi Select -->
+  <dimen name="select_all_text_size">14sp</dimen>
+  <dimen name="select_all_icon_padding">16dp</dimen>
+  <dimen name="select_all_text_left_padding">18dp</dimen>
+
   <!-- Call Log -->
   <dimen name="call_log_horizontal_margin">8dp</dimen>
-  <dimen name="call_log_call_action_size">32dp</dimen>
-  <dimen name="call_log_call_action_width">54dp</dimen>
-  <dimen name="call_log_inner_margin">13dp</dimen>
   <dimen name="call_log_outer_margin">8dp</dimen>
   <dimen name="call_log_start_margin">8dp</dimen>
-  <dimen name="call_log_indent_margin">24dp</dimen>
   <dimen name="call_log_name_margin_bottom">2dp</dimen>
   <dimen name="call_log_call_account_margin_bottom">2dp</dimen>
   <dimen name="call_log_vertical_padding">8dp</dimen>
-  <dimen name="call_log_list_item_height">56dp</dimen>
   <dimen name="call_log_list_item_info_margin_start">16dp</dimen>
-  <dimen name="show_call_history_list_item_height">72dp</dimen>
 
   <!-- Size of contact photos in the call log and call details. -->
   <dimen name="contact_photo_size">48dp</dimen>
-  <dimen name="call_detail_button_spacing">2dip</dimen>
-  <dimen name="call_detail_horizontal_margin">20dp</dimen>
-  <dimen name="call_detail_top_margin">16dp</dimen>
-  <dimen name="call_detail_bottom_margin">16dp</dimen>
-  <dimen name="call_detail_header_top_margin">20dp</dimen>
-  <dimen name="call_detail_header_bottom_margin">9dp</dimen>
-  <dimen name="call_detail_elevation">0.5dp</dimen>
-  <dimen name="call_detail_action_item_padding_horizontal">28dp</dimen>
-  <dimen name="call_detail_action_item_padding_vertical">16dp</dimen>
-  <dimen name="call_detail_action_item_drawable_padding">28dp</dimen>
-  <dimen name="call_detail_action_item_text_size">16sp</dimen>
-  <dimen name="transcription_top_margin">18dp</dimen>
-  <dimen name="transcription_bottom_margin">18dp</dimen>
-
-  <!-- Size of call provider icon width and height -->
-  <dimen name="call_provider_small_icon_size">12dp</dimen>
-
-  <!-- Match call_button_height to Phone's dimens/in_call_end_button_height -->
-  <dimen name="call_button_height">74dp</dimen>
 
   <!-- Dimensions for speed dial tiles -->
   <dimen name="contact_tile_divider_width">1dp</dimen>
@@ -68,20 +47,14 @@
   <dimen name="contact_tile_text_side_padding">12dp</dimen>
   <dimen name="contact_tile_text_bottom_padding">9dp</dimen>
   <dimen name="favorites_row_top_padding">1dp</dimen>
-  <dimen name="favorites_row_bottom_padding">0dp</dimen>
   <dimen name="favorites_row_start_padding">1dp</dimen>
 
   <!-- Padding from the last contact tile will provide the end padding. -->
   <dimen name="favorites_row_end_padding">0dp</dimen>
-  <dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
 
   <!-- Size of the star icon on the favorites tile. -->
   <dimen name="favorites_star_icon_size">12dp</dimen>
 
-  <!-- Padding for the tooltip -->
-  <dimen name="dismiss_button_padding_start">20dip</dimen>
-  <dimen name="dismiss_button_padding_end">28dip</dimen>
-
   <!-- Margin to the left and right of the search box. -->
   <dimen name="search_margin_horizontal">8dp</dimen>
   <!-- Margin above the search box. -->
@@ -98,22 +71,6 @@
   <dimen name="search_list_padding_top">16dp</dimen>
   <dimen name="search_box_elevation">3dp</dimen>
 
-  <!-- Padding for icons to increase their touch target. Icons are typically 24 dps in size
-       so this extra padding makes the entire touch target 40dp -->
-  <dimen name="icon_padding">8dp</dimen>
-
-  <!-- Length of dialpad's shadows in dialer. -->
-  <dimen name="shadow_length">10dp</dimen>
-
-  <dimen name="empty_list_message_top_padding">20dp</dimen>
-  <dimen name="empty_list_message_text_size">16sp</dimen>
-
-  <!-- Dimensions for individual preference cards -->
-  <dimen name="preference_padding_top">16dp</dimen>
-  <dimen name="preference_padding_bottom">16dp</dimen>
-  <dimen name="preference_side_margin">16dp</dimen>
-  <dimen name="preference_summary_line_spacing_extra">4dp</dimen>
-
   <dimen name="call_log_list_item_primary_action_dimen">48dp</dimen>
 
   <!-- Dimensions for promo cards -->
@@ -137,9 +94,7 @@
   <dimen name="blocked_number_add_top_margin">8dp</dimen>
   <dimen name="blocked_number_add_bottom_margin">8dp</dimen>
   <dimen name="blocked_number_primary_text_size">16sp</dimen>
-  <dimen name="blocked_number_secondary_text_size">12sp</dimen>
   <dimen name="blocked_number_delete_icon_size">32dp</dimen>
   <dimen name="blocked_number_search_text_size">14sp</dimen>
   <dimen name="blocked_number_settings_description_text_size">14sp</dimen>
-  <dimen name="blocked_number_header_height">48dp</dimen>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/donottranslate_config.xml b/java/com/android/dialer/app/res/values/donottranslate_config.xml
deleted file mode 100644
index e7a8e6f..0000000
--- a/java/com/android/dialer/app/res/values/donottranslate_config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2012 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
-  -->
-
-<resources>
-
-  <!-- If true, enable vibration (haptic feedback) for dialer key presses.
-       The pattern is set on a per-platform basis using config_virtualKeyVibePattern.
-       TODO: If enough users are annoyed by this, we might eventually
-       need to make it a user preference rather than a per-platform
-        resource. -->
-  <bool name="config_enable_dialer_key_vibration">true</bool>
-
-  <!-- If true, show an onscreen "Dial" button in the dialer.
-       In practice this is used on all platforms even the ones with hard SEND/END
-       keys, but for maximum flexibility it's controlled by a flag here
-       (which can be overridden on a per-product basis.) -->
-  <bool name="config_show_onscreen_dial_button">true</bool>
-
-  <!-- Regular expression for prohibiting certain phone numbers in dialpad.
-       Ignored if empty. -->
-  <string name="config_prohibited_phone_number_regexp"></string>
-
-</resources>
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 9e1fdeb..50e7174 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -16,21 +16,14 @@
   -->
 
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- Application name used in Settings/Apps. Default label for activities
        that don't specify a label. -->
-  <string name="applicationLabel">Phone</string>
+  <string name="applicationLabel" tools:ignore="UnusedResources">Phone</string>
 
   <!-- Title for the activity that dials the phone, when launched directly into the dialpad -->
   <string name="launcherDialpadActivityLabel">Phone Keypad</string>
-  <!-- The description text for the dialer tab.
-
-  Note: AccessibilityServices use this attribute to announce what the view represents.
-  This is especially valuable for views without textual representation like ImageView.
-
-  [CHAR LIMIT=NONE] -->
-  <string name="dialerIconLabel">Phone</string>
 
   <!-- The description text for the call log tab.
 
@@ -38,10 +31,7 @@
   This is especially valuable for views without textual representation like ImageView.
 
   [CHAR LIMIT=NONE] -->
-  <string name="callHistoryIconLabel">Call history</string>
-
-  <!-- Text for a menu item to report a call as having been incorrectly identified. [CHAR LIMIT=48] -->
-  <string name="action_report_number">Report inaccurate number</string>
+  <string name="callHistoryIconLabel" tools:ignore="UnusedResources">Call history</string>
 
   <!-- Option displayed in context menu to copy long pressed phone number. [CHAR LIMIT=48] -->
   <string name="action_copy_number_text">Copy number</string>
@@ -49,12 +39,6 @@
   <!-- Option displayed in context menu to copy long pressed voicemail transcription. [CHAR LIMIT=48] -->
   <string name="copy_transcript_text">Copy transcription</string>
 
-  <!-- Label for action to block a number. [CHAR LIMIT=48] -->
-  <string name="action_block_number">Block number</string>
-
-  <!-- Label for action to unblock a number [CHAR LIMIT=48]-->
-  <string name="action_unblock_number">Unblock number</string>
-
   <!-- Label for action to edit a number before calling it. [CHAR LIMIT=48] -->
   <string name="action_edit_number_before_call">Edit number before call</string>
 
@@ -79,10 +63,6 @@
   <!-- Title of the "Clearing call log" progress-dialog [CHAR LIMIT=35] -->
   <string name="clearCallLogProgress_title">Clearing call history\u2026</string>
 
-  <!-- Title used for the activity for placing a call. This name appears
-       in activity disambig dialogs -->
-  <string name="userCallActivityLabel" product="default">Phone</string>
-
   <!-- Notification strings -->
   <!-- Missed call notification label, used when there's exactly one missed call -->
   <string name="notification_missedCallTitle">Missed call</string>
@@ -114,15 +94,12 @@
   <!-- Title of the notification of new voicemails. [CHAR LIMIT=30] -->
   <plurals name="notification_voicemail_title">
     <item quantity="one">Voicemail</item>
-        <item quantity="other">
+    <item quantity="other">
             <xliff:g id="count">%1$d</xliff:g>
             Voicemails
         </item>
   </plurals>
 
-  <!-- Used in the notification of a new voicemail for the action to play the voicemail. -->
-  <string name="notification_action_voicemail_play">Play</string>
-
   <!-- Used to build a list of names or phone numbers, to indicate the callers who left
        voicemails.
        The first argument may be one or more callers, the most recent ones.
@@ -131,12 +108,12 @@
 
        [CHAR LIMIT=10]
    -->
-    <string name="notification_voicemail_callers_list"><xliff:g id="newer_callers">%1$s</xliff:g>,
+  <string name="notification_voicemail_callers_list"><xliff:g id="newer_callers">%1$s</xliff:g>,
         <xliff:g id="older_caller">%2$s</xliff:g>
     </string>
 
   <!-- Text used in the ticker to notify the user of the latest voicemail. [CHAR LIMIT=30] -->
-    <string name="notification_new_voicemail_ticker">New voicemail from
+  <string name="notification_new_voicemail_ticker">New voicemail from
         <xliff:g id="caller">%1$s</xliff:g>
     </string>
 
@@ -146,54 +123,14 @@
   <!-- Message to display whilst we are waiting for the content to be fetched. [CHAR LIMIT=40] -->
   <string name="voicemail_fetching_content">Loading voicemail\u2026</string>
 
-  <!-- Message to display whilst we are waiting for the content to be archived. [CHAR LIMIT=40] -->
-  <string name="voicemail_archiving_content">Archiving voicemail\u2026</string>
-
   <!-- Message to display if we fail to get content within a suitable time period. [CHAR LIMIT=40] -->
   <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string>
 
-  <!-- The header to show that call log is only showing voicemail calls. [CHAR LIMIT=40] -->
-  <string name="call_log_voicemail_header">Calls with voicemail only</string>
-
-  <!-- The header to show that call log is only showing incoming calls. [CHAR LIMIT=40] -->
-  <string name="call_log_incoming_header">Incoming calls only</string>
-
-  <!-- The header to show that call log is only showing outgoing calls. [CHAR LIMIT=40] -->
-  <string name="call_log_outgoing_header">Outgoing calls only</string>
-
-  <!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] -->
-  <string name="call_log_missed_header">Missed calls only</string>
-
   <!-- The counter for calls in a group and the date of the latest call as shown in the call log [CHAR LIMIT=15] -->
-    <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
+  <string name="call_log_item_count_and_date">(<xliff:g id="count">%1$d</xliff:g>)
         <xliff:g id="date">%2$s</xliff:g>
     </string>
 
-  <!-- String describing the Search ImageButton
-
-       Used by AccessibilityService to announce the purpose of the button.
-       [CHAR LIMIT=NONE]
-  -->
-  <string name="description_search_button">search</string>
-
-  <!-- String describing the Dial ImageButton
-
-       Used by AccessibilityService to announce the purpose of the button.
-  -->
-  <string name="description_dial_button">dial</string>
-
-  <!-- String describing the digits text box containing the number to dial.
-
-       Used by AccessibilityService to announce the purpose of the view.
-  -->
-  <string name="description_digits_edittext">number to dial</string>
-
-  <!-- String describing the button in the voicemail playback to start/stop playback.
-
-       Used by AccessibilityService to announce the purpose of the view.
-  -->
-  <string name="description_playback_start_stop">Play or stop playback</string>
-
   <!-- String describing the button in the voicemail playback to switch on/off speakerphone.
 
        Used by AccessibilityService to announce the purpose of the view.
@@ -206,18 +143,6 @@
   -->
   <string name="description_playback_seek">Seek playback position</string>
 
-  <!-- String describing the button in the voicemail playback to decrease playback rate.
-
-       Used by AccessibilityService to announce the purpose of the view.
-  -->
-  <string name="description_rate_decrease">Decrease playback rate</string>
-
-  <!-- String describing the button in the voicemail playback to increase playback rate.
-
-       Used by AccessibilityService to announce the purpose of the view.
-  -->
-  <string name="description_rate_increase">Increase playback rate</string>
-
   <!-- Content description for the fake action menu button that brings up the call history
        activity -->
   <string name="action_menu_call_history_description">Call history</string>
@@ -232,25 +157,6 @@
        [CHAR LIMIT=NONE] -->
   <string name="action_menu_dialpad_button">key pad</string>
 
-  <!-- Menu item used to show only outgoing in the call log. [CHAR LIMIT=30] -->
-  <string name="menu_show_outgoing_only">Show outgoing only</string>
-
-  <!-- Menu item used to show only incoming in the call log. [CHAR LIMIT=30] -->
-  <string name="menu_show_incoming_only">Show incoming only</string>
-
-  <!-- Menu item used to show only missed in the call log. [CHAR LIMIT=30] -->
-  <string name="menu_show_missed_only">Show missed only</string>
-
-  <!-- Menu item used to show only voicemails in the call log. [CHAR LIMIT=30] -->
-  <string name="menu_show_voicemails_only">Show voicemails only</string>
-
-  <!-- Menu item used to show all calls in the call log. [CHAR LIMIT=30] -->
-  <string name="menu_show_all_calls">Show all calls</string>
-
-  <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->
-  <string name="add_2sec_pause">Add 2-sec pause</string>
-  <string name="add_wait">Add wait</string>
-
   <!-- Label for the dialer app setting page [CHAR LIMIT=30]-->
   <string name="dialer_settings_label">Settings</string>
 
@@ -258,47 +164,36 @@
        and testing. [CHAR LIMIT=30]-->
   <string name="simulator_submenu_label">Simulator</string>
 
-  <!-- Menu item to display all contacts [CHAR LIMIT=30] -->
-  <string name="menu_allContacts">All contacts</string>
+  <!-- Label for the menu item that installs a shortcut for the new UI. [CHAR LIMIT=30] -->
+  <string name="new_ui_launcher_shortcut_label">Create New UI Shortcut</string>
 
-  <!-- Item label: jump to the in-call DTMF dialpad.
-       (Part of a list of options shown in the dialer when another call
-       is already in progress.) -->
-  <string name="dialer_useDtmfDialpad">Use touch tone keypad</string>
+  <!-- String describing the user entering bulk action mode.
 
-  <!-- Item label: jump to the in-call UI.
-       (Part of a list of options shown in the dialer when another call
-       is already in progress.) -->
-  <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+    Note: AccessibilityServices use this attribute to announce what the view represents.
+          This is especially valuable for views without textual representation like ImageView.
+-->
+  <string name="description_entering_bulk_action_mode">Entering bulk action mode</string>
 
-  <!-- Item label: use the Dialer's keypad to add another call.
-       (Part of a list of options shown in the dialer when another call
-       is already in progress.) -->
-  <string name="dialer_addAnotherCall">Add call</string>
+  <!-- String describing the user leaving bulk action mode.
 
-  <!-- Description for incoming calls going to voice mail vs. not -->
-  <string name="actionIncomingCall">Incoming calls</string>
+    Note: AccessibilityServices use this attribute to announce what the view represents.
+          This is especially valuable for views without textual representation like ImageView.
+-->
+  <string name="description_leaving_bulk_action_mode">Left bulk action mode</string>
 
-  <!-- String describing the icon in the call log used to play a voicemail.
+  <!-- String describing the button to select an entry for bulk action.
 
       Note: AccessibilityServices use this attribute to announce what the view represents.
             This is especially valuable for views without textual representation like ImageView.
   -->
-  <string name="description_call_log_play_button">Play voicemail</string>
+  <string name="description_selecting_bulk_action_mode">Selected <xliff:g id="nameOrNumber">%1$s</xliff:g></string>
 
-  <!-- String describing the button to view the contact for the current number.
+  <!-- String describing the button to unselect an entry for bulk action.
 
       Note: AccessibilityServices use this attribute to announce what the view represents.
             This is especially valuable for views without textual representation like ImageView.
   -->
-  <string name="description_view_contact">View contact <xliff:g id="name">%1$s</xliff:g></string>
-
-  <!-- String describing the button to call a number or contact.
-
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-  -->
-  <string name="description_call">Call <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="description_unselecting_bulk_action_mode">Unselected <xliff:g id="nameOrNumber">%1$s</xliff:g></string>
 
   <!-- String describing the button to access the contact details for a name or number.
 
@@ -330,43 +225,27 @@
   -->
   <string name="description_video_call">Video call.</string>
 
-  <!-- String describing the button to SMS a number or contact.
-
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-            [CHAR LIMIT=NONE]
-  -->
-  <string name="description_send_text_message">Send SMS to <xliff:g id="name">%1$s</xliff:g></string>
-
-  <!-- String describing the icon in the call log used to represent an unheard voicemail left to
-       the user.
-
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-            [CHAR LIMIT=NONE]
-  -->
-  <string name="description_call_log_unheard_voicemail">Unheard voicemail</string>
-
   <!-- String describing the icon used to start a voice search -->
   <string name="description_start_voice_search">Start voice search</string>
 
-  <!-- Menu item used to call a contact, containing the number of the contact to call -->
-  <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string>
-
   <!-- String used for displaying calls to the voicemail number in the call log -->
   <string name="voicemail">Voicemail</string>
 
-  <!-- A nicely formatted call duration displayed when viewing call details for duration less than 1 minute. For example "28 sec" -->
-  <string name="callDetailsShortDurationFormat"><xliff:g example="28" id="seconds">%s</xliff:g> sec</string>
+  <!-- String describing the cancel button in multi select.
+       Note: AccessibilityServices uses this attribute to announce what the view represents.
+       [CHAR LIMIT=NONE] -->
+  <string name="description_cancel_multi_select">Cancel batch actions mode</string>
 
-  <!-- A nicely formatted call duration displayed when viewing call details. For example "42 min 28 sec" -->
-  <string name="callDetailsDurationFormat"><xliff:g example="42" id="minutes">%s</xliff:g> min <xliff:g example="28" id="seconds">%s</xliff:g> sec</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel</string>
 
-  <string name="voicemailMultiSelectVoicemail">voicemail</string>
-  <string name="voicemailMultiSelectVoicemails">voicemails</string>
-  <string name="voicemailMultiSelectDeleteConfirm">Yes</string>
-  <string name="voicemailMultiSelectDeleteCancel">No</string>
-  <string name="voicemailMultiSelectDialogTitle">Delete selected <xliff:g id="voicemailorvoicemails">%1$s</xliff:g>?</string>
+  <string name="voicemailMultiSelectActionBarTitle"><xliff:g id="number">%1$s</xliff:g> selected</string>
+
+  <!-- Alert dialog title to accept or decline deleting voicemail(s). -->
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete this voicemail? </b></item>
+    <item quantity="other"><b>Delete these voicemails? </b></item>
+  </plurals>
 
   <!-- The string 'Today'. This value is used in the voicemailCallLogDateTimeFormat rather than an
        explicit date string, e.g. Jul 25, 2014, in the event that a voicemail was created on the
@@ -383,44 +262,9 @@
   <!-- A format string used for displaying the date, time and duration for a voicemail call log. For example: Jul 25, 2014 at 2:49 PM • 00:34 -->
   <string name="voicemailCallLogDateTimeFormatWithDuration"><xliff:g example="Jul 25, 2014 at 2:49PM" id="dateAndTime">%1$s</xliff:g> \u2022 <xliff:g example="01:22" id="duration">%2$s</xliff:g></string>
 
-  <!-- Dialog message which is shown when the user tries to make a phone call
-       to prohibited phone numbers [CHAR LIMIT=NONE] -->
-  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
-
-  <!-- Dialog message which is shown when the user tries to check voicemail
-       while the system isn't ready for the access. [CHAR LIMIT=NONE] -->
-  <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
-
-  <!-- Dialog message which is shown when the user tries to check voicemail
-       while the system is in airplane mode. The user cannot access to
-       voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
-  <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
-
-  <!-- Message that appears in the favorites tab of the Phone app when the contact list has not fully loaded yet (below the favorite and frequent contacts) [CHAR LIMIT=20] -->
-  <string name="contact_list_loading">Loading\u2026</string>
-
-  <!-- The title of a dialog that displays the IMEI of the phone -->
-  <string name="imei">IMEI</string>
-
-  <!-- The title of a dialog that displays the MEID of the CDMA phone -->
-  <string name="meid">MEID</string>
-
-  <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial -->
-  <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
-
-  <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial -->
-  <string name="simContacts_title">SIM card contacts</string>
-
-  <!-- Message displayed when there is no application available to handle the add contact menu option. [CHAR LIMIT=NONE] -->
-  <string name="add_contact_not_available">No contacts app available</string>
-
   <!-- Message displayed when there is no application available to handle voice search. [CHAR LIMIT=NONE] -->
   <string name="voice_search_not_available">Voice search not available</string>
 
-  <!-- Message displayed when the Phone application has been disabled and a phone call cannot
-       be made. [CHAR LIMIT=NONE] -->
-  <string name="call_not_available">Cannot make a phone call because the Phone application has been disabled.</string>
-
   <!-- Hint displayed in dialer search box when there is no query that is currently typed.
        [CHAR LIMIT=30] -->
   <string name="dialer_hint_find_contact">Search contacts</string>
@@ -429,12 +273,6 @@
        [CHAR LIMIT=45] -->
   <string name="block_number_search_hint">Add number or search contacts</string>
 
-  <!-- String resource for the font-family to use for the call log activity's title -->
-  <string name="call_log_activity_title_font_family" translatable="false">sans-serif-light</string>
-
-  <!-- String resource for the font-family to use for the full call history footer -->
-  <string name="view_full_call_history_font_family" translatable="false">sans-serif</string>
-
   <!-- Text displayed when the call log is empty. -->
   <string name="call_log_all_empty">Your call history is empty</string>
 
@@ -447,11 +285,8 @@
   <!-- Text displayed when the list of voicemails is empty -->
   <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string>
 
-  <!--  Menu option to show favorite contacts only -->
-  <string name="show_favorites_only">Show favorites only</string>
-
   <!--  Title of activity that displays a list of all calls -->
-  <string name="call_log_activity_title">Call History</string>
+  <string name="call_log_activity_title" tools:ignore="UnusedResources">Call History</string>
 
   <!-- Title for the call log tab containing the list of all voicemails and calls
        [CHAR LIMIT=30] -->
@@ -461,10 +296,6 @@
        [CHAR LIMIT=30] -->
   <string name="call_log_missed_title">Missed</string>
 
-  <!-- Title for the call log tab containing the list of all voicemail calls only
-       [CHAR LIMIT=30] -->
-  <string name="call_log_voicemail_title">Voicemail</string>
-
   <!-- Accessibility text for the tab showing recent and favorite contacts who can be called.
        [CHAR LIMIT=40] -->
   <string name="tab_speed_dial">Speed dial</string>
@@ -478,13 +309,8 @@
   <!-- Accessibility text for the tab showing the user's voicemails. [CHAR LIMIT=40] -->
   <string name="tab_voicemail">Voicemail</string>
 
-  <!--  Text displayed when user swipes out a favorite contact -->
-  <string name="favorite_hidden">Removed from favorites</string>
-  <!--  Text displayed for the undo button to undo removing a favorite contact -->
-  <string name="favorite_hidden_undo">Undo</string>
-
   <!-- Shortcut item used to call a number directly from search -->
-    <string name="search_shortcut_call_number">Call
+  <string name="search_shortcut_call_number">Call
         <xliff:g id="number">%s</xliff:g>
     </string>
 
@@ -505,30 +331,18 @@
   <!-- Shortcut item used to block a number directly from search. [CHAR LIMIT=25] -->
   <string name="search_shortcut_block_number">Block number</string>
 
-  <!-- Number of missed calls shown on call card [CHAR LIMIT=40] -->
-  <string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string>
-
   <!-- Shown when there are no speed dial favorites. -->
   <string name="speed_dial_empty">No one is on your speed dial yet</string>
 
   <!-- Shown as an action when there are no speed dial favorites -->
   <string name="speed_dial_empty_add_favorite_action">Add a favorite</string>
 
-  <!-- Shown when there are no contacts in the all contacts list. -->
-  <string name="all_contacts_empty">You don\'t have any contacts yet</string>
-
-  <!-- Shown as an action when the all contacts list is empty -->
-  <string name="all_contacts_empty_add_contact_action">Add a contact</string>
-
-  <!-- Shows up as a tooltip to provide a hint to the user that the profile pic in a contact
-       card can be tapped to bring up a list of all numbers, or long pressed to start reordering
-       [CHAR LIMIT=NONE]
-  -->
-  <string name="contact_tooltip">Touch image to see all numbers or touch &amp; hold to reorder</string>
-
   <!-- Remove button that shows up when contact is long-pressed. [CHAR LIMIT=NONE] -->
   <string name="remove_contact">Remove</string>
 
+  <!-- Select all text that shows up when in multi select mode. [CHAR LIMIT=NONE] -->
+  <string name="select_all">Select all</string>
+
   <!-- Button text for the "video call" displayed underneath an entry in the call log.
        Tapping causes a video call to be placed to the caller represented by the call log entry.
        [CHAR LIMIT=30] -->
@@ -550,13 +364,13 @@
 
   <!-- Button text for the button displayed underneath an entry in the call log, which when
        tapped triggers a return call to the named user. [CHAR LIMIT=30] -->
-    <string name="call_log_action_call">
+  <string name="call_log_action_call">
         Call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
   <!-- String describing an incoming missed call entry in the call log.
-       Note: AccessibilityServices uses this attribute to announce what the view represents.
-       [CHAR LIMIT=NONE] -->
+     Note: AccessibilityServices uses this attribute to announce what the view represents.
+     [CHAR LIMIT=NONE] -->
   <string name="description_incoming_missed_call">Missed call from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>, <xliff:g example="Mobile" id="typeOrLocation">^2</xliff:g>, <xliff:g example="2 min ago" id="timeOfCall">^3</xliff:g>, <xliff:g example="on SIM 1" id="phoneAccount">^4</xliff:g>.</string>
 
   <!-- String describing an incoming answered call entry in the call log.
@@ -592,7 +406,7 @@
        action triggers a return call to the named user.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_call_action">
+  <string name="description_call_action">
         Call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
@@ -600,7 +414,7 @@
        action triggers a return video call to the named person/number.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_video_call_action">
+  <string name="description_video_call_action">
         Video call <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>.
     </string>
 
@@ -609,50 +423,20 @@
        triggers playing back the voicemail.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
        [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_action">
+  <string name="description_voicemail_action">
         Listen to voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
-  <!-- String describing the "play voicemail" action for an entry in the call log.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_play">
-        Play voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
-    </string>
-
-  <!-- String describing the "pause voicemail" action for an entry in the call log.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_pause">
-        Pause voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
-    </string>
-
-
-  <!-- String describing the "delete voicemail" action for an entry in the call log.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-    <string name="description_voicemail_delete">
-        Delete voicemail from <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
-    </string>
-
-  <!-- String describing the number of new voicemails, displayed as a number badge on a tab.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-  <plurals name="description_voicemail_unread">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> new voicemail</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> new voicemails</item>
-  </plurals>
-
   <!-- Description for the "create new contact" action for an entry in the call log. This action
        opens a screen for creating a new contact for this name or number. [CHAR LIMIT=NONE] -->
-    <string name="description_create_new_contact_action">
+  <string name="description_create_new_contact_action">
         Create contact for <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
   <!-- Description for the "add to existing contact" action for an entry in the call log. This
        action opens a screen for adding this name or number to an existing contact.
        [CHAR LIMIT=NONE] -->
-    <string name="description_add_to_existing_contact_action">
+  <string name="description_add_to_existing_contact_action">
         Add <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g> to existing contact
     </string>
 
@@ -660,14 +444,10 @@
        displays the call details screen for an entry in the call log.  This shows the calls to
        and from the specified number associated with the call log entry.
        [CHAR LIMIT=NONE] -->
-    <string name="description_details_action">
+  <string name="description_details_action">
         Call details for <xliff:g example="John Smith" id="nameOrNumber">^1</xliff:g>
     </string>
 
-  <!-- Toast message which appears when a call log entry is deleted.
-       [CHAR LIMIT=NONE] -->
-  <string name="toast_entry_removed">Deleted from call history</string>
-
   <!-- String used as a header in the call log above calls which occurred today.
        [CHAR LIMIT=65] -->
   <string name="call_log_header_today">Today</string>
@@ -680,11 +460,6 @@
        [CHAR LIMIT=65] -->
   <string name="call_log_header_other">Older</string>
 
-  <!-- String a header on the call details screen.  Appears above the list calls to or from a
-       particular number.
-       [CHAR LIMIT=65] -->
-  <string name="call_detail_list_header">Calls list</string>
-
   <!-- String describing the "speaker on" button on the playback control used to listen to a
        voicemail message.  When speaker is on, playback of the voicemail will occur through the
        phone speaker.
@@ -699,18 +474,6 @@
        [CHAR LIMIT=NONE] -->
   <string name="voicemail_speaker_off">Turn speaker off.</string>
 
-  <!-- String describing the "play faster" button in the playback control used to listen to a
-       voicemail message.  Speeds up playback of the voicemail message.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-  <string name="voicemail_play_faster">Play faster.</string>
-
-  <!-- String describing the "play slower" button in the playback control used to listen to a
-       voicemail message.  Slows down playback of the voicemail message.
-       Note: AccessibilityServices uses this attribute to announce the purpose of the button.
-       [CHAR LIMIT=NONE] -->
-  <string name="voicemail_play_slower">Play slower.</string>
-
   <!-- String describing the "play/pause" button in the playback control used to listen to a
        voicemail message.  Starts playback or pauses ongoing playback.
        Note: AccessibilityServices uses this attribute to announce the purpose of the button.
@@ -764,19 +527,16 @@
   <!-- Label for the voicemail settings section [CHAR LIMIT=30] -->
   <string name="voicemail_settings_label">Voicemail</string>
 
-  <!-- Title for the preference screen to select which SIM to change voicemail settings for [CHAR LIMIT=30] -->
-  <string name="voicemail_settings_select_sim_title">Select SIM for voicemail settings</string>
-
   <!-- Label for a section describing that call blocking is temporarily disabled because an
        emergency call was made. [CHAR LIMIT=50] -->
-    <string name="blocked_numbers_disabled_emergency_header_label">
+  <string name="blocked_numbers_disabled_emergency_header_label">
         Call blocking temporarily off
     </string>
 
   <!-- Description that call blocking is temporarily disabled because the user called an
        emergency number, and explains that call blocking will be re-enabled after a buffer
        period has passed. [CHAR LIMIT=NONE] -->
-    <string name="blocked_numbers_disabled_emergency_desc">
+  <string name="blocked_numbers_disabled_emergency_desc">
         Call blocking has been disabled because you contacted emergency services from this phone
         within the last 48 hours. It will be automatically reenabled once the 48 hour period
         expires.
@@ -789,7 +549,7 @@
   <!-- Text informing the user they have previously marked contacts to be sent to voicemail.
        This will be followed by two buttons, 1) to view who is marked to be sent to voicemail
        and 2) importing these settings to Dialer's block list. [CHAR LIMIT=NONE] -->
-    <string name="blocked_call_settings_import_description">
+  <string name="blocked_call_settings_import_description">
         You previously marked some callers to be automatically sent to voicemail via other apps.
     </string>
 
@@ -811,13 +571,13 @@
 
   <!-- Footer message of number blocking screen with visual voicemail active.
       [CHAR LIMIT=NONE] -->
-    <string name="block_number_footer_message_vvm">
+  <string name="block_number_footer_message_vvm">
         Calls from these numbers will be blocked and voicemails will be automatically deleted.
     </string>
 
   <!-- Footer message of number blocking screen with no visual voicemail.
        [CHAR LIMIT=NONE] -->
-    <string name="block_number_footer_message_no_vvm">
+  <string name="block_number_footer_message_no_vvm">
          Calls from these numbers will be blocked, but they may still be able to leave you voicemails.
     </string>
 
@@ -826,7 +586,7 @@
 
   <!-- Error message shown when user tries to add a number to the block list that was already
       blocked. [CHAR LIMIT=64] -->
-    <string name="alreadyBlocked"><xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>
+  <string name="alreadyBlocked"><xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>
         is already blocked.</string>
 
   <!-- Label for the phone account settings [CHAR LIMIT=30] -->
@@ -841,24 +601,12 @@
   <!-- Internal key for DTMF tone length preference. -->
   <string name="dtmf_tone_length_preference_key" translatable="false">button_dtmf_settings</string>
 
-  <!-- The label of the button used to turn on a single permission [CHAR LIMIT=30]-->
-  <string name="permission_single_turn_on">Turn on</string>
-
-  <!--  The label of the button used to turn on multiple permissions [CHAR LIMIT=30]-->
-  <string name="permission_multiple_turn_on">Set permissions</string>
-
   <!-- Shown as a prompt to turn on the contacts permission to enable speed dial [CHAR LIMIT=NONE]-->
   <string name="permission_no_speeddial">To enable speed dial, turn on the Contacts permission.</string>
 
   <!-- Shown as a prompt to turn on the phone permission to enable the call log [CHAR LIMIT=NONE]-->
   <string name="permission_no_calllog">To see your call log, turn on the Phone permission.</string>
 
-  <!-- Shown as a prompt to turn on the contacts permission to show all contacts [CHAR LIMIT=NONE]-->
-  <string name="permission_no_contacts">To see your contacts, turn on the Contacts permission.</string>
-
-  <!-- Shown as a prompt to turn on the phone permission to show voicemails [CHAR LIMIT=NONE]-->
-  <string name="permission_no_voicemail">To access your voicemail, turn on the Phone permission.</string>
-
   <!-- Shown as a prompt to turn on contacts permissions to allow contact search [CHAR LIMIT=NONE]-->
   <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
 
@@ -900,4 +648,23 @@
   <!-- Label for setting that shows more information about the Phone app [CHAR LIMIT=30] -->
   <string name="about_phone_label">About</string>
 
+  <!-- Label indicating who provided the voicemail transcription [CHAR LIMIT=40] -->
+  <string name="voicemail_transcription_branding_text">Transcribed by Google</string>
+
+  <!-- Label indicating that a voicemail transcription is in progress [CHAR LIMIT=40] -->
+  <string name="voicemail_transcription_in_progress">Google is transcribing &#8230;</string>
+
+  <!-- Label indicating that a voicemail transcription failed [CHAR LIMIT=40] -->
+  <string name="voicemail_transcription_failed">Transcript not available</string>
+
+  <!-- Button text to prompt a user to open an sms conversation [CHAR LIMIT=NONE] -->
+  <string name="view_conversation">View</string>
+
+  <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need
+        to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] -->
+  <string name="ec_data_deleted">Call deleted. View and delete attachments shared during this call in Messages.</string>
+
+  <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need
+        to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] -->
+  <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml
index 7adf7ca..d464ca7 100644
--- a/java/com/android/dialer/app/res/values/styles.xml
+++ b/java/com/android/dialer/app/res/values/styles.xml
@@ -16,6 +16,11 @@
   -->
 <resources>
 
+  <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+  </style>
+
   <style name="DialtactsTheme" parent="DialerThemeBase">
 
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
@@ -25,13 +30,13 @@
     <item name="windowActionModeOverlay">true</item>
     <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
     <item name="actionBarStyle">@style/DialtactsActionBarStyle</item>
+    <item name="actionModeStyle">@style/ActionModeStyle</item>
+    <item name="android:actionModeStyle">@style/ActionModeStyle</item>
 
     <item name="android:windowContentOverlay">@null</item>
     <item name="android:overlapAnchor">true</item>
-    <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
 
     <item name="android:listViewStyle">@style/ListViewStyle</item>
-    <item name="section_header_background">@drawable/list_title_holo</item>
     <item name="list_section_header_height">32dip</item>
     <item name="list_item_padding_top">7dp</item>
     <item name="list_item_padding_right">24dp</item>
@@ -66,7 +71,7 @@
     <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
 
     <!-- Video call icon -->
-    <item name="list_item_video_call_icon_size">32dip</item>
+    <item name="list_item_video_call_icon_size">48dip</item>
     <item name="list_item_video_call_icon_margin">8dip</item>
 
     <item name="dialpad_style">@style/Dialpad.Light</item>
@@ -100,19 +105,6 @@
     <item name="android:fastScrollTrackDrawable">@null</item>
   </style>
 
-  <style name="CallDetailActionItemStyle">
-    <item name="android:foreground">?android:attr/selectableItemBackground</item>
-    <item name="android:clickable">true</item>
-    <item name="android:drawablePadding">@dimen/call_detail_action_item_drawable_padding</item>
-    <item name="android:gravity">center_vertical</item>
-    <item name="android:paddingStart">@dimen/call_detail_action_item_padding_horizontal</item>
-    <item name="android:paddingEnd">@dimen/call_detail_action_item_padding_horizontal</item>
-    <item name="android:paddingTop">@dimen/call_detail_action_item_padding_vertical</item>
-    <item name="android:paddingBottom">@dimen/call_detail_action_item_padding_vertical</item>
-    <item name="android:textColor">@color/call_detail_footer_text_color</item>
-    <item name="android:textSize">@dimen/call_detail_action_item_text_size</item>
-  </style>
-
   <style name="DialtactsActionBarStyle" parent="DialerActionBarBaseStyle">
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
     <item name="android:background">@color/actionbar_background_color</item>
@@ -129,6 +121,12 @@
     <item name="contentInsetStart">@dimen/actionbar_contentInsetStart</item>
   </style>
 
+  <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
+    <item name="android:background">@color/actionbar_background_color</item>
+    <item name="background">@color/actionbar_background_color</item>
+    <item name="closeItemLayout">@layout/action_mode_close_button</item>
+  </style>
+
   <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle">
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
     <item name="android:displayOptions"></item>
@@ -192,11 +190,6 @@
     <item name="android:importantForAccessibility">no</item>
   </style>
 
-  <style name="DismissButtonStyle">
-    <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
-    <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>
-  </style>
-
   <!-- Style applied to the "Settings" screen.  Keep in sync with SettingsLight in Telephony. -->
   <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay">
     <!-- Setting text. -->
@@ -223,10 +216,6 @@
     <item name="height">@dimen/action_bar_height</item>
   </style>
 
-  <style name="VoicemailPlaybackLayoutTextStyle">
-    <item name="android:textSize">14sp</item>
-  </style>
-
   <style name="VoicemailPlaybackLayoutButtonStyle">
     <item name="android:layout_width">56dp</item>
     <item name="android:layout_height">56dp</item>
diff --git a/java/com/android/dialer/app/res/xml/file_paths.xml b/java/com/android/dialer/app/res/xml/file_paths.xml
index 41522e4..0dd41a0 100644
--- a/java/com/android/dialer/app/res/xml/file_paths.xml
+++ b/java/com/android/dialer/app/res/xml/file_paths.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<paths>
+<paths xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
   <!-- Offer access to files under Context.getCacheDir() -->
   <cache-path name="my_cache"/>
   <!-- Offer access to voicemail folder under Context.getFilesDir() -->
diff --git a/java/com/android/dialer/app/res/xml/searchable.xml b/java/com/android/dialer/app/res/xml/searchable.xml
deleted file mode 100644
index 0ea1685..0000000
--- a/java/com/android/dialer/app/res/xml/searchable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-  android:hint="@string/dialer_hint_find_contact"
-  android:imeOptions="actionSearch"
-  android:inputType="textNoSuggestions"
-  android:label="@string/applicationLabel"
-  android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
-  />
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/xml/sound_settings.xml b/java/com/android/dialer/app/res/xml/sound_settings.xml
index 796ed2e..d9afb74 100644
--- a/java/com/android/dialer/app/res/xml/sound_settings.xml
+++ b/java/com/android/dialer/app/res/xml/sound_settings.xml
@@ -25,13 +25,13 @@
     android:ringtoneType="ringtone"
     android:title="@string/ringtone_title"/>
 
-  <CheckBoxPreference
+  <SwitchPreference
     android:defaultValue="false"
     android:key="@string/vibrate_on_preference_key"
     android:persistent="false"
     android:title="@string/vibrate_on_ring_title"/>
 
-  <CheckBoxPreference
+  <SwitchPreference
     android:defaultValue="true"
     android:key="@string/play_dtmf_preference_key"
     android:persistent="false"
diff --git a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java
index 2c46438..e8e4256 100644
--- a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java
+++ b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java
@@ -18,7 +18,6 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
@@ -49,10 +48,6 @@
     getDelegate().onPostCreate(savedInstanceState);
   }
 
-  public ActionBar getSupportActionBar() {
-    return getDelegate().getSupportActionBar();
-  }
-
   public void setSupportActionBar(Toolbar toolbar) {
     getDelegate().setSupportActionBar(toolbar);
   }
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index f1c270c..6010f92 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -31,12 +31,11 @@
 import android.telephony.TelephonyManager;
 import android.view.MenuItem;
 import android.widget.Toast;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.dialer.about.AboutPhoneFragment;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.proguard.UsedByReflection;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
@@ -83,14 +82,12 @@
     soundSettingsHeader.id = R.id.settings_header_sounds_and_vibration;
     target.add(soundSettingsHeader);
 
-    if (CompatUtils.isMarshmallowCompatible()) {
-      Header quickResponseSettingsHeader = new Header();
-      Intent quickResponseSettingsIntent =
-          new Intent(TelecomManager.ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS);
-      quickResponseSettingsHeader.titleRes = R.string.respond_via_sms_setting_title;
-      quickResponseSettingsHeader.intent = quickResponseSettingsIntent;
-      target.add(quickResponseSettingsHeader);
-    }
+    Header quickResponseSettingsHeader = new Header();
+    Intent quickResponseSettingsIntent =
+        new Intent(TelecomManager.ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS);
+    quickResponseSettingsHeader.titleRes = R.string.respond_via_sms_setting_title;
+    quickResponseSettingsHeader.intent = quickResponseSettingsIntent;
+    target.add(quickResponseSettingsHeader);
 
     TelephonyManager telephonyManager =
         (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
diff --git a/java/com/android/dialer/app/settings/SoundSettingsFragment.java b/java/com/android/dialer/app/settings/SoundSettingsFragment.java
index 83ce453..dcfb7a5 100644
--- a/java/com/android/dialer/app/settings/SoundSettingsFragment.java
+++ b/java/com/android/dialer/app/settings/SoundSettingsFragment.java
@@ -23,11 +23,11 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.Vibrator;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
@@ -68,8 +68,8 @@
           updateRingtonePreferenceSummary();
         }
       };
-  private CheckBoxPreference mVibrateWhenRinging;
-  private CheckBoxPreference mPlayDtmfTone;
+  private SwitchPreference mVibrateWhenRinging;
+  private SwitchPreference mPlayDtmfTone;
   private ListPreference mDtmfToneLength;
 
   @Override
@@ -87,9 +87,9 @@
 
     mRingtonePreference = findPreference(context.getString(R.string.ringtone_preference_key));
     mVibrateWhenRinging =
-        (CheckBoxPreference) findPreference(context.getString(R.string.vibrate_on_preference_key));
+        (SwitchPreference) findPreference(context.getString(R.string.vibrate_on_preference_key));
     mPlayDtmfTone =
-        (CheckBoxPreference) findPreference(context.getString(R.string.play_dtmf_preference_key));
+        (SwitchPreference) findPreference(context.getString(R.string.play_dtmf_preference_key));
     mDtmfToneLength =
         (ListPreference)
             findPreference(context.getString(R.string.dtmf_tone_length_preference_key));
diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
index 9d07ec5..d681df2 100644
--- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
+++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
@@ -21,40 +21,72 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.preference.PreferenceManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.os.BuildCompat;
-import android.support.v4.os.UserManagerCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
-import com.android.dialer.app.calllog.DefaultVoicemailNotifier;
+import com.android.dialer.app.calllog.LegacyVoicemailNotifier;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PerAccountSharedPreferences;
+import com.android.dialer.util.DialerUtils;
+import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 
 /**
  * Receives {@link TelephonyManager#ACTION_SHOW_VOICEMAIL_NOTIFICATION}, and forwards to {@link
- * DefaultVoicemailNotifier}. Will ignore the notification if the account has visual voicemail.
+ * LegacyVoicemailNotifier}. Will ignore the notification if the account has visual voicemail.
  * Legacy voicemail is the traditional, non-visual, dial-in voicemail.
  */
 @TargetApi(VERSION_CODES.O)
 public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver {
 
   private static final String LEGACY_VOICEMAIL_COUNT = "legacy_voicemail_count";
+  @VisibleForTesting static final String LEGACY_VOICEMAIL_DISMISSED = "legacy_voicemail_dismissed";
+
+  /**
+   * Whether the notification is just a refresh or for a new voicemail. The phone should not play a
+   * ringtone or vibrate during a refresh if the notification is already showing. This is Hidden in
+   * O and public in O MR1.
+   */
+  @VisibleForTesting static final String EXTRA_IS_REFRESH = "is_refresh";
 
   @Override
   public void onReceive(Context context, Intent intent) {
     LogUtil.i(
         "LegacyVoicemailNotificationReceiver.onReceive", "received legacy voicemail notification");
-    Assert.checkArgument(BuildCompat.isAtLeastO());
+    if (!BuildCompat.isAtLeastO()) {
+      LogUtil.e(
+          "LegacyVoicemailNotificationReceiver.onReceive",
+          "SDK not finalized: SDK_INT="
+              + Build.VERSION.SDK_INT
+              + ", PREVIEW_SDK_INT="
+              + Build.VERSION.PREVIEW_SDK_INT
+              + ", RELEASE="
+              + Build.VERSION.RELEASE);
+      return;
+    }
 
     PhoneAccountHandle phoneAccountHandle =
         Assert.isNotNull(intent.getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE));
-
     int count = intent.getIntExtra(TelephonyManager.EXTRA_NOTIFICATION_COUNT, -1);
+    boolean isRefresh = intent.getBooleanExtra(EXTRA_IS_REFRESH, false);
+    LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "isRefresh: " + isRefresh);
+    PerAccountSharedPreferences preferences = getSharedPreferences(context, phoneAccountHandle);
+    if (isRefresh) {
+      if (preferences.getBoolean(LEGACY_VOICEMAIL_DISMISSED, false)) {
+        LogUtil.i(
+            "LegacyVoicemailNotificationReceiver.onReceive",
+            "notification dismissed, ignoring refresh");
+        return;
+      }
+    } else {
+      setDismissed(context, phoneAccountHandle, false);
+    }
 
-    if (!hasVoicemailCountChanged(context, phoneAccountHandle, count)) {
+    if (!hasVoicemailCountChanged(preferences, count)) {
       LogUtil.i(
           "LegacyVoicemailNotificationReceiver.onReceive",
           "voicemail count hasn't changed, ignoring");
@@ -70,11 +102,11 @@
 
     if (count == 0) {
       LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "clearing notification");
-      new DefaultVoicemailNotifier(context).cancelLegacyNotification();
+      LegacyVoicemailNotifier.cancelNotification(context);
       return;
     }
 
-    if (UserManagerCompat.isUserUnlocked(context)
+    if (!intent.getBooleanExtra(VoicemailClient.EXTRA_IS_LEGACY_MODE, false)
         && VoicemailComponent.get(context)
             .getVoicemailClient()
             .isActivated(context, phoneAccountHandle)) {
@@ -91,33 +123,31 @@
         intent.getParcelableExtra(TelephonyManager.EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT);
 
     LogUtil.i("LegacyVoicemailNotificationReceiver.onReceive", "sending notification");
-    new DefaultVoicemailNotifier(context)
-        .notifyLegacyVoicemail(
-            phoneAccountHandle,
-            count,
-            voicemailNumber,
-            callVoicemailIntent,
-            voicemailSettingIntent);
+    LegacyVoicemailNotifier.showNotification(
+        context,
+        phoneAccountHandle,
+        count,
+        voicemailNumber,
+        callVoicemailIntent,
+        voicemailSettingIntent,
+        isRefresh);
+  }
+
+  public static void setDismissed(
+      Context context, PhoneAccountHandle phoneAccountHandle, boolean dismissed) {
+    getSharedPreferences(context, phoneAccountHandle)
+        .edit()
+        .putBoolean(LEGACY_VOICEMAIL_DISMISSED, dismissed)
+        .apply();
   }
 
   private static boolean hasVoicemailCountChanged(
-      Context context, PhoneAccountHandle phoneAccountHandle, int newCount) {
-    // Need credential encrypted storage to access preferences.
-    if (!UserManagerCompat.isUserUnlocked(context)) {
-      LogUtil.i(
-          "LegacyVoicemailNotificationReceiver.onReceive",
-          "User locked, bypassing voicemail count check");
-      return true;
-    }
-
+      PerAccountSharedPreferences preferences, int newCount) {
     if (newCount == -1) {
       // Carrier does not report voicemail count
       return true;
     }
 
-    PerAccountSharedPreferences preferences =
-        new PerAccountSharedPreferences(
-            context, phoneAccountHandle, PreferenceManager.getDefaultSharedPreferences(context));
     // Carriers may send multiple notifications for the same voicemail.
     if (newCount != 0 && newCount == preferences.getInt(LEGACY_VOICEMAIL_COUNT, -1)) {
       return false;
@@ -125,4 +155,13 @@
     preferences.edit().putInt(LEGACY_VOICEMAIL_COUNT, newCount).apply();
     return true;
   }
+
+  @VisibleForTesting
+  static PerAccountSharedPreferences getSharedPreferences(
+      Context context, PhoneAccountHandle phoneAccountHandle) {
+    return new PerAccountSharedPreferences(
+        context,
+        phoneAccountHandle,
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context));
+  }
 }
diff --git a/java/com/android/dialer/app/voicemail/VoicemailAudioManager.java b/java/com/android/dialer/app/voicemail/VoicemailAudioManager.java
index 8d70cdb..d3c3820 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailAudioManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailAudioManager.java
@@ -86,6 +86,7 @@
     if (newIsPluggedIn) {
       newRoute = CallAudioState.ROUTE_WIRED_HEADSET;
     } else {
+      mVoicemailPlaybackPresenter.pausePlayback();
       if (mWasSpeakerOn) {
         newRoute = CallAudioState.ROUTE_SPEAKER;
       } else {
diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
index a0bae36..bc6ffb5 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
@@ -92,7 +92,7 @@
       }
     }
     alertItem.updateStatus(statuses, this);
-    // TODO: b/30668323 support error from multiple sources.
+    // TODO(twyen): b/30668323 support error from multiple sources.
     return;
   }
 
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
index f160e02..9c1e446 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
@@ -85,7 +85,7 @@
           // When the undo button is pressed, the viewHolder we have is no longer valid because when
           // we hide the view it is binded to something else, and the layout is not updated for
           // hidden items. copy the adapter position so we can update the view upon undo.
-          // TODO: refactor this so the view holder will always be valid.
+          // TODO(twyen): refactor this so the view holder will always be valid.
           final int adapterPosition = mViewHolder.getAdapterPosition();
 
           mPresenter.pausePlayback();
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
index ea48c83..de4e1cc 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
@@ -47,16 +47,17 @@
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogListItemViewHolder;
 import com.android.dialer.common.Assert;
-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.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.phonenumbercache.CallLogQuery;
+import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.google.common.io.ByteStreams;
 import java.io.File;
@@ -87,7 +88,6 @@
  * calls into this class from outside must be done from the main UI thread.
  */
 @NotThreadSafe
-@VisibleForTesting
 @TargetApi(VERSION_CODES.M)
 public class VoicemailPlaybackPresenter
     implements MediaPlayer.OnPreparedListener,
@@ -221,7 +221,7 @@
       }
       shareVoicemailExecutor =
           DialerExecutors.createUiTaskBuilder(
-                  mActivity.getFragmentManager(), "test", new ShareVoicemailWorker())
+                  mActivity.getFragmentManager(), "shareVoicemail", new ShareVoicemailWorker())
               .onSuccess(
                   output -> {
                     if (output == null) {
@@ -502,7 +502,7 @@
    * will call {@link #onError()} otherwise.
    */
   protected void prepareContent() {
-    if (mView == null) {
+    if (mView == null || mContext == null) {
       return;
     }
     LogUtil.d("VoicemailPlaybackPresenter.prepareContent", null);
@@ -516,6 +516,11 @@
     mView.disableUiElements();
     mIsPrepared = false;
 
+    if (mContext != null && TelecomUtil.isInCall(mContext)) {
+      handleError(new IllegalStateException("Cannot play voicemail when call is in progress"));
+      return;
+    }
+
     try {
       mMediaPlayer = new MediaPlayer();
       mMediaPlayer.setOnPreparedListener(this);
@@ -548,7 +553,9 @@
     mView.setClipPosition(mPosition, mDuration.get());
     mView.enableUiElements();
     mView.setSuccess();
-    mMediaPlayer.seekTo(mPosition);
+    if (!mp.isPlaying()) {
+      mMediaPlayer.seekTo(mPosition);
+    }
 
     if (mIsPlaying) {
       resumePlayback();
diff --git a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
index 48602ea..79e0383 100644
--- a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
@@ -47,6 +47,12 @@
   @Nullable
   public static VoicemailErrorMessage create(
       Context context, VoicemailStatus status, final VoicemailStatusReader statusReader) {
+    VoicemailErrorMessage tosMessage =
+        new VoicemailTosMessageCreator(context, status, statusReader).maybeCreateTosMessage();
+    if (tosMessage != null) {
+      return tosMessage;
+    }
+
     if (Status.CONFIGURATION_STATE_OK == status.configurationState
         && Status.DATA_CHANNEL_STATE_OK == status.dataChannelState
         && Status.NOTIFICATION_CHANNEL_STATE_OK == status.notificationChannelState) {
@@ -130,6 +136,25 @@
     return null;
   }
 
+  public static boolean isSyncBlockingError(VoicemailStatus status) {
+    if (status.notificationChannelState != Status.NOTIFICATION_CHANNEL_STATE_OK) {
+      return true;
+    }
+
+    if (status.dataChannelState != Status.DATA_CHANNEL_STATE_OK) {
+      return true;
+    }
+
+    switch (status.configurationState) {
+      case Status.CONFIGURATION_STATE_OK:
+        // allow activation to be queued again in case it is interrupted
+      case Status.CONFIGURATION_STATE_CONFIGURING:
+        return false;
+      default:
+        return true;
+    }
+  }
+
   @Nullable
   private static VoicemailErrorMessage checkQuota(
       Context context, VoicemailStatus status, VoicemailStatusReader statusReader) {
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java
index d045b1b..dbdf0f0 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java
@@ -20,6 +20,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.text.util.Linkify;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.dialer.app.alert.AlertManager;
 import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
@@ -132,6 +133,13 @@
     TextView secondaryButton = (TextView) view.findViewById(R.id.voicemail_tos_button_accept);
     secondaryButton.setText(secondaryAction.getText());
     secondaryButton.setOnClickListener(secondaryAction.getListener());
+
+    if (message.getImageResourceId() != null) {
+      ImageView voicemailTosImage = (ImageView) view.findViewById(R.id.voicemail_image);
+      voicemailTosImage.setImageResource(message.getImageResourceId());
+      voicemailTosImage.setVisibility(View.VISIBLE);
+    }
+
     return view;
   }
 
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
index a0dd30f..92c787d 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
@@ -47,6 +47,7 @@
   private final List<Action> actions;
 
   private boolean modal;
+  private Integer imageResourceId;
 
   /** Something the user can click on to resolve an error, such as retrying or calling voicemail */
   public static class Action {
@@ -100,6 +101,16 @@
     return this;
   }
 
+  @Nullable
+  public Integer getImageResourceId() {
+    return imageResourceId;
+  }
+
+  public VoicemailErrorMessage setImageResourceId(Integer imageResourceId) {
+    this.imageResourceId = imageResourceId;
+    return this;
+  }
+
   public VoicemailErrorMessage(CharSequence title, CharSequence description, Action... actions) {
     this(title, description, Arrays.asList(actions));
   }
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
index 2048d49..44ceb89 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
@@ -43,4 +43,13 @@
         return OmtpVoicemailMessageCreator.create(context, status, statusReader);
     }
   }
+
+  public boolean isSyncBlockingError(VoicemailStatus status) {
+    switch (status.type) {
+      case VisualVoicemailTypeExtensions.VVM_TYPE_VVM3:
+        return Vvm3VoicemailMessageCreator.isSyncBlockingError(status);
+      default:
+        return OmtpVoicemailMessageCreator.isSyncBlockingError(status);
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java b/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
index 2ff182b..bbba7ac 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
@@ -24,10 +24,10 @@
 import android.provider.VoicemailContract.Status;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 
@@ -75,7 +75,7 @@
         "VoicemailStatusCorruptionHandler.maybeFixVoicemailStatus",
         "Source="
             + source
-            + ", CONFIGURATION_STAIE="
+            + ", CONFIGURATION_STATE="
             + status.configurationState
             + ", visualVoicemailEnabled="
             + visualVoicemailEnabled);
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java b/java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java
new file mode 100644
index 0000000..95b16e8
--- /dev/null
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java
@@ -0,0 +1,72 @@
+/*
+ * 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.app.voicemail.error;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Build.VERSION_CODES;
+import android.provider.VoicemailContract.Status;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.database.VoicemailStatusQuery;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.voicemail.VoicemailComponent;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Worker for {@link com.android.dialer.common.concurrent.DialerExecutors} to fetch voicemail status
+ */
+@TargetApi(VERSION_CODES.M)
+public class VoicemailStatusWorker implements Worker<Context, List<VoicemailStatus>> {
+
+  @Nullable
+  @Override
+  public List<VoicemailStatus> doInBackground(@Nullable Context context) throws Throwable {
+    List<VoicemailStatus> statuses = new ArrayList<>();
+    if (!TelecomUtil.hasReadWriteVoicemailPermissions(context)) {
+      return statuses;
+    }
+    StringBuilder where = new StringBuilder();
+    java.util.List<String> selectionArgs = new ArrayList<>();
+
+    VoicemailComponent.get(context)
+        .getVoicemailClient()
+        .appendOmtpVoicemailStatusSelectionClause(context, where, selectionArgs);
+
+    try (Cursor cursor =
+        context
+            .getContentResolver()
+            .query(
+                Status.CONTENT_URI,
+                VoicemailStatusQuery.getProjection(),
+                where.toString(),
+                selectionArgs.toArray(new String[selectionArgs.size()]),
+                null)) {
+      if (cursor == null) {
+        return statuses;
+      }
+
+      for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+        statuses.add(new VoicemailStatus(context, cursor));
+      }
+    }
+
+    return statuses;
+  }
+}
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
new file mode 100644
index 0000000..baf7b99
--- /dev/null
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
@@ -0,0 +1,347 @@
+/*
+ * 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.app.voicemail.error;
+
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import android.text.SpannableString;
+import android.text.style.StyleSpan;
+import android.view.View;
+import android.view.View.OnClickListener;
+import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.voicemail.VisualVoicemailTypeExtensions;
+import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.VoicemailComponent;
+import java.util.Locale;
+
+/**
+ * Create error message from {@link VoicemailStatus} for voicemail. This is will show different
+ * terms of service for Verizon and for other carriers.
+ */
+public class VoicemailTosMessageCreator {
+  // Flag to check which version of the Verizon ToS that the user has accepted.
+  public static final String VVM3_TOS_VERSION_ACCEPTED_KEY = "vvm3_tos_version_accepted";
+
+  // Flag to check which version of the Google Dialer ToS that the user has accepted.
+  public static final String DIALER_TOS_VERSION_ACCEPTED_KEY = "dialer_tos_version_accepted";
+
+  public static final int CURRENT_VVM3_TOS_VERSION = 2;
+  public static final int CURRENT_DIALER_TOS_VERSION = 1;
+
+  private static final String ISO639_SPANISH = "es";
+
+  private final Context context;
+  private final VoicemailStatus status;
+  private final VoicemailStatusReader statusReader;
+  private final SharedPreferences preferences;
+
+  VoicemailTosMessageCreator(
+      final Context context,
+      final VoicemailStatus status,
+      final VoicemailStatusReader statusReader) {
+    this.context = context;
+    this.status = status;
+    this.statusReader = statusReader;
+    this.preferences =
+        PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
+  }
+
+  @Nullable
+  VoicemailErrorMessage maybeCreateTosMessage() {
+    // TODO(mdooley): add filtering based on carrier
+    if (hasAcceptedTos()) {
+      return null;
+    }
+
+    if (!shouldShowTos()) {
+      return null;
+    }
+
+    logTosCreatedImpression();
+
+    return new VoicemailTosMessage(
+            getTosTitle(),
+            getTosMessage(),
+            new Action(
+                getDeclineText(),
+                new OnClickListener() {
+                  @Override
+                  public void onClick(View v) {
+                    LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "decline clicked");
+                    PhoneAccountHandle handle =
+                        new PhoneAccountHandle(
+                            ComponentName.unflattenFromString(status.phoneAccountComponentName),
+                            status.phoneAccountId);
+                    logTosDeclinedImpression();
+                    showDeclineTosDialog(handle);
+                  }
+                }),
+            new Action(
+                getAcceptText(),
+                new OnClickListener() {
+                  @Override
+                  public void onClick(View v) {
+                    LogUtil.i("VoicemailTosMessageCreator.maybeShowTosMessage", "accept clicked");
+                    recordTosAcceptance();
+                    logTosAcceptedImpression();
+                    statusReader.refresh();
+                  }
+                },
+                true /* raised */))
+        .setModal(true)
+        .setImageResourceId(getTosImageId());
+  }
+
+  private boolean shouldShowTos() {
+    if (isVvm3()) {
+      LogUtil.i("VoicemailTosMessageCreator.shouldShowTos", "showing TOS for verizon");
+      return true;
+    }
+
+    if (isVoicemailTranscriptionEnabled()) {
+      LogUtil.i(
+          "VoicemailTosMessageCreator.shouldShowTos", "showing TOS for Google transcription users");
+      return true;
+    }
+
+    return false;
+  }
+
+  private boolean isVoicemailTranscriptionEnabled() {
+    return ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false);
+  }
+
+  private void showDeclineTosDialog(final PhoneAccountHandle handle) {
+    if (isVvm3() && Vvm3VoicemailMessageCreator.PIN_NOT_SET == status.configurationState) {
+      LogUtil.i(
+          "VoicemailTosMessageCreator.showDeclineTosDialog", "PIN_NOT_SET, showing set PIN dialog");
+      showSetPinBeforeDeclineDialog();
+      return;
+    }
+    LogUtil.i(
+        "VoicemailTosMessageCreator.showDeclineVerizonTosDialog",
+        "showing decline ToS dialog, status=" + status);
+    final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setMessage(getTosDeclinedDialogMessageId());
+    builder.setPositiveButton(
+        getTosDeclinedDialogDowngradeId(),
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINED);
+            VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
+            if (voicemailClient.isVoicemailModuleEnabled()) {
+              voicemailClient.setVoicemailEnabled(context, status.getPhoneAccountHandle(), false);
+            } else {
+              TelephonyManagerCompat.setVisualVoicemailEnabled(telephonyManager, handle, false);
+            }
+          }
+        });
+
+    builder.setNegativeButton(
+        android.R.string.cancel,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+          }
+        });
+
+    builder.setCancelable(true);
+    builder.show();
+  }
+
+  private void showSetPinBeforeDeclineDialog() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setMessage(R.string.verizon_terms_and_conditions_decline_set_pin_dialog_message);
+    builder.setPositiveButton(
+        R.string.verizon_terms_and_conditions_decline_set_pin_dialog_set_pin,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            Logger.get(context)
+                .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN);
+            Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
+            context.startActivity(intent);
+          }
+        });
+
+    builder.setNegativeButton(
+        android.R.string.cancel,
+        new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+          }
+        });
+
+    builder.setCancelable(true);
+    builder.show();
+  }
+
+  private boolean isVvm3() {
+    return VisualVoicemailTypeExtensions.VVM_TYPE_VVM3.equals(status.type);
+  }
+
+  private boolean useSpanish() {
+    return Locale.getDefault().getLanguage().equals(new Locale(ISO639_SPANISH).getLanguage());
+  }
+
+  private boolean hasAcceptedTos() {
+    if (isVvm3()) {
+      return preferences.getInt(VVM3_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_VVM3_TOS_VERSION;
+    } else {
+      return preferences.getInt(DIALER_TOS_VERSION_ACCEPTED_KEY, 0) >= CURRENT_DIALER_TOS_VERSION;
+    }
+  }
+
+  private void recordTosAcceptance() {
+    if (isVvm3()) {
+      preferences.edit().putInt(VVM3_TOS_VERSION_ACCEPTED_KEY, CURRENT_VVM3_TOS_VERSION).apply();
+    } else {
+      preferences
+          .edit()
+          .putInt(DIALER_TOS_VERSION_ACCEPTED_KEY, CURRENT_DIALER_TOS_VERSION)
+          .apply();
+    }
+    VoicemailComponent.get(context).getVoicemailClient().onTosAccepted(context);
+  }
+
+  private void logTosCreatedImpression() {
+    if (isVvm3()) {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_CREATED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_CREATED);
+    }
+  }
+
+  private void logTosDeclinedImpression() {
+    if (isVvm3()) {
+      Logger.get(context)
+          .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_DECLINE_CLICKED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_DECLINE_CLICKED);
+    }
+  }
+
+  private void logTosAcceptedImpression() {
+    if (isVvm3()) {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_V2_ACCEPTED);
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_DIALER_TOS_ACCEPTED);
+    }
+  }
+
+  private CharSequence getVvm3Tos() {
+    return useSpanish()
+        ? context.getString(R.string.verizon_terms_and_conditions_1_1_spanish)
+        : context.getString(R.string.verizon_terms_and_conditions_1_1_english);
+  }
+
+  private CharSequence getDialerTos() {
+    if (!isVoicemailTranscriptionEnabled()) {
+      return "";
+    }
+
+    return useSpanish()
+        ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish)
+        : context.getString(R.string.dialer_terms_and_conditions_1_0_english);
+  }
+
+  private CharSequence getAcceptText() {
+    if (isVvm3()) {
+      return useSpanish()
+          ? context.getString(R.string.verizon_terms_and_conditions_accept_spanish)
+          : context.getString(R.string.verizon_terms_and_conditions_accept_english);
+    } else {
+      return useSpanish()
+          ? context.getString(R.string.dialer_terms_and_conditions_accept_spanish)
+          : context.getString(R.string.dialer_terms_and_conditions_accept_english);
+    }
+  }
+
+  private CharSequence getDeclineText() {
+    if (isVvm3()) {
+      return useSpanish()
+          ? context.getString(R.string.verizon_terms_and_conditions_decline_spanish)
+          : context.getString(R.string.verizon_terms_and_conditions_decline_english);
+    } else {
+      return useSpanish()
+          ? context.getString(R.string.dialer_terms_and_conditions_decline_spanish)
+          : context.getString(R.string.dialer_terms_and_conditions_decline_english);
+    }
+  }
+
+  private CharSequence getTosTitle() {
+    return isVvm3()
+        ? context.getString(R.string.verizon_terms_and_conditions_title)
+        : context.getString(R.string.dialer_terms_and_conditions_title);
+  }
+
+  private CharSequence getTosMessage() {
+    if (isVvm3()) {
+      // For verizon the TOS consist of three pieces: google dialer TOS, Verizon TOS message and
+      // Verizon TOS details.
+      CharSequence vvm3Details = getVvm3Tos();
+      CharSequence tos =
+          context.getString(
+              R.string.verizon_terms_and_conditions_message, getDialerTos(), vvm3Details);
+      // Make all text bold except the details.
+      SpannableString spannableTos = new SpannableString(tos);
+      spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length() - vvm3Details.length(), 0);
+      return spannableTos;
+    } else {
+      // The TOS for everyone else there are no details, so just make everything bold.
+      CharSequence tos =
+          context.getString(R.string.dialer_terms_and_conditions_message, getDialerTos());
+      SpannableString spannableTos = new SpannableString(tos);
+      spannableTos.setSpan(new StyleSpan(Typeface.BOLD), 0, tos.length(), 0);
+      return spannableTos;
+    }
+  }
+
+  private int getTosDeclinedDialogMessageId() {
+    return isVvm3()
+        ? R.string.verizon_terms_and_conditions_decline_dialog_message
+        : R.string.dialer_terms_and_conditions_decline_dialog_message;
+  }
+
+  private int getTosDeclinedDialogDowngradeId() {
+    return isVvm3()
+        ? R.string.verizon_terms_and_conditions_decline_dialog_downgrade
+        : R.string.dialer_terms_and_conditions_decline_dialog_downgrade;
+  }
+
+  private Integer getTosImageId() {
+    return isVvm3() ? null : R.drawable.voicemail_tos_image;
+  }
+}
diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
index 132e8a3..8e8106b 100644
--- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
@@ -16,32 +16,20 @@
 
 package com.android.dialer.app.voicemail.error;
 
-import android.app.AlertDialog;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
-import android.preference.PreferenceManager;
+import android.provider.VoicemailContract.Status;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
-import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.voicemail.VoicemailClient;
-import com.android.voicemail.VoicemailComponent;
-import java.util.Locale;
 
 /**
  * Create error message from {@link VoicemailStatus} for VVM3 visual voicemail. VVM3 is used only by
@@ -84,15 +72,13 @@
   public static final int PIN_NOT_SET = -100;
   public static final int SUBSCRIBER_UNKNOWN = -99;
 
-  private static final String ISO639_SPANISH = "es";
-  @VisibleForTesting static final String VVM3_TOS_ACCEPTANCE_FLAG_KEY = "vvm3_tos_acceptance_flag";
-
   @Nullable
   public static VoicemailErrorMessage create(
       final Context context,
       final VoicemailStatus status,
       final VoicemailStatusReader statusReader) {
-    VoicemailErrorMessage tosMessage = maybeShowTosMessage(context, status, statusReader);
+    VoicemailErrorMessage tosMessage =
+        new VoicemailTosMessageCreator(context, status, statusReader).maybeCreateTosMessage();
     if (tosMessage != null) {
       return tosMessage;
     }
@@ -272,9 +258,29 @@
     return OmtpVoicemailMessageCreator.create(context, status, statusReader);
   }
 
+  public static boolean isSyncBlockingError(VoicemailStatus status) {
+    if (status.notificationChannelState != Status.NOTIFICATION_CHANNEL_STATE_OK) {
+      return true;
+    }
+
+    if (status.dataChannelState != Status.DATA_CHANNEL_STATE_OK) {
+      return true;
+    }
+
+    switch (status.configurationState) {
+      case PIN_NOT_SET:
+      case Status.CONFIGURATION_STATE_OK:
+        // allow activation to be queued again in case it is interrupted
+      case Status.CONFIGURATION_STATE_CONFIGURING:
+        return false;
+      default:
+        return true;
+    }
+  }
+
   @NonNull
   private static CharSequence getCustomerSupportString(Context context, int id) {
-    // TODO: get number based on the country the user is currently in.
+    // TODO(twyen): get number based on the country the user is currently in.
     return ContactDisplayUtils.getTtsSpannedPhoneNumber(
         context.getResources(),
         id,
@@ -299,135 +305,4 @@
           }
         });
   }
-
-  @Nullable
-  private static VoicemailErrorMessage maybeShowTosMessage(
-      final Context context,
-      final VoicemailStatus status,
-      final VoicemailStatusReader statusReader) {
-    final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-    if (preferences.getBoolean(VVM3_TOS_ACCEPTANCE_FLAG_KEY, false)) {
-      return null;
-    }
-    Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_SHOWN);
-
-    CharSequence termsAndConditions;
-    CharSequence acceptText;
-    CharSequence declineText;
-    // TODO(b/29082671): use LocaleList
-    if (Locale.getDefault().getLanguage().equals(new Locale(ISO639_SPANISH).getLanguage())) {
-      // Spanish
-      termsAndConditions = context.getString(R.string.verizon_terms_and_conditions_1_1_spanish);
-      acceptText = context.getString(R.string.verizon_terms_and_conditions_accept_spanish);
-      declineText = context.getString(R.string.verizon_terms_and_conditions_decline_spanish);
-    } else {
-      termsAndConditions = context.getString(R.string.verizon_terms_and_conditions_1_1_english);
-      acceptText = context.getString(R.string.verizon_terms_and_conditions_accept_english);
-      declineText = context.getString(R.string.verizon_terms_and_conditions_decline_english);
-    }
-
-    return new VoicemailTosMessage(
-            context.getString(R.string.verizon_terms_and_conditions_title),
-            context.getString(R.string.verizon_terms_and_conditions_message, termsAndConditions),
-            new Action(
-                declineText,
-                new OnClickListener() {
-                  @Override
-                  public void onClick(View v) {
-                    LogUtil.i("Vvm3VoicemailMessageCreator.maybeShowTosMessage", "decline clicked");
-                    PhoneAccountHandle handle =
-                        new PhoneAccountHandle(
-                            ComponentName.unflattenFromString(status.phoneAccountComponentName),
-                            status.phoneAccountId);
-                    Logger.get(context)
-                        .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CLICKED);
-                    showDeclineTosDialog(context, handle, status);
-                  }
-                }),
-            new Action(
-                acceptText,
-                new OnClickListener() {
-                  @Override
-                  public void onClick(View v) {
-                    LogUtil.i("Vvm3VoicemailMessageCreator.maybeShowTosMessage", "accept clicked");
-                    preferences.edit().putBoolean(VVM3_TOS_ACCEPTANCE_FLAG_KEY, true).apply();
-                    Logger.get(context)
-                        .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_ACCEPTED);
-                    statusReader.refresh();
-                  }
-                },
-                true /* raised */))
-        .setModal(true);
-  }
-
-  private static void showDeclineTosDialog(
-      final Context context, final PhoneAccountHandle handle, VoicemailStatus status) {
-    if (PIN_NOT_SET == status.configurationState) {
-      LogUtil.i(
-          "Vvm3VoicemailMessageCreator.showDeclineTosDialog",
-          "PIN_NOT_SET, showing set PIN dialog");
-      showSetPinBeforeDeclineDialog(context);
-      return;
-    }
-    LogUtil.i(
-        "Vvm3VoicemailMessageCreator.showDeclineTosDialog",
-        "showing decline ToS dialog, status=" + status);
-    final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setMessage(R.string.verizon_terms_and_conditions_decline_dialog_message);
-    builder.setPositiveButton(
-        R.string.verizon_terms_and_conditions_decline_dialog_downgrade,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            Logger.get(context).logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINED);
-            VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
-            if (voicemailClient.isVoicemailModuleEnabled()) {
-              voicemailClient.setVoicemailEnabled(context, status.getPhoneAccountHandle(), false);
-            } else {
-              TelephonyManagerCompat.setVisualVoicemailEnabled(telephonyManager, handle, false);
-            }
-          }
-        });
-
-    builder.setNegativeButton(
-        android.R.string.cancel,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        });
-
-    builder.setCancelable(true);
-    builder.show();
-  }
-
-  private static void showSetPinBeforeDeclineDialog(final Context context) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setMessage(R.string.verizon_terms_and_conditions_decline_set_pin_dialog_message);
-    builder.setPositiveButton(
-        R.string.verizon_terms_and_conditions_decline_set_pin_dialog_set_pin,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            Logger.get(context)
-                .logImpression(DialerImpression.Type.VOICEMAIL_VVM3_TOS_DECLINE_CHANGE_PIN_SHOWN);
-            Intent intent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
-            context.startActivity(intent);
-          }
-        });
-
-    builder.setNegativeButton(
-        android.R.string.cancel,
-        new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            dialog.dismiss();
-          }
-        });
-
-    builder.setCancelable(true);
-    builder.show();
-  }
 }
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml
new file mode 100644
index 0000000..681c795
--- /dev/null
+++ b/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <solid android:color="#42000000" />
+</shape>
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png
new file mode 100644
index 0000000..2e076c6
--- /dev/null
+++ b/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png
Binary files differ
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
index c193eaa..ec8abed 100644
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -9,13 +23,21 @@
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
     android:orientation="vertical">
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp"
       android:orientation="vertical">
+      <ImageView
+        android:id="@+id/voicemail_image"
+        android:layout_width="@dimen/voicemail_tos_image_size"
+        android:layout_height="@dimen/voicemail_tos_image_size"
+        android:layout_gravity="center"
+        android:paddingTop="24dp"
+        android:visibility="gone"
+        android:importantForAccessibility="no"/>
       <TextView
         android:id="@+id/tos_message_title"
         android:textStyle="bold"
@@ -39,8 +61,9 @@
 
   <View
     android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="#D2D2D2"/>
+    android:layout_height="0.5dp"
+    android:elevation="1dp"
+    android:background="@drawable/shadow"/>
 
   <LinearLayout
     android:id="@+id/voicemail_tos_button"
@@ -48,10 +71,12 @@
     android:layout_height="wrap_content"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
     android:orientation="horizontal">
     <TextView
       android:id="@+id/voicemail_tos_button_decline"
-      style="@style/ErrorActionStyle"
+      style="@style/ErrorActionDeclineStyle"
       android:background="?android:attr/selectableItemBackground"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -62,10 +87,10 @@
       android:layout_weight="1"/>
     <TextView
       android:id="@+id/voicemail_tos_button_accept"
-      style="@style/RaisedErrorActionStyle"
+      style="@style/ErrorActionStyle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/verizon_terms_and_conditions_accept_english"/>
   </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
index 9c64735..cad00f3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-af/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Skakel vliegtuigmodus af"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiveer tans visuele stemboodskapdiens"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Jy sal dalk nie stemboodskapkennisgewings ontvang totdat visuele stemboodskapdiens heeltemal geaktiveer is nie. Bel stemboodskapdiens om nuwe boodskappe te kry totdat stemboodskapdiens volledig geaktiveer is."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan nie visuele stemboodskapdiens aktiveer nie"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Maak seker jou foon het sellulêre verbinding en probeer weer."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Maak seker jou foon het ’n mobiele netwerkverbinding en probeer weer."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Skakel vliegtuigmodus af en probeer weer."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Geen verbinding nie"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. As jy op Wi-Fi is, kan jy jou stemboodskapdiens nagaan deur nou te sinkroniseer."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. As jy op Wi-Fi is, kan jy jou stemboodskapdiens nagaan deur nou te sinkroniseer."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. Skakel vliegtuigmodus af om jou stemboodskapdiens te sinkroniseer."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Jou foon benodig \'n sellulêre dataverbinding om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Jou foon benodig \'n mobiele dataverbinding om stemboodskapdiens na te gaan"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan nie visuele stemboodskapdiens aktiveer nie"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probeer weer wanneer jou Wi-Fi- of sellulêre verbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probeer weer wanneer jou sellulêredataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probeer weer wanneer jou Wi-Fi- of mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probeer weer wanneer jou mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Jy kan steeds bel om stemboodskapdiens na te gaan."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan nie visuele stemboodskapdiens opdateer nie"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jou posbus is amper vol. Om spasie beskikbaar te maak, skakel ekstra berging aan sodat Google jou stemboodskappe kan bestuur en rugsteun."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Stel jou stemboodskap-PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Jy sal \'n stemboodskap-PIN nodig hê wanneer jy ook al na jou stemboodskapdiens toe bel."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Onbekende fout"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Vliegtuigmodusinstellings"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Stel PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Probeer weer"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Iets het verkeerd geloop"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontak asseblief Kliëntediens by <xliff:g id="NUMBER">%1$s</xliff:g> en gee vir hulle die foutkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuele stemboodskapdiens se bepalings en voorwaardes"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Jy moet Verizon Wireless se bepalings en voorwaardes aanvaar om visuele stemboodskapdiens te gebruik:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJy moet Verizon Wireless se bepalings en voorwaardes aanvaar om visuele stemboodskappe te gebruik:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Skakel visuele stemboodskappe aan"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuele stemboodskapdiens sal gedeaktiveer word as die bepalings en voorwaardes afgekeur word."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Deaktiveer visuele stemboodskapdiens"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Stemboodskaptranskripsie sal gedeaktiveer word as die bepalings en voorwaardes afgekeur word."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Deaktiveer stemboodskaptranskripsie"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Stempos sal slegs toeganklik wees as jy *86 bel. Stel \'n nuwe stempos-PIN om voort te gaan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Stel PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
index 502b873..0770308 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-am/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"የአውሮፕላን ሁነታን ያጥፉ"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"እይታዊ የድምጽ መልዕክት በማግበር ላይ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"እይታዊ የድምጽ መልዕክት ሙሉ ለሙሉ እስከሚነቃ ድረስ የድምፅ መልዕክት ማሳወቂያዎችን ላይቀበሉ ይችላሉ። የድምጽ መልዕክት ሙሉ ለሙሉ እስኪያገብር ድረስ አዲስ መልዕክቶችን ለማምጣት ወደ ድምፅ መልዕክት ይደውሉ።"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ስልክዎ የሴሉላር ግንኙነት እንዳለው ያረጋግጡና እንደገና ይሞክሩ።"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ስልክዎ የተንቀሳቃሽ ስልክ አውታረ መረብ ግንኙነት እንዳለው ያረጋግጡና እንደገና ይሞክሩ።"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"የአውሮፕላን ሁነታን ያጥፉ እና እንደገና ይሞክሩ።"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ምንም ግንኙነት የለም"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። Wi-Fi ላይ ከሆኑ አሁን በማስመር የድምጽ መልዕክትን መፈተሽ ይችላሉ።"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። Wi-Fi ላይ ከሆኑ አሁን በማስመር የድምጽ መልዕክትን መፈተሽ ይችላሉ።"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። የድምጽ መልዕክትዎን ለማስመር የአውሮፕላን ሁነታን ያጥፉ።"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"የድምጽ መልዕክት ለመፈተሽ ስልክዎ የሴሉላር ውሂብ ያስፈልገዋል።"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"የድምጽ መልዕክትን ለመፈተሽ ስልክዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት ያስፈልገዋል።"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"የWi-Fi ወይም ሴሉላር ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክት ለመፈተሽ መደወል ይችላሉ።"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"የሴሉላር ውሂብዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"የWi‑Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"የእርስዎ የመልእክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልእክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ትርፍ ማከማቻን ያብሩ።"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"የድምፅ መልዕክት ፒንዎን ያስገቡ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"በማንኛውም ጊዜ የድምፅ መልዕክትዎ ላይ ለመድረስ ሲደውሉ የድምፅ መልዕክት ፒን ያስፈልግዎታል።"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ያልታወቀ ስህተት"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"የአውሮፕላን ሁነታ ቅንብሮች"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"ፒን ያዘጋጁ"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"እንደገና ይሞክሩ"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"የሆነ ችግር ተፈጥሯል"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"እባክዎ የደንበኛ አገልግሎትን በ<xliff:g id="NUMBER">%1$s</xliff:g> ላይ ያግኙ እና የስህተት ቁጥሩ 9999 እንደሆነ ይንገሯቸው።"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual Voicemail የአገልግሎት ውል"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"እይታዊ የድምጽ መልዕክትን ለመጠቀም የVerizon Wirelessን የአገልግሎት ውል መቀበል አለብዎ፦ \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nእይታዊ የድምጽ መልዕክትን ለመጠቀም የVerizon Wirelessን የአገልግሎት ውል መቀበል አለብዎ፦\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"እይታዊ የድምጽ መልዕክን አብራ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"የአገልግሎት ውሉ ተቀባይነት ካላገኘ እይታዊ የድምጽ መልዕክት ይወገዳል።"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"እይታዊ የድምጽ መልዕክትን አስወግድ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"የአገልግሎት ውል ተቀባይነት ካላገኙ፣ የድምጽ መልዕክት ወደ ጽሁፍ መለወጥ ይሰናከላል።"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"የድምጽ መልዕክትን ወደ ጽሁፍ መለወጥን አሰናክል"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"የድምጽ መልዕክት ላይ መድረስ የሚቻለው *86 በመደወል ብቻ ነው። ለመቀጠል አዲስ የድምጽ መልዕክት ፒን ያዘጋጁ።"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ፒን ያዘጋጁ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
index 6d462ef..e4cbbcf 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ar/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"إيقاف وضع الطائرة"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"تنشيط البريد الصوتي المرئي"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"قد لا تتلقّى إشعارات البريد الصوتي حتى يتم تنشيط البريد الصوتي المرئي تمامًا. يمكنك الاتصال بالبريد الصوتي لاسترداد الرسائل الجديدة إلى أن يتم تنشيط البريد الصوتي تمامًا."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"يتعذر تنشيط البريد الصوتي المرئي"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"تأكد من وجود اتصال جوال على هاتفك وحاول مرة أخرى."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"تأكد من أن هاتفك توجد به اتصال شبكة جوال وحاول مرة أخرى."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"أوقف تشغيل وضع الطائرة وحاول مرة أخرى."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"لا يتوفر اتصال"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏لن يتم إعلامك برسائل البريد الصوتي الجديدة. إذا كنت تستخدم شبكة Wi-Fi، فيمكنك التحقق من البريد الصوتي عن طريق إجراء المزامنة الآن."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏لن يتم إعلامك برسائل البريد الصوتي الجديدة. إذا كنت تستخدم شبكة Wi-Fi، فيمكنك التحقق من البريد الصوتي عن طريق إجراء المزامنة الآن."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"لن يتم إعلامك برسائل البريد الصوتي الجديدة. أوقف تشغيل وضع الطائرة لمزامنة بريدك الصوتي."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"يحتاج هاتفك إلى اتصال جوال للتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"يحتاج هاتفك إلى اتصال بيانات جوال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"يتعذر تنشيط البريد الصوتي المرئي"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"يتعذر تحديث البريد الصوتي المرئي"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏حاول مرة أخرى عندما يكون لديك اتصال Wi-Fi أو جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"حاول مرة أخرى عندما يكون لديك اتصال جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏حاول مرة أخرى عندما يكون لديك اتصال Wi-Fi أو جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"حاول مرة أخرى عندما يكون لديك اتصال جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"يتعذر تحديث البريد الصوتي المرئي"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"يتعذر تحديث البريد الصوتي المرئي"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"إعداد رقم التعريف الشخصي للبريد الصوتي"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ستحتاج رقم تعريف شخصي للبريد الصوتي في كل مرة تتصل فيها للوصول إلى بريدك الصوتي."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"حدث خطأ غير معروف"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"إعدادات وضع الطائرة"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"تعيين رقم التعريف الشخصي"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"إعادة المحاولة"</string>
@@ -101,10 +99,14 @@
     <string name="vvm3_error_imap_select_error_message" msgid="7535508175537847085">"يُرجى الاتصال بخدمة العملاء على الرقم <xliff:g id="NUMBER">%1$s</xliff:g> وإبلاغهم أن رمز الخطأ هو 9989."</string>
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"حدث خطأٌ ما"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"يُرجى الاتصال بخدمة العملاء على الرقم <xliff:g id="NUMBER">%1$s</xliff:g> وإبلاغهم أن رمز الخطأ هو 9999."</string>
-    <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"البنود والشروط للبريد الصوتي المرئي"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏يجب قبول البنود والشروط لاتصال Verizon اللاسلكي من أجل استخدام البريد الصوتي المرئي:\n\n%s"</string>
-    <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"سيتم تعطيل البريد الصوتي المرئي في حالة رفض البنود والشروط."</string>
+    <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"الأحكام والشروط للبريد الصوتي المرئي"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nينبغي لك قبول الأحكام والشروط التي تخص Verizon Wireless لاستخدام البريد الصوتي المرئي:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"تشغيل البريد الصوتي المرئي"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
+    <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"سيتم تعطيل البريد الصوتي المرئي في حالة رفض الأحكام والشروط."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"تعطيل البريد الصوتي المرئي"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"سيتم تعطيل نسخ البريد الصوتي في حالة رفض الأحكام والشروط."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"تعطيل نسخ البريد الصوتي"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"يمكن الوصول إلى البريد الصوتي فقط عن طريق طلب *86. ينبغي تعيين رقم تعريف شخصي جديد للبريد الصوتي للمتابعة."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"تعيين رقم التعريف الشخصي"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
index 33ddafa..16741b3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-az/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Təyyarə rejimini deaktiv edin"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizual Səsli Mesaj aktiv edilir"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vizual səsli mesaj tam aktiv edilənə klim səsli mesaj bildirişi ala bilməzsiniz. Səsli mesaj tam aktiv edilənə kimi yeni mesajları əldə etmək üçün səsli poçta zəng edin."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizual Səsli Mesaj aktiv edilə bilmir"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefonunuzda mobil bağlantı olduğuna əmin olun və yenidən cəhd edin."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Əmin olun ki, telefonun şəbəkə bağlantısı var və yenidən cəhd edin."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Təyyarə rejimini deaktiv edin və yenidən cəhd edin."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Bağlantı yoxdur"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Yeni gələn səsli mesajlara görə bildiriş almayacaqsınız. Wi-Fi qoşuludursa, sinxronizasiya etməklə səsli mesajları yoxlaya bilərsiniz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Yeni gələn səsli e-məktublara görə bildiriş almayacaqsınız. Wi-Fi qoşuludursa, sinxronizasiya etməklə səsli e-məktubları yoxlaya bilərsiniz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Yeni gələn səsli mesajlara görə bildiriş almayacaqsınız. Səsli mesajları sinxronizasiya etmək üçün təyyarə rejimini deaktiv edin."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Səsli mesajları yoxlamaq üçün telefonda mobil data bağlantısı olmalıdır."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Səsli e-məktubları yoxlamaq üçün telefonda mobil data bağlantısı olmalıdır."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizual Səsli Mesaj aktiv edilə bilmir"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizual səsli mesajları yeniləmək olmur"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fivə ya mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi‑Fi və ya mobil data bağlantısı daha yaxşı olduqda yenidən cəhd edin. Səsli e-məktubları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mobil data bağlantısı yaxşı olduqda bir daha yoxlayın. Səsli e-məktubları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizual səsli mesajları yeniləmək olmur"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Səsli mesajları yoxlamaq üçün yenə də zəng edə bilərsiniz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizual səsli mesajları yeniləmək olmur"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"E-poçt qutusu artıq doludur. Boş yer yaratmaq üçün əlavə yaddaşı aktiv edin, beləliklə Google səsli e-məktub mesajlarını idarə edə və yedəkləyə bilər."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Səsli mesaj PIN kodunu ayarlayın"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Zəng etdiyiniz zaman səsli mesaja daxil olmaq üçün PIN koda ehtiyacınız olacaq."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Naməlum xəta"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Təyyarə Rejimi Ayarları"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN kodu ayarlayın"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Yenidən cəhd edin"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nəsə Xəta Oldu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lütfən, <xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi ilə Müştəri Xidmətinə zəng edin. Xəta kodu 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizual Səsli Poçt Şərtləri və Qaydaları"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vizual səsli poçtu istifadə etmək üçün Verizon Wireless şərtlər və qaydalarını qəbul etməlisiniz:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nGörünən səsli e-poçtdan istifadə etmək üçün Verizon Wireless\'in şərt və qaydalarını qəbul etməlisiniz:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Görünən Səsli e-poçtu aktiv edin"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Şərtlər və qaydalar rədd edilsə, vizual səsli poçt deaktiv ediləcək."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vizual səsli poçtu deaktiv edin"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Şərt və qaydalar rədd edilərsə, səsli e-poçt transkripsiyası deaktiv ediləcək."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Səsli e-poçt transkripsiyasını deaktiv edin"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Səsli məktub yalnız *86 nömrəsinə zəng etməklə mümkündür. Davam etmək üçün yeni səsli məktub PIN kodu təyin edin."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kodu ayarlayın"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
index 98dc061..fa118dd 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-b+sr+Latn/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Isključite režim rada u avionu"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivira se vizuelna govorna pošta"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete dobijati obaveštenja o govornoj pošti dok potpuno ne aktivirate vizuelnu govornu poštu. Pozovite govornu poštu da biste preuzeli nove poruke dok govorna pošta ne bude potpuno aktivirana."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Aktiviranje vizuelne govorne pošte nije uspelo"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Proverite da li telefon ima mobilnu vezu i pokušajte ponovo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Proverite da li telefon ima vezu preko mobilne mreže i probajte ponovo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite režim rada u avionu i pokušajte ponovo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Veza nije uspostavljena"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete dobijati obaveštenja o novim govornim porukama. Ako ste na Wi-Fi mreži, sinhronizujte da biste proverili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete dobijati obaveštenja o novim govornim porukama. Ako ste na Wi‑Fi mreži, možete da sinhronizujete da biste proverili govornu poštu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete dobijati obaveštenja o novim govornim porukama. Isključite režim rada u avionu da biste sinhronizovali govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonu treba mobilna veza za prenos podataka da biste proverili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonu je za proveru govorne pošte potrebna mobilna veza za prenos podataka."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Aktiviranje vizuelne govorne pošte nije uspelo"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probajte ponovo kad budete imali bolju Wi-Fi ili mobilnu vezu. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probajte ponovo kad budete imali bolju mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probajte ponovo kad budete imali bolju Wi‑Fi ili mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probajte ponovo kad budete imali bolju mobilnu vezu za prenos podataka. I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete da pozovete govornu poštu da biste je proverili."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ažuriranje vizuelne govorne pošte nije uspelo"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Poštansko sanduče je skoro puno. Da biste oslobodili prostor, uključite dodatni memorijski prostor, pa će Google moći da upravlja vašim govornim porukama i pravi njihove rezervne kopije."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Podesite PIN govorne pošte"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN govorne pošte vam treba svaki put kad upućujete poziv da biste pristupili govornoj pošti."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nepoznata greška"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Podešavanja režima rada u avionu"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Podesi PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Probaj ponovo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto nije u redu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktirajte korisničku podršku na <xliff:g id="NUMBER">%1$s</xliff:g> i recite im da je kôd greške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uslovi i odredbe za vizuelnu govornu poštu"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Morate da prihvatite Verizon Wireless uslove i odredbe da biste koristili vizuelnu govornu poštu:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nMorate da prihvatite Verizon Wireless uslove i odredbe da biste koristili vizuelnu govornu poštu:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključite vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ako odbijete uslove i odredbe, onemogućićete vizuelnu govornu poštu."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogućite vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripcija govorne pošte će biti onemogućena ako se uslovi i odredbe odbiju."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogućite transkripciju govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti ćete moći da pristupite samo ako pozovete *86. Podesite novi PIN kôd govorne pošte da biste nastavili."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Podesite PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
index 50f32af..95662a2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-be/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Выключыць рэжым палёту"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Актывацыя візуальнай галасавой пошты"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Вы можаце не атрымліваць апавяшчэнні галасавой пошты, пакуль візуальная галасавая пошта не будзе поўнасцю актывавана. Каб атрымліваць новыя паведамленні да завяршэння актывацыі, выклікайце галасавую пошту."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Немагчыма актываваць візуальную галасавую пошту"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Пераканайцеся, што ваш тэлефон падключаны да сотавай сеткі і паўтарыце спробу."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Пераканайцеся, што ваш тэлефон падключаны да мабільнай сеткі і паўтарыце спробу."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Выключыце рэжым палёту і паўтарыце спробу."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Няма падключэння"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Калі вы падключаны да Wi-Fi, можаце праверыць галасавую пошту шляхам сінхранізацыі."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Калі вы падключаны да Wi-Fi, можаце праверыць галасавую пошту шляхам сінхранізацыі."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Выключыце рэжым палёту і сінхранізуйце сваю галасавую пошту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Каб праверыць галасавую пошту, вашаму тэлефону патрэбна падключэнне да сотавай перадачы даных."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Каб праверыць галасавую пошту, вашаму тэлефону патрэбна падключэнне да мабільнай перадачы даных."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Немагчыма актываваць візуальную галасавую пошту"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Немагчыма абнавіць візуальную галасавую пошту"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Паўтарыце спробу, калі падключэнне да Wi-Fi да сотавай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Паўтарыце спробу, калі паша падключэнне да сотавай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Паўтарыце спробу, калі падключэнне да Wi-Fi або да мабільнай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Паўтарыце спробу, калі паша падключэнне да мабільнай перадачы даных палепшыцца. Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Немагчыма абнавіць візуальную галасавую пошту"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Вы надалей можаце пазваніць, каб праверыць галасавую пошту."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Немагчыма абнавіць візуальную галасавую пошту"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ваша паштовая скрыня амаль запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Наладзьце PIN-код галасавой пошты"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Вам спатрэбіцца PIN-код галасавой пошты заўжды, калі вы тэлефануеце на сваю галасавую пошту."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Невядомая памылка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Налады рэжыму палёту"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Наладзіць PIN-код"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Паўтарыце спробу"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешта пайшло не так"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Звяжыцеся са Службай падтрымкі па нумары <xliff:g id="NUMBER">%1$s</xliff:g> і паведаміце код памылкі 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Умовы візуальнай галасавой пошты"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Вы павінны прыняць ўмовы Verizon Wireless, каб можна было карыстацца візуальнай галасавой поштай:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nВы павінны прыняць правілы і ўмовы Verizon Wireless, каб можна было карыстацца візуальнай галасавой поштай:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Уключыць візуальную галасавую пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Без згоды з правіламі і ўмовамі візуальная галасавая пошта будзе адключана."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Адключыць візуальную галасавую пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Без згоды з правіламі і ўмовамі транскрыпцыя галасавой пошты будзе адключана."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Адключыць транскрыпцыю галасавой пошты"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Галасавая пошта даступна толькі па выкліку на нумар *86. Каб працягнуць, задайце новы PIN-код галасавой пошты."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Задаць PIN-код"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
index dbca19e..f00033c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bg/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Изключване на самолетния режим"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалната гласова поща се активира"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Възможно е да не получавате известия за гласова поща, докато визуалната гласова поща не бъде напълно активирана. Обаждайте се на номера за гласова поща, за да получавате нови съобщения, докато гласовата поща не е активирана."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалната гласова поща не може да се активира"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверете дали телефонът ви има мобилна връзка и опитайте отново."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверете дали телефонът ви има връзка с мобилната мрежа и опитайте отново."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Изключете самолетния режим и опитайте отново."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Няма връзка"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Няма да бъдете известявани за нови гласови съобщения. Ако използвате Wi-Fi, можете да проверите за гласова поща, като синхронизирате сега."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Няма да бъдете известявани за нови гласови съобщения. Ако използвате Wi-Fi, можете да проверите за гласова поща, като синхронизирате сега."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Няма да бъдете известявани за нови гласови съобщения. Изключете самолетния режим, за да синхронизирате гласовата си поща."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"За да проверите гласовата поща, телефонът ви трябва да използва връзка за мобилни данни."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"За да проверите гласовата поща, телефонът ви трябва да използва мобилна връзка за данни."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалната гласова поща не може да се активира"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Все пак можете да проверите гласовата поща с обаждане."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалната гласова поща не може да се актуализира."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Опитайте отново, когато имате по-добра Wi-Fi или мобилна връзка. Все пак можете да проверите гласовата поща с обаждане."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Опитайте отново, когато имате по-добра връзка за мобилни данни. Все пак можете да проверите гласовата поща с обаждане."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Опитайте отново, когато имате по-добра Wi-Fi връзка или мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Опитайте отново, когато имате по-добра мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалната гласова поща не може да се актуализира."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Все пак можете да проверите гласовата поща с обаждане."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалната гласова поща не може да се актуализира."</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Пощенската ви кутия е почти пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Задайте ПИН за гласовата си поща"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ще ви е необходим ПИН за гласовата поща при всяко обаждане за достъп до съобщенията ви в нея."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Неизвестна грешка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Настройки за самолетен режим"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Задаване на ПИН"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Нов опит"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нещо се обърка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Моля, свържете се с екипа за поддръжка на клиенти на телефон <xliff:g id="NUMBER">%1$s</xliff:g> и кажете, че кодът на грешката е 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Общи условия за визуалната гласова поща"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"За да използвате визуалната гласова поща, трябва да приемете Общите условия на Verizon:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЗа да използвате визуалната гласова поща, трябва да приемете Общите условия на Verizon:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Включване на визуалната гласова поща"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако отхвърлите Общите условия, визуалната гласова поща ще бъде деактивирана."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Деактивиране на визуалната гласова поща"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ако отхвърлите Общите условия, създаването на преписи на гласовите съобщения ще бъде деактивирано."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Деактивиране на преписите на гласовите съобщения"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ще имате достъп до гласовата поща само когато наберете *86. За да продължите, задайте нов ПИН за гласовата поща."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Задаване на ПИН"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
index 5954448..cc179d7 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bn/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"বিমান মোড বন্ধ করুন"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ভিজ্যুয়াল ভয়েসমেল সক্রিয়করণ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ভিজ্যুয়াল ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না করা পর্যন্ত আপনি ভয়েসমেল সংক্রান্ত কোনো বিজ্ঞপ্তি নাও পেতে পারেন৷ ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না হওয়া পর্যন্ত নতুন বার্তাগুলিকে পুনরুদ্ধার করতে ভয়েসমেলে কল করুন৷"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ভিজ্যুয়াল ভয়েসমেল সক্রিয় করবেন না"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"নিশ্চিত করুন যে আপনার ফোনে সেলুলার সংযোগ আছে এবং আবার চেষ্টা করুন।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"আপনার ফোনে কোনো মোবাইল নেটওয়ার্ক সংযোগ আছে কিনা নিশ্চিত করে আবার চেষ্টা করুন।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"বিমান মোড বন্ধ করুন এবং আবার চেষ্টা করুন।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"কোনো সংযোগ নেই"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনি Wi-Fi ব্যবহার করলে, আপনি এখনই সিঙ্ক করে ভয়েসমেল চেক করতে পারেন।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনি ওয়াই-ফাই ব্যবহার করলে, এখনই সিঙ্ক করে ভয়েসমেল চেক করতে পারেন।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"আপনাকে নতুন ভয়েসমেলগুলির জন্য সূচিত করা হবে না। আপনার ভয়েসমেলে সিঙ্ক করার জন্য বিমান মোড বন্ধ করুন।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ভয়েসমেল চেক করার জন্য আপনার ফোনের একটি সেলুলার ডেটার প্রয়োজন।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ভয়েসমেল চেক করার জন্য আপনার ফোনের একটি মোবাইল ডেটা সংযোগের প্রয়োজন।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ভিজ্যুয়াল ভয়েসমেল সক্রিয় করবেন না"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"যখন আপনার Wi-Fi অথবা সেলুলার সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"যখন আপনার Wi-Fi অথবা সেলুলার সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"যখন আপনার ওয়াই-ফাই অথবা মোবাইল ডেটা সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"মোবাইল ডেটা সংযোগ ভালো থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ভিজ্যুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"আপনার মেলবক্স প্রায় পূর্ণ। স্থান খালি করতে, অতিরিক্ত সঞ্চয়স্থান চালু করুন যাতে Google আপনার ভয়েসমেল বার্তাগুলি পরিচালনা করতে এবং ব্যাক আপ নিতে পারে।"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"আপনার ভয়েসমেল পিন সেট করুন"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"যে কোনো সময়ে আপনার ভয়েসমেল অ্যাক্সেস করার জন্য আপনার একটি ভয়েসমেল পিন প্রয়োজন৷"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"অজানা ত্রুটি"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"বিমান মোড সেটিংস"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"পিন সেট করুন"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"আবার চেষ্টা করুন"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"কিছু ভুল হয়েছে"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"অনুগ্রহ করে <xliff:g id="NUMBER">%1$s</xliff:g> এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের জানান যে ত্রুটি কোডটি হলো ৯৯৯৯৷"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ভিজ্যুয়াল ভয়েসমেলের নিবন্ধন এবং শর্তাদি"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ভিজ্যুয়াল ভয়েসমেল ব্যবহার করার জন্য আপনাকে অবশ্যই Verizon Wireless এর নিবন্ধন এবং শর্তাদি স্বীকার করতে হবে:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nভিজ্যুয়াল ভয়েসমেল ব্যবহার করার জন্য আপনাকে অবশ্যই Verizon Wireless এর নিবন্ধন এবং শর্তাদি স্বীকার করতে হবে:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ভিজ্যুয়াল ভয়েসমেল চালু করুন"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"নিবন্ধন এবং শর্তাদি অস্বীকার করা হলে ভিজ্যুয়াল ভয়েসমেল অক্ষম করা হবে৷"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ভিজ্যুয়াল ভয়েসমেল অক্ষম করুন"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"নিবন্ধন এবং শর্তাদি অস্বীকার করা হলে ভিজ্যুয়াল ভয়েসমেলের ট্রান্সক্রিপশান অক্ষম করা হবে৷"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ভয়েসমেলের ট্রান্সক্রিপশান অক্ষম করুন"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"শুধুমাত্র *৮৬ নম্বরে কল করেই ভয়েসমেল অ্যাক্সেস করা যাবে৷ এগিয়ে যাওয়ার জন্য একটি নতুন ভয়েসমেলের পিন সেট করুন৷"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"পিন সেট করুন"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
index 0352436..c61b56c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-bs/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Isključi način rada u avionu"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizuelne govorne pošte"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete primati obavještenja o govornoj pošti dok se vizuelna govorna pošta ne aktivira u potpunosti. U međuvremenu pozovite govornu poštu za preuzimanje novih poruka."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nije moguće aktivirati vizuelnu govornu poštu"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Provjerite imate li mobilnu mrežu na telefonu i pokušajte ponovo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Provjerite imate li mobilnu mrežu na telefonu i pokušajte ponovo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite način rada u avionu i pokušajte ponovo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Niste povezani na mrežu"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete primati obavještenja o novoj govornoj pošti. Ako ste na Wi-Fi mreži, možete provjeriti govornu poštu tako što ćete sada obaviti sinhronizaciju."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete primati obavještenja o novim govornim porukama. Ako ste na Wi-Fi mreži, provjerite govornu poštu tako što ćete odmah obaviti sinhronizaciju."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete primati obavještenja o novoj govornoj pošti. Isključite način rada u avionu da sinhronizirate govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vaš telefon treba imati mobilnu podatkovnu vezu za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonu je potreban mobilni prijenos podataka radi provjere govorne pošte."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nije moguće aktivirati vizuelnu govornu poštu"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Pokušajte ponovo kada Wi-Fi ili mobilna mreža bude bolja. I dalje možete nazvati za provjeru govorne pošte."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Pokušajte ponovo kada mobilna podatkovna mreža bude bolja. I dalje možete nazvati za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Pokušajte ponovo kada Wi-Fi veza ili mobilni prijenos podataka bude bolji. I dalje možete nazvati za provjeru govorne pošte."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Pokušajte ponovo kada mobilni prijenos podataka bude bolji. I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete nazvati za provjeru govorne pošte."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nije moguće ažurirati vizuelnu govornu poštu"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Poštanski pretinac je gotovo sasvim pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Postavite PIN za govornu poštu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN za govornu poštu trebat će vam svaki put kada zatražite pristup govornoj pošti."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nepoznata greška"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Postavke načina rada u avionu"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Postavi PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Pokušajte ponovo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto nije uredu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktirajte korisničku podršku na broj <xliff:g id="NUMBER">%1$s</xliff:g> i obavijestite ih da je kȏd greške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uslovi i odredbe vizuelne govorne pošte"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Morate prihvatiti uslove i odredbe kompanije Verizon Wireless prije korištenja vizuelne govorne pošte:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nMorate prihvatiti uslove i odredbe kompanije Verizon Wireless prije korištenja vizuelne govorne pošte:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključi vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Vizuelna govorna pošta bit će onemogućena ako odbijete uslove i odredbe."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogući vizuelnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripcija govorne pošte će biti onemogućena ako odbijete uslove i odredbe."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogući transkripciju govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti ćete moći pristupiti samo pozivanjem broja *86. Postavite novi PIN govorne pošte da nastavite."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Postavi PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
index b6d844d..b6e4c00 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ca/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desactiva el mode d\'avió"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"S\'està activant la bústia de veu visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"És possible que no rebis notificacions de missatges de veu fins que la bústia de veu visual estigui completament activada. Fins aleshores, truca a la bústia de veu per recuperar els missatges nous."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No es pot activar la bústia de veu visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Comprova la connexió mòbil del telèfon i torna-ho a provar."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assegura\'t que el telèfon tingui connexió a una xarxa mòbil i torna-ho a provar."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el mode d\'avió i torna-ho a provar."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sense connexió"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No rebràs notificacions de missatges de veu nous. Si estàs connectat a una xarxa Wi-Fi, pots sincronitzar ara per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No rebràs notificacions de missatges de veu nous. Si estàs connectat a una xarxa Wi-Fi, pots sincronitzar ara per consultar la bústia de veu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No rebràs notificacions de missatges de veu nous. Desactiva el mode d\'avió per sincronitzar la bústia de veu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"El telèfon necessita una connexió de dades mòbils per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Cal que el telèfon tingui una connexió de dades mòbils per poder consultar la bústia de veu."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No es pot activar la bústia de veu visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No es pot actualitzar la bústia de veu visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Torna-ho a provar quan la connexió Wi-Fi o mòbil sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Torna-ho a provar quan la connexió de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Torna-ho a provar quan la connexió Wi-Fi o de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Torna-ho a provar quan la connexió de dades mòbils sigui millor. Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No es pot actualitzar la bústia de veu visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Pots trucar igualment per consultar la bústia de veu."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No es pot actualitzar la bústia de veu visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tens la bústia gairebé plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Defineix el PIN per als missatges de veu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necessitaràs el PIN per als missatges de veu cada vegada que truquis per accedir-hi."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconegut"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Configuració del mode d\'avió"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Defineix el PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Torna-ho a provar"</string>
@@ -58,7 +56,7 @@
     <string name="voicemail_action_dimiss" msgid="6018415798136796966">"No, gràcies"</string>
     <string name="voicemail_action_sync" msgid="5139315923415392787">"Sincronitza"</string>
     <string name="voicemail_action_call_voicemail" msgid="6701710720535556395">"Truca a la bústia veu"</string>
-    <string name="voicemail_action_call_customer_support" msgid="7698973007656462748">"Truca a l\'assistència al client"</string>
+    <string name="voicemail_action_call_customer_support" msgid="7698973007656462748">"Truca a l\'atenció al client"</string>
     <string name="vvm3_error_vms_dns_failure_title" msgid="7561818769198666727">"S\'ha produït un error"</string>
     <string name="vvm3_error_vms_dns_failure_message" msgid="4284259553458502369">"Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al <xliff:g id="NUMBER">%1$s</xliff:g> i informa\'ls que el codi d\'error és 9001."</string>
     <string name="vvm3_error_vmg_dns_failure_title" msgid="6257196468618464574">"S\'ha produït un error"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"S\'ha produït un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contacta amb el servei d\'atenció al client al <xliff:g id="NUMBER">%1$s</xliff:g> i informa\'ls que el codi d\'error és 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termes i condicions de la bústia de veu visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Has d\'acceptar els termes i condicions de Verizon Wireless per utilitzar la bústia de veu visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nHas d\'acceptar els termes i condicions de Verizon Wireless per poder utilitzar la bústia de veu visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activa la bústia de veu visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"La bústia de veu visual es desactivarà si es rebutgen els termes i condicions."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desactiva la bústia de veu visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcripció dels missatges de veu es desactivarà si es rebutgen els termes i condicions."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desactiva la transcripció dels missatges de veu"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Només podràs accedir a la bústia de veu trucant al *86. Defineix un nou PIN de la bústia de veu per continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Defineix el PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
index c52f7b0..8de3333 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-cs/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Vypnout režim letadla"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivace vizuální hlasové schránky"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Je možné, že dokud nebude vizuální hlasová schránka plně aktivována, nebudou vám chodit oznámení z hlasové schránky. Do té doby se k novým zprávám dostanete po zavolání do hlasové schránky."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizuální hlasovou schránku se nepodařilo aktivovat"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Zkontrolujte, že je telefon připojen k mobilní síti a zkuste to znovu."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Zkontrolujte, že je telefon připojen k mobilní síti a zkuste to znovu."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vypněte režim letadla a zkuste to znovu."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nejste připojeni"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud jste připojeni k Wi-Fi, můžete hlasovou schránku zkontrolovat synchronizací."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud jste připojeni k Wi-Fi, můžete hlasovou schránku zkontrolovat synchronizací."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nebudete dostávat oznámení o nových hlasových zprávách. Pokud chcete hlasovou schránku synchronizovat, vypněte režim letadla."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon musí být připojen k mobilním datům, aby bylo možné zkontrolovat hlasovou schránku."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon musí být připojen k mobilním datům, aby bylo možné zkontrolovat hlasovou schránku."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizuální hlasovou schránku se nepodařilo aktivovat"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Můžete ji ale stále zkontrolovat zavoláním."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Zkuste to znovu, až budete mít lepší připojení k Wi-Fi nebo k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Zkuste to znovu, až budete mít lepší připojení k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Zkuste to znovu, až budete mít lepší připojení k Wi-Fi nebo k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Zkuste to znovu, až budete mít lepší připojení k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Můžete ji ale stále zkontrolovat zavoláním."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizuální hlasovou schránku se nepodařilo aktualizovat"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Vaše e-mailová schránka je téměř plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastavit kód PIN hlasové schránky"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN hlasové schránky budete potřebovat, kdykoli do své hlasové schránky zavoláte."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznámá chyba"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Nastavení režimu letadla"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Nastavit kód PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Zkusit znovu"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Něco se pokazilo"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontaktujte zákaznický servis na čísle <xliff:g id="NUMBER">%1$s</xliff:g> a sdělte kód chyby 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Smluvní podmínky vizuální hlasové schránky"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Pokud chcete používat vizuální hlasovou schránku, musíte přijmout smluvní podmínky společnosti Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nChcete-li používat vizuální hlasovou schránku, musíte přijmout smluvní podmínky společnosti Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Zapnout vizuální hlasovou schránku"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Pokud smluvní podmínky odmítnete, vizuální hlasová schránka bude vypnuta."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vypnout vizuální hlasovou schránku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Pokud smluvní podmínky odmítnete, přepis hlasové schránky bude vypnut."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Vypnout přepis hlasové schránky"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Hlasová schránka bude dostupná jen zavoláním na číslo *86. Pokud chcete pokračovat, nastavte si nový kód PIN k hlasové schránce."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavit kód PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
index 26e5ede..00355bd 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-da/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Slå flytilstand fra"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiverer visuel telefonsvarer"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Du modtager muligvis ikke telefonsvarerunderretninger, før den visuelle telefonsvarer er fuldt aktiveret. Ring til telefonsvareren for hente nye beskeder, indtil telefonsvareren er fuldt aktiveret."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuel telefonsvarer kan ikke aktiveres"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sørg for, at din telefon har mobilforbindelse, og prøv igen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sørg for, at din telefon har forbindelse til mobilnetværket, og prøv igen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå flytilstand fra, og prøv igen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen forbindelse"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du vil ikke få besked om nye telefonsvarerbeskeder. Hvis du er på Wi-Fi, kan du tjekke, om der er telefonsvarerbeskeder, ved at synkronisere nu."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du får ikke besked om nye talebeskeder. Hvis du er på Wi-Fi, kan du tjekke, om der er talebeskeder, ved at synkronisere nu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du vil ikke få besked om nye telefonsvarerbeskeder. Slå flytilstand fra for at synkronisere din e-mail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Din telefon skal have en mobilforbindelse, for at du kan tjekke din telefonsvarer."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Din telefon skal have en mobildataforbindelse, for at du kan tjekke, om der er talebeskeder."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuel telefonsvarer kan ikke aktiveres"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuel telefonsvarer kan ikke opdateres"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igen, når din Wi-Fi- eller mobilforbindelse er bedre. Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igen, når din mobildataforbindelse er bedre. Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv igen, når din Wi-Fi- eller mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igen, når din mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuel telefonsvarer kan ikke opdateres"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan stadig ringe op for at tjekke din telefonsvarer."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuel telefonsvarer kan ikke opdateres"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Din telefonsvarer er næsten fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Bestem pinkoden til din telefonsvarer"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du skal bruge en pinkode til din telefonsvarer, når du ringer for at få adgang til den."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukendt fejl"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Indstillinger for flytilstand"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Vælg pinkode"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Prøv igen"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Der opstod en fejl"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g>, og fortæl dem, at fejlkoden er 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår og betingelser for visuel telefonsvarer"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du skal acceptere vilkår og betingelser for Verizon Wireless for at bruge visuel telefonsvarer:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu skal acceptere vilkår og betingelser for Verizon Wireless for at bruge visuel telefonsvarer:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå Visuel telefonsvarer til"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuel telefonsvarer bliver deaktiveret, hvis vilkår og betingelser afvises."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Deaktiver visuel telefonsvarer"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transskription af talebeskeder deaktiveres, hvis du ikke accepterer vilkår og betingelser."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Deaktiver transskription af talebeskeder"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Telefonsvareren er kun tilgængelig, hvis du taster *86 og ringer op. Angiv en ny pinkode til telefonsvarer for at fortsætte."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angiv pinkode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
index 865ddd9..e55e283 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-de/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Flugmodus deaktivieren"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuelle Mailbox wird aktiviert"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Möglicherweise erhältst du keine Mailbox-Benachrichtigungen, solange die visuelle Mailbox nicht vollständig aktiviert ist. Bis es soweit ist, kannst du deine Mailbox anrufen, um neue Nachrichten abzuhören."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuelle Mailbox kann nicht aktiviert werden"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Vergewissere dich, dass dein Smartphone eine Mobilfunkverbindung hat und versuche es noch einmal."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Vergewissere dich, dass auf deinem Smartphone eine Mobilfunkverbindung besteht, und versuche es noch einmal."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Schalte den Flugmodus aus und versuche es noch einmal."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Keine Verbindung"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du wirst nicht über neue Mailboxnachrichten informiert. Wenn du eine WLAN-Verbindung hast, kannst du deine Mailbox abrufen, indem du dein Smartphone jetzt synchronisierst."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du wirst nicht über neue Mailboxnachrichten informiert. Wenn du eine WLAN-Verbindung verwendest, kannst du deine Mailbox abrufen, indem du dein Smartphone jetzt synchronisierst."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du wirst nicht über neue Mailboxnachrichten informiert. Schalte den Flugmodus aus, um deine Mailbox zu synchronisieren."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Dein Smartphone benötigt eine mobile Datenverbindung, um die Mailbox abzurufen."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Dein Smartphone benötigt eine mobile Datenverbindung, um die Mailbox abzurufen."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuelle Mailbox kann nicht aktiviert werden"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kannst deine Mailbox immer noch per Anruf abhören."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Versuch es noch einmal, sobald die WLAN- bzw. Mobilfunkverbindung besser ist. Du kannst deine Mailbox immer noch per Anruf abhören."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Versuch es noch einmal, sobald die Mobilfunkverbindung besser ist. Du kannst deine Mailbox immer noch per Anruf abhören."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Versuche es noch einmal, sobald die WLAN- bzw. Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Versuche es noch einmal, sobald die Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kannst deine Mailbox immer noch per Anruf abhören."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuelle Mailbox kann nicht aktualisiert werden"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Dein Postfach fast ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben. So kann Google deine Mailboxnachrichten verwalten und sichern."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Mailbox-PIN festlegen"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Bei jedem Anruf auf deiner Mailbox benötigst du eine Mailbox-PIN."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unbekannter Fehler"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Flugmoduseinstellungen"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN festlegen"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Erneut versuchen"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ein Problem ist aufgetreten"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Bitte wende dich an den Kundensupport unter der Nummer <xliff:g id="NUMBER">%1$s</xliff:g> und gib den Fehlercode 9999 an."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Nutzungsbedingungen für visuelle Mailbox"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du muss den Nutzungsbedingungen von Verizon Wireless zustimmen, um die visuelle Mailbox zu verwenden:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu musst den Nutzungsbedingungen von Verizon Wireless zustimmen, um die visuelle Mailbox zu verwenden:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuelle Mailbox aktivieren"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Die visuelle Mailbox wird deaktiviert, wenn du die Nutzungsbedingungen ablehnst."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuelle Mailbox deaktivieren"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Die Sprache-zu-Text-Umwandlung von Mailbox-Nachrichten wird deaktiviert, wenn die Nutzungsbedingungen abgelehnt werden."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Sprache-zu-Text-Umwandlung von Mailbox-Nachrichten deaktivieren"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Du kannst nur auf Mailboxnachrichten zugreifen, indem du *86 anrufst. Lege eine neue Mailbox-PIN fest, um fortzufahren."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN festlegen"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
index acd1ca0..32cee36 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-el/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Απενεργοποίηση λειτουργίας πτήσης"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ενεργοποίηση οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Ενδέχεται να μην λαμβάνετε ειδοποιήσεις αυτόματου τηλεφωνητή έως ότου ο οπτικός αυτόματος τηλεφωνητής ενεργοποιηθεί πλήρως. Καλέστε τον αυτόματο τηλεφωνητή για να ανακτήσετε νέα μηνύματα, έως ότου γίνει πλήρης ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Βεβαιωθείτε ότι το τηλέφωνό σας διαθέτει σύνδεση κινητής τηλεφωνίας και δοκιμάστε ξανά."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Βεβαιωθείτε ότι το τηλέφωνό σας διαθέτει σύνδεση κινητής τηλεφωνίας και δοκιμάστε ξανά."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Απενεργοποιήστε τη λειτουργία πτήσης και δοκιμάστε ξανά."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Δεν υπάρχει σύνδεση"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Εάν είστε συνδεδεμένοι μέσω Wi-Fi, μπορείτε να ελέγξετε τον αυτόματο τηλεφωνητή σας για μηνύματα, εκτελώντας συγχρονισμό τώρα."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Εάν είστε συνδεδεμένοι μέσω Wi-Fi, μπορείτε να ελέγξετε τον αυτόματο τηλεφωνητή σας για μηνύματα, εκτελώντας συγχρονισμό τώρα."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Απενεργοποιήστε τη λειτουργία πτήσης για συγχρονισμό φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή σας."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Το τηλέφωνό σας χρειάζεται σύνδεση δεδομένων κινητής τηλεφωνίας για έλεγχο του αυτόματου τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Το τηλέφωνό σας χρειάζεται σύνδεση δεδομένων κινητής τηλεφωνίας για έλεγχο του αυτόματου τηλεφωνητή σας."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Δοκιμάστε ξανά όταν η σύνδεση Wi-Fi ή η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Δοκιμάστε ξανά όταν η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Δοκιμάστε ξανά όταν η σύνδεση Wi-Fi ή η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Δοκιμάστε ξανά όταν η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Το γραμματοκιβώτιό σας είναι σχεδόν πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ορίστε PIN για τον αυτόματο τηλεφωνητή σας"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Θα χρειάζεστε ένα PIN φωνητικού τηλεφωνητή κάθε φορά που καλείτε, για να έχετε πρόσβαση στον τηλεφωνητή σας."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Άγνωστο σφάλμα"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Ρυθμίσεις λειτουργίας πτήσης"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Ορισμός PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Δοκιμάστε ξανά"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο <xliff:g id="NUMBER">%1$s</xliff:g> και αναφέρετέ τους τον κωδικό σφάλματος 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Όροι και Προϋποθέσεις οπτικού αυτόματου τηλεφωνητή"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Πρέπει να αποδεχτείτε τους Όρους και τις Προϋποθέσεις της Verizon Wireless για να χρησιμοποιήσετε τον οπτικό αυτόματο τηλεφωνητή:\n\n"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nΠρέπει να αποδεχτείτε τους όρους και τις προϋποθέσεις της Verizon Wirelessγια τη χρήση οπτικού αυτόματου τηλεφωνητή:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ενεργοποίηση Οπτικού αυτόματου τηλεφωνητή"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ο οπτικός αυτόματος τηλεφωνητής θα απενεργοποιηθεί εάν δεν αποδεχτείτε τους Όρους και τις Προϋποθέσεις."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Απενεργοποίηση οπτικού αυτόματου τηλεφωνητή"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Η μεταγραφή αυτόματου τηλεφωνητή θα απενεργοποιηθεί εάν δεν αποδεχτείτε τους Όρους και τις Προϋποθέσεις."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Απενεργοποίηση μεταγραφής αυτόματου τηλεφωνητή"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ο αυτόματος τηλεφωνητής θα είναι προσβάσιμος μόνο καλώντας το *86. Ορίστε έναν νέο αριθμό PIN αυτόματου τηλεφωνητή για να συνεχίσετε."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ορισμός PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
index a036950..64e9d89 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rAU/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Turn off aeroplane mode"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Aeroplane mode settings"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Set PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Try again"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
index a036950..64e9d89 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Turn off aeroplane mode"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Aeroplane mode settings"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Set PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Try again"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
index a036950..64e9d89 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rIN/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Turn off aeroplane mode"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activating visual voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Can\'t activate visual voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Make sure that your phone has a mobile connection and try again."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Make sure your phone has a mobile network connection and try again."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Turn off aeroplane mode and try again."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"No connection"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Your phone needs a mobile data connection to check voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Your phone needs a mobile data connection to check voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Can\'t activate visual voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"You can still call to check voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Can\'t update visual voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Try again when your mobile data connection is better. You can still call to check voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Can\'t update visual voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"You can still call to check voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Can\'t update visual voicemail"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Aeroplane mode settings"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Set PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Try again"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Something went wrong"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service on <xliff:g id="NUMBER">%1$s</xliff:g> and tell them that the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visual voicemail Terms and Conditions"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Turn on Visual Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visual voicemail will be disabled if the Terms and Conditions are declined."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disable visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail transcription will be disabled if the terms and conditions are declined."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disable voicemail transcription"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Set PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
index 485a78b..d1a47cf 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-es-rUS/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desactivar el modo de avión"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando el buzón de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Es posible que no recibas notificaciones de los mensajes de voz hasta que el buzón de voz visual se encuentre completamente activado. Hasta ese momento, puedes llamar al buzón de voz para recuperar los mensajes nuevos."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No se puede activar el buzón de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asegúrate de que el teléfono tenga conexión móvil y vuelve a intentarlo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que el teléfono tenga conexión móvil y vuelve a intentarlo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el modo de avión y vuelve a intentarlo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sin conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás conectado a Wi-Fi, puedes sincronizar ahora para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás conectado a Wi-Fi, puedes sincronizar ahora para revisar el buzón de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No recibirás notificaciones de los mensajes de voz nuevos. Desactiva el modo de avión para sincronizar el buzón de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"El teléfono necesita una conexión de datos móviles para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"El teléfono necesita una conexión de datos móviles para revisar el buzón de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No se puede activar el buzón de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No se puede actualizar el buzón de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Vuelve a intentarlo cuando la conexión Wi-Fi o la conexión móvil mejoren. Aún puedes llamar para revisar el buzón de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Vuelve a intentarlo cuando la conexión de datos móviles mejore. Aún puedes llamar para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Vuelve a intentarlo cuando la conexión Wi-Fi o la conexión de datos móviles mejoren. Aún puedes llamar para revisar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Vuelve a intentarlo cuando la conexión de datos móviles mejore. Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No se puede actualizar el buzón de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Aún puedes llamar para revisar el buzón de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No se puede actualizar el buzón de voz visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tu buzón está casi lleno. Para liberar espacio, obtén almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Configura el PIN del buzón de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necesitas un PIN cada vez que llames para acceder al buzón de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconocido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Configuración del modo de avión"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Establecer PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Volver a intentarlo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Se produjo un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Comunícate con el servicio de atención al cliente al <xliff:g id="NUMBER">%1$s</xliff:g> e indícales que el código de error es el 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Términos y condiciones del buzón de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Debes aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"El buzón de voz visual se desactiva si no aceptas los términos y condiciones."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inhabilitar buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcripción del buzón de voz se desactivará si no aceptas los términos y condiciones."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inhabilitar la transcripción del buzón de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Solo podrás acceder al buzón de voz llamando al *86. Para continuar, establece un nuevo PIN para el buzón de voz."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Establecer PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
index d351f37..a7c9f47 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-es/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desactivar modo avión"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando el buzón de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Es posible que no recibas notificaciones de mensajes de voz hasta que se active totalmente el buzón de voz visual. Hasta ese momento, puedes llamar al buzón de voz para escuchar los mensajes nuevos."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"No se puede activar el correo de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Comprueba que el teléfono tenga cobertura e inténtalo otra vez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que tu teléfono tenga conexión a una red móvil y vuelve a intentarlo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva el modo avión e inténtalo otra vez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sin conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás usando una Wi-Fi, puedes sincronizar ahora el teléfono para comprobar si hay mensajes de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"No recibirás notificaciones de los mensajes de voz nuevos. Si estás usando una conexión Wi-Fi, puedes sincronizar ahora el teléfono para comprobar si hay mensajes de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"No recibirás notificaciones de los mensajes de voz nuevos. Si quieres sincronizar tu buzón de voz, desactiva el modo avión."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Para comprobar el buzón de voz, necesitas una conexión de datos móviles en el teléfono."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Para comprobar el buzón de voz, necesitas una conexión de datos móviles en el teléfono."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"No se puede activar el correo de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"No se puede actualizar el correo de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Inténtalo otra vez cuando tengas mejor conexión Wi-Fi o de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Inténtalo otra vez cuando tengas mejor conexión de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Inténtalo otra vez cuando tengas mejor conexión Wi-Fi o de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Inténtalo otra vez cuando tengas mejor conexión de datos móviles. Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"No se puede actualizar el correo de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puedes llamar para comprobar el buzón de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"No se puede actualizar el correo de voz visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Tu buzón de voz está prácticamente lleno. Para desocupar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Configura el PIN del buzón de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Deberás introducir un PIN del buzón de voz siempre que llames para escuchar los mensajes de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Error desconocido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Ajustes del modo avión"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Configurar el PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Volver a intentarlo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Se ha producido un error"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Llama al servicio de Atención al cliente al <xliff:g id="NUMBER">%1$s</xliff:g> e indícales que el código de error es el 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Términos y Condiciones del buzón de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Tienes que aceptar los términos y condiciones de Verizon Wireless para usar el buzón de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar los términos y condiciones de Verizon Wireless para poder usar el buzón de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si rechazas los términos y condiciones, el buzón de voz visual se quedará inhabilitado."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inhabilitar el buzón de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Si rechazas los términos y condiciones, se inhabilitará la transcripción de mensajes de voz."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inhabilitar la transcripción de mensajes de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Solo podrás acceder al buzón de voz llamando al *86. Configura un nuevo PIN del buzón para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Configurar el PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
index 953b36b..5374d9f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-et/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Lennureżiimi väljalülitamine"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuaalse kõneposti aktiveerimine"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Te ei pruugi kõneposti märguandeid saada enne, kui visuaalne kõnepost on täielikult aktiveeritud. Kuni kõnepost on täielikult aktiveeritud, helistage uute sõnumite toomiseks kõneposti."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuaalset kõneposti ei saa aktiveerida"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Veenduge, et teie telefonis oleks mobiilne andmeside saadaval, ja proovige uuesti."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Veenduge, et teie telefonis oleks mobiilsidevõrk saadaval, ja proovige uuesti."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Lülitage lennurežiim välja ja proovige uuesti."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ühendus puudub"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Teid ei teavitata uutest kõnepostisõnumitest. Kui kasutate WiFi-t, saate kõneposti kontrollida, kui kohe sünkroonite."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Teid ei teavitata uutest kõnepostisõnumitest. Kui kasutate WiFi-t, saate kõneposti kontrollida, kui kohe sünkroonite."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Teid ei teavitata uutest kõnepostisõnumitest. Kõneposti sünkroonimiseks lülitage lennurežiim välja."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Teie telefonis peab kõneposti kontrollimiseks olema lubatud mobiilne andmeside."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Teie telefonis peab kõneposti kontrollimiseks olema lubatud mobiilne andmesideühendus."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuaalset kõneposti ei saa aktiveerida"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuaalset kõneposti ei saa värskendada"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Proovige uuesti, kui WiFi- või mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Proovige uuesti, kui mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Proovige uuesti, kui WiFi- või mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Proovige uuesti, kui mobiilne andmesideühendus on parem. Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuaalset kõneposti ei saa värskendada"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Kõneposti saate siiski kontrollida, kui sinna helistate."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuaalset kõneposti ei saa värskendada"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Teie postkast on peaaegu täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Määrake kõneposti PIN-kood"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vajate PIN-koodi juhul, kui helistate kõnepostile juurdepääsemiseks."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Tundmatu viga"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Lennurežiimi seaded"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Määra PIN-kood"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Proovi uuesti"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Midagi läks valesti"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Võtke ühendust klienditeenindusega numbril <xliff:g id="NUMBER">%1$s</xliff:g> ja öelge neile, et veakood on 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuaalse kõneposti nõuded ja tingimused"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Visuaalse kõneposti kasutamiseks peate nõustuma Verizon Wirelessi nõuete ja tingimustega:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVisuaalse kõneposti kasutamiseks peate nõustuma Verizon Wirelessi nõuete ja tingimustega:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuaalse kõneposti sisselülitamine"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuaalne kõnepost keelatakse, kui nõuded ja tingimused tagasi lükatakse."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuaalse kõneposti keelamine"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Kõnepostisõnumite transkribeerimine keelatakse, kui nõuete ja tingimustega ei nõustuta."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Kõnepostisõnumite transkribeerimise keelamine"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Kõnepost on saadaval vaid siis, kui helistate numbril *86. Jätkamiseks määrake uus kõneposti PIN-kood."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-koodi määramine"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
index af40192..cf381f2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-eu/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desaktibatu hegaldi modua"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ikusizko erantzungailua aktibatzen"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"aktibatu arte, agian ez duzu jasoko erantzungailuaren jakinarazpenik. Erantzungailua guztiz aktibatuta ez dagoen artean, deitu erantzungailuari mezu berriak entzuteko."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ezin da aktibatu ikusizko erantzungailua"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Ziurtatu telefonoak datu-konexioa duela eta saiatu berriro."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Ziurtatu telefonoak datu-konexioa duela eta saiatu berriro."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desaktibatu hegaldi modua eta saiatu berriro."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ez dago konexiorik"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ez duzu jakinarazpenik jasoko ahots-mezu berriak dituzunean. Wi-Fi sarea erabiltzen ari bazara, orain sinkroniza dezakezu erantzungailua ahots-mezurik duzun begiratzeko."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ez duzu jasoko jakinarazpenik ahots-mezu berriak dituzunean. Wi-Fi sarea erabiltzen ari bazara, orain sinkroniza dezakezu erantzungailua ahots-mezurik duzun begiratzeko."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ez duzu jakinarazpenik jasoko ahots-mezu berriak dituzunean. Desaktibatu hegaldi modua erantzungailua sinkronizatzeko."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Erantzungailua egiaztatzeko, datu-konexioa behar du telefonoak."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Erantzungailua egiaztatzeko, datu-konexioa behar du telefonoak."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ezin da aktibatu ikusizko erantzungailua"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ezin da eguneratu ikusizko erantzungailua."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Saiatu berriro Wi-Fi konexioa edo datu-mugikorrak hobeak direnean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Saiatu berriro datu-konexioa hobea denean. Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Saiatu berriro Wi-Fi edo datu-konexioa hobeak direnean. Bestela ere, deitu egin dezakezu erantzungailua egiaztatzeko."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Saiatu berriro datu-konexioa hobea denean. Bestela ere, deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ezin da eguneratu ikusizko erantzungailua."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Deitu egin dezakezu erantzungailua egiaztatzeko."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ezin da eguneratu ikusizko erantzungailua."</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ia beteta dago postontzia. Tokia egiteko, lortu biltegiratze-toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ezarri erantzungailuko PIN kodea"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Erantzungailua atzitzeko deitzen duzunerako behar duzu PIN kodea."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Errore ezezagun bat gertatu da"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Hegaldi moduaren ezarpenak"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Ezarri PIN kodea"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Saiatu berriro"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Arazoren bat izan da"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Jarri harremanetan bezeroarentzako arreta-zerbitzuarekin (<xliff:g id="NUMBER">%1$s</xliff:g>) eta esan iezaiezu errore-kodea 9999 dela."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Ikusizko erantzungailuaren Zehaztapenak eta baldintzak"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Verizon Wireless zerbitzuaren zehaztapenak eta baldintzak onartu behar dituzu ikusizko erantzungailua erabiltzeko:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVerizon Wireless zerbitzuaren Zehaztapenak eta baldintzak onartu behar dituzu ikusizko erantzungailua erabiltzeko:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktibatu ikusizko erantzungailua"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Zehaztapenak eta baldintzak onartzen ez badituzu, desgaitu egingo da ikusizko erantzungailua."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desgaitu ikusizko erantzungailua"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Zehaztapenak eta baldintzak onartzen ez badituzu, desgaitu egingo da ahots-mezuak transkribatzeko aukera."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desgaitu ahots-mezuak transkribatzeko aukera"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Erantzungailua atzitzeko, *86 zenbakira deitu beharko duzu. Jarraitzeko, ezarri erantzungailuaren PIN kodea."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ezarri PIN kodea"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
index af79322..a2ad417 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fa/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"غیرفعال کردن حالت هواپیما"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"فعال کردن پست صوتی تصویری"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ممکن است تا زمانی که پست صوتی تصویری کاملاً فعال نشده باشد، اعلان‌های پست صوتی را دریافت نکنید. تا زمانی که پست صوتی به‌طور کامل فعال نشده است، برای بازیابی پیام‌های جدید، با پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"پست صوتی تصویری فعال نشد"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"بررسی کنید تلفن دارای اتصال همراه باشد و دوباره امتحان کنید."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"مطمئن شوید تلفنتان اتصال شبکه تلفن همراه دارد و دوباره امتحان کنید."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"حالت هواپیما را غیرفعال کنید و دوباره امتحان کنید."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"اتصال برقرار نیست"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏برای پست‌های صوتی جدید به شما اطلاع داده نمی‌شود. اگر از Wi-Fi استفاده می‌کنید، اکنون با همگام‌سازی می‌توانید پست صوتی را بررسی کنید."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏از پست‌های صوتی جدید مطلع نمی‌شود. اگر از Wi-Fi استفاده می‌کنید، با انجام همگام‌سازی در این لحظه، می‌توانید پست صوتی را بررسی کنید."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"برای پست‌های صوتی جدید به شما اطلاع داده نمی‌شود. حالت هواپیما را غیرفعال کنید تا پست صوتی همگام‌سازی شود."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"تلفنتان برای بررسی پست صوتی به اتصال داده همراه نیاز دارد."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"برای بررسی پست صوتی، تلفنتان باید اتصال داده همراه داشته باشد."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"پست صوتی تصویری فعال نشد"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"پست صوتی تصویری به‌روزرسانی نشد"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏وقتی Wi-Fi یا اتصال همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"وقتی اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏وقتی Wi-Fi یا اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی، تماس بگیرید."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"وقتی اتصال داده همراه بهتر شد دوباره امتحان کنید. همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"پست صوتی تصویری به‌روزرسانی نشد"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"پست صوتی تصویری به‌روزرسانی نشد"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏صندوق ورودی‌تان تقریباً پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"تنظیم پین پست صوتی"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"هر بار که تماس می‌گیرید برای دسترسی به پست صوتی‌تان به پین پست صوتی نیاز دارید."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"خطای ناشناس"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"تنظیمات حالت هواپیما"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"تنظیم پین"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"دوباره امتحان کنید"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"مشکلی روی داد"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"لطفاً از طریق شماره <xliff:g id="NUMBER">%1$s</xliff:g> با خدمات مشتری تماس بگیرید و این کد خطا را به آنها بگویید: ٩٩٩٩."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"شرایط و ضوابط پست صوتی دیداری"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏برای استفاده از پست صوتی تصویری باید  شرایط و ضوابط Verizon Wireless را بپذیرید:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nبرای استفاده از پست صوتی تصویری، باید با شرایط و ضوابط Verizon Wireless موافقت کنید:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"روشن کردن پست صوتی تصویری"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"اگر شرایط و ضوابط را رد کنید، پست صوتی تصویری غیرفعال می‌شود."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"غیرفعال کردن پست صوتی تصویری"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"اگر شرایط و ضوابط را رد کنید، ترانویسی پست صوتی غیرفعال خواهد شد."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"غیرفعال کردن ترانویسی پست صوتی"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"پست صوتی فقط از طریق تماس با ٨۶* قابل دسترسی است. برای ادامه، یک پین پست صوتی جدید تنظیم کنید."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"تنظیم پین"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
index 5416765..db19586 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fi/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Poista lentokonetila käytöstä"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivoidaan visuaalista puhelinvastaajaa."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Et ehkä saa vastaajan ilmoituksia, ennen kuin visuaalinen puhelinvastaaja on täysin aktivoitu. Saat uudet viestit soittamalla vastaajaan."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Visuaalisen puhelinvastaajan aktivointi epäonnistui."</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Varmista, että puhelimesi mobiiliyhteys toimii, ja yritä uudelleen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Varmista, että puhelimesi mobiilidatayhteys toimii, ja yritä uudelleen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Poista lentokonetila käytöstä ja yritä uudelleen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ei yhteyttä"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Jos olet Wi-Fi:ssä, voit tarkistaa vastaajaviestit synkronoimalla nyt."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Jos olet yhteydessä Wi-Fi-verkkoon, voit tarkistaa vastaajaviestit synkronoimalla nyt."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Synkronoi vastaajaviestit poistamalla lentokonetila käytöstä."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vastaajaviestien tarkistamista varten puhelimessasi on oltava mobiilidatayhteys."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Vastaajaviestien tarkistamista varten puhelimessasi on oltava mobiilidatayhteys."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Visuaalisen puhelinvastaajan aktivointi epäonnistui."</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Voit silti tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Visuaalisen vastaajan päivitys epäonnistui."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Yritä uudelleen, kun olet Wi-Fi:ssä tai mobiiliyhteys on parempi. Voit silti tarkistaa vastaajaviestit soittamalla."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Yritä uudelleen, kun mobiilidatayhteys on parempi. Voit silti tarkistaa vastaajaviestit soittamalla."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Yritä uudelleen, kun Wi-Fi- tai mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Yritä uudelleen, kun mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Visuaalisen vastaajan päivitys epäonnistui."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Voit silti tarkistaa vastaajaviestit soittamalla."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Visuaalisen vastaajan päivitys epäonnistui."</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Postilaatikkosi on lähes täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Aseta vastaajan PIN-koodi"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vastaajan PIN-koodi on annettava aina, kun käytät vastaajaa."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Tuntematon virhe"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Lentokonetilan asetukset"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Aseta PIN-koodi"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Yritä uudelleen"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Jokin meni vikaan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Ota yhteys asiakastukeen numerossa <xliff:g id="NUMBER">%1$s</xliff:g> ja ilmoita virhekoodi 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Visuaalisen puhelinvastaajan käyttöehdot"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Visuaalisen puhelinvastaajan käyttöä varten sinun on hyväksyttävä Verizon Wirelessin käyttöehdot:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nSinun on hyväksyttävä Verizon Wirelessin käyttöehdot, jotta voit käyttää visuaalista puhelinvastaajaa:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ota visuaalinen puhelinvastaaja käyttöön"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuaalinen puhelinvastaaja poistetaan käytöstä, jos käyttöehtoja ei hyväksytä."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Poista visuaalinen puhelinvastaaja käytöstä"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Puhelinvastaajan transkriptio poistetaan käytöstä, jos käyttöehtoja ei hyväksytä."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Poista puhelinvastaajan transkriptio käytöstä"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Vastaaja on käytettävissä vain soittamalla numeroon *86. Jatka asettamalla vastaajalle uusi PIN-koodi."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Aseta PIN-koodi"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
index ef88ecf..30b253d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fr-rCA/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Désactiver le mode Avion"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activation de la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vous ne recevrez peut-être aucune notification de la messagerie vocale tant que la messagerie vocale visuelle ne sera pas complètement activée. Appelez la messagerie vocale pour récupérer de nouveaux messages jusqu\'à l\'activation complète de la messagerie vocale."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossible d\'activer la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Assurez-vous que votre téléphone dispose d\'une connexion cellulaire et réessayez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assurez-vous que votre téléphone dispose d\'une connexion réseau cellulaire et réessayez."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Désactivez le mode Avion et réessayez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aucune connexion"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Vous ne serez pas averti à la réception de nouveaux messages vocaux. Si vous utilisez le Wi-Fi, vous pouvez vérifier si vous avez de nouveaux messages vocaux par une synchronisation."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Vous ne recevrez pas de notification à l\'arrivée de nouveaux messages vocaux. Si vous utilisez le Wi-Fi, vous pouvez vérifier si vous avez de nouveaux messages vocaux en effectuant une synchronisation."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Vous ne serez pas averti à la réception de nouveaux messages vocaux. Désactivez le mode Avion pour synchroniser votre messagerie vocale."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Votre téléphone requiert une connexion de données cellulaire pour consulter la messagerie vocale."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Votre téléphone requiert une connexion de données mobiles pour que vous puissiez consulter la messagerie vocale."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossible d\'activer la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Réessayez lorsque votre connexion Wi-Fi ou cellulaire sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Réessayez lorsque votre connexion cellulaire sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Réessayez lorsque votre connexion Wi-Fi ou de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Réessayez lorsque votre connexion de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Vous pouvez tout de même appeler pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Définir votre NIP de messagerie vocale"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vous devez saisir un NIP de messagerie vocale chaque fois que vous appelez pour accéder à vos messages vocaux."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erreur inconnue"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Paramètres du mode Avion"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Définir le NIP"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Réessayer"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Une erreur s\'est produite"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Veuillez communiquer avec le service à la clientèle au numéro <xliff:g id="NUMBER">%1$s</xliff:g> et lui indiquer que le code d\'erreur est le 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Conditions d\'utilisation de la messagerie vocale visuelle"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vous devez accepter les conditions d\'utilisation de Verizon Wireless pour utiliser la messagerie vocale visuelle : \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVous devez accepter les conditions d\'utilisation de Verizon Wireless pour utiliser la messagerie vocale visuelle :\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activer la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si les conditions d\'utilisation sont refusées, la messagerie vocale visuelle sera désactivée."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Désactiver la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Si les conditions d\'utilisation sont refusées, la fonction de transcription des messages vocaux sera désactivée."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Désactiver la fonction de transcription des messages vocaux"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Pour accéder à la messagerie vocale, vous devrez composer *86. Définissez un nouveau NIP de messagerie vocale pour continuer."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Définir le NIP"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
index eefd5ad..8861b6f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-fr/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Désactiver le mode Avion"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activation de la messagerie vocale visuelle..."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Tant que la messagerie vocale visuelle n\'est pas totalement activée, vous risquez de ne pas être averti de la réception de nouveaux messages. Appelez votre boîte vocale pour consulter ces derniers."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossible d\'activer la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Vérifiez que votre téléphone est bien connecté au réseau mobile, puis réessayez."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Vérifiez que votre téléphone est bien connecté au réseau mobile, puis réessayez."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Désactivez le mode Avion, puis réessayez."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aucune connexion"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Vous ne recevrez aucune notification en cas de nouveau message vocal. Si vous êtes connecté en Wi-Fi, vous pouvez consulter votre messagerie vocale maintenant en effectuant une synchronisation."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Vous ne recevrez aucune notification en cas de nouveau message vocal. Si vous êtes connecté en Wi-Fi, vous pouvez consulter votre messagerie vocale dès à présent en effectuant une synchronisation."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Vous ne recevrez aucune notification en cas de nouveau message. Désactivez le mode Avion pour synchroniser votre messagerie vocale."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Vous devez disposer d\'une connexion de données mobiles pour consulter votre messagerie vocale."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Vous devez disposer d\'une connexion de données mobiles pour consulter votre messagerie vocale."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossible d\'activer la messagerie vocale visuelle"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion au réseau mobile ou Wi-Fi. La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion de données mobiles. La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion au réseau mobile ou Wi-Fi. Vous pouvez tout de même consulter votre messagerie vocale par téléphone."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Réessayez lorsque vous bénéficierez d\'une meilleure connexion de données mobiles. Vous pouvez tout de même consulter votre messagerie vocale par téléphone."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"La consultation de votre messagerie vocale par téléphone est toujours possible."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossible de mettre à jour la messagerie vocale visuelle"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Définir le code de votre messagerie vocale"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Vous devrez saisir ce code chaque fois que vous consulterez votre messagerie vocale."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erreur inconnue"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Paramètres du mode Avion"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Définir un code"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Réessayer"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Problème"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Veuillez contacter le service client au <xliff:g id="NUMBER">%1$s</xliff:g>. Le code d\'erreur à transmettre au conseiller est le 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Conditions d\'utilisation de la messagerie vocale visuelle"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vous devez accepter les conditions d\'utilisation de Verizon Wireless pour pouvoir utiliser la messagerie vocale visuelle :\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVous devez accepter les conditions d\'utilisation de Verizon Wireless pour pouvoir utiliser la messagerie vocale virtuelle :\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activer la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Si vous refusez les conditions d\'utilisation, la messagerie vocale visuelle sera désactivée."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Désactiver la messagerie vocale visuelle"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La transcription des messages vocaux sera désactivée en cas de refus des conditions d\'utilisation."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Désactiver la transcription des messages vocaux"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Vous ne pouvez accéder à la messagerie vocale qu\'en composant le *86. Définissez un nouveau code PIN de messagerie vocale pour continuer."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Définir un code"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
index efd174f..32b738e 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-gl/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desactivar modo avión"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Activando correo de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"É posible que non recibas notificacións do correo de voz ata que actives o correo de voz visual. Chama ao correo de voz para consultar as mensaxes novas ata que o correo de voz estea completamente activado."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Non se pode activar o correo de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asegúrate de que o teléfono ten conexión móbil e téntao de novo."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asegúrate de que o teu teléfono ten unha conexión de rede móbil e téntao de novo."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desactiva o modo avión e téntao de novo."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sen conexión"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Non recibirás notificacións dos correos de voz novos. Se estás utilizando o sinal wifi, podes comprobar o correo de voz se o sincronizas agora."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Non recibirás notificacións dos correos de voz novos. Se estás utilizando o sinal wifi, podes comprobar o correo de voz se o sincronizas agora."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Non recibirás notificacións dos correos de voz novos. Desactiva o modo avión para sincronizar o correo de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"O teléfono necesita conexión de datos móbiles para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"O teléfono necesita conexión de datos móbiles para comprobar o correo de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Non se pode activar o correo de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Non se pode actualizar o correo de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Téntao de novo cando o a conexión móbil ou wifi sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Téntao de novo cando a conexión de datos móbiles sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Téntao de novo cando o a túa conexión de datos móbiles ou wifi sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Téntao de novo cando a túa conexión de datos móbiles sexa mellor. Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Non se pode actualizar o correo de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Aínda podes chamar para comprobar o correo de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Non se pode actualizar o correo de voz visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A túa caixa de correo está case chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Establece o PIN para o teu correo de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Necesitarás o PIN cada vez que chames para acceder ao teu correo de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Produciuse un erro descoñecido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Configuración do modo avión"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Establecer PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Tentar de novo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Produciuse un erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Ponte en contacto co servizo de atención ao cliente (<xliff:g id="NUMBER">%1$s</xliff:g>) e indica o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e condicións do correo de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Debes aceptar os termos e condicións de Verizon Wireless para utilizar o correo de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDebes aceptar os termos e condicións de Verizon Wireless para usar o correo de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activar correo de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Se non se aceptan os termos e condicións, desactivarase o correo de voz visual."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desactivar correo de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Se se rexeitan os termos e condicións, desactivarase a transcrición do correo de voz."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desactivar transcrición do correo de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Só poderás acceder ao correo de voz chamando ao *86. Configura un novo PIN do correo de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Establecer PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
index 4463443..1238adc 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-gu/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"એરપ્લેન મોડ બંધ કરો"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી રહ્યાં છે"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"જ્યાં સુધી વિઝ્યુઅલ વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી તમે વૉઇસમેઇલની સૂચનાઓ પ્રાપ્ત કરી શકશો નહીં. વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી નવા સંદેશા પુનઃપ્રાપ્ત કરવા માટે વૉઇસમેઇલને કૉલ કરો."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકતાં નથી"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"તમારા ફોન પર સેલ્યુલર કનેક્શન હોવાની ખાતરી કરો અને ફરી પ્રયાસ કરો."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"તમારા ફોન પર મોબાઇલ નેટવર્ક કનેક્શન હોવાની ખાતરી કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"એરપ્લેન મોડ બંધ કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"કોઈ કનેક્શન નથી"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"નવી વૉઇસમેઇલ્સ માટે તમને સૂચિત કરવામાં આવશે નહીં. જો તમે Wi-Fi પર છો, તો હમણાં સમન્વયિત કરીને વૉઇસમેઇલ માટે તપાસ કરી શકો છો."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"નવા વૉઇસમેઇલ માટે તમને સૂચિત કરવામાં આવશે નહીં. જો તમે Wi-Fi પર છો, તો તમે હમણાં સમન્વયિત કરીને વૉઇસમેઇલ માટે તપાસ કરી શકો છો."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"નવી વૉઇસમેઇલ્સ માટે તમને સૂચિત કરવામાં આવશે નહીં. તમારી વૉઇસમેઇલ સમન્વયિત કરવા માટે એરપ્લેન મોડ બંધ કરો."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"વૉઇસમેઇલને તપાસવા માટે તમારા ફોનને સેલ્યુલર ડેટા કનેક્શનની જરૂર છે."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"વૉઇસમેઇલને તપાસવા માટે તમારા ફોનને મોબાઇલ ડેટા કનેક્શનની જરૂર છે."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકતાં નથી"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"તમારું Wi-Fi અથવા સેલ્યુલર કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"તમારું સેલ્યુલર ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"તમારું Wi-Fi અથવા મોબાઇલ ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"તમારું મોબાઇલ ડેટા કનેક્શન બહેતર હોવા પર ફરી પ્રયાસ કરો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકતાં નથી"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"તમારું મેઇલબોક્સ મોટાંભાગે ભરાઇ ગયું છે. સ્થાન ખાલી કરવા માટે, અતિરિક્ત સ્ટોરેજ ખાલી કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા સંચાલિત કરી અને તેનું બેકઅપ લઈ શકે."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"તમારો વૉઇસમેઇલ PIN સેટ કરો"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"તમારી વૉઇસમેઇલને ઍક્સેસ કરવા માટે તમે કોઈપણ સમયે કૉલ કરો છો, ત્યારે તમને વૉઇસમેઇલ PIN ની જરૂર પડશે."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"અજાણી ભૂલ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"એરપ્લેન મોડ સેટિંગ્સ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN સેટ કરો"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ફરી પ્રયાસ કરો"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"કંઈક ખોટું થયું"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"કૃપા કરીને <xliff:g id="NUMBER">%1$s</xliff:g> પર ગ્રાહક સેવાનો સંપર્ક કરી અને તેમને ભૂલ કોડ 9999 કહો."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"વિઝ્યુઅલ વૉઇસમેઇલની શરતો અને નિયમો"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"વિઝ્યુઅલ વૉઇસમેઇલનો ઉપયોગ કરવા માટે તમારે Verizon Wireless ની શરતો અને નિયમોનો સ્વીકાર કરવો આવશ્યક છે:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nવિઝ્યુઅલ વૉઇસમેઇલનો ઉપયોગ કરવા માટે તમારે Verizon Wireless નાં નિયમો અને શરતોને સ્વીકારવી આવશ્યક છે:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ કરો"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"જો શરતો અને નિયમો નકારવામાં આવે છે તો વિઝ્યુઅલ વૉઇસમેઇલ અક્ષમ કરવામાં આવશે."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"વિઝ્યુઅલ વૉઇસમેઇલ અક્ષમ કરો"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"જો શરતો અને નિયમો નકારવામાં આવે તો વૉઇસમેઇલ ટ્રાંસ્ક્રિપ્શન અક્ષમ કરવામાં આવશે."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"વૉઇસમેઇલ ટ્રાંસ્ક્રિપ્શન અક્ષમ કરો"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"વૉઇસમેઇલ માત્ર *86 પર કૉલ કરીને જ ઍક્સેસ કરી શકાશે. આગળ વધવા માટે નવો વૉઇસમેઇલ PIN સેટ કરો."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN સેટ કરો"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
index bc9c463..c554165 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"हवाई जहाज़ मोड बंद करें"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"विज़ुअल वॉइसमेल सक्रिय किया जा रहा है"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"विज़ुअल वॉइसमेल के पूरी तरह सक्रिय होने तक हो सकता है कि आपको वॉइसमेल नोटिफ़िकेशन प्राप्त ना हों. वॉइसमेल के पूरी तरह सक्रिय होने तक नए संदेश प्राप्त करने के लिए वॉइसमेल को कॉल करें."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"विज़ुअल वॉइसमेल सक्रिय नहीं किया जा सकता"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"सुनिश्चित करें कि आपके फ़ोन में सेल्यूलर कनेक्शन है और फिर से प्रयास करें."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"सुनिश्चित करें कि आपके फ़ोन में मोबाइल नेटवर्क कनेक्शन है और दोबारा कोशिश करें."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"हवाई जहाज़ मोड बंद करें और फिर से प्रयास करें."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"कोई कनेक्शन नहीं"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"आपको नए वॉइसमेल के लिए सूचित नहीं किया जाएगा. यदि आप वाई-फ़ाई पर हैं, तो आप समन्वयित करके अभी वॉइसमेल देख सकते हैं."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"आपको नए वॉइसमेल की सूचना नहीं दी जाएगी. अगर आप Wi‑Fi का उपयोग कर रहे हैं, तो आप अभी सिंक करके वॉइसमेल देख सकते हैं."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"आपको नए वॉइसमेल के लिए सूचित नहीं किया जाएगा. अपना वॉइसमेल समन्वयित करने के लिए हवाई जहाज़ मोड बंद करें."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"वॉइसमेल देखने के लिए आपके फ़ोन में सेल्यूलर डेटा की आवश्यकता होगी."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"वॉइसमेल देखने के लिए आपके फ़ोन में मोबाइल डेटा कनेक्शन होना चाहिए."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"विज़ुअल वॉइसमेल सक्रिय नहीं किया जा सकता"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"अपना वाई-फ़ाई या सेल्यूलर कनेक्शन बेहतर होने पर फिर से प्रयास करें. आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"अपना सेल्यूलर डेटा कनेक्शन बेहतर होने पर फिर से प्रयास करें. आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"आपका Wi‑Fi या मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी वॉइसमेल देखने के लिए कॉल कर सकते हैं."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"आपका मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी वॉइसमेल देखने के लिए कॉल कर सकते हैं."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"आप वॉइसमेल देखने के लिए अभी भी कॉल कर सकते हैं."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता"</string>
@@ -50,12 +49,11 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"आपका मेलबॉक्स लगभग भर गया है. जगह खाली करने के लिए, अतिरिक्त जगह चालू करें ताकि Google आपके वॉइसमेल संदेशों को प्रबंधित कर सके और उनका बैकअप ले सके."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"अपना वॉइसमेल पिन सेट करें"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"आप जब भी अपना वॉइसमेल एक्सेस करने के लिए कॉल करते हैं, आपको वॉइसमेल पिन की आवश्यकता होगी."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात गड़बड़ी"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"हवाई जहाज़ मोड सेटिंग"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"पिन सेट करें"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"पुन: प्रयास करें"</string>
     <string name="voicemail_action_turn_archive_on" msgid="6008444955560830591">"चालू करें"</string>
-    <string name="voicemail_action_dimiss" msgid="6018415798136796966">"नहीं धन्यवाद"</string>
+    <string name="voicemail_action_dimiss" msgid="6018415798136796966">"रहने दें"</string>
     <string name="voicemail_action_sync" msgid="5139315923415392787">"समन्वयित करें"</string>
     <string name="voicemail_action_call_voicemail" msgid="6701710720535556395">"वॉइसमेल को कॉल करें"</string>
     <string name="voicemail_action_call_customer_support" msgid="7698973007656462748">"ग्राहक सहायता को कॉल करें"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"कुछ गलत हुआ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"कृपया <xliff:g id="NUMBER">%1$s</xliff:g> पर ग्राहक सेवा से संपर्क करें और उन्हें बताएं कि गड़बड़ी कोड 9999 है."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"विज़ुअल वॉइसमेल नियम और शर्तें"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"विज़ुअल वॉइसमेल का उपयोग करने के लिए आपको Verizon वायरलेस के नियम और शर्तों को स्वीकार करना होगा:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nआपको विज़ुअल वॉइसमेल का उपयोग करने के लिए Verizon Wireless के नियम और शर्तों को स्वीकार करना होगा:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"विज़ुअल वॉयसमेल चालू करें"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"नियम और शर्तों को अस्वीकार किए जाने पर विज़ुअल वॉइसमेल अक्षम कर दिया जाएगा."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"विज़ुअल वॉइसमेल अक्षम करें"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"अगर नियम और शर्तों को अस्वीकार कर दिया जाता है, तो वॉइसमेंल ट्रांसक्रिप्शन अक्षम हो जाएगा."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"वॉइसमेल ट्रांसक्रिप्शन अक्षम करें"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"वॉइसमेल को केवल *86 पर कॉल करके एक्सेस किया जा सकेगा. आगे बढ़ने के लिए नया वॉइसमेल पिन सेट करें."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"पिन सेट करें"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
index a310d59..dbc1272 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hr/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Isključivanje načina rada u zrakoplovu"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizualne govorne pošte"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Možda nećete primiti obavijesti o govornoj pošti dok se vizualna govorna pošta u potpunosti ne aktivira. Nazovite službu za govornu poštu da biste dohvatili nove poruke dok se govorna pošta u potpunosti ne aktivira."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizualna govorna pošta ne može se aktivirati"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Provjerite mobilnu vezu telefona i pokušajte ponovno."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Provjerite mobilnu vezu telefona i pokušajte ponovno."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Isključite način rada u zrakoplovu i pokušajte ponovno."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nema veze"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nećete primati obavijesti o novim govornim porukama. Ako upotrebljavate Wi-Fi mrežu, govornu poštu možete provjeriti tako da se odmah sinkronizirate."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nećete primati obavijesti o novim govornim porukama. Ako upotrebljavate Wi-Fi mrežu, govornu poštu možete provjeriti tako da se odmah sinkronizirate."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nećete primati obavijesti o novim govornim porukama. Isključite način rada u zrakoplovu da biste sinkronizirali govornu poštu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon mora imati mobilnu podatkovnu vezu da biste provjerili govornu poštu."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon mora imati mobilnu podatkovnu vezu da biste provjerili govornu poštu."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizualna govorna pošta ne može se aktivirati"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizualna govorna pošta ne može se ažurirati"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Pokušajte ponovno kad uspostavite bolju Wi-Fi ili mobilnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Pokušajte ponovno kad uspostavite bolju mobilnu podatkovnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Pokušajte ponovno kad uspostavite bolju Wi-Fi ili mobilnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Pokušajte ponovno kad uspostavite bolju mobilnu podatkovnu vezu. I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizualna govorna pošta ne može se ažurirati"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"I dalje možete nazvati govornu poštu i provjeriti je."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizualna govorna pošta ne može se ažurirati"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Vaš je poštanski pretinac gotovo pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Postavljanje PIN-a za govornu poštu"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN za govornu poštu trebat će vam svaki put kad zatražite pristup govornoj pošti."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nepoznata pogreška"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Postavke načina rada u zrakoplovu"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Postavi PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Pokušajte ponovo"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nešto je pošlo po zlu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obratite se korisničkoj službi na broj <xliff:g id="NUMBER">%1$s</xliff:g> i recite da je kôd pogreške 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Uvjeti i odredbe za vizualnu govornu poštu"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Da biste koristili vizualnu govornu poštu morate prihvatiti uvjete i odredbe Verizon Wirelessa:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDa biste koristili vizualnu govornu poštu, morate prihvatiti uvjete i odredbe Verizon Wirelessa:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Uključivanje vizualne govorne pošte"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ako odbijete uvjete i odredbe, onemogućit ćete vizualnu govornu poštu."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogući vizualnu govornu poštu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ako odbijete uvjete i odredbe, onemogućit ćete prijepis govorne pošte."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogućavanje prijepisa govorne pošte"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Govornoj pošti moći će se pristupiti samo pozivanjem broja *86. Postavite novi PIN za govornu poštu da biste nastavili."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Postavljanje PIN-a"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
index cc3eb7e..525a2a7 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hu/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Repülős üzemmód kikapcsolása"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizuális hangpostaüzenetek aktiválása"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"A vizuális hangposta teljes aktiválásáig nem feltétlenül kap értesítést a hangpostaüzenetekről. A szolgáltatás teljes aktiválásáig a hangpostát felhívva kérheti le új üzeneteit."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nem sikerült aktiválni a vizuális hangpostaüzeneteket"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Győződjön meg róla, hogy van adatkapcsolat, és próbálja újra."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Győződjön meg róla, hogy van mobil-adatkapcsolat, és próbálja újra."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Kapcsolja ki a repülős üzemmódot, és próbálja újra."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nincs kapcsolat"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nem kap értesítést az új hangpostaüzenetekről. Ha Wi-Fi-t használ, szinkronizálással lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nem kap értesítést az új hangpostaüzenetekről. Ha Wi-Fi-t használ, szinkronizálással lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nem kap értesítést az új hangpostaüzenetekről. Kapcsolja ki a repülős üzemmódot, és szinkronizálja a hangpostaüzeneteket."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"A hangpostaüzenetek lekéréshez adatkapcsolattal kell rendelkeznie."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"A hangpostaüzenetek lekéréshez adatkapcsolattal kell rendelkeznie."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nem sikerült aktiválni a vizuális hangpostaüzeneteket"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Próbálja újra, amikor a Wi-Fi- vagy adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Próbálja újra, amikor az adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Próbálja újra, amikor a Wi-Fi- vagy adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Próbálja újra, amikor a mobil-adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hívással továbbra is lekérheti a hangpostaüzeneteket."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nem sikerült frissíteni a vizuális hangpostaüzeneteket"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A postaláda majdnem betelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"A hangposta PIN-kódjának beállítása"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"A hangpostafiók eléréséhez PIN-kódra van szüksége."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ismeretlen hiba"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"A repülős üzemmód beállításai"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN-kód beállítása"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Próbálja újra"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Hiba történt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9999-es hibakódot: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"A vizuális hangposta általános szerződési feltételei"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"A vizuális hangposta használatához el kell fogadnia a Verizon Wireless általános szerződési feltételeit:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nA virtuális hangposta használatához el kell fogadnia a Verizon Wireless Általános Szerződési Feltételeit:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"A vizuális hangposta bekapcsolása"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ha nem fogadja el az általános szerződési feltételeket, letiltjuk a vizuális hangpostát."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"A vizuális hangposta letiltása"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ha nem fogadja el az általános szerződési feltételeket, letiltjuk a hangpostaüzenetek átírását."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Hangpostaüzenetek átírásának letiltása"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"A hangpostát a *86 számot tárcsázva érheti el. A folytatáshoz állítson be új PIN-kódot."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-kód beállítása"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
index 4a9c2ed..999bdd4 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-hy/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Անջատել ինքնաթիռի ռեժիմը"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ձայնային փոստի ցուցադրման ակտիվացում"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա, քանի որ չեք ակտիվացրել ձայնային փոստի ցուցադրումը: Մինչ այդ, նոր հաղորդագրությունները լսելու համար զանգեք ձայնային փոստի ծառայություն:"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Համոզվեք, որ հեռախոսը միացած է բջջային ցանցին և նորից փորձեք:"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Համոզվեք, որ հեռախոսը միացած է բջջային ցանցին և նորից փորձեք:"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Անջատեք ինքնաթիռի ռեժիմը և նորից փորձեք:"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Կապ չկա"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Եթե միացած եք Wi-Fi-ին, կարող եք ստուգել ձայնային փոստը՝ կատարելով համաժամեցում:"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Եթե միացած եք Wi-Fi-ին, կարող եք ստուգել ձայնային փոստը՝ կատարելով համաժամեցում:"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Անջատեք ինքնաթիռի ռեժիմը՝ ձայնային փոստը համաժամեցնելու համար:"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ձայնային փոստը ստուգելու համար ձեր հեռախոսի բջջային ինտերնետը պետք է միացած լինի:"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ձայնային փոստը ստուգելու համար ձեր հեռախոսի բջջային ինտերնետը պետք է միացած լինի:"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Նորից փորձեք, երբ Wi-Fi-ը կամ բջջային կապը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Նորից փորձեք, երբ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Նորից փորձեք, երբ Wi-Fi-ը կամ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Նորից փորձեք, երբ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ձեր փոստարկղը գրեթե լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ընտրել ձեր ձայնային փոստի PIN-ը"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ամեն անգամ ձայնային փոստին զանգելիս ձեզանից կպահանջվի ձայնային փոստի PIN-ը:"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Անհայտ սխալ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Ինքնաթիռի ռեժիմի կարգավորումներ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Ընտրել PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Փորձել նորից"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Սխալ առաջացավ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9999 կոդը:"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Տեսողական ձայնային փոստի օգտագործման պայմաններ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Տեսողական ձայնային փոստն օգտագործելու համար ընդունեք Verizon Wireless-ի օգտագործման պայմանները՝\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nՏեսողական ձայնային փոստն օգտագործելու համար ընդունեք Verizon Wireless-ի օգտագործման պայմանները՝\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Միացնել տեսողական ձայնային փոստը"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Եթե չընդունեք օգտագործման պայմանները, տեսողական ձայնային փոստը կանջատվի:"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Անջատել տեսողական ձայնային փոստը"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Եթե չընդունեք օգտագործման պայմանները, ձայնային փոստի տառադրումը կանջատվի:"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Անջատել ձայնային փոստի տառադրումը"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ձայնային փոստը հասանելի կլինի միայն *86 համարով: Շարունակելու համար ընտրեք ձայնային փոստի նոր PIN:"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ընտրել PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
index 948afae..004c23a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-in/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Nonaktifkan mode pesawat"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Mengaktifkan pesan suara visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Anda mungkin tidak menerima pemberitahuan pesan suara hingga visual pesan suara sepenuhnya diaktifkan. Panggil pesan suara untuk mengambil pesan baru hingga pesan suara sepenuhnya diaktifkan."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Tidak dapat mengaktifkan pesan suara visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pastikan ponsel Anda memiliki koneksi seluler, lalu coba lagi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pastikan ponsel memiliki koneksi jaringan seluler, dan coba lagi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Nonaktifkan mode pesawat, lalu coba lagi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Tidak ada sambungan internet"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Anda tidak akan menerima notifikasi pesan suara baru. Jika menggunakan Wi-Fi, pesan suara dapat diperiksa dengan menyinkronkannya sekarang."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Anda tidak akan menerima notifikasi pesan suara baru. Jika menggunakan Wi-Fi, pesan suara dapat diperiksa dengan menyinkronkannya sekarang."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Anda tidak akan menerima notifikasi pesan suara baru. Nonaktifkan mode pesawat untuk menyinkronkan pesan suara."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ponsel Anda memerlukan koneksi data seluler untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ponsel memerlukan koneksi data seluler untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Tidak dapat mengaktifkan pesan suara visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Tidak dapat memperbarui pesan suara visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Coba lagi ketika koneksi Wi-Fi atau seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Coba lagi ketika koneksi data seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Coba lagi ketika koneksi Wi-Fi atau data seluler lebih baik. Anda masih bisa menelepon untuk memeriksa pesan suara."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Coba lagi ketika koneksi data seluler lebih baik. Anda masih bisa menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Tidak dapat memperbarui pesan suara visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Anda masih dapat menelepon untuk memeriksa pesan suara."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Tidak dapat memperbarui pesan suara visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Kotak surat Anda hampir penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setel PIN pesan suara Anda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Anda akan memerlukan PIN pesan suara setiap kali menelepon untuk mengakses pesan suara."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Kesalahan tidak dikenal"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Setelan Mode Pesawat"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Setel PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Coba Lagi"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Terjadi Kesalahan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Hubungi Layanan Pelanggan melalui nomor telepon <xliff:g id="NUMBER">%1$s</xliff:g> dan beri tahukan kode kesalahan 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Persyaratan dan Ketentuan Pesan Suara Visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Anda harus menerima persyaratan dan ketentuan Verizon Wireless untuk menggunakan pesan suara visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAnda harus menerima persyaratan dan ketentuan Verizon Wireless untuk menggunakan pesan suara visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktifkan Pesan Suara Visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Pesan suara visual akan dinonaktifkan jika persyaratan dan ketentuan ditolak."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Nonaktifkan pesan suara visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsi pesan suara akan dinonaktifkan jika persyaratan dan ketentuan ditolak."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Nonaktifkan transkripsi pesan suara"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Pesan suara hanya dapat diakses dengan menghubungi *86. Setel PIN pesan suara baru untuk melanjutkan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setel PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
index ae0497e..3ba97b6 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-is/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Slökkva á flugstillingu"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Virkjar myndrænt talhólf"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Þú getur ekki fengið tilkynningar um talhólfsskilaboð fyrr en myndrænt talhólf er virkjað að fullu. Hringdu í talhólfið til að sækja ný skilaboð þar til talhólfið hefur verið virkjað að fullu."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ekki hægt að virkja myndrænt talhólf"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Gakktu úr skugga um að síminn sé tengdur farsímakerfi og reyndu aftur."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Gakktu úr skugga um að síminn sé tengdur farsímakerfi og reyndu aftur."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slökktu á flugstillingu og reyndu aftur."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Engin tenging"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Þú færð ekki tilkynningu um ný talhólfsskilaboð. Ef þú ert með Wi-Fi tengingu geturðu athugað talhólfið með því að samstilla núna."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Þú færð ekki tilkynningar um ný talhólfsskilaboð. Ef þú ert með Wi-Fi tengingu geturðu athugað talhólfið með því að samstilla núna."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Þú færð ekki tilkynningu um ný talhólfsskilaboð. Slökktu á flugstillingu til að samstilla talhólfið."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Síminn þarf tengingu við farsímanet til að athuga talhólf."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Síminn þarf tengingu við farsímanet til að athuga talhólf."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ekki hægt að virkja myndrænt talhólf"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Reyndu aftur þegar Wi-Fi eða farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Reyndu aftur þegar farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Reyndu aftur þegar Wi-Fi eða farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Reyndu aftur þegar farsímanettengingin þín er betri. Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Þú getur samt hringt til að athuga talhólfið."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ekki hægt að uppfæra sjónrænt talhólf"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Pósthólfið þitt er næstum fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Stilla PIN-númer talhólfs"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Þú þarft að nota PIN-númer talhólfsins í hvert skipti sem þú hringir til að athuga það."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Óþekkt villa"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Stilling flugstillingar"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Stilla PIN-númer"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Reyna aftur"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Eitthvað fór úrskeiðis"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Hafðu samband við þjónustudeild í síma <xliff:g id="NUMBER">%1$s</xliff:g> og gefðu upp villukóðann 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Skilmálar myndræns talhólfs"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Þú verður að samþykkja skilmála Verizon Wireless til að geta notað myndrænt talhólf:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nÞú verður að samþykkja skilmála Verizon Wireless til að nota myndrænt talhólf:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Kveikja á myndrænu talhólfi"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Slökkt verður á myndrænu talhólfi ef skilmálum er hafnað."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slökkva á myndrænu talhólfi"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Slökkt verður á umritun talhólfsskilaboða ef skilmálarnir eru ekki samþykktir."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slökkva á umritun talhólfsskilaboða"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talhólf er einungis aðgengilegt með því að hringja í *86. Stilltu nýtt PIN-númer fyrir talhólfið til að halda áfram."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Stilla PIN-númer"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
index 1df608a..89714f5 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-it/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Disattiva modalità aereo"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Attivazione della lettura della segreteria"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Potresti non ricevere le notifiche dei messaggi vocali fino a che non avrai attivato completamente la funzione di lettura della segreteria. Fino ad allora, chiama la segreteria per recuperare i nuovi messaggi."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Impossibile attivare la lettura della segreteria"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Assicurati che il telefono abbia una connessione alla rete dati e riprova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Assicurati che il telefono abbia una connessione alla rete mobile e riprova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Disattiva la modalità aereo e riprova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nessuna connessione"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Non riceverai notifiche per i nuovi messaggi vocali. Se sei connesso a una rete Wi-Fi, puoi consultare la segreteria effettuando subito la sincronizzazione."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Non riceverai notifiche per i nuovi messaggi vocali. Se sei connesso a una rete Wi-Fi, puoi consultare la segreteria effettuando subito la sincronizzazione."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Non riceverai notifiche per i nuovi messaggi vocali. Disattiva la modalità aereo per sincronizzare la segreteria."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Per poter consultare la segreteria, il telefono deve essere connesso a una rete dati."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Per poter consultare la segreteria, il telefono deve essere connesso a una rete mobile."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Impossibile attivare la lettura della segreteria"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Impossibile aggiornare la lettura della segreteria"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Riprova quando la connessione alla rete Wi-Fi o dati sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Riprova quando la connessione alla rete dati sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Riprova quando la connessione alla rete Wi-Fi o mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Riprova quando la connessione dati mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Impossibile aggiornare la lettura della segreteria"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puoi ancora consultare la segreteria tramite chiamata."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Impossibile aggiornare la lettura della segreteria"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"La tua casella di posta e quasi piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Imposta il PIN della segreteria"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Dovrai inserire il PIN della segreteria ogni volta che chiami per accedervi."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Errore sconosciuto"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Impostazioni modalità aereo"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Imposta PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Riprova"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Si è verificato un problema"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contatta l\'assistenza clienti al numero <xliff:g id="NUMBER">%1$s</xliff:g> indicando il seguente codice di errore: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termini e condizioni della lettura della segreteria"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Devi accettare i termini e condizioni di Verizon Wireless per utilizzare la lettura della segreteria:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDevi accettare termini e condizioni di Verizon Wireless per utilizzare la lettura della segretaria:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Attiva la lettura della segreteria"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"La lettura della segreteria verrà disattivata se non accetti i termini e condizioni."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Disattiva la lettura della segreteria"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"La trascrizione della segreteria verrà disattivata se non accetti termini e condizioni."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Disattiva la trascrizione della segreteria"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"La segreteria sarà accessibile unicamente chiamando il numero *86. Imposta un nuovo PIN per la segreteria per procedere."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Imposta PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
index c05a02f..e1828ab 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-iw/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"השבת את מצב טיסה"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"מפעיל את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ייתכן שלא תקבל עדכונים על הודעות חדשות בדואר הקולי עד שהדואר הקולי הוויזואלי יופעל במלואו. עד אז, תצטרך להתקשר לדואר הקולי כדי להאזין להודעות החדשות."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"לא ניתן להפעיל את הדואר הקולי הוויזואלי"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ודא שלטלפון יש חיבור לרשת סלולרית ונסה שוב."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ודא שהטלפון מחובר לרשת סלולרית ונסה שוב."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"השבת את מצב טיסה ונסה שוב."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"אין חיבור"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏לא תקבל עדכונים על הודעות חדשות בדואר הקולי. אם אתה משתמש בחיבור Wi-Fi, סנכרן עכשיו כדי לבדוק את הדואר הקולי."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏לא תקבל עדכונים על הודעות קוליות חדשות. אם אתה משתמש בחיבור Wi-Fi, סנכרן עכשיו כדי לבדוק אם יש לך הודעות קוליות."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"לא תקבל עדכונים על הודעות חדשות בדואר הקולי. השבת את מצב הטיסה כדי לסנכרן את הדואר הקולי שלך."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"כדי שתוכל לבדוק את הדואר הקולי, נדרש חיבור לנתונים סלולריים בטלפון."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"כדי לבדוק הודעות קוליות נדרש חיבור לרשת סלולרית בטלפון."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"לא ניתן להפעיל את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏נסה שוב כשיהיה חיבור טוב יותר ל-Wi-Fi או לרשת הסלולרית. עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"נסה שוב כשיהיה חיבור טוב יותר לרשת הסלולרית. עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏נסה שוב כשיהיה חיבור טוב יותר ל-Wi-Fi או לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"נסה שוב כשיהיה חיבור טוב יותר לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"לא ניתן לעדכן את הדואר הקולי הוויזואלי"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏תיבת הדואר שלך כמעט מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"הגדר קוד גישה לדואר הקולי"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"בכל פעם שתשתמש בדואר הקולי תצטרך את קוד הגישה."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"שגיאה לא ידועה"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"הגדרות למצב טיסה"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"הגדרת קוד גישה"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"נסה שוב"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"משהו השתבש"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"התקשר לשירות הלקוחות בטלפון <xliff:g id="NUMBER">%1$s</xliff:g> ואמור לנציג שקוד השגיאה הוא 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"התנאים וההגבלות של הדואר הקולי הוויזואלי"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏עליך לקבל את התנאים וההגבלות של Verizon Wireless כדי להשתמש בדואר הקולי הוויזואלי:\n\n‎%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nעליך לאשר את התנאים וההגבלות של Verizon Wireless כדי להשתמש בדואר הקולי הוויזואלי:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"הפעלה של דואר קולי ויזואלי"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"‎%s‎"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"אם תדחה את התנאים וההגבלות הדואר הקולי הוויזואלי יושבת."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"השבת את הדואר הקולי הוויזואלי"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"אם התנאים וההגבלות לא יאושרו, התמלולים של ההודעות הקוליות יושבתו."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"השבתת התמלולים של ההודעות הקוליות"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"תוכל לבדוק את הדואר הקולי רק על ידי חיוג 86*. כדי להמשיך, הגדר קוד גישה חדש לדואר הקולי."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"הגדרת קוד גישה"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
index 5d47a9c..5ea7e6f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ja/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"機内モードを OFF"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ビジュアル ボイスメールを有効化中"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ビジュアル ボイスメールの有効化が完了するまでボイスメール通知を受信できません。ボイスメールの有効化が完了するまでは、ボイスメールを呼び出して新しいメッセージを取得してください。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ビジュアル ボイスメールを有効化できません"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"スマートフォンがモバイル ネットワークに接続済みであることを確認してから、もう一度お試しください。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"スマートフォンがモバイル ネットワークに接続済みであることを確認してから、もう一度お試しください。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"機内モードをオフにしてから、もう一度お試しください。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"接続なし"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"新しいボイスメールの通知を受信できません。Wi-Fi をご利用の場合、同期してボイスメールを確認できます。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"新しいボイスメールの通知を受信できません。Wi-Fi をご利用の場合は同期してボイスメールを確認できます。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"新しいボイスメールの通知を受信できません。ボイスメールを同期するには機内モードをオフにしてください。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ボイスメールを確認するには、スマートフォンでモバイルデータ接続を使用する必要があります。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ボイスメールを確認するには、スマートフォンでモバイルデータ接続を使用する必要があります。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ビジュアル ボイスメールを有効化できません"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ビジュアル ボイスメールを更新できません"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi かモバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"モバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi かモバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"モバイルデータの接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ビジュアル ボイスメールを更新できません"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ボイスメール サービスを呼び出してボイスメールを確認することは可能です。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ビジュアル ボイスメールを更新できません"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"メールボックスの保存容量がもう少しで上限に達します。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ボイスメール PIN を設定"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ボイスメールを呼び出すには、ボイスメール PIN が必要です。"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明なエラー"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"機内モードの設定"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN を設定"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"再試行"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"エラー"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"カスタマー サービス（<xliff:g id="NUMBER">%1$s</xliff:g>）にご連絡いただき、エラーコード 9999 をお伝えください。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ビジュアル ボイスメールの利用規約"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ビジュアル ボイスメールを利用するには Verizon Wireless の利用規約に同意していただく必要があります。\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nビジュアル ボイスメールを利用するには Verizon Wireless の利用規約に同意していただく必要があります。\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ビジュアル ボイスメールの有効化"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"利用規約に同意いただけない場合は、ビジュアル ボイスメールが無効となります。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ビジュアル ボイスメールを無効にする"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"利用規約に同意いただけない場合は、ボイスメールの音声文字変換が無効になります。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ボイスメールの音声文字変換を無効にする"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86 への発信によってのみ、ボイスメールにアクセスできます。続行するには、新しいボイスメール PIN を設定してください。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN の設定"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
index c5f6a12..d984a76 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ka/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"თვითმფრინავის რეჟიმის გამორთვა"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ვიზუალური ხმოვანი ფოსტა აქტიურდება"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ვიზუალური ხმოვანი ფოსტის სრულად გააქტიურებამდე შეიძლება ხმოვანი ფოსტის შეტყობინებები არ მიიღოთ. დარეკეთ ხმოვან ფოსტაში, რათა მიიღოთ ახალი შეტყობინებები ხმოვანი ფოსტის ბოლომდე გააქტიურებამდე."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"დარწმუნდით, რომ თქვენს ტელეფონს აქვს ფიჭური კავშირი და სცადეთ ხელახლა."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"დარწმუნდით, რომ თქვენს ტელეფონს აქვს მობილურ ქსელთან კავშირი და სცადეთ ხელახლა."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"გამორთეთ თვითმფრინავის რეჟიმი და სცადეთ ხელახლა."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"კავშირი არ არის"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ახალი ხმოვანი ფოსტის შესახებ არ გეცნობებათ. თუ იყენებთ Wi-Fi-ს, შეგიძლიათ ახლავე შეამოწმოთ ხმოვანი ფოსტა სინქრონიზაციის მეშვეობით."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ახალი ხმოვანი ფოსტის შესახებ შეტყობინებას არ მიიღებთ. თუ იყენებთ Wi-Fi-ს, შეგიძლიათ შეამოწმოთ ხმოვანი ფოსტა ახლავე სინქრონიზაციის მეშვეობით."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ახალი ხმოვანი ფოსტის შესახებ არ გეცნობებათ. გამორთეთ თვითმფრინავის რეჟიმი ხმოვანი ფოსტის სინქრონიზაციისთვის."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ხმოვანი ფოსტის შესამოწმებლად თქვენი ტელეფონი საჭიროებს მობილურ ინტერნეტთან კავშირს."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ხმოვანი ფოსტის შესამოწმებლად თქვენი ტელეფონი საჭიროებს მობილურ ინტერნეტთან კავშირს."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"სცადეთ ხელახლა, როდესაც Wi-Fi ან ფიჭური კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"სცადეთ ხელახლა, როდესაც ფიჭური კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"სცადეთ ხელახლა, როდესაც Wi‑Fi ან მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"სცადეთ ხელახლა, როდესაც მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"თქვენი საფოსტო ყუთი თითქმის სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"დააყენეთ თქვენი ხმოვანი ფოსტის PIN-კოდი"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ნებისმიერ დროს, როდესაც დარეკავთ, რათა ხმოვან ფოსტაზე წვდომა იქონიოთ, ხმოვანი ფოსტის PIN-კოდი დაგჭირდებათ."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"უცნობი შეცდომა"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"თვითმფრინავის რეჟიმის პარამეტრები"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"დააყენეთ PIN-კოდი"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ხელახლა ცდა"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"მოხდა რაღაც შეცდომა"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე <xliff:g id="NUMBER">%1$s</xliff:g> და უთხრათ, რომ შეცდომის კოდია 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ვიზუალური ხმოვანი ფოსტის მომსახურების პირობები"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"თქვენ უნდა დაეთანხმოთ Verizon Wireless-ის მომსახურების პირობებს, რათა გამოიყენოთ ვიზუალური ხმოვანი ფოსტა:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nვიზუალური ხმოვანი ფოსტის გამოსაყენებლად თქვენ უნდა დაეთანხმოთ Verizon Wireless-ის მომსახურების პირობებს:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ვიზუალური ხმოვანი ფოსტის ჩართვა"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"თუ მომსახურების პირობებს უარყოფთ, ვიზუალური ხმოვანი ფოსტა გამოირთვება."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ვიზუალური ხმოვანი ფოსტის გამორთვა"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"მომსახურების პირობების უარყოფის შემთხვევაში ხმოვანი ფოსტის ტრანსკრიბირება გამოირთვება."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ხმოვანი ფოსტის ტრანსკრიბირების გამორთვა"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ხმოვანი ფოსტა ხელმისაწვდომი იქნება მხოლოდ *86-ზე დარეკვით. გასაგრძელებლად დააყენეთ ხმოვანი ფოსტის ახალი PIN-კოდი."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"დააყენეთ PIN-კოდი"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
index ad164c8..ee52be9 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-kk/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Ұшақ режимін өшіру"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалды дауыстық хабарды іске қосу"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Визуалды дауыстық пошта толығымен белсендірілгенше, дауыстық пошта хабарландыруларын қабылдай алмайсыз. Дауыстық пошта толығымен белсендірілгенше, жаңа хабарлар шығарып алу үшін дауыстық поштаға қоңырау шалыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалды дауыстық хабарды іске қосу мүмкін болмады"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Телефоныңыздың ұялы байланысын тексеріп, әрекетті қайталаңыз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Телефоныңыздың мобильдік байланысын тексеріп, әрекетті қайталаңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Ұшақ режимін өшіріп, әрекетті қайталаңыз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Байланыс жоқ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Wi-Fi байланысыңыз болса, дауыстық хабарды қазір синхрондау арқылы тексере аласыз."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Сізге жаңа дауыстық хабарлар туралы ескерту жіберілмейді. Егер Wi-Fi байланысын қолдансаңыз, қазір синхрондап, дауыстық хабарларды қазір тексеруіңізге болады."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Дауыстық хабарды синхрондау үшін ұшақ режимін өшіріңіз."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Дауыстық хабарды тексеру үшін телефоныңызда ұялы деректер байланысы болуы керек."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Дауыстық хабарларды тексеру үшін телефоныңызда мобильдік байланыс болуы керек."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалды дауыстық хабарды іске қосу мүмкін болмады"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалды дауыстық хабарды жаңарту мүмкін болмады."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi немесе ұялы байланыс жақсарғанда, әрекетті қайталаңыз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Ұялы деректер байланысы жақсарғанда, әрекетті қайталаңыз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi немесе мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалды дауыстық хабарды жаңарту мүмкін болмады"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Дауыстық хабарды тексеру үшін қоңырау шалуыңызға болады."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалды дауыстық хабарды жаңарту мүмкін болмады"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Кіріс жәшігі толы. Орын босату үшін, қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Дауыстық пошта PIN кодын орнатыңыз"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Дауыстық поштаны тыңдау үшін кез келген уақытта қоңырау шалғанда, дауыстық пошта PIN коды сұралады."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Белгісіз қате"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Ұшақ режимінің параметрлері"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN кодын орнату"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Әрекетті қайталау"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Бірдеңе дұрыс болмады"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Тұтынушыларға қызмет көрсету орталығына <xliff:g id="NUMBER">%1$s</xliff:g> бойынша хабарласыңыз және қате коды 9999 екенін айтыңыз."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Визуалды дауыстық хабар функциясының шарттары мен талаптары"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Визуалды дауыстық хабар функциясын қолдану үшін Verizon Wireless шарттарын қабылдауыңыз қажет:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nВизуалды дауыстық хабар функциясын қолдану үшін Verizon Wireless шарттарын қабылдауыңыз қажет:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visual дауыстық хабарын қосу"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Шарттары мен талаптары қабылданбаса, визуалды дауыстық хабар функциясы өшіріледі."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Визуалды дауыстық хабар функциясын өшіру"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Шарттары мен талаптары қабылданбаса, визуалды дауыстық хабар транскрипциясы өшіріледі."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Дауыстық хабар транскрипциясын өшіру"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Дауыстық хабарлар поштасына кіру *86 нөміріне қоңырау шалғанда ғана мүмкін болады. Жалғастыру үшін жаңа PIN кодын тағайындаңыз."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN кодын тағайындау"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
index f0ebf04..0206445 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-km/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"បិទ​របៀប​ជិះ​​យន្តហោះ"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"អ្នក​ប្រហែលជា​​មិន​ទទួល​បាន​ការ​ជូនដំណឹង​ជា​សារ​សំឡេង​រហូត​​ទាល់តែ​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​ពេញលេញ​​។ ហៅ​ជា​សារ​សំឡេង​ដើម្បី​​ទទួល​បាន​សារ​ថ្មី​រហូត​សារ​ជា​សំឡេង​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ពេញលេញ។"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"មិន​អាច​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"សូម​ប្រាកដ​ថា​ទូរសព្ទ​របស់​អ្នក​​បាន​ភ្ជាប់​​បណ្ដាញ​អ៊ីនធឺណិត និង​​ព្យាយាម​​ម្ដង​ទៀត។"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"សូមប្រាកដ​ថា ទូរសព្ទ​របស់​អ្នក​មាន​ភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត រួច​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"បិទ​របៀប​លើ​យន្តហោះ និង​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"គ្មាន​បណ្ដាញ​អ៊ីនធឺណិត"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​នឹង​មិន​ជូន​ដំណឹង​ទៅ​អ្នក​ឡើយ។ បើ​អ្នក​​បាន​ភ្ជាប់​វ៉ាយហ្វាយ អ្នក​អាច​ឆែក​រក​មើល​សារ​ជា​សំឡេង​ដោយ​ទាញ​យក​ឥឡូវ​នេះ។"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"អ្នក​នឹង​មិន​ទទួល​បាន​ការជូនដំណឹង នៅពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​ទេ។ បើ​អ្នក​​ភ្ជាប់​ទៅ Wi-Fi អ្នក​អាច​ពិនិត្យមើល​​សារ​ជា​សំឡេង​ដោយ​ធ្វើ​សមកាលកម្ម​ឥឡូវ​នេះ។"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​នឹង​មិន​ជូន​ដំណឹង​ទៅ​អ្នក​ឡើយ។ សូម​បិទ​របៀប​លើ​យន្តហោះ​ដើម្បី​ទាញយក​សារ​សំឡេង​របស់​អ្នក។"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ទូរសព្ទ​របស់​អ្នក​ត្រូវ​​ភ្ជាប់​អ៊ីនធឺណិតតាម​ទិន្នន័យ​ទូរសព្ទ​​​ចល័ត​ដើម្បី​អាច​ពិនិត្យ​មើល​សារ​​ជា​សំឡេង​បាន​។"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ទូរសព្ទ​របស់​អ្នក​ត្រូវ​​ភ្ជាប់​អ៊ីនធឺណិតតាម​ទិន្នន័យ​ទូរសព្ទ​​​ចល័ត​ ដើម្បី​អាច​ពិនិត្យ​មើល​សារ​​ជា​សំឡេង​បាន​។"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"មិន​អាច​ធ្វើ​ឲ្យ​សកម្ម​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​​​ទេ។"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​ Wi-Fi ឬ​ការតភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ដើម្បី​​ស្ដាប់​សារ​ជា​សំឡេង​។"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ព្យាយាម​ម្ដង​ទៀត នៅពេល​​​ការតភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត​ប្រសើរ។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ដើម្បី​​ស្ដាប់​សារ​ជា​សំឡេង​។"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"សូមព្យាយាម​ម្ដង​ទៀត នៅពេលការតភ្ជាប់ Wi-Fi ឬ​​​ទិន្នន័យ​​ទូរសព្ទ​ចល័តរបស់អ្នក​បានប្រសើរឡើង។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ពិនិត្យមើល​សារ​ជា​សំឡេង​​បាន។"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"សូមព្យាយាម​ម្ដង​ទៀត នៅពេល​​​​ការតភ្ជាប់​ទិន្នន័យ​​ទូរសព្ទ​ចល័តរបស់អ្នកបាន​ប្រសើរឡើង។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ពិនិត្យមើលសារ​ជា​សំឡេង​បាន។"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ។"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​​​ទេ។"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ប្រអប់​សារ​របស់​អ្នក​ពេញហើយ។ ដើម្បី​បង្កើន​ទំហំ​ផ្ទុក​ទំនេរ សូម​បើក​ទំហំផ្ទុក​បន្ថែម ដើម្បី​ឲ្យ Google អាច​គ្រប់គ្រង និង​បម្រុងទុក​សារ​សារ​ជា​សំឡេង​របស់​អ្នក​បាន។"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"កំណត់កូដ PIN ​សារ​ជាសំឡេង​របស់​អ្នក"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"អ្នក​នឹង​ត្រូវការកូដ PIN សារ​ជាសំឡេងមួយ ​គ្រប់​ពេល​ដែល​អ្នក​ហៅ ​​ដើម្បី​ចូល​ដំណើរការ​សារ​ជា​សំឡេង​របស់​អ្នក។"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"បញ្ហាមិនស្គាល់"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ការ​កំណត់​របៀប​​ពេល​ជិះ​យន្តហោះ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"កំណត់​កូដ PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ព្យាយាម​ម្តង​ទៀត"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"មានអ្វីមួយមិនប្រក្រតី"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"សូម​ទាក់ទង​ផ្នែក​បម្រើ​សេវា​អតិថិជន​តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g> និង​ប្រាប់​ពួកគេ​កូដ​មាន​បញ្ហា គឺ 9999។"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"លក្ខខណ្ឌ​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"អ្នក​ត្រូវតែ​យល់ព្រម​នឹង​​លក្ខខណ្ឌ​ប្រើប្រាស់​របស់​ Verizon Wireless ដើម្បី​អាច​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ៖\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nអ្នក​ត្រូវតែ​យល់ព្រម​នឹង​​គោលការណ៍ និង​លក្ខខណ្ឌ​របស់ Verizon Wireless ដើម្បី​ប្រើប្រាស់​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ៖\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"បើក​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"សារ​ជា​សំឡេង​ដែល​​មើល​ឃើញ​នឹង​ត្រូវ​បាន​បិទ បើ​លក្ខខណ្ឌ​ប្រើប្រាស់​ត្រូវ​បាន​បដិសេធ។"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"បិទសារជាសំឡេងដែលមើលឃើញ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ការធ្វើ​ប្រតិចារឹក​សារ​ជាសំឡេង​នឹង​ត្រូវ​បិទ ប្រសិនបើ​គោលការណ៍ និង​លក្ខខណ្ឌ​ត្រូវបាន​បដិសេធ។"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"បិទ​ការធ្វើ​ប្រតិចារឹក​សារ​ជា​សំឡេង"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"សារ​ជា​សំឡេង​នឹង​អាច​ចូល​ស្ដាប់​បាន​​ដោយ​ហៅ​ទៅ *86។ កំណត់​កូដ PIN នៃ​សារ​ជា​សំឡេង​ថ្មី ដើម្បី​ចាប់ផ្ដើម​ដំណើរការ។"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"កំណត់​កូដ PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
index 7840fca..c3973ff 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-kn/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸುವವರೆಗೂ ನಿಮಗೆ ಧ್ವನಿಮೇಲ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗದೇ ಇರಬಹುದು. ಧ್ವನಿಮೇಲ್‌ಗಳು ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯವಾಗುವವರೆಗೆ ಹೊಸ ಸಂದೇಶಗಳನ್ನು ಹಿಂಪಡೆಯಲು ಧ್ವನಿಮೇಲ್‌ನಲ್ಲಿ ಕರೆಮಾಡಿ."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ನಿಮ್ಮ ಫೋನ್‌ ಸೆಲ್ಯುಲಾರ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ನಿಮ್ಮ ಫೋನ್‌ ಮೊಬೈಲ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ ಹಾಗೂ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ವೈ-ಫೈನಲ್ಲಿದ್ದರೆ, ನೀವು ಈಗಲೇ ಸಿಂಕ್ ಮಾಡುವ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪರಿಶೀಲಿಸಬಹುದು."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ವೈ-ಫೈ ನಲ್ಲಿದ್ದರೆ, ನೀವು ಈಗಲೇ ಸಿಂಕ್ ಮಾಡುವ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಬಹುದು."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಸಿಂಕ್ ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌‌ಗೆ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಸಂಪರ್ಕ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌‌ಗೆ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಸೆಲ್ಯುಲಾರ್ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ನಿಮ್ಮ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಲು ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ಬಹುತೇಕ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿಕೊಳ್ಳುವ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್  ಮಾಡಬಹುದು."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ನೀವು ಕರೆ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪ್ರವೇಶಿಸಲು ನಿಮಗೆ ಯಾವಾಗಲೂ ಧ್ವನಿಮೇಲ್‌ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ಅಪರಿಚಿತ ದೋಷ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ಯಾವುದೋ ತಪ್ಪು ಸಂಭವಿಸಿದೆ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ಗ್ರಾಹಕ ಸೇವೆ ಸಂಖ್ಯೆ <xliff:g id="NUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿ ಮತ್ತು 9999 ದೋಷದ ಕೋಡ್‌ ಅನ್ನು ಅವರಿಗೆ ತಿಳಿಸಿ."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್‌ನ ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳು"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಬಳಸಲು ವೆರಿಜೋನ್ ವೈರ್‌ಲೆಸ್‌ನ ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನೀವು ಒಪ್ಪಿಕೊಳ್ಳಬೇಕು:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಬಳಸಲು Verizon Wireless ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನೀವು ಒಪ್ಪಿಕೊಳ್ಳಬೇಕು:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆನ್ ಮಾಡಿ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳುಗಳನ್ನು ನಿರಾಕರಿಸಿದಲ್ಲಿ ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನಿರಾಕರಿಸಿದಲ್ಲಿ ಧ್ವನಿಮೇಲ್ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ಧ್ವನಿಮೇಲ್ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86 ಗ ಕರೆ ಮಾಡುವ ಮೂಲಕ ಮಾತ್ರ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯ. ಮುಂದುವರೆಯಲು ಒಂದು ಹೊಸ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ಪಿನ್ ಹೊಂದಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
index 092214d..177a05f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ko/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"비행기 모드 사용 중지"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"시각적 음성사서함 활성화 중"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"시각적 음성사서함이 완전히 활성화될 때까지 음성사서함 알림을 받지 못할 수 있습니다. 음성사서함이 완전히 활성화될 때까지 음성사서함으로 전화하여 새 메시지를 가져오세요."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"시각적 음성사서함을 활성화할 수 없음"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"휴대전화가 모바일 데이터에 연결되었는지 확인한 다음 다시 시도해 주세요."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"휴대전화가 모바일 네트워크에 연결되었는지 확인한 다음 다시 시도해 주세요."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"비행기 모드를 사용 중지한 다음 다시 시도해 주세요."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"네트워크 연결 없음"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"새로운 음성사서함에 대한 알림이 전송되지 않습니다. Wi-Fi에 연결되어 있는 경우 지금 동기화하여 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"새로운 음성 메시지에 관한 알림이 전송되지 않습니다. Wi-Fi에 연결되어 있는 경우 지금 동기화하여 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"새로운 음성사서함에 대한 알림이 전송되지 않습니다. 음성사서함을 동기화하려면 비행기 모드를 사용 중지하세요."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"음성사서함을 확인하려면 모바일 데이터에 연결되어야 합니다."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"음성사서함을 확인하려면 휴대전화가 모바일 데이터에 연결되어야 합니다."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"시각적 음성사서함을 활성화할 수 없음"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"시각적 음성사서함을 업데이트할 수 없음"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi 또는 모바일 데이터 연결이 개선되면 다시 시도해 주세요. 여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"모바일 데이터 연결이 개선되면 다시 시도해 주세요. 여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi 또는 모바일 데이터 연결이 개선되면 다시 시도해 주세요. 지금도 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"모바일 데이터 연결이 개선되면 다시 시도해 주세요. 지금도 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"시각적 음성사서함을 업데이트할 수 없음"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"여전히 전화를 걸어 음성사서함을 확인할 수 있습니다."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"시각적 음성사서함을 업데이트할 수 없음"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"음성사서함이 거의 가득 찼습니다. Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하여 여유 공간을 확보하세요."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"음성사서함 PIN 설정"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"음성사서함에 액세스하도록 호출할 때마다 음성사서함 PIN이 필요합니다."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"알 수 없는 오류"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"비행기 모드 설정"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN 설정"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"다시 시도"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"문제 발생"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"고객 서비스 담당자(<xliff:g id="NUMBER">%1$s</xliff:g>)에게 문의하고 오류 코드가 9999임을 알려주시기 바랍니다."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"시각적 음성사서함 이용약관"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"시각적 음성사서함을 사용하려면 Verizon Wireless의 이용약관을 수락해야 합니다.\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVerizon Wireless의 이용약관에 동의한 후 시각적 음성사서함을 사용할 수 있습니다:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"시각적 음성사서함 사용"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"이용약관을 거부하는 경우 시각적 음성사서함이 사용 중지됩니다."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"시각적 음성사서함 사용 중지"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"이용약관을 거부하면 음성사서함 텍스트 변환은 사용 중지됩니다."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"음성사서함 텍스트 변환 사용 중지"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"음성사서함은 *86번으로 통화해야만 액세스가 가능합니다. 계속하려면 새 음성사서함 PIN을 설정하세요."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN 설정"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
index 0fffb06..208c05c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ky/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Учак режимин өчүрүү"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Визуалдык үн почтасын иштетүү"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Визуалдык үн почтасы толук иштетилмейинче үн почтасынын эскертмелерин ала албайсыз. Үн почтасы толугу менен иштетилгенче жаңы билдирүүлөрдү алуу үчүн үн почтасына чалыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Визуалдык үн почтасы иштебей жатат"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Телефонуңузда мобилдик байланыш бар экенин текшерип, кайра аракет кылыңыз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Телефонуңузда мобилдик байланыш бар экенин текшерип, кайра аракет кылыңыз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Учак режимин өчүрүп, кайра аракет кылыңыз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Байланыш жок"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Эгер телефонуңуз Wi-Fi тармагына туташып турса, аны үн почтасы менен шайкештириңиз."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Эгер телефонуңуз Wi-Fi тармагына туташып турса, аны үн почтасы менен шайкештириңиз."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Учак режимин өчүрүп, телефонуңузду үн почтаңыз менен шайкештириңиз."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Үн почтаңызды текшерүү үчүн мобилдик интернетти иштетиңиз."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Үн почтаңызды текшерүү үчүн мобилдик интернетти иштетиңиз."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Визуалдык үн почтасы иштебей жатат"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Визуалдык үн почтасы жаңырбай жатат"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi сигналы же мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Wi-Fi сигналы же мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Визуалдык үн почтасы жаңырбай жатат"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Визуалдык үн почтасы жаңырбай жатат"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Үн почтаңыз толуп калды. Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Үн почтаңыздын PIN-кодун орнотуңуз"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN-код ар чалган сайын үн почтаңызды угуу үчүн керек."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Белгисиз ката"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Учак режиминин жөндөөлөрү"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN-кодду орнотуу"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Дагы аракет кылыңыз"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Бир жерден ката кетти"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Кардарларды колдоо кызматынын <xliff:g id="NUMBER">%1$s</xliff:g> номерине чалып, ката коду 9999 деп айтыңыз."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Визуалдык үн почтасынын колдонуу жоболору жана шарттары"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Сиз Verizon Wireless\'тин визуалдык үн почтасын колдонуу жоболору менен шарттарына макул болушуңуз керек:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nСиз Verizon Wireless\'тин визуалдык үн почтасын колдонуу жоболору менен шарттарына макул болушуңуз керек:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Визуалдык үн почтасын күйгүзүңүз"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Эгер колдонуу жоболору менен шарттары четке кагылган болсо, визуалдык үн почтасы өчүрүлөт."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Визуалдык үн почтасын өчүрүү"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Эгер колдонуу жоболору менен шарттары четке кагылган болсо, үн почтасы өчүрүлөт."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Үн почтасынын транскрипциясын өчүрүңүз"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Үн почтасын угуу үчүн *86 номерине чалыңыз. Улантуу үчүн, үн почтасына жаңы PIN-кодду коюңуз."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN-код коюу"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
index d6293d2..65d06dc 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lo/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ປິດໂໝດຢູ່ໃນຍົນ"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ກຳລັງເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ໃຫ້ກວດສອບເບິ່ງວ່າໂທລະສັບຂອງທ່ານເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືແລ້ວ ຈາກນັ້ນລອງໃໝ່ອີກຄັ້ງ."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ໃຫ້ກວດສອບວ່າໂທລະສັບຂອງທ່ານມີການເຊື່ອມຕໍ່ອິນເຕີເນັດ ແລ້ວລອງໃໝ່ອີກຄັ້ງ"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ປິດໂໝດຢູ່ໃນຍົນແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ບໍ່ມີການເຊື່ອມຕໍ່"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ຫາກທ່ານໃຊ້ Wi-Fi, ທ່ານສາມາດກວດສອບຂໍ້ຄວາມສຽງໄດ້ໂດຍການຊິ້ງຂໍ້ມູນຕອນນີ້."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ຫາກທ່ານໃຊ້ Wi-Fi, ທ່ານສາມາດກວດສອບຂໍ້ຄວາມສຽງໄດ້ໂດຍການຊິ້ງຂໍ້ມູນຕອນນີ້."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ກະລຸນາປິດໂໝດຢູ່ໃນຍົນເພື່ອຊິ້ງຂໍ້ຄວາມສຽງຂອງທ່ານ."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ໂທລະສັບຂອງທ່ານຕ້ອງມີການເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືເພື່ອກວດສອບຂໍ້ຄວາມສຽງ."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ໂທລະສັບຂອງທ່ານຕ້ອງມີການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືເພື່ອກວດສອບຂໍ້ຄວາມສຽງ."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ Wi-Fi ຫຼື ເຄືອຂ່າຍມືຖືຂອງທ່ານດີຂຶ້ນ. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ເຄືອຂ່າຍມືຖືຂອງທ່ານດີຂຶ້ນ. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ໃຫ້ລອງໃໝ່ອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ Wi‑Fi ຫຼື ອິນເຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ອິນຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ກ່ອງອີເມວຂອງທ່ານໃກ້ເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ທ່ານຈະຕ້ອງໃຊ້ລະຫັດ PIN ໃນຕອນໃດກໍຕາມທີ່ທ່ານໂທເພື່ອເຂົ້າຟັງຂໍ້ຄວາມສຽງຂອງທ່ານ."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ການຕ້ງຄ່າໂໝດຢູ່ໃນຍົນ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"ຕັ້ງລະຫັດ PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ລອງໃໝ່ອີກເທື່ອໜຶ່ງ"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ມີບາງສິ່ງຜິດປົກກະຕິເກີດຂຶ້ນ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Please contact Customer Service at <xliff:g id="NUMBER">%1$s</xliff:g> and tell them the error code is 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ທ່ານຕ້ອງຍອມຮັບຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂອງ Verizon Wireless ເພື່ອໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nທ່ານຈະຕ້ອງຍອມຮັບຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂອງ Verizon Wireless ກ່ອນເພື່ອໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ຂໍ້ຄວາມສຽງສະເໝືອນຈະຖືກປິດການນຳໃຊ້ຫາກປະຕິເສດຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂດັ່ງກ່າວ."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ປິດການນຳໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ການຖອດຂໍ້ຄວາມສຽງຈະຖືກປິດການນຳໃຊ້ຫາກປະຕິເສດຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂ."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ປິດການນຳໃຊ້ການຖອດຂໍ້ຄວາມສຽງ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ຂໍ້ຄວາມສຽງສາມາດເຂົ້າເຖິງໄດ້ສະເພາະການໂທຜ່ານ *86 ເທົ່ານັ້ນ. ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງໃໝ່ເພື່ອດຳເນີນການຕໍ່."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ຕັ້ງລະຫັດ PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
index 92f3316..66446ab 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lt/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Išjungti lėktuvo režimą"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Suaktyvinamas vaizdinis balso paštas"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kol vaizdinis balso paštas nebus visiškai suaktyvintas, galite negauti balso pašto pranešimų. Jei norite gauti naujus pranešimus, kol jis nėra visiškai suaktyvintas, paskambinkite į balso paštą."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nepavyksta suaktyvinti vaizdinio balso pašto"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Įsitikinkite, kad telefone veikia korinis ryšys, ir bandykite dar kartą."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Įsitikinkite, kad telefone veikia mobilusis ryšys, ir bandykite dar kartą."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Išjunkite lėktuvo režimą ir bandykite dar kartą."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nėra ryšio"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jums nebus pranešta apie naujus balso pašto pranešimus. Jei esate prisijungę prie „Wi-Fi“, dabar įjungę sinchronizavimą galite patikrinti, ar yra naujų balso pašto pranešimų."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jums nebus pranešta apie naujus balso pašto pranešimus. Jei esate prisijungę prie „Wi-Fi“, dabar įjungę sinchronizavimą galite patikrinti, ar yra balso pašto pranešimų."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jums nebus pranešta apie naujus balso pašto pranešimus. Išjunkite lėktuvo režimą, kad galėtumėte sinchronizuoti balso pašto pranešimus."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"kad galėtumėte patikrinti balso pašto pranešimus, telefone turi būti įjungti mobiliojo ryšio duomenys."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Kad galėtumėte patikrinti balso pašto pranešimus, telefone turi būti įjungti mobiliojo ryšio duomenys."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nepavyksta suaktyvinti vaizdinio balso pašto"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Bandykite dar kartą, kai „Wi-Fi“ arba mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Bandykite dar kartą, kai mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Bandykite dar kartą, kai „Wi-Fi“ arba mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Bandykite dar kartą, kai mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Vis tiek galite skambinti ir tikrinti balso pašto pranešimus."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nepavyksta atnaujinti vaizdinio balso pašto"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jūsų pašto dėžutė beveik pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nustatyti balso pašto PIN kodą"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Jums reikės balso pašto PIN kodo visada, kai skambinsite norėdami pasiekti balso paštą."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nežinoma klaida"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Lėktuvo režimo nustatymai"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Nustatyti PIN kodą"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Bandyti dar kartą"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Kažkas ne taip"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Susisiekite su klientų aptarnavimo tarnyba numeriu <xliff:g id="NUMBER">%1$s</xliff:g> ir pasakykite klaidos kodą 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vaizdinio balso pašto taisyklės ir nuostatos"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Norėdami naudoti vaizdinį balso paštą, turite sutikti su „Verizon Wireless“ taisyklėmis ir nuostatomis:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTurite sutikti su „Verizon Wireless“ taisyklėmis ir nuostatomis, kad galėtumėte naudoti vaizdinį balso paštą:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vaizdinio balso pašto įjungimas"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Atmetus taisykles ir nuostatas, vaizdinis balso paštas bus išjungtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Išjungti vaizdinį balso paštą"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Atmetus taisykles ir nuostatas, balso pašto transkribavimas bus išjungtas."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Išjungti balso pašto transkribavimą"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Balso paštas bus pasiekiamas tik paskambinus numeriu *86. Nustatykite naują balso pašto PIN kodą, kad galėtumėte tęsti."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kodo nustatymas"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
index e27de6f..3694175 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-lv/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Izslēgt lidojuma režīmu"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizuālā balss pasta aktivizēšana"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kamēr vizuālais balss pasts nebūs pilnībā aktivizēts, iespējams, nesaņemsiet balss pasta paziņojumus. Lai izgūtu jaunus ziņojumus, kamēr balss pasts nav pilnībā aktivizēts, zvaniet balss pastam."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nevar aktivizēt vizuālo balss pastu."</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pārbaudiet, vai tālrunim ir mobilo datu savienojums, un mēģiniet vēlreiz."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pārbaudiet, vai tālrunim ir mobilo datu savienojums, un mēģiniet vēlreiz."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Izslēdziet lidojuma režīmu un mēģiniet vēlreiz."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nav savienojuma."</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Ja ir izveidots Wi-Fi savienojums, varat pārbaudīt balss pastu, veicot sinhronizāciju tūlīt."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Ja ir izveidots Wi-Fi savienojums, varat pārbaudīt balss pastu, tagad veicot sinhronizāciju."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Jums netiks paziņots par jauniem balss pasta ziņojumiem. Lai sinhronizētu balss pastu, izslēdziet lidojuma režīmu."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Lai pārbaudītu balss pastu, tālrunim ir nepieciešams mobilo datu savienojums."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Lai pārbaudītu balss pastu, tālrunim ir nepieciešams mobilo datu savienojums."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nevar aktivizēt vizuālo balss pastu."</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nevar atjaunināt vizuālo balss pastu."</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Mēģiniet vēlreiz, kad būs stiprāks Wi-Fi vai mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mēģiniet vēlreiz, kad būs stiprāks mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Mēģiniet vēlreiz, kad būs spēcīgāks Wi-Fi vai mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mēģiniet vēlreiz, kad būs spēcīgāks mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nevar atjaunināt vizuālo balss pastu."</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Joprojām varat piezvanīt, lai pārbaudītu balss pastu."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nevar atjaunināt vizuālo balss pastu."</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Jūsu pastkaste ir gandrīz pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Balss pasta PIN iestatīšana"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Lai piekļūtu balss pastam zvanot, būs vajadzīgs balss pasta PIN."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nezināma kļūda"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Lidojuma režīma iestatījumi"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN iestatīšana"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Mēģināt vēlreiz"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Radās problēma"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālāk norādīto tālruņa numuru, un nosauciet kļūdas kodu “9999”: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizuālā balss pasta pakalpojumu sniegšanas noteikumi"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Lai izmantotu vizuālo balss pastu, jums ir jāpiekrīt Verizon Wireless pakalpojumu sniegšanas noteikumiem:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJums ir jāpiekrīt Verizon Wireless pakalpojumu sniegšanas noteikumiem, lai izmantotu vizuālo balss pastu:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ieslēgt vizuālo balss pastu"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ja tiks noraidīti pakalpojumu sniegšanas noteikumi, vizuālais balss pasts tiks atspējots."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Atspējot vizuālo balss pastu"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ja tiks noraidīti pakalpojumu sniegšanas noteikumi, balss pasta transkripcija tiks atspējota."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Atspējot balss pasta transkripciju"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Balss pasts būs pieejams, tikai zvanot uz numuru *86. Lai turpinātu, iestatiet jaunu balss pasta PIN."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN iestatīšana"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
index 3ff8b87..75c7557 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mk/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Исклучете го авионскиот режим"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Се активира визуелна говорна пошта"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Може да не добивате известувања за говорна пошта сѐ додека говорната пошта не се активира во целост. Дотогаш, повикувајте ја говорната пошта за преслушување на новите пораки."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не може да се активира визуелна говорна пошта"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверете дали телефонот има мобилна врска и обидете се повторно."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверете дали телефонот е поврзан на мобилна мрежа и обидете се повторно."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Исклучете го авионскиот режим и обидете се повторно."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Нема мрежа"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Нема да добивате известувања за нова говорна пошта. Ако сте поврзани на Wi-Fi, може да ја проверите говорната пошта со синхронизирање сега."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Нема да добивате известувања за нови говорни пораки. Ако сте поврзани на Wi-Fi, може да ја проверите говорната пошта со синхронизирање сега."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Нема да добивате известувања за нова говорна пошта. Исклучете го авионскиот режим за синхронизирање на говорната пошта."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"За проверување говорна пошта, телефонот треба да се поврзе на интернет."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"За проверување говорна пошта, телефонот треба да се поврзе на мобилен интернет."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не може да се активира визуелна говорна пошта"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Сѐ уште може да повикате за да ја проверите говорната пошта"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не може да се ажурира визуелната говорна пошта"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Обидете се повторно кога Wi-Fi или мобилната врска ќе се подобрат. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Обидете се повторно кога ќе се подобри интернет-врската. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Обидете се повторно кога Wi-Fi или мобилниот интернет ќе се подобрат. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Обидете се повторно кога ќе се подобри мобилниот интернет. Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не може да се ажурира визуелната говорна пошта"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Сѐ уште може да повикате за да ја проверите говорната пошта."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не може да се ажурира визуелната говорна пошта"</string>
@@ -50,12 +49,11 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Вашето поштенско сандаче е речиси полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Поставете PIN за говорната пошта"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Секогаш кога ќе повикате за да пристапите до говорната пошта, ќе треба да внесете PIN за говорна пошта."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Непозната грешка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Поставки на авионски режим"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Поставете PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Обидете се повторно"</string>
     <string name="voicemail_action_turn_archive_on" msgid="6008444955560830591">"Вклучи"</string>
-    <string name="voicemail_action_dimiss" msgid="6018415798136796966">"Не, благодарам"</string>
+    <string name="voicemail_action_dimiss" msgid="6018415798136796966">"Не, фала"</string>
     <string name="voicemail_action_sync" msgid="5139315923415392787">"Синхронизирајте"</string>
     <string name="voicemail_action_call_voicemail" msgid="6701710720535556395">"Повикајте говорна пошта"</string>
     <string name="voicemail_action_call_customer_support" msgid="7698973007656462748">"Повикајте ја Поддршката на корисници"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешто тргна наопаку"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Контактирајте со Грижа за корисници на <xliff:g id="NUMBER">%1$s</xliff:g> и кажете им дека кодот за грешка е 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Одредби и услови на визуелна говорна пошта"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Мора да ги прифатите Одредбите и условите на Verizon Wireless за да користите говорна пошта:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nМора да ги прифатите Одредбите и условите на Verizon Wireless за да користите визуелна говорна пошта:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Вклучи „Визуелна говорна пошта“"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако ги одбиете Одредбите и условите, визуелната говорна пошта ќе се оневозможи."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Оневозможете визуелна говорна пошта"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ако ги одбиете Одредбите и условите, транскрипцијата на говорната пошта ќе се оневозможи."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Оневозможи транскрипција на говорна пошта"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Говорната пошта ќе биде достапна само со повикување *86. За да продолжите, поставете нов PIN на говорната пошта."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Поставете PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
index 84d221e..892469c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ml/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ഫ്ലൈറ്റ് മോഡ് ഓഫുചെയ്യുക"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"വിഷ്വൽ വോയ്‌സ്മെയിൽ സജീവമാക്കുന്നു"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ നിങ്ങൾക്ക് വോയ്‌സ്‌മെയിൽ അറിയിപ്പുകൾ ലഭിക്കാനിടയില്ല. വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ പുതിയ സന്ദേശങ്ങൾ വീണ്ടെടുക്കാൻ വോയ്‌സ്‌മെയിലിലേക്ക് വിളിക്കുക."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"നിങ്ങളുടെ ഫോണിന് സെല്ലുലാർ കണക്ഷനുണ്ടെന്ന് ഉറപ്പാക്കി, വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"നിങ്ങളുടെ ഫോണിന് മൊബൈൽ നെറ്റ്‌വർക്ക് കണക്ഷനുണ്ടെന്ന് ഉറപ്പാക്കിയശേഷം വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കി, വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"കണക്ഷൻ ഇല്ല"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. നിങ്ങൾ Wi-Fi ഉപയോഗിക്കുകയാണെങ്കിൽ, ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിലൂടെ വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാനാവും."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. നിങ്ങൾ വൈഫൈ ഉപയോഗിക്കുകയാണെങ്കിൽ, ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിലൂടെ വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാനാവും."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. വോയ്‌സ്‌മെയിൽ സമന്വയിപ്പിക്കാൻ ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ നിങ്ങളുടെ ഫോണിന് ഒരു സെല്ലുലാർ ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ നിങ്ങളുടെ ഫോണിന് ഒരു മൊബൈൽ ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട Wi-Fi അല്ലെങ്കിൽ സെല്ലുലാർ കണക്ഷൻ ലഭിക്കുമ്പോൾ, വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട സെല്ലുലാർ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട വൈഫൈ അല്ലെങ്കിൽ മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ, വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"നിങ്ങൾക്ക് മെച്ചപ്പെട്ട മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുചെയ്യാനാകുന്നില്ല"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"നിങ്ങളുടെ മെയിൽബോക്‌സ്‌ ഏകദേശം നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ മാനേജുചെയ്യാനും ബായ്‌ക്കപ്പെടുക്കാനുമാകും."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ സജ്ജമാക്കുക"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"വോയ്‌സ്മെയിൽ ആക്‌സസ് ചെയ്യാൻ ശ്രമിക്കുമ്പോഴെല്ലാം നിങ്ങൾക്കൊരു വോയ്‌സ്‌മെയിൽ പിൻ ആവശ്യമാണ്."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"തിരിച്ചറിയാനാകാത്ത പിശക്"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ഫ്ലൈറ്റ് മോഡ് ക്രമീകരണം"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"പിൻ സജ്ജമാക്കുക"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"വീണ്ടും ശ്രമിക്കുക"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"എന്തോ കുഴപ്പം സംഭവിച്ചു"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g>-ൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9999 ആണെന്ന് പറയുക."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"വിഷ്വൽ വോയ്‌സ് മെയിൽ നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"വിഷ്വൽ വോയ്‌സ് മെയിൽ ഉപയോഗിക്കാൻ, നിങ്ങൾ Verizon Wireless-ന്റെ നിബന്ധനകളും വ്യവസ്ഥകളും അംഗീകരിക്കേണ്ടതുണ്ട്:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nവിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഉപയോഗിക്കുന്നതിന് നിങ്ങൾ Verizon Wireless-ന്റെ നിബന്ധനകളും വ്യവസ്ഥകളും അംഗീകരിക്കേണ്ടതുണ്ട്:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഓണാക്കുക"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"നിബന്ധനകളും വ്യവസ്ഥകളും നിരസിക്കപ്പെട്ടാൽ വിഷ്വൽ വോയ്‌സ്‌ മെയിൽ പ്രവർത്തനരഹിതമാവും."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"വിഷ്വൽ വോയ്‌സ്‌‌മെയിൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"നിബന്ധനകളും വ്യവസ്ഥകളും നിരസിക്കപ്പെടുകയാണെങ്കിൽ വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്‌ഷൻ പ്രവർത്തനരഹിതമാക്കും."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്‌ഷൻ പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86-ൽ വിളിച്ച്‌ മാത്രമേ വോയ്‌സ്‌മെയിൽ ആക്‌സസ്‌ ചെയ്യാനാവൂ. തുടരാൻ, പുതിയൊരു വോയ്‌സ്‌മെയിൽ പിൻ‌ നമ്പർ‌ സജ്ജമാക്കുക."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"പിൻ സജ്ജമാക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
index 99fc29d..26d53ee 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mn/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Нислэгийн горимыг унтраах"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Уншиж болох дуут шууданг идэвхжүүлж байна"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Уншиж болох дуут шууданг бүрэн идэвхжүүлэхээс өмнө танд дуут шуудангийн мэдэгдэл ирэхгүй байж магадгүй. Дуут шууданг бүрэн идэвхжих хүртэл шинэ зурвас авахын тулд дуут шуудан руу залгана уу."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Утасны үүрэн холболт байгаа эсэхийг шалгаад дахин оролдоно уу."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Утасны мобайл холболт байгаа эсэхийг шалгаад дахин оролдоно уу."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Нислэгийн горимыг идэвхгүй болгоод дахин оролдоно уу."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Холболт байхгүй"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Хэрэв та Wi-Fi дээр байвал одоо синк хийж дуут шуудангаа шалгана уу."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Хэрэв та Wi-Fi-тай холбогдсон бол одоо синк хийж дуут шуудангаа шалгана уу."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Дуут шуудангаа синк хийхийн тулд нислэгийн горимыг идэвхгүй болгоно уу."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Дуут шууданг шалгахын тулд таны утсанд үүрэн датаны холболт шаардлагатай."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Дуут шууданг шалгахын тулд таны утсанд мобайл датаны холболт шаардлагатай."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Та дуут шууданг дуудлага хийж сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Та Wi-Fi дээр байх буюу үүрэн холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Таны үүрэн датаны холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Та Wi-Fi эсвэл мобайл холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Таны мобайл датаны холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Уншиж болох дуут шууданг шинэчлэх боломжгүй"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Таны имэйл хайрцаг бараг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Өөрийн дуут шуудангийн PIN-г тохируулна уу"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Та дуут шуудандаа хандахаар дуудлага хийх бүрт дуут шуудангийн PIN шаардлагатай болно."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Тодорхойгүй алдаа"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Нислэгийн горимын тохиргоо"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN тохируулах"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Дахин оролдоно уу"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ямар нэг алдаа гарлаа"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Хэрэглэгчийн үйлчилгээ <xliff:g id="NUMBER">%1$s</xliff:g> руу залгаж алдааны код 9999 гэж хэлнэ үү."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Уншиж болохуйц дуут шуудангийн нөхцөл"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Та уншиж болох дуут шууданг ашиглахын тулд Verizon Wireless-н нөхцөлийг зөвшөөрөх шаардлагатай:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nТа уншиж болох дуут шууданг ашиглахын тулд Verizon Wireless-н нөхцөлийг зөвшөөрөх шаардлагатай:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Уншиж болох дуут шууданг идэвхжүүлэх"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Нөхцөлийг зөвшөөрөхгүй бол уншиж болохуйц дуут шууданг идэвхгүй болгоно."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Уншиж болохуйц дуут шууданг идэвхгүй болгох"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Нөхцөлийг зөвшөөрөхгүй бол дуут шуудан сийрүүлэхийг идэвхгүй болгоно."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Дуут шуудан сийрүүлэхийг идэвхгүй болгох"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Дуут шууданд зөвхөн *86 руу залгаж хандах боломжтой. Үргэлжлүүлэхийн тулд шинэ дуут шуудангийн PIN тохируулна уу."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN тохируулах"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
index 43c8bdd..b825f37 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-mr/strings.xml
@@ -17,28 +17,27 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"विमान मोड बंद करा"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"दृश्‍यमान व्हॉइसमेल सक्रिय करीत आहे"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"व्हिज्युअल व्हॉइसमेल पूर्णपणे सक्रिय होईपर्यंत आपल्याला व्हॉइसमेल सूचना प्राप्त होऊ शकत नाहीत. व्हॉइसमेल पूर्णपणे सक्रिय होईपर्यंत नवीन संदेश पुनर्प्राप्त करण्यासाठी व्हॉइसमेल बोलवा."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"दृश्‍यमान व्हॉइसमेल सक्रिय करू शकत नाही"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"आपल्‍या फोनवर सेल्युलर कनेक्‍शन असल्याची खात्री करा आणि पुन्हा प्रयत्न करा."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"आपल्या फोनमध्‍ये मोबाइल नेटवर्क कनेक्शन आहे याची खात्री करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"विमान मोड बंद करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"कोणतेही कनेक्शन नाही"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपण वाय-फाय वर असल्यास आपण आता संकालित करून व्हॉइसमेलसाठी तपासू शकता."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपण वाय-फाय वर असल्यास, आपण आता संकालित करून व्हॉइसमेल तपासू शकता."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"आपल्याला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. आपला व्हॉइसमेल संकालित करण्यासाठी विमान मोड बंद करा."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"व्हॉइसमेल तपासण्यासाठी आपल्या फोनला सेल्युलर डेटा कनेक्शनची आवश्यकता आहे."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"व्हॉइसमेल तपासण्यासाठी आपल्या फोनसाठी मोबाइल डेटा कनेक्शनची आवश्यकता आहे."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"दृश्‍यमान व्हॉइसमेल सक्रिय करू शकत नाही"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
-    <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"आपले वाय-फाय किंवा सेल्युलर कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण अद्याप व्हॉइसमेल तपासण्यासाठी कॉल करू शकता."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"आपले सेल्युलर डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण अद्याप व्हॉइसमेल तपासण्यासाठी कॉल करू शकता."</string>
-    <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
+    <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"दृश्यमान व्हॉइसमेल अपडेट करू शकत नाही"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"आपले वाय‑फाय किंवा मोबाइल डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण व्हॉइसमेल तपासण्‍यासाठी अद्याप कॉल करू शकता."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"आपले मोबाइल डेटा कनेक्शन चांगले असताना पुन्हा प्रयत्न करा. आपण  व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
+    <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"दृश्यमान व्हॉइसमेल अपडेट करू शकत नाही"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
-    <string name="voicemail_error_communication_title" msgid="9183339646110368169">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
+    <string name="voicemail_error_communication_title" msgid="9183339646110368169">"दृश्यमान व्हॉइसमेल अपडेट करू शकत नाही"</string>
     <string name="voicemail_error_communication_message" msgid="1226746423005179379">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
-    <string name="voicemail_error_server_connection_title" msgid="3036980885397552848">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
+    <string name="voicemail_error_server_connection_title" msgid="3036980885397552848">"दृश्यमान व्हॉइसमेल अपडेट करू शकत नाही"</string>
     <string name="voicemail_error_server_connection_message" msgid="6008577624710159550">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
-    <string name="voicemail_error_server_title" msgid="5355286554022049134">"दृश्यमान व्हॉइसमेल अद्यतनित करू शकत नाही"</string>
+    <string name="voicemail_error_server_title" msgid="5355286554022049134">"दृश्यमान व्हॉइसमेल अपडेट करू शकत नाही"</string>
     <string name="voicemail_error_server_message" msgid="3538157415413084592">"आपण व्हॉइसमेल तपासण्यासाठी अद्याप कॉल करू शकता."</string>
     <string name="voicemail_error_inbox_near_full_title" msgid="7568681773644454672">"इनबॉक्स जवळजवळ भरलेला"</string>
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"आपला इनबॉक्स भरलेला असल्यास आपण नवीन व्हॉइसमेल प्राप्त करण्यात सक्षम असणार नाही."</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"आपला मेलबॉक्स जवळजवळ पूर्ण भरला आहे. स्थान मोकळे करण्यासाठी, अतिरिक्त संचय चालू करा त्यामुळे Google आपले व्हॉइसमेल संदेश व्यवस्थापित करू शकते आणि त्यांचा बॅक अप घेऊ शकते."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"आपला व्हॉइसमेल पिन सेट करा"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"आपल्या व्हॉइसमेलमध्ये प्रवेश करण्यासाठी आपण कधीही कॉल करता तेव्हा आपल्याला व्हॉइसमेल पिन आवश्यक असेल."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात त्रुटी"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"विमान मोड सेटिंग्ज"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"पिन सेट करा"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"पुन्‍हा प्रयत्न करा"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"काहीतरी चूक झाली."</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ग्राहक सेवा संपर्काशी <xliff:g id="NUMBER">%1$s</xliff:g> येथे संपर्क साधाा आणि त्यांना त्रुटी कोड 9999 सांगा."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"व्हिज्युअल व्हॉइसमेल अटी आणि नियम"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"आपण व्हिज्युअल व्हॉइसमेल वापरण्यासाठी Verizon वायरलेसच्या अटी आणि नियम स्वीकारणे आवश्यक आहे: \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nव्हिज्युअल व्हॉइसेमल वापरण्‍यासाठी आपण Verizon Wireless च्या अटी आणि नियम स्वीकारणे  आवश्‍यक आहे:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"व्हिज्युअल व्हॉइसमेल चालू करा"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"अटी आणि नियम नाकारल्या गेल्यास व्हिज्युअल व्हॉइसमेल अक्षम केले जाईल."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"व्हिज्युअल व्हॉइसमेल अक्षम करा"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"अटी आणि नियम नाकारल्यास व्हॉइसमेल प्रतिलेखन अक्षम केले जाईल."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"व्हॉइसमेल प्रतिलेखन अक्षम करा"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"व्हॉइसमेल केवळ *86 वर कॉल करून प्रवेश करण्यायोग्य असेल. सुरू ठेवण्यासाठी नवीन व्हॉइसमेल पिन सेट करा."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"पिन सेट करा"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
index c8b70d5..dc76381 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ms/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Matikan mod pesawat"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Mengaktifkan mel suara visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Anda mungkin tidak menerima pemberitahuan mel suara sehingga mel suara visual diaktifkan sepenuhnya. Panggil mel suara untuk mengambil mesej baharu sehingga mel suara diaktifkan sepenuhnya."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Tidak dapat mengaktifkan mel suara visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Pastikan telefon anda mempunyai sambungan selular, kemudian cuba lagi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Pastikan telefon anda mempunyai sambungan rangkaian mudah alih, kemudian cuba lagi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Matikan mod pesawat, kemudian cuba lagi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Tiada sambungan"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Anda tidak akan dimaklumkan tentang mel suara baharu. Jika anda menggunakan Wi-Fi, anda boleh menyemak mel suara dengan menyegerak sekarang."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Anda tidak akan dimaklumi tentang mel suara baharu. Jika anda menggunakan Wi-Fi, anda boleh menyemak mel suara dengan menyegerak sekarang."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Anda tidak akan diberitahu tentang mel suara baharu. Matikan mod pesawat untuk menyegerakkan mel suara anda."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefon anda memerlukan sambungan data selular untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefon anda memerlukan sambungan data mudah alih untuk menyemak mel suara."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Tidak dapat mengaktifkan mel suara visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Tidak dapat mengemas kini mel suara visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Cuba lagi apabila sambungan Wi-Fi atau selular anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Cuba lagi apabila sambungan data selular anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Cuba lagi apabila sambungan Wi-Fi atau data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Cuba lagi apabila sambungan data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Tidak dapat mengemas kini mel suara visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Anda masih dapat membuat panggilan untuk menyemak mel suara."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Tidak dapat mengemas kini mel suara visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Peti mel anda hampir penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google boleh mengurus dan menyandarkan mesej mel suara anda."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Tetapkan PIN mel suara anda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Anda memerlukan PIN mel suara setiap kali anda memanggil untuk mengakses mel suara anda."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ralat tidak diketahui"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Tetapan Mod Pesawat"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Tetapkan PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Cuba Lagi"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Berlaku Kesilapan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Sila hubungi Khidmat Pelanggan melalui <xliff:g id="NUMBER">%1$s</xliff:g> dan beritahu mereka kod ralatnya ialah 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Terma dan Syarat Mel Suara Visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Anda mesti menerima terma dan syarat Verizon Wireless untuk menggunakan mel suara visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAnda mesti menerima terma dan syarat Verizon Wireless untuk menggunakan mel suara:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Hidupkan Mel Suara Visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Mel suara visual akan dilumpuhkan jika terma dan syarat ditolak."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Lumpuhkan mel suara visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsi mel suara akan dilumpuhkan jika terma dan syarat ditolak."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Lumpuhkan transkripsi mel suara"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Mel suara hanya dapat diakses dengan memanggil *86. Tetapkan PIN mel suara baharu untuk meneruskan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Tetapkan PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
index 686d37d..8b53606 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-my/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"လေယာဉ်ပျံမုဒ်ပိတ်ရန်"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"မြင်နိုင်သောအသံမေးလ်ကို ဖွင့်နေသည်"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"မြင်ရသောအသံမေးလ်ကို အပြည့်အဝစမဖွင့်သရွေ့ အသံမေးလ်အကြောင်းကြားချက်များကို လက်ခံရရှိနိုင်မည်မဟုတ်ပါ။ အသံမေးလ်ကို အပြည့်အဝစဖွင့်မပြီးမချင်း မက်ဆေ့ဂျ်အသစ်များရယူရန် အသံမေးလ်ခေါ်ဆိုပါ။"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"မြင်ရသောအသံမေးလ်ကို ဖွင့်၍မရပါ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"သင့်ဖုန်းတွင် ဆယ်လူလာချိတ်ဆက်မှုရှိကြောင်း စစ်ဆေး၍ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"သင့်ဖုန်းတွင် မိုဘိုင်းကွန်ရက် ချိတ်ဆက်မှုရှိကြောင်း စစ်ဆေး၍ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"လေယာဉ်ပျံမုဒ်ပိတ်၍ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ချိတ်ဆက်မှုမရှိပါ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ Wi-Fi သုံးနေပါက ယခုပင် ပြိုင်တူညှိခြင်းဖြင့် အသံမေးလ်ကို စစ်ဆေးနိုင်ပါသည်။"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ Wi-Fi သုံးနေပါက ယခုပင် စင့်ခ်လုပ်ခြင်းဖြင့် အသံမေးလ်ကို စစ်ဆေးနိုင်ပါသည်။"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"အသံမေးလ်အသစ်များအတွက် သင့်ကို အကြောင်းကြားလိမ့်မည်မဟုတ်ပါ။ သင့်အသံမေးလ်ပြိုင်တူညှိရန် လေယာဉ်ပျံမုဒ်ပိတ်ပါ။"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"အသံမေးလ်စစ်ရန်အတွက် သင့်ဖုန်းတွင် ဆယ်လူလာဒေတာချိတ်ဆက်မှုတစ်ခု လိုပါသည်။"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"အသံမေးလ်စစ်ရန်အတွက် သင့်ဖုန်းတွင် မိုဘိုင်းဒေတာချိတ်ဆက်မှုတစ်ခု လိုပါသည်။"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"မြင်ရသောအသံမေးလ် ဖွင့်၍မရပါ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"သင်၏ Wi-Fi (သို့) ဆယ်လူလာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"သင်၏ဆယ်လူလာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"သင်၏ Wi-Fi (သို့) မိုဘိုင်းဒေတာချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှု လိုင်းပိုကောင်းမှ ထပ်စမ်းကြည့်ပါ။ အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"အသံမေးလ်စစ်ရန်အတွက် ဖုန်းခေါ်နိုင်ပါသေးသည်။"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"မြင်ရသောအသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"သင့်ဝင်စာ ပြည့်လုပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် Google က သင်၏အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲပြီး မိတ္တူကူးနိုင်ရန် အပိုသိုလှောင်မှုကို ဖွင့်ပါ။"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"သင်၏အသံမေးလ်ပင်နံပါတ် သတ်မှတ်ပါ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"သင်၏အသံမေးလ်ကို သုံးစွဲရန်အတွက် သင်ခေါ်ဆိုသည့်အခါတိုင်း အသံမေးလ်ပင်နံပါတ်တစ်ခု လိုအပ်ပါမည်။"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"အမျိုးအမည်မသိမှားယွင်းမှု"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"လေယာဉ်ပျံမုဒ်ဆက်တင်များ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ထပ်စမ်းကြည့်ရန်"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"တစ်စုံတစ်ခု လွဲချော်နေပါသည်"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"သုံးစွဲသူဝန်ဆောင်ရေးကို <xliff:g id="NUMBER">%1$s</xliff:g> တွင် ဆက်သွယ်ပြီး အမှားအယွင်းကုဒ်သည် ၉၉၉၉ ဖြစ်ကြောင်း ပြောပါ။"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"မြင်နိုင်သောအသံမေးလ် ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"သင်သည် မြင်နိုင်သောအသံမေးလ်ကို အသုံးပြုရန် Verizon Wireless ၏ ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို လက်ခံရပါမည် - \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nစာသားမှတ်တမ်းပါ အသံမေးလ်ကို အသုံးပြုရန် Verizon ကြိုးမဲ့စနစ်၏ ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို လက်ခံရပါမည် - \n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"စာသားမှတ်တမ်းပါ အသံမေးလ်ဖွင့်ခြင်း"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို ငြင်းပယ်ပါက မြင်နိုင်သောအသံမေးလ်ကို ပိတ်ပစ်ပါလိမ့်မည်။"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"မြင်နိုင်သောအသံမေးလ် ပိတ်ပါ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို ငြင်းပယ်ပါက အသံမေးလ် စာသားမှတ်တမ်းများကို ပိတ်ပစ်ပါလိမ့်မည်။"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"အသံမေးလ် စာသားမှတ်တမ်းကို ပိတ်ရန်"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*၈၆ သို့ ခေါ်ဆိုခြင်းဖြင့်သာ အသံမေးလ်ကို ဝင်သုံးနိုင်ပါမည်။ ဆက်သွားရန် အသံမေးလ်ပင်နံပါတ်အသစ်ကို သတ်မှတ်ပါ။"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ပင်နံပါတ်ကို သတ်မှတ်ပါ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
index 6fc7561..029e4cb 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-nb/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Slå av flymodus"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Slår på visuell talepostkasse"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Det er ikke sikert at du kan motta talepostvarsler før visuell talepost er fullt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan ikke slå på visuell talepost"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sjekk at telefonen din har mobilforbindelse og prøv igjen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sjekk at telefonen din har mobilforbindelse, og prøv på nytt."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå av flymodus og prøv igjen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen tilkobling"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonen din trenger mobildatatilkobling for å kunne sjekke talepost."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan ikke slå på visuell talepost"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan ikke oppdatere visuell talepost"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igjen når Wi-Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan ikke oppdatere visuell talepost"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan ikke oppdatere visuell talepost"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Angi PIN-koden din for talepost"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukjent feil"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Flymodus-innstillinger"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Angi PIN-kode"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Prøv på nytt"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noe gikk galt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g> og referer til feilkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår for visuell talepost"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du må godta vilkårene til Verizon Wireless før du kan ta i bruk visuell talepost:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu må godta Verizon Wireless sine vilkår for å kunne bruke visuell talepost:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå på visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell talepost blir slått av hvis vilkårene ikke godtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slå av visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsjon av talepost blir slått av hvis vilkårene blir avvist."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slå av transkripsjon av talepost"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angi PIN-kode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
index ff06fa0..12ea00c 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ne/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"हवाइजहाज मोडलाई निष्क्रिय पार्नुहोस्"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"भिजुअल भ्वाइसमेललाई सक्रिय पार्दै"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"भिजुअल भ्वाइसमेल पूर्णतया सक्रिय नभएसम्म तपाईँलाई भ्वाइसमेलका सूचनाहरू प्राप्त नहुन सक्छन्। भ्वाइसमेल पूर्णतया सक्रिय नहुन्जेल नयाँ सन्देशहरू प्राप्त गर्न भ्वाइसमेल सेवामा कल गर्नुहोस्।"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"भिजुअल भ्वाइस मेललाई सक्रिय पार्न सकिँदैन"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"आफ्नो फोन सेलुलरमा जडान भएको छ भन्ने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"आफ्नो फोन मोबाइल नेटवर्कमा जडान भएको छ भन्ने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"हवाइजहाज मोड बन्द गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"जडान छैन"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। तपाईं Wi-Fi चलाउँदै हुनुहुन्छ भने, अब सिङ्क गरी भ्वाइस मेल जाँच गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। तपाईं Wi-Fi चलाउँदै हुनुहुन्छ भने, अब सिङ्क गरी भ्वाइस मेल जाँच गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"तपाईंलाई नयाँ भ्वाइस मेल सम्बन्धी सूचना दिइने छैन। आफ्नो भ्वाइस मेल सिङ्क गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"भ्वाइस मेल जाँच गर्न तपाईंको फोन सेलुलर डेटामा जडान हुनु आवश्यक हुन्छ।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"भ्वाइस मेल जाँच गर्न तपाईंको फोन मोबाइल डेटामा जडान हुनु आवश्यक हुन्छ।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"भिजुअल भ्वाइस मेललाई सक्रिय गर्न सकिँदैन"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"तपाईंको Wi-Fi वा सेलुलर जडान राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"तपाईंको Wi-Fi वा सेलुलर जडान अझ राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"तपाईंको Wi-Fi वा मोबाइल जडान राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईंले अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"तपाईंको मोबाइल डेटा जडान अझ राम्रो भएका बेला पुन: प्रयास गर्नुहोस्। तपाईंले अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"तपाईं अझै पनि भ्वाइस मेल जाँच गर्न कल गर्न सक्नुहुन्छ।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिँदैन"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"तपाईंको मेल बक्स लगभग भरिएको छ। ठाउँ खाली गर्न Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय पार्नुहोस्।"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"आफ्नो भ्वाइस मेलको PIN सेट गर्नुहोस्"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"तपाईँलाई जुनसुकै समयमा आफ्नो भ्वाइस मेलमा पहुँच गर्न कल गर्दा भ्वाइस मेल PIN को आवश्यकता पर्दछ।"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"अज्ञात त्रुटि"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"हवाइजहाज मोड सेटिङ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN सेट गर्नुहोस्"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"फेरि प्रयास गर्नुहोस्"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"केही गडबड भयो"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"कृपया <xliff:g id="NUMBER">%1$s</xliff:g> मा ग्राहक सेवामा सम्पर्क गर्नुहोस् र तिनीहरूलाई त्रुटिको कोड ९९९९ हो भनी बताउनुहोस्।"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"भिजुअल भ्वाइस मेल सम्बन्धी सेवाका सर्तहरू"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"भिजुअल भ्वाइस मेल प्रयोग गर्नका लागि तपाईंले अनिवार्य रूपले Verizon Wireless का सेवाका सर्तहरू स्वीकार गर्नुपर्छ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n भिजुअल भ्वाइस मेल प्रयोग गर्नका लागि तपाईंले अनिवार्य रूपले Verizon Wireless का सेवाका सर्तहरू स्वीकार गर्नुपर्छ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"भिजुअल भ्वाइस मेल सक्रिय गर्नुहोस्"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"सेवाका सर्तहरू अस्वीकार गरिएमा भिजुअल भ्वाइस मेल असक्षम पारिने छ।"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"भिजुअल भ्वाइस मेल असक्षम पार्नुहोस्"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"सेवाका सर्तहरू अस्वीकार गरिएमा भिजुअल ट्रान्स्क्रिप्सनलाई असक्षम पारिने छ।"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"भ्वाइस मेल ट्रान्स्क्रिप्सन असक्षम पार्नुहोस्"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*८६ मा कल गरेर मात्र भ्वाइस मेलमाथि पहुँच राख्न सकिने छ। अघि बढ्न भ्वाइस मेलको नयाँ PIN सेट गर्नुहोस्।"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN सेट गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
index f74a37d..7e73cae 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-nl/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Vliegtuigmodus uitschakelen"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Visuele voicemail activeren"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Je ontvangt mogelijk geen voicemailmeldingen totdat visuele voicemail volledig is geactiveerd. Bel je voicemail om nieuwe berichten op te halen totdat visuele voicemail volledig is geactiveerd."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan visuele voicemail niet activeren"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Zorg dat je telefoon een mobiele verbinding heeft en probeer het opnieuw."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Zorg dat je telefoon een mobiele netwerkverbinding heeft en probeer het opnieuw."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Schakel de vliegtuigmodus uit en probeer het opnieuw."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Geen verbinding"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Je ontvangt geen meldingen voor nieuwe voicemails. Als je wifi gebruikt, kun je je voicemail controleren door nu te synchroniseren."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Je ontvangt geen meldingen voor nieuwe voicemails. Als je wifi gebruikt, kun je je voicemail controleren door nu te synchroniseren."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Je ontvangt geen meldingen voor nieuwe voicemails. Schakel de vliegtuigmodus uit om je voicemail te synchroniseren."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Je telefoon heeft een mobiele dataverbinding nodig om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Je telefoon heeft een mobiele dataverbinding nodig om je voicemail te controleren."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan visuele voicemail niet activeren"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan visuele voicemail niet updaten"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Probeer het opnieuw als er een betere wifi- of mobiele verbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail controleren."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Probeer het opnieuw wanneer er een betere mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Probeer het opnieuw als er een betere wifi- of mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Probeer het opnieuw wanneer er een betere mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan visuele voicemail niet updaten"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Je kunt nog steeds bellen om je voicemail te controleren."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan visuele voicemail niet updaten"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Je mailbox is bijna vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Een pincode voor je voicemail instellen"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Je hebt een pincode voor de voicemail nodig wanneer je belt om toegang tot je voicemail te krijgen."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Onbekende fout"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Instellingen voor vliegtuigmodus"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Pincode instellen"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Opnieuw proberen"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Er is iets misgegaan"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Neem via <xliff:g id="NUMBER">%1$s</xliff:g> contact op met de klantenservice en geef de foutcode 9999 door."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Algemene voorwaarden voor visuele voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Je moet de Algemene voorwaarden van Verizon accepteren om visuele voicemail te gebruiken:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nJe moet de Algemene voorwaarden van Verizon Wireless accepteren om visuele voicemail te kunnen gebruiken:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Visuele voicemail inschakelen"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuele voicemail wordt uitgeschakeld als de Algemene voorwaarden worden geweigerd."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Visuele voicemail uitschakelen"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Voicemail-transcriptie wordt uitgeschakeld als de Algemene voorwaarden worden geweigerd."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Voicemail-transcriptie uitschakelen"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Voicemail is alleen toegankelijk door *86 te bellen. Stel een nieuwe pincode voor de voicemail in om door te gaan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Pincode instellen"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
index 6fc7561..029e4cb 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-no/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Slå av flymodus"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Slår på visuell talepostkasse"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Det er ikke sikert at du kan motta talepostvarsler før visuell talepost er fullt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Kan ikke slå på visuell talepost"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sjekk at telefonen din har mobilforbindelse og prøv igjen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sjekk at telefonen din har mobilforbindelse, og prøv på nytt."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Slå av flymodus og prøv igjen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen tilkobling"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonen din trenger mobildatatilkobling for å kunne sjekke talepost."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Kan ikke slå på visuell talepost"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Kan ikke oppdatere visuell talepost"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Prøv igjen når Wi-Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Prøv igjen når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Kan ikke oppdatere visuell talepost"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortsatt ringe for å sjekke talepost."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Kan ikke oppdatere visuell talepost"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Angi PIN-koden din for talepost"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Ukjent feil"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Flymodus-innstillinger"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Angi PIN-kode"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Prøv på nytt"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noe gikk galt"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakt kundeservice på <xliff:g id="NUMBER">%1$s</xliff:g> og referer til feilkode 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vilkår for visuell talepost"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du må godta vilkårene til Verizon Wireless før du kan ta i bruk visuell talepost:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu må godta Verizon Wireless sine vilkår for å kunne bruke visuell talepost:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Slå på visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell talepost blir slått av hvis vilkårene ikke godtas."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Slå av visuell talepost"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkripsjon av talepost blir slått av hvis vilkårene blir avvist."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Slå av transkripsjon av talepost"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Angi PIN-kode"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
index 2a07b45..e77084a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pa/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"ਜਦੋਂ ਤੱਕ ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੋ ਜਾਂਦੀ, ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਵੌਇਸਮੇਲ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਾ ਹੋਣ। ਵੌਇਸਮੇਲ ਦੇ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਤੱਕ ਨਵੇਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰੋ।"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਹੈ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਹੈ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ਕੋਈ ਕਨੈਕਸ਼ਨ ਨਹੀਂ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ Wi-Fi \'ਤੇ ਹੋ, ਤਾਂ ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੁਆਰਾ ਵੌਇਸਮੇਲਾਂ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ Wi-Fi \'ਤੇ ਹੋ, ਤਾਂ ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਕਰਕੇ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਆਪਣੀਆਂ ਵੌਇਸਮੇਲਾਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨ ਲਈ ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"ਵੌਇਸਮੇਲਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਇੱਕ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਇੱਕ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ਤੁਹਾਡੇ Wi-Fi ਜਾਂ ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ਤੁਹਾਡੇ ਸੈਲਿਊਲਰ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ਤੁਹਾਡੇ Wi-Fi ਜਾਂ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਲਗਭਗ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ਆਪਣਾ ਵੌਇਸਮੇਲ PIN ਸੈੱਟ ਕਰੋ"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਪਣੀ ਵੌਇਸਮੇਲ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰੋਂਗੇ ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਵੌਇਸਮੇਲ PIN ਦੀ ਲੋੜ ਪਵੇਗੀ।"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ਅਗਿਆਤ ਗੜਬੜ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN ਸੈੱਟ ਕਰੋ"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"ਕਿਰਪਾ ਕਰਕੇ <xliff:g id="NUMBER">%1$s</xliff:g> \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9999 ਹੈ।"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ਵਿਜੁਅਲ ਵੌਇਸਮੇਲ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਸੀਂ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ Verizon ਵਾਇਰਲੈੱਸ ਦੀਆਂ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਸੀਂ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ Verizon ਵਾਇਰਲੈੱਸ ਦੀਆਂ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਅਯੋਗ ਹੋ ਜਾਵੇਗੀ ਜੇਕਰ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ਵਿਜ਼ੁਅਲ ਵੌਇਸਮੇਲ ਅਯੋਗ ਬਣਾਓ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"ਵੌਇਸਮੇਲ ਪ੍ਰਤਿਲਿਪੀ ਅਯੋਗ ਹੋ ਜਾਵੇਗੀ ਜੇਕਰ ਮਦਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ਵੌਇਸਮੇਲ ਪ੍ਰਤਿਲਿਪੀ ਨੂੰ ਅਯੋਗ ਬਣਾਓ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"ਵੌਇਸਮੇਲ ਸਿਰਫ਼ *86 \'ਤੇ ਕਾਲ ਕਰਨ ਦੁਆਰਾ ਪਹੁੰਚਯੋਗ ਹੋਵੇਗੀ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਇੱਕ ਨਵਾਂ ਵੌਇਸਮੇਲ PIN ਸੈੱਟ ਕਰੋ।"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN ਸੈੱਟ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
index b122908..00cbe8b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pl/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Wyłącz tryb samolotowy"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktywuję wizualną pocztę głosową"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Powiadomienia poczty głosowej mogą być dostępne dopiero po pełnej aktywacji wizualnej poczty głosowej. Do tego momentu nowe wiadomości możesz pobierać, dzwoniąc na pocztę głosową."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nie udało się aktywować wizualnej poczty głosowej"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Upewnij się, że telefon ma połączenie z internetem, i spróbuj jeszcze raz."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Upewnij się, że telefon ma połączenie z siecią komórkową, i spróbuj jeszcze raz."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Wyłącz tryb samolotowy i spróbuj jeszcze raz."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Brak połączenia"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Jeśli masz połączenie Wi-Fi, możesz teraz sprawdzić dostępność nowych wiadomości przez zsynchronizowanie urządzenia."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Jeśli masz połączenie Wi-Fi, możesz teraz sprawdzić dostępność nowych wiadomości przez zsynchronizowanie urządzenia."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Wyłącz tryb samolotowy, aby zsynchronizować pocztę głosową."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Aby sprawdzić pocztę głosową, telefon musi mieć połączenie z internetem."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Aby sprawdzić pocztę głosową, telefon musi mieć połączenie z internetem."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nie udało się aktywować wizualnej poczty głosowej"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej lub Wi-Fi. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej lub Wi-Fi. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej. Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Możesz też zadzwonić do poczty głosowej, aby odsłuchać wiadomości."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nie udało się zaktualizować wizualnej poczty głosowej"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Twoja skrzynka pocztowa jest prawie pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ustaw kod PIN do poczty głosowej"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Za każdym razem, gdy zadzwonisz pod numer poczty głosowej, będzie konieczne wpisanie kodu PIN."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Nieznany błąd"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Ustawienia trybu samolotowego"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Ustaw kod PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Spróbuj jeszcze raz"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Coś poszło nie tak"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Skontaktuj się z obsługą klienta pod numerem <xliff:g id="NUMBER">%1$s</xliff:g>, podając kod błędu 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Warunki korzystania z wizualnej poczty głosowej"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Aby korzystać z wizualnej poczty głosowej, musisz zaakceptować warunki operatora Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAby korzystać z wizualnej poczty głosowej, musisz zaakceptować warunki operatora Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Włącz wizualną pocztę głosową"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Jeśli odrzucisz warunki korzystania z usługi, wizualna poczta głosowa zostanie wyłączona."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Wyłącz wizualną pocztę głosową"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Jeśli odrzucisz warunki korzystania z usługi, transkrypcja wiadomości w poczcie głosowej zostanie wyłączona."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Wyłącz transkrypcję wiadomości w poczcie głosowej"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Poczta głosowa będzie dostępna tylko przez połączenie telefoniczne z numerem *86. Ustaw nowy kod PIN poczty głosowej, aby przejść dalej."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ustaw kod PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
index bbe9340..0256bec 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rBR/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desativar modo avião"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ativando correio de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não foi possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Verifique se seu smartphone tem uma conexão celular e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem conexão"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Seu smartphone precisa de uma conexão de dados da rede celular para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não foi possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não foi possível atualizar o correio de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando estiver com uma conexão celular ou Wi-Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando estiver com uma conexão de dados da rede celular melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não foi possível atualizar o correio de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não foi possível atualizar o correio de voz visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Configurações do modo avião"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Definir PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Tentar novamente"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Entre em contato com o atendimento ao cliente pelo número <xliff:g id="NUMBER">%1$s</xliff:g> e forneça o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e Condições do correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Você precisa aceitar os termos e condições da Verizon Wireless para usar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVocê precisa aceitar os Termos e Condições da Verizon Wireless para usar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se os termos e condições forem recusados."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição do correio de voz será desativada se os Temos e Condições forem recusados."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar transcrição do correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
index 364b278..c4ec4e5 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt-rPT/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desativar o modo de avião"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"A ativar o correio de voz visual..."</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Poderá não receber notificações de correio de voz até o correio de voz visual estar completamente ativado. Ligue para o correio de voz para obter novas mensagens até o correio de voz estar completamente ativado."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não é possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Certifique-se de que o seu telemóvel tem uma ligação de rede móvel e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Certifique-se de que o seu telemóvel tem uma ligação de rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo de avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem ligação"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Não será notificado quando receber novas mensagens de correio de voz. Se estiver numa ligação Wi-Fi, pode verificar se existem mensagens de correio de voz ao sincronizar agora."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Não será notificado quando receber novas mensagens de correio de voz. Se estiver numa ligação Wi-Fi, pode verificar se existem mensagens de correio de voz ao sincronizar agora."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Não será notificado quando receber novas mensagens de correio de voz. Desative o modo de avião para sincronizar as suas mensagens de correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"O seu telemóvel precisa de uma ligação de dados móveis para verificar se existem mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"O seu telemóvel precisa de uma ligação de dados móveis para verificar se existem mensagens de correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não é possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando a sua ligação Wi-Fi ou de rede móvel for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando a sua ligação de rede móvel for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando a sua ligação Wi-Fi ou de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando a sua ligação de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ainda pode efetuar chamadas para consultar as mensagens de correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não é possível atualizar as mensagens de correio de voz visuais"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"A sua caixa de correio está quase cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir o seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Irá precisar de um PIN do correio de voz sempre que efetuar uma chamada para aceder ao seu correio de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Definições do modo de avião"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Definir PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Tentar novamente"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contacte o serviço de apoio ao cliente através do número <xliff:g id="NUMBER">%1$s</xliff:g> e indique que o código de erro é 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos de Utilização do Correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Tem de aceitar os Termos de Utilização da Verizon Wireless para utilizar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTem de aceitar os Termos de Utilização da Verizon Wireless para utilizar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar o correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se tiver recusado os Termos de Utilização."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar o correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição das mensagens de correio de voz será desativada se tiver recusado os Termos de Utilização."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar a transcrição das mensagens de correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz está apenas disponível ao ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
index bbe9340..0256bec 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-pt/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Desativar modo avião"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ativando correio de voz visual"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Não foi possível ativar o correio de voz visual"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Verifique se seu smartphone tem uma conexão celular e tente novamente."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Desative o modo avião e tente novamente."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Sem conexão"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Seu smartphone precisa de uma conexão de dados da rede celular para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Não foi possível ativar o correio de voz visual"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Não foi possível atualizar o correio de voz visual"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Tente novamente quando estiver com uma conexão celular ou Wi-Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Tente novamente quando estiver com uma conexão de dados da rede celular melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Não foi possível atualizar o correio de voz visual"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Você ainda pode ligar para verificar o correio de voz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Não foi possível atualizar o correio de voz visual"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das suas mensagens do correio de voz."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Definir seu PIN do correio de voz"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Erro desconhecido"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Configurações do modo avião"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Definir PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Tentar novamente"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ocorreu um erro"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Entre em contato com o atendimento ao cliente pelo número <xliff:g id="NUMBER">%1$s</xliff:g> e forneça o código de erro 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termos e Condições do correio de voz visual"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Você precisa aceitar os termos e condições da Verizon Wireless para usar o correio de voz visual:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVocê precisa aceitar os Termos e Condições da Verizon Wireless para usar o correio de voz visual:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Ativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"O correio de voz visual será desativado se os termos e condições forem recusados."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Desativar correio de voz visual"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"A transcrição do correio de voz será desativada se os Temos e Condições forem recusados."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Desativar transcrição do correio de voz"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Definir PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
index 263ab00..d6d478d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ro/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Dezactivați modul Avion"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Se activează mesageria vocală vizuală"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"E posibil să nu primiți notificări de la mesageria vocală până când mesageria vocală vizuală nu este activată complet. Apelați mesageria vocală pentru a prelua mesajele noi până la activarea completă a mesageriei."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Nu se poate activa mesagerie vocală vizuală"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Asigurați-vă că telefonul are conexiune mobilă și încercați din nou."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Asigurați-vă că telefonul are o conexiune la o rețea mobilă și încercați din nou."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Dezactivați modul avion și încercați din nou."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nicio conexiune"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nu veți primi notificări pentru mesaje vocale noi. Dacă folosiți Wi-Fi, puteți verifica mesageria sincronizând acum."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nu veți primi notificări pentru mesaje vocale noi. Dacă folosiți Wi-Fi, puteți verifica mesageria sincronizând acum."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nu veți primi notificări pentru mesajele vocale noi. Dezactivați modul avion pentru a vă sincroniza mesageria."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefonul dvs. are nevoie de conexiune mobilă pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefonul dvs. are nevoie de conexiune mobilă pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Nu se poate activa mesagerie vocală vizuală"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Nu se poate actualiza mesageria vocală vizuală"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Încercați din nou când aveți o conexiune Wi-Fi sau mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Încercați din nou când aveți o conexiune mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Încercați din nou când aveți o conexiune Wi-Fi sau mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Încercați din nou când aveți o conexiune mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Nu se poate actualiza mesageria vocală vizuală"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Puteți totuși să apelați pentru a verifica mesageria vocală."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Nu se poate actualiza mesageria vocală vizuală"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Căsuța dvs. de e-mail este aproape plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setați un cod PIN pentru mesageria vocală"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Aveți nevoie de un cod PIN pentru mesageria vocală când sunați pentru a o accesa."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Eroare necunoscută"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Setări pentru modul avion"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Setați codul PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Încercați din nou"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"A apărut o eroare"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Contactați Serviciul de asistență pentru clienți la <xliff:g id="NUMBER">%1$s</xliff:g> și comunicați-le codul erorii: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Termeni și condiții pentru mesageria vocală vizuală"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Trebuie să acceptați termenii și condițiile Verizon Wireless pentru a folosi mesageria vocală vizuală:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nTrebuie să acceptați Termenii și condițiile Verizon Wireless pentru a folosi mesageria vocală vizuală:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Activați Mesageria vocală vizuală"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Mesageria vocală vizuală va fi dezactivată dacă nu acceptați termenii și condițiile."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Dezactivați mesageria vocală vizuală"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transcrierea mesajelor vocale va fi dezactivată dacă termenii și condițiile sunt refuzate."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Dezactivați transcrierea mesajelor vocale"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Mesageria vocală va fi accesibilă numai apelând *86. Setați un cod PIN nou pentru mesageria vocală pentru a continua."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setați codul PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
index 1989f26..331509d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ru/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Отключить режим полета"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Включение просмотра голосовой почты"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Вы не будете получать оповещения, пока не активируете визуальную голосовую почту. Позвоните, чтобы прослушать новые сообщения."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не удалось включить просмотр голосовой почты"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверьте подключение к мобильной сети и повторите попытку."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Убедитесь, что телефон подключен к мобильной сети, и повторите попытку."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Отключите режим полета и повторите попытку."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Нет соединения"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Вы не будете получать оповещения о новых голосовых сообщениях. Если телефон подключен к Wi-Fi, выполните синхронизацию."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Вы не будете получать оповещения о новых голосовых сообщениях. Если телефон подключен к Wi-Fi, то вы можете выполнить синхронизацию и проверить голосовую почту сейчас."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Вы не будете получать оповещения о новых сообщениях. Чтобы выполнить синхронизацию, отключите режим полета."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Чтобы проверить голосовую почту, подключите мобильные данные."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Чтобы проверить голосовую почту, подключитесь к мобильному Интернету."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не удалось включить просмотр голосовой почты"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Чтобы проверить голосовую почту, вы можете позвонить на специальный номер."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не удалось обновить страницу просмотра голосовой почты"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Дождитесь стабильного сигнала Wi-Fi или мобильной сети и повторите попытку. Если вы хотите проверить почту сейчас, позвоните на специальный номер."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Дождитесь стабильного сигнала мобильной сети и повторите попытку. Если вы хотите проверить почту сейчас, позвоните на специальный номер."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Дождитесь стабильного сигнала Wi-Fi или мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Дождитесь стабильного сигнала мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не удалось обновить страницу просмотра голосовой почты"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Чтобы проверить голосовую почту, вы можете позвонить на специальный номер."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не удалось обновить страницу просмотра голосовой почты"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Почтовый ящик почти заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Установите PIN-код голосовой почты"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Он будет нужен вам каждый раз, когда вы звоните, чтобы прослушать голосовую почту."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Неизвестная ошибка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Настройки режима полета"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Установить PIN-код"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Повторить"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ошибка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Свяжитесь со службой поддержки по номеру <xliff:g id="NUMBER">%1$s</xliff:g> и сообщите им код ошибки 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Условия использования визуальной голосовой почты"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Чтобы работать с визуальной голосовой почтой, примите Условия использования Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЧтобы работать с визуальной голосовой почтой, примите Условия использования Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Включить визуальную голосовую почту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Если вы не примете Условия использования, визуальная голосовая почта будет отключена."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Отключение визуальной голосовой почты"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Если вы не примете Условия использования, транскрипция голосовых сообщений будет отключена."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Отключение транскрипции голосовых сообщений"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Для прослушивания голосовой почты необходимо будет отправить вызов по номеру *86. Чтобы продолжить, установите новый PIN-код голосовой почты."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Установка PIN-кода"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
index 2a057fa..441d67b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-si/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කිරීම"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් ඔබට හඩ තැපැල් දැනුම් දීම් නොලැබීමට හැකිය. දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් නව පණිවිඩ යළි ලබා ගැනීමට හඬ තැපෑල අමතන්න."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"ඔබේ දුරකථනයට සෙලියුලර් සම්බන්ධතාවක් ඇති බව පරීක්ෂා කර නැවත උත්සාහ කරන්න."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"ඔබේ දුරකථනයට ජංගම ජාල සම්බන්ධතාවක් ඇති බව සහතික කරගෙන නැවත උත්සාහ කරන්න."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කර නැවත උත්සාහ කරන්න."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"සම්බන්ධතාවය නැත"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබ Wi-Fi මත සිටින්නේ නම්, ඔබට දැන් සමමුහුර්ත කිරීමෙන් හඬ තැපැල් සඳහා පරීක්ෂා කළ හැකිය."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබ Wi-Fi වල සිටින්නේ නම්, ඔබට දැන් සමමුහුර්ත කිරීමෙන් හඬ තැපෑල සඳහා පරීක්ෂා කළ හැකිය."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබේ හඬ තැපැල් සමමුහුර්ත කිරීමට ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"හඬ තැපැල් පරීක්ෂා කිරීමට ඔබේ දුරකථනයට සෙලියුලර් දත්ත සබැඳුමක් අවශ්‍යය."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"හඬ තැපෑල පරීක්ෂා කිරීමට ඔබේ දුරකථනයට ජංගම දත්ත සම්බන්ධතාවක් අවශ්‍යයි."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ඔබේ Wi-Fi හෝ සෙලියුලර් සබැඳුම වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ඔබේ සෙලියුලර් දත්ත සබැඳුම වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ඔබේ Wi-Fi හෝ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ඔබේ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"ඔබේ තැපැල් පෙට්ටිය මුළුමනින්ම පාහේ පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ඔබේ හඬ තැපැල් PIN අංකය සකසන්න"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"ඔබ ඔබේ හඬ තැපෑලට ප්‍රවේශ වීමට අමතන ඕනෑම අවස්ථාවක ඔබට හඬ තැපැල් PIN අංකයක් අවශ්‍ය වනු ඇත."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"නොදන්නා දෝෂයකි"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ගුවන් යානා ප්‍රකාර සැකසීම්"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN අංකය සකසන්න"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"නැවත උත්සාහ කරන්න"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"යම් දෙයක් වැරදිණි"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"කරුණාකර <xliff:g id="NUMBER">%1$s</xliff:g> අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9999 බව ඔවුන්ට පවසන්න."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"දෘශ්‍ය හඬ තැපෑල් නියම සහ කොන්දේසි"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"ඔබ දෘශ්‍ය හඬ තැපෑල භාවිත කිරීමට Verizon Wireless හි නියම සහ කොන්දේසි පිළිගත යුතුය:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nඔබ දෘශ්‍ය හඬ තැපෑල භාවිත කිරීමට Verizon Wireless හි නියම සහ කොන්දේසි පිළිගත යුතුය:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කරන්න"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"නියම සහ කොන්දේසි ප්‍රතික්ෂේප කර ඇති නම් දෘශ්‍ය හඬ තැපෑල අබල කරනු ඇත."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"දෘශ්‍ය හඬ තැපෑල අබල කරන්න"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"නියම සහ කොන්දේසි ප්‍රතික්ෂේප කර ඇති නම් හඬ තැපැල් පිටපත් කිරීම අබල කරනු ඇත."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"හඬ තැපැල් පිටපත් කිරීම අබල කරන්න"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"හඩ තැපෑල *86 වෙත ඇමතීමෙන් පමණක් ලබා ගත හැකිය. ඉදිරියට යාමට නව හඩ තැපැල් PIN එකක් පිහිටුවන්න."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN අංකය සකසන්න"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
index 165a9f5..8e39891 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sk/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Vypnúť režim v lietadle"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktivuje sa vizuálna hlasová schránka"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kým nebude vizuálna hlasová schránka úplne aktivovaná, pravdepodobne nebudete dostávať upozornenia hlasovej schránky. Kým nebude hlasová schránka úplne aktivovaná, nové správy môžete načítať zavolaním do hlasovej schránky."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizuálna hlasová schránka sa nedá aktivovať"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Skontrolujte, či má telefón mobilné pripojenie, a skúste to znova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Skontrolujte, či má telefón pripojenie k mobilnej sieti, a skúste to znova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vypnite režim v lietadle a skúste to znova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Žiadne pripojenie"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nedostanete upozornenia na nové hlasové správy. Ak používate Wi-Fi, synchronizáciou môžete skontrolovať hlasovú schránku."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nedostanete upozornenia na nové hlasové správy. Ak používate Wi‑Fi, hlasovú schránku môžete skontrolovať synchronizáciou."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nedostanete upozornenia na nové hlasové správy. Vypnite režim v lietadle a synchronizujte hlasovú schránku."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Na kontrolu hlasovej schránky potrebuje telefón mobilné dátové pripojenie."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Na kontrolu hlasovej schránky potrebuje telefón mobilné dátové pripojenie."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizuálna hlasová schránka sa nedá aktivovať"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Skúste to znova, keď budete mať lepšie pripojenie cez Wi-Fi alebo lepšie mobilné pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Skúste to znova, keď budete mať lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Skúste to znova, keď budete mať lepšie pripojenie cez Wi‑Fi alebo lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Skúste to znova, keď budete mať lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hlasovú schránku si stále môžete skontrolovať zavolaním."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizuálna hlasová schránka sa nedá aktualizovať"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Poštovú schránku máte takmer plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastaviť kód PIN hlasovej schránky"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kód PIN hlasovej schránky budete potrebovať vždy, keď zavoláte do svojej hlasovej schránky."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznáma chyba"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Nastavenia režimu v lietadle"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Nastaviť kód PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Skúsiť znova"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Vyskytol sa problém"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obráťte sa na služby zákazníkom na čísle <xliff:g id="NUMBER">%1$s</xliff:g> a oznámte kód chyby 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Zmluvné podmienky vizuálnej hlasovej schránky"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Ak chcete používať vizuálnu hlasovú schránku, je nutné prijať zmluvné podmienky spoločnosti Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nAk chcete používať vizuálnu hlasovú schránku, prijmite zmluvné podmienky spoločnosti Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Zapnutie vizuálnej hlasovej schránky"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"V prípade odmietnutia zmluvných podmienok bude vizuálna hlasová schránka zakázaná."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Zakázať vizuálnu hlasovú schránku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"V prípade odmietnutia zmluvných podmienok bude prepis hlasových správ zakázaný."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Zakázať prepis hlasových správ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Hlasová schránka bude k dispozícii len po zavolaní na číslo *86. Ak chcete pokračovať, nastavte nový PIN hlasovej schránky."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavenie kódu PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
index d4f63c1..f42a232 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sl/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Izklop načina za letalo"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiviranje vizualnih sporočil v odzivniku"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Dokler niso vizualna sporočila v odzivniku v celoti aktivirana, morda ne boste prejemali obvestil o sporočilih v odzivniku. Pokličite odzivnik, da prenesete nova sporočila, dokler niso sporočila v odzivniku v celoti aktivirana."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizualnih sporočil v odzivniku ni mogoče aktivirati"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Preverite, ali je v telefonu vzpostavljena mobilna internetna povezava, in poskusite znova."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Preverite, ali je v telefonu vzpostavljena povezava z mobilnim omrežjem, in poskusite znova."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Izklopite način za letalo in poskusite znova."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ni povezave"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če ste v omrežju Wi-Fi, lahko zdaj zaženete sinhronizacijo in preverite, ali ste prejeli sporočila v odzivniku."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če ste v omrežju Wi-Fi, lahko zdaj zaženete sinhronizacijo in preverite, ali ste prejeli sporočila v odzivniku."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če želite sinhronizirati sporočila v odzivniku, izklopite način za letalo."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Če želite preveriti sporočila v odzivniku, je treba v telefonu vzpostaviti povezavo za prenos podatkov v mobilnih omrežjih."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Če želite preveriti sporočila v odzivniku, je treba v telefonu vzpostaviti povezavo za prenos podatkov v mobilnem omrežju."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizualnih sporočil v odzivniku ni mogoče aktivirati"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Poskusite znova, ko bo povezava Wi-FI ali mobilna internetna povezava boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Poskusite znova, ko bo mobilna internetna povezava boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Poskusite znova, ko bo povezava z omrežjem Wi-Fi ali povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Poskusite znova, ko bo povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Sporočila v odzivniku lahko še vedno preverite tako, da pokličete."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizualnih sporočil v odzivniku ni mogoče posodobiti"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Odzivnik je skoraj poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Nastavite kodo PIN za glasovno pošto"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kodo PIN za glasovno pošto boste potrebovali ob vsakem klicu za dostop do glasovne pošte."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Neznana napaka"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Nastavitve načina za letalo"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Nastavi kodo PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Poskusi znova"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Prišlo je do napake"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Obrnite se na podporo za stranke na številki <xliff:g id="NUMBER">%1$s</xliff:g> in jim sporočite to kodo napake: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Določila in pogoji za vizualna sporočila v odzivniku"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Če želite uporabljati vizualna sporočila v odzivniku, morate sprejeti določila in pogoje podjetja Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nČe želite uporabljati vizualna sporočila v odzivniku, morate sprejeti določila in pogoje podjetja Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vklop vizualnih sporočil v odzivniku"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Če zavrnete določila in pogoje, bodo vizualna sporočila v odzivniku onemogočena."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Onemogočanje vizualnih sporočil v odzivniku"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Če zavrnete določila in pogoje, bo prepis sporočil v odzivniku onemogočen."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Onemogočanje prepisa sporočil v odzivniku"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Sporočila v odzivniku so na voljo samo tako, da pokličete *86. Če želite nadaljevati, nastavite novo kodo PIN za sporočila v odzivniku."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Nastavitev kode PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
index d400cd8..49ab33f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sq/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Çaktivizo modalitetin e aeroplanit"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Po aktivizon postën zanore vizuale"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Mund të mos marrësh njoftime të postës zanore derisa posta zanore vizuale të aktivizohet plotësisht. Merr në telefon te posta zanore për të marrë mesazhet e reja derisa posta zanore të aktivizohet plotësisht."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Posta zanore vizuale nuk aktivizohet"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Sigurohu që telefoni tënd të ketë lidhje celulare dhe provo përsëri."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Sigurohu që telefoni yt të ketë një lidhje rrjeti celular dhe provo përsëri."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Çaktivizo modalitetin e aeroplanit dhe provo përsëri."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Nuk ka lidhje"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Nuk do të njoftohesh për postë zanore të re. Nëse je në rrjetin Wi-Fi, mund të kontrollosh për postë zanore duke sinkronizuar tani."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Nuk do të njoftohesh për postat e reja zanore. Nëse je në rrjetin Wi-Fi, mund të kontrollosh për postën zanore duke e sinkronizuar tani."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Nuk do të njoftohesh për postë zanore të re. Çaktivizo modalitetin në aeroplan për të sinkronizuar postën zanore."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Telefoni yt ka nevojë për lidhje me të dhënat celulare për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Telefoni yt ka nevojë për një lidhje të të dhënave celulare për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Posta zanore vizuale nuk aktivizohet"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Posta zanore vizuale nuk u përditësua"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Provo përsëri kur lidhja Wi-Fi ose celulare të jetë më e mirë. Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Provo përsëri kur lidhja e të dhënave celulare të jetë më e mirë. Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Provo përsëri kur lidhja Wi-Fi ose e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Provo përsëri kur lidhja e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Posta zanore vizuale nuk u përditësua"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Përsëri mund të telefonosh për të kontrolluar postën zanore."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Posta zanore vizuale nuk u përditësua"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Kutia jote postare është thuajse plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Vendos kodin PIN të postës zanore"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Të duhet një kod PIN për postën zanore në çdo kohë që telefonon për të hyrë te posta zanore."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Gabim i panjohur"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Cilësimet e modalitetit në aeroplan"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Konfiguro kodin PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Provo përsëri"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Ndodhi një gabim"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakto me \"Shërbimin e klientit\" në <xliff:g id="NUMBER">%1$s</xliff:g> dhe tregoju kodin e gabimit 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Kushtet e përgjithshme të postës zanore vizuale"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Duhet të pranosh kushtet e përgjithshme të Verizon Wireless për të përdorur postën zanore vizuale:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDuhet të pranosh kushtet e përgjithshme të Verizon Wireless për të përdorur postën zanore vizuale:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktivizo postën zanore vizuale"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Posta zanore vizuale duhet të çaktivizohet nëse refuzohen kushtet e përgjithshme."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Çaktivizo postën zanore vizuale"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkriptimi i postës zanore do të çaktivizohet nëse refuzohen kushtet e përgjithshme."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Çaktivizo transkriptimin e postës zanore"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Do të mund të qasesh te posta zanore vetëm duke telefonuar në *86. Cakto një kod PIN të ri për postën zanore për të vazhduar."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Konfiguro kodin PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
index da1853a..e2a4798 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sr/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Искључите режим рада у авиону"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Активира се визуелна говорна пошта"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Можда нећете добијати обавештења о говорној пошти док потпуно не активирате визуелну говорну пошту. Позовите говорну пошту да бисте преузели нове поруке док говорна пошта не буде потпуно активирана."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Активирање визуелне говорне поште није успело"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Проверите да ли телефон има мобилну везу и покушајте поново."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Проверите да ли телефон има везу преко мобилне мреже и пробајте поново."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Искључите режим рада у авиону и покушајте поново."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Веза није успостављена"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Нећете добијати обавештења о новим говорним порукама. Ако сте на Wi-Fi мрежи, синхронизујте да бисте проверили говорну пошту."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Нећете добијати обавештења о новим говорним порукама. Ако сте на Wi‑Fi мрежи, можете да синхронизујете да бисте проверили говорну пошту."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Нећете добијати обавештења о новим говорним порукама. Искључите режим рада у авиону да бисте синхронизовали говорну пошту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Телефону треба мобилна веза за пренос података да бисте проверили говорну пошту."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Телефону је за проверу говорне поште потребна мобилна веза за пренос података."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Активирање визуелне говорне поште није успело"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ажурирање визуелне говорне поште није успело"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Пробајте поново кад будете имали бољу Wi-Fi или мобилну везу. И даље можете да позовете говорну пошту да бисте је проверили."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Пробајте поново кад будете имали бољу мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Пробајте поново кад будете имали бољу Wi‑Fi или мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Пробајте поново кад будете имали бољу мобилну везу за пренос података. И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ажурирање визуелне говорне поште није успело"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"И даље можете да позовете говорну пошту да бисте је проверили."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ажурирање визуелне говорне поште није успело"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Поштанско сандуче је скоро пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Подесите PIN говорне поште"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN говорне поште вам треба сваки пут кад упућујете позив да бисте приступили говорној пошти."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Непозната грешка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Подешавања режима рада у авиону"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Подеси PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Пробај поново"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Нешто није у реду"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Контактирајте корисничку подршку на <xliff:g id="NUMBER">%1$s</xliff:g> и реците им да је кôд грешке 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Услови и одредбе за визуелну говорну пошту"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Морате да прихватите Verizon Wireless услове и одредбе да бисте користили визуелну говорну пошту:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nМорате да прихватите Verizon Wireless услове и одредбе да бисте користили визуелну говорну пошту:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Укључите визуелну говорну пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Ако одбијете услове и одредбе, онемогућићете визуелну говорну пошту."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Онемогућите визуелну говорну пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Транскрипција говорне поште ће бити онемогућена ако се услови и одредбе одбију."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Онемогућите транскрипцију говорне поште"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Говорној пошти ћете моћи да приступите само ако позовете *86. Подесите нови PIN кôд говорне поште да бисте наставили."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Подесите PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
index cfab830..eba474f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sv/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Inaktivera flygplansläge"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Aktiverar visuell röstbrevlåda"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Du får kanske inte röstmeddelanden tills visuell röstbrevlåda är helt aktiverad. Ring röstbrevlådan för att hämta nya meddelanden innan den är helt aktiverad."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Det går inte att aktivera visuell röstbrevlåda"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Se till att mobilen har en mobildataanslutning och försök igen."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Se till att mobilen har en mobilnätverksanslutning och försök igen."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Inaktivera flygplansläget och försök igen."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Ingen anslutning"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Du meddelas inte om nya röstmeddelanden. Om du är ansluten till Wi-Fi kan du kontrollera om du har fått nya röstmeddelanden genom att synkronisera."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Du meddelas inte om nya röstmeddelanden. Om du är ansluten till Wi-Fi kan du lyssna på nya röstmeddelanden genom att synkronisera nu."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Du blir inte meddelad om nya röstmeddelanden. Inaktivera flygplansläget om du vill synkronisera röstbrevlådan."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Mobilen måste ha en mobildataanslutning för att du ska kunna lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Mobilen måste ha en mobildataanslutning för att lyssna av röstbrevlådan."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Det går inte att aktivera visuell röstbrevlåda"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Du kan fortfarande lyssna av röstbrevlådan genom att ringa."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Försök igen när du har en bättre Wi-Fi- eller mobildataanslutning. Du kan fortfarande lyssna av röstbrevlådan."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Försök igen när du har en bättre mobildataanslutning. Du kan fortfarande lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Försök igen när du har en bättre Wi-Fi- eller mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Försök igen när du har en bättre mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Du kan fortfarande lyssna av röstbrevlådan genom att ringa."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Det går inte att uppdatera den visuella röstbrevlådan"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Din postlåda är nästan full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ange PIN-kod till röstbrevlåda"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Du måste ha en PIN-kod till röstbrevlådan varje gång du ringer till den."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Okänt fel"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Inställningar för flygplansläge"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Ange PIN-kod"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Försök igen"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Något gick fel"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Kontakta kundtjänst på <xliff:g id="NUMBER">%1$s</xliff:g> och ange felkoden 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Användarvillkor för visuell röstbrevlåda"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Du måste acceptera Verizon Wireless användarvillkor för att använda visuell röstbrevlåda:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nDu måste godkänna Verizon Wireless användarvillkor för att använda visuell röstbrevlåda:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Aktivera visuell röstbrevlåda"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Visuell röstbrevlåda inaktiveras om användarvillkoren avböjs."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Inaktivera visuell röstbrevlåda"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Transkription av röstbrevlådan inaktiveras om användarvillkoren avböjs."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Inaktivera transkription av röstbrevlåda"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Röstbrevlådan är endast tillgänglig genom att ringa *86. Fortsätt genom att ställa in en ny PIN-kod till röstbrevlådan."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Ställ in pinkod"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
index 56aad21..628efa8 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-sw/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Zima hali ya ndegeni"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Inawasha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Huenda usipokee arifa za ujumbe wa sauti mpaka kipengele cha ujumbe wa sauti unaoonekana kiwe kimewashwa kabisa. Piga nambari ya ujumbe wa sauti ili upate ujumbe mpya mpaka kipengele hicho kitakapokuwa kimewashwa kabisa."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Hakikisha kwamba simu yako ina muunganisho wa mtandao wa simu kisha ujaribu tena."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Hakikisha kwamba simu yako ina muunganisho wa mtandao wa simu kisha ujaribu tena."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Zima hali ya ndegeni kisha ujaribu tena."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Hakuna muunganisho"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Kama unatumia Wi-Fi sasa hivi, unaweza kuangalia kama una ujumbe wa sauti kwa kusawazisha sasa."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Kama unatumia Wi-Fi sasa hivi, unaweza kuangalia kama una ujumbe wa sauti kwa kusawazisha sasa."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Hutaarifiwa ukipata ujumbe mpya wa sauti. Zima hali ya ndegeni ili usawazishe ujumbe wa sauti."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Simu yako inahitaji muunganisho wa mtandao wa simu kufungua ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Simu yako inahitaji muunganisho wa mtandao wa simu kufungua ujumbe wa sauti."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Jaribu tena baadaye muunganisho wa Wi-Fi au mtandao wa simu ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Jaribu tena baadaye muunganisho wa data ya simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Jaribu tena baadaye muunganisho wa Wi-Fi au mtandao wa simu ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Jaribu tena baadaye muunganisho wa data ya simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Bado unaweza kupiga simu usikilize ujumbe wa sauti."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Sanduku lako la ujumbe wa sauti linakaribia kujaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Weka PIN yako ya ujumbe wa sauti"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Utahitaji PIN ya ujumbe wa sauti wakati wowote unapopiga simu ili ufikie ujumbe wako wa sauti."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Hitilafu isiyojulikana"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Mipangilio ya Hali ya Ndegeni"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Weka PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Jaribu Tena"</string>
@@ -102,9 +100,15 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Hitilafu Fulani Imetokea"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia <xliff:g id="NUMBER">%1$s</xliff:g> na uwaambie kwamba msimbo wa hitilafu ni 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Sheria na Masharti ya kipengele cha Ujumbe wa Sauti Unaoonekana"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Lazima ukubali sheria na masharti ya Verizon Wireless ili uweze kutumia kipengele cha ujumbe wa sauti unaoonekana:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nNi lazima ukubali sheria na masharti ya Verizon Wireless ili uweze kutumia kipengele cha ujumbe wa sauti:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Washa Kipengele cha Ujumbe wa Sauti Unaoonekana"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for dialer_terms_and_conditions_message (6207219973959897196) -->
+    <skip />
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Kipengele cha ujumbe wa sauti unaoonekana kitazimwa ukikataa sheria na masharti."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Zima kipengele cha ujumbe wa sauti unaoonekana"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Kipengele cha unukuzi wa ujumbe wa sauti kitazimwa ukikataa sheria na masharti."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Zima kipengele cha unukuzi wa ujumbe wa sauti"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Utaweza kupata ujumbe wa sauti kwa kupiga *86 tu. Weka PIN mpya ya ujumbe wa sauti ili uweze kuendelea."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Weka PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
index f2613f0..346d898 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ta/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"விமானப் பயன்முறையை முடக்கு"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"விஷூவல் குரலஞ்சலைச் செயல்படுத்துகிறது"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"விஷுவல் குரலஞ்சலை முழுவதுமாக இயக்கும் வரை, உங்களால் குரலஞ்சல் அறிவிப்புகளைப் பெற முடியாமல் போகலாம். குரலஞ்சலை முழுவதுமாக இயக்கும் வரை புதிய செய்திகளைப் பெற, குரலஞ்சலை அழைக்கவும்."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"விஷூவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"உங்கள் மொபைலில் செல்லுலார் இணைப்பு உள்ளதை உறுதிசெய்து, மீண்டும் முயலவும்."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"உங்கள் ஃபோனில் மொபைல் நெட்வொர்க் இணைப்பு உள்ளதை உறுதிசெய்து, மீண்டும் முயலவும்."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"விமானப் பயன்முறையை முடக்கி, மீண்டும் முயலவும்."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"இணைப்பு இல்லை"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். வைஃபை இணைப்பைப் பயன்படுத்திக்கொண்டிருந்தால், இப்போதே ஒத்திசைத்து குரலஞ்சல் உள்ளதா எனப் பார்க்கலாம்."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். வைஃபை இணைப்பைப் பயன்படுத்திக்கொண்டிருந்தால், இப்போதே ஒத்திசைத்து குரலஞ்சல் உள்ளதா எனப் பார்க்கலாம்."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். குரலஞ்சலை ஒத்திசைக்க, விமானப் பயன்முறையை முடக்கவும்."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"குரலஞ்சலைப் பார்க்க, உங்கள் மொபைலில் செல்லுலார் தரவு இணைப்பு இருக்க வேண்டும்."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"குரலஞ்சலைக் கேட்க, உங்கள் ஃபோனில் மொபைல் தரவு இணைப்பு இருக்க வேண்டும்."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"விஷூவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"வைஃபை அல்லது செல்லுலார் இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"செல்லுலார் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"வைஃபை அல்லது மொபைல் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"மொபைல் தரவு இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"குரலஞ்சலைப் பெற, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"விஷூவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"உங்கள் அஞ்சல்பெட்டி கிட்டத்தட்ட நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"உங்கள் குரலஞ்சல் பின்னை அமைக்கவும்"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"உங்கள் குரலஞ்சலை அணுகுவதற்கு நீங்கள் எப்போது அழைத்தாலும் குரலஞ்சல் பின் அவசியம்."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"அறியப்படாத பிழை"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"விமானப் பயன்முறை அமைப்புகள்"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"பின்னை அமை"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"மீண்டும் முயலவும்"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ஏதோ தவறாகிவிட்டது"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9999 எனக் கூறவும்."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"விஷுவல் குரலஞ்சலின் விதிமுறைகள் மற்றும் நிபந்தனைகள்"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"விஷுவல் குரலஞ்சலைப் பயன்படுத்த Verizon Wireless இன் விதிமுறைகள் மற்றும் நிபந்தனைகளை ஏற்க வேண்டும்:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nவிஷுவல் குரலஞ்சலைப் பயன்படுத்த, Verizon Wireless இன் விதிமுறைகளையும் நிபந்தனைகளையும் ஏற்க வேண்டும்:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"விஷுவல் குரலஞ்சலை இயக்கவும்"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"விதிமுறைகள் மற்றும் நிபந்தனைகள் நிராகரிக்கப்பட்டால், விஷுவல் குரலஞ்சல் முடக்கப்படும்."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"விஷுவல் குரலஞ்சலை முடக்கு"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"விதிமுறைகளையும் நிபந்தனைகளையும் நிராகரித்தீர்கள் எனில், குரலஞ்சல் டிரான்ஸ்கிரிப்ஷன் முடக்கப்படும்."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"குரலஞ்சல் டிரான்ஸ்கிரிப்ஷனை முடக்கு"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"*86ஐ அழைத்தால் மட்டுமே, குரலஞ்சலை அணுக முடியும். தொடர, புதிய குரலஞ்சல் பின்னை அமைக்கவும்."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"பின்னை அமை"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
index a881550..f337212 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-te/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేస్తోంది"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"దృశ్య వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు మీరు వాయిస్ మెయిల్ నోటిఫికేషన్‌లను స్వీకరించలేకపోవచ్చు. వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు కొత్త సందేశాలను తిరిగి పొందడానికి వాయిస్ మెయిల్‌కి కాల్ చేయండి."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"మీ ఫోన్‌కు సెల్యులార్ కనెక్షన్ ఉన్నట్లు నిర్ధారించుకొని, ఆపై మళ్లీ ప్రయత్నించండి."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"మీ ఫోన్‌కు మొబైల్ నెట్‌వర్క్ కనెక్షన్ ఉన్నట్లు నిర్ధారించుకొని, ఆపై మళ్లీ ప్రయత్నించండి."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేసి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"కనెక్షన్ లేదు"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీరు Wi-Fiలో ఉంటే, ఇప్పుడే సమకాలీకరించడం ద్వారా వాయిస్ మెయిల్‌‍ను తనిఖీ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీరు Wi-Fiలో ఉంటే, ఇప్పుడే సమకాలీకరించడం ద్వారా వాయిస్ మెయిల్‌‍ను తనిఖీ చేయవచ్చు."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీ వాయిస్ మెయిల్‌‍ను సమకాలీకరించడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి మీ ఫోన్‌కు సెల్యులార్ డేటా కనెక్షన్ అవసరం."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి మీ ఫోన్‌కు మొబైల్ డేటా కనెక్షన్ అవసరం."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"మీ Wi-Fi లేదా సెల్యులార్ కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి ఇప్పటికీ కాల్ చేయవచ్చు."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"మీ సెల్యులార్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"మీ Wi-Fi లేదా మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"మీ మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"మీ మెయిల్‌బాక్స్ దాదాపు నిండిపోయింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"మీ వాయిస్ మెయిల్ PIN సెట్ చేయండి"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"మీరు మీ వాయిస్ మెయిల్‌ను ప్రాప్యత చేయడానికి కాల్ చేసే ప్రతిసారి మీకు వాయిస్ మెయిల్ PIN అవసరమవుతుంది."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"తెలియని లోపం"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ఎయిర్‌ప్లైన్ మోడ్ సెట్టింగ్‌లు"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN సెట్ చేయి"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"మళ్లీ ప్రయత్నించండి"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"ఏదో తప్పు జరిగింది"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"దయచేసి <xliff:g id="NUMBER">%1$s</xliff:g> నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి లోపం కోడ్ 9999గా తెలపండి."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"దృశ్య వాయిస్ మెయిల్ నిబంధనలు మరియు షరతులు"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"మీరు దృశ్య వాయిస్ మెయిల్‌ను ఉపయోగించడానికి తప్పనిసరిగా Verizon వైర్‌లెస్ నిబంధనలు మరియు షరతులను ఆమోదించాలి:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nమీరు దృశ్య వాయిస్ మెయిల్‌ను ఉపయోగించాలంటే Verizon Wireless నిబంధనలు మరియు షరతులను తప్పనిసరిగా ఆమోదించాలి:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"దృశ్య వాయిస్ మెయిల్‌ను ఆన్ చేయండి"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"నిబంధనలు మరియు షరతులను తిరస్కరిస్తే దృశ్య వాయిస్ మెయిల్ నిలిపివేయబడుతుంది."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"దృశ్య వాయిస్ మెయిల్‌ను నిలిపివేయండి"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"నిబంధనలు మరియు షరతులను నిరాకరిస్తే వాయిస్ మెయిల్ లిప్యంతరీకరణ నిలిపివేయబడుతుంది."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"వాయిస్ మెయిల్ లిప్యంతరీకరణను నిలిపివేయండి"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"వాయిస్ మెయిల్‌ను కేవలం *86కి కాల్ చేయడం ద్వారా మాత్రమే ప్రాప్యత చేయగలరు. కొనసాగించడానికి కొత్త వాయిస్ మెయిల్ PINని సెట్ చేయండి."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PINని సెట్ చేయండి"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
index 31302cc..96ec15d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-th/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ปิดโหมดบนเครื่องบิน"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"กำลังเปิดใช้ข้อความเสียงพร้อมภาพ"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"คุณอาจไม่ได้รับการแจ้งเตือนข้อความเสียงจนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ โทรฟังข้อความเสียงเพื่อเรียกข้อความใหม่จนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"โปรดตรวจสอบว่าโทรศัพท์เชื่อมต่อเครือข่ายมือถืออยู่ แล้วลองใหม่"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"โปรดตรวจสอบว่าโทรศัพท์เชื่อมต่อเครือข่ายมือถืออยู่ แล้วลองใหม่"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ปิดโหมดบนเครื่องบินและลองใหม่"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"ไม่มีการเชื่อมต่อ"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"คุณจะไม่ได้รับข้อความเสียงใหม่ ถ้าเปิด Wi-Fi อยู่ คุณจะตรวจสอบข้อความเสียงได้โดยซิงค์เลย"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"คุณจะไม่ได้รับข้อความเสียงใหม่ ถ้าคุณใช้เครือข่าย Wi-Fi อยู่ สามารถตรวจสอบข้อความเสียงได้โดยซิงค์เดี๋ยวนี้"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"คุณจะไม่ได้รับข้อความเสียงใหม่ ปิดโหมดบนเครื่องบินเพื่อซิงค์ข้อความเสียง"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"โทรศัพท์ต้องเชื่อมต่ออินเทอร์เน็ตมือถือ จึงจะตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"โทรศัพท์ต้องเชื่อมต่ออินเทอร์เน็ตมือถือจึงจะตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"ลองใหม่เมื่อ Wi-Fi หรือสัญญาณเชื่อมต่อเครือข่ายมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"ลองใหม่เมื่อสัญญาณเชื่อมต่อเครือข่ายมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"ลองใหม่เมื่อ Wi-Fi หรือการเชื่อมต่ออินเทอร์เน็ตมือถือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"ลองใหม่เมื่อการเชื่อมต่ออินเทอร์เน็ตมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"ไม่สามารถอัปเดตข้อความเสียงพร้อมภาพได้"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"กล่องจดหมายของคุณใกล้เต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google สามารถจัดการและเก็บสำรองข้อความเสียงได้"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"ตั้งค่า PIN ข้อความเสียง"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"คุณต้องใช้ PIN ข้อความเสียงทุกครั้งที่โทรหาบริการข้อความเสียง"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"ข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"การตั้งค่าโหมดบนเครื่องบิน"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"ตั้งค่า PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"ลองใหม่"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"เกิดข้อผิดพลาด"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข <xliff:g id="NUMBER">%1$s</xliff:g> และแจ้งรหัสข้อผิดพลาด 9999"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"ข้อกำหนดในการให้บริการข้อความเสียงพร้อมภาพ"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"คุณต้องยอมรับข้อกำหนดในการให้บริการของ Verizon Wireless จึงจะใช้ข้อความเสียงพร้อมภาพได้:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nคุณต้องยอมรับข้อกำหนดในการให้บริการของ Verizon Wireless เพื่อใช้ข้อความเสียงพร้อมภาพ:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"เปิดใช้ข้อความเสียงพร้อมภาพ"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"หากคุณไม่ยอมรับข้อกำหนดในการใช้บริการ ข้อความเสียงพร้อมภาพจะถูกปิดใช้งาน"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"ปิดใช้ข้อความเสียงพร้อมภาพ"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"หากคุณไม่ยอมรับข้อกำหนดในการใช้บริการ การถอดข้อความเสียงจะปิดใช้งาน"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"ปิดใช้การถอดข้อความเสียง"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"คุณสามารถรับฟังข้อความเสียงด้วยการโทรไป *86 เท่านั้น และตั้งค่า PIN ข้อความเสียงใหม่เพื่อดำเนินการต่อ"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"ตั้งค่า PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
index b99d0c3..7504f16 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-tl/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"I-off ang airplane mode"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Ina-activate ang visual na voicemail"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Maaaring hindi ka makatanggap ng mga notification sa voicemail hanggang sa ganap na ma-activate ang visual na voicemail. Tawagan ang voicemail upang makuha ang mga bagong mensahe hanggang sa ganap na ma-activate ang voicemail."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Hindi ma-activate ang visual na voicemail"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Tiyaking mayroong cellular na koneksyon ang iyong telepono at subukang muli."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Tiyaking mayroong koneksyon sa mobile network ang iyong telepono at subukang muli."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"I-off ang airplane mode at subukang muli."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Walang koneksyon"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Hindi ka aabisuhan para sa mga bagong voicemail. Kung nasa Wi-Fi ka, maaari mong tingnan ang voicemail sa pamamagitan ng pag-sync ngayon."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Hindi ka aabisuhan para sa mga bagong voicemail. Kung nasa Wi-Fi ka, maaari mong tingnan ang voicemail sa pamamagitan ng pag-sync ngayon."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Hindi ka aabisuhan para sa mga bagong voicemail. I-off ang airplane mode para i-sync ang iyong voicemail."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Kailangan ng cellular data na koneksyon ng iyong telepono upang tingnan ang voicemail."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Kailangan ng koneksyon ng mobile data ng iyong telepono upang tingnan ang voicemail."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Hindi ma-activate ang visual na voicemail"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Hindi ma-update ang visual na voicemail"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Subukang muli kapag mas maganda na ang iyong Wi-Fi o cellular na koneksyon. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Subukang muli kapag mas maganda na ang iyong cellular data na koneksyon. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Subukang muli kapag mas maganda na ang iyong Wi-Fi o koneksyon ng mobile data."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Subukang muli kapag mas maganda na ang iyong koneksyon ng mobile data. Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Hindi ma-update ang visual na voicemail"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Maaari ka pa ring tumawag upang tingnan ang voicemail."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Hindi ma-update ang visual na voicemail"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Malapit nang mapuno ang iyong mailbox. Upang magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Itakda ang iyong PIN sa voicemail"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Kakailanganin mo ng isang PIN sa voicemail sa tuwing tatawag ka upang ma-access ang iyong voicemail."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Hindi alam na error"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Mga Setting ng Airplane Mode"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Magtakda ng PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Subukang Muli"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Nagkaroon ng Problema"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Pakikontak ang Customer Service sa <xliff:g id="NUMBER">%1$s</xliff:g> at sabihin sa kanila na ang code ng error ay 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Mga Tuntunin at Kundisyon ng Visual na Voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Kailangan mong tanggapin ang mga tuntunin at kundisyon ng Verizon Wireless upang gamitin ang visual na voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nKailangan mong tanggapin ang mga tuntunin at kundisyon ng Verizon Wireless upang gamitin ang visual na voicemail:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"I-on ang Visual na Voicemail"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Idi-disable ang visual na voicemail kung tatanggihan ang mga tuntunin at kundisyon."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"I-disable ang visual na voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Idi-disable ang transkripsyon ng voicemail kung tatanggihan ang mga tuntunin at kundisyon."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"I-disable ang transkripsyon ng voicemail"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Maa-access lang ang voicemail sa pamamagitan ng pagtawag sa *86. Magtakda ng bagong PIN sa voicemail upang magpatuloy."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Magtakda ng PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
index be5cbb0..6153af2 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-tr/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Uçak modunu kapatın"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Görsel sesli mesaj etkinleştiriliyor"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Görsel sesli mesaj tam olarak etkinleştirilene dek sesli mesaj bildirimlerini almayabilirsiniz. Sesli mesaj tam olarak etkinleştirilene kadar, yeni mesajları almak için sesli mesaj hizmetini arayın."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Görsel sesli mesaj etkinleştirilemiyor"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefonunuzda hücresel bağlantı bulunduğundan emin olun ve tekrar deneyin."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Telefonunuzda mobil ağ bağlantısı olduğundan emin olup tekrar deneyin."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Uçak modunu kapatıp tekrar deneyin."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Bağlantı yok"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Kablosuz bağlantınız varsa şimdi senkronizasyon gerçekleştirerek sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Kablosuz bağlantınız varsa şimdi senkronizasyon gerçekleştirerek sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Sesli mesajlarınızı senkronize etmek için uçak modunu kapatın."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Sesli mesaj kontrolü için telefonunuzda hücresel veri bağlantısı bulunmalıdır."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Sesli mesaj kontrolü için telefonunuzda mobil veri bağlantısı olmalıdır."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Görsel sesli mesaj etkinleştirilemiyor"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Görsel sesli mesaj güncellenemiyor"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Kablosuz veya hücresel bağlantı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Hücresel veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Kablosuz veya mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Görsel sesli mesaj güncellenemiyor"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Görsel sesli mesaj güncellenemiyor"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Posta kutunuz dolmak üzere. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Sesli mesaj PIN\'inizi ayarlayın"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Sesli mesajlarınıza erişmek için her aradığınızda bir sesli mesaj PIN\'i girmeniz gerekecek."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Bilinmeyen hata"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Uçak Modu Ayarları"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN ayarlayın"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Tekrar Deneyin"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Bir Sorun Oluştu"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Lütfen <xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9999 olduğunu bildirin."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Görsel Sesli Mesaj Şartlar ve Koşulları"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Görsel sesli mesajı kullanmak için Verizon Wireless\'ın şartlar ve koşullarını kabul etmelisiniz:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nGörsel sesli mesajı kullanabilmek için Verizon Wireless\'ın şartlar ve koşullarını kabul etmelisiniz:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Görsel Sesli Mesaj\'ı etkinleştirme"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Şartlar ve koşullar reddedilirse görsel sesli mesaj devre dışı bırakılır."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Görsel sesli mesajı devre dışı bırak"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Şartlar ve koşullar reddedilirse sesli mesaj çeviri yazısı devre dışı bırakılır."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Sesli mesaj çeviri yazısını devre dışı bırakın"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Sesli mesajlara yalnızca *86 aranarak erişilebilir. Devam etmek için yeni bir sesli mesaj PIN\'i belirleyin."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN belirleyin"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
index 6adf49a..e48cec3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-uk/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Вимкнути режим польоту"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Активація візуальної голосової пошти"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Якщо візуальну голосову пошту активовано неповністю, сповіщення голосової пошти можуть не надходити. У такому разі слід телефонувати на голосову пошту, щоб прослуховувати нові повідомлення."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Не вдалось активувати візуальну голосову пошту"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Переконайтеся, що в телефоні ввімкнено мобільний зв’язок, і спробуйте ще раз."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Переконайтеся, що в телефоні ввімкнено мобільний Інтернет, і спробуйте ще раз."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Вимкніть режим польоту та спробуйте ще раз."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Немає з’єднання"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Якщо активовано Wi-Fi, можете просто ввімкнути синхронізацію, і нові повідомлення завантажаться."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Якщо активовано Wi-Fi, можете просто ввімкнути синхронізацію, і нові повідомлення завантажаться."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Щоб синхронізувати голосову пошту, вимкніть режим польоту."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Щоб перевірити голосову пошту, потрібен мобільний трафік."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Щоб перевірити голосову пошту, потрібно ввімкнути мобільний Інтернет."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Не вдалось активувати візуальну голосову пошту"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Не вдалось оновити візуальну голосову пошту"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Спробуйте ще раз, коли буде кращий мобільний або Wi-Fi-зв’язок. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Спробуйте ще раз, коли буде кращий мобільний зв’язок. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Спробуйте ще раз, коли буде вища швидкість мобільного Інтернету або кращий сигнал Wi-Fi. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Спробуйте ще раз, коли буде вища швидкість мобільного Інтернету. Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Не вдалось оновити візуальну голосову пошту"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Щоб перевірити голосову пошту, ви також можете зателефонувати."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Не вдалось оновити візуальну голосову пошту"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"У поштовій скриньці майже не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять, і тоді Google почне робити резервні копії вашої голосової пошти й керувати нею."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Установіть PIN-код голосової пошти"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"PIN-код буде потрібен під час кожного дзвінка на голосову пошту."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Невідома помилка"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Налаштування режиму польоту"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Установити PIN-код"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Повторити спробу"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Сталася помилка"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Зв’яжіться зі службою обслуговування клієнтів за номером <xliff:g id="NUMBER">%1$s</xliff:g> і повідомте такий код помилки: 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Умови використання візуальної голосової пошти"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Щоб використовувати візуальну голосову пошту, потрібно прийняти Умови використання Verizon Wireless:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nЩоб використовувати візуальну голосову пошту, потрібно прийняти правила та умови Verizon Wireless:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Увімкнути візуальну голосову пошту"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Якщо відхилити умови використання, візуальну голосову пошту буде вимкнено."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Вимкнути візуальну голосову пошту"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Якщо відхилити правила та умови, транскрипцію голосової пошти буде вимкнено."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Вимкнути транскрипцію голосової пошти"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Прослухати голосову пошту можна буде, лише набравши *86. Установіть новий PIN-код для голосової пошти, щоб продовжити."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Установити PIN-код"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
index e6fd9f7..cd6a4f8 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-ur/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"ہوائی جہاز وضع آف کریں"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"بصری صوتی میل کو فعال کیا جا رہا ہے"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"بصری صوتی میل کے مکمل طور پر فعال ہونے تک ہو سکتا ہے آپ کو صوتی میل کی اطلاعات موصول نہ ہو۔ صوتی میل کے مکمل طور پر فعال ہونے تک نئے پیغامات کی بازیافت کیلئے صوتی میل پر کال کریں۔"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"بصری صوتی میل کو فعال نہیں کیا جا سکتا"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"یقینی بنائیں کہ آپ کے فون میں ایک سیلولر کنکشن موجود ہے اور دوبارہ کوشش کریں۔"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"یقینی بنائیں کہ آپ کے فون میں ایک موبائل کنکشن موجود ہے اور دوبارہ کوشش کریں۔"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"ہوائی جہاز وضع آف کریں اور دوبارہ کوشش کریں۔"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"کوئی کنکشن نہیں ہے"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"‏آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اگر آپ Wi-Fi پر ہیں تو آپ ابھی مطابقت پذیری کرکے صوتی میل کیلئے چیک کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"‏آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اگر آپ Wi-Fi پر ہیں تو آپ ابھی مطابقت پذیری کرکے صوتی میل کیلئے چیک کر سکتے ہیں۔"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"آپ کو نئی صوتی میلز سے مطلع نہیں کیا جائے گا۔ اپنی صوتی میل کو مطابقت پذیر بنانے کیلئے ہوائی جہاز وضع آف کریں۔"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"صوتی میل چیک کرنے کیلئے آپ کے فون کو سیلولر ڈیٹا کنکشن کی ضرورت ہے۔"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"صوتی میل چیک کرنے کیلئے آپ کے فون کو موبائل ڈیٹا کنکشن کی ضرورت ہے۔"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"بصری صوتی میل کو فعال نہیں کیا جا سکتا"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"‏جب آپ کا Wi-Fi یا سیلولر کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"جب آپ کا سیلولر ڈیٹا کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"‏جب آپ کا Wi-Fi یا موبائل کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"جب آپ کا موبائل ڈیٹا کنکشن بہتر تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"بصری صوتی میل اپ ڈیٹ نہیں ہو سکتی"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"‏آپ کا میل باکس تقریباً بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج کو آن کریں تا کہ Google آپ کے صوتی میل پیغامات کا بیک اپ اور ان کا نظم کر سکے۔"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"‏اپنی صوتی میل PIN سیٹ کریں"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"‏آپ جب بھی صوتی میل تک رسائی کیلئے کال کریں گے تو آپ کو صوتی میل PIN چاہئیے ہوگی۔"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"نامعلوم خرابی"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"ہوائی جہاز وضع کی ترتیبات"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"‏PIN سیٹ کریں"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"دوبارہ کوشش کریں"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"کچھ غلط ہوگیا"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"براہ کرم <xliff:g id="NUMBER">%1$s</xliff:g> پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9999 ہے۔"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"بصری صوتی میل کی شرائط و ضوابط"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"‏بصری صوتی میل استعمال کرنے کیلئے آپ کو Verizon وائرلیس کی شرائط و ضوابط قبول کرنا ہونگی:\n\n‎%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"‏%1$s\n\nصوتی میل استعمال کرنے کیلئے آپ کو Verizon وائرلیس کی شرائط و ضوابط قبول کرنی چاہئیں::\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"بصری صوتی میل آن کریں"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"‎%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"شرائط و ضوابط مسترد کئے جانے کی صورت میں بصری صوتی میل غیر فعال کر دی جائے گی۔"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"بصری صوتی میل کو غیر فعال کریں"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"شرائط و ضوابط مسترد کئے جانے کی صورت میں صوتی میل ٹرانسکرپشن غیر فعال کر دی جائے گی۔"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"صوتی میل ٹرانسکرپشن غیر فعال کریں"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"‏صوتی میل تک رسائی صرف ‎*86 کو کال کرنے سے ہوگی۔ آگے بڑھنے کیلئے صوتی میل کی نئی PIN سیٹ کریں۔"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"‏PIN سیٹ کریں"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
index 5583e27..b3a50cf 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-uz/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Parvoz rejimini o‘chirib qo‘yish"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Vizual ovozli pochta faollashtirilmoqda"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Vizual ovozli pochta xizmati faollashtirilmasa, yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Ungacha ovozli pochtaga qo‘ng‘iroq qilib, yangi xabarlarni tinglashingiz mumkin."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Vizual ovozli pochtani faollashtirib bo‘lmadi"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Telefoningizda uyali aloqa faol ekanligini tekshiring va qayta urinib ko‘ring."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Telefoningizda mobil internet yoqilganligini tekshiring va qayta urinib ko‘ring."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Parvoz rejimini o‘chiring va qayta urinib ko‘ring."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Aloqa yo‘q"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Sizga yangi ovozli pochta xabarlari haqida bildirishnoma kelmaydi. Agar Wi-Fi tarmog‘idan foydalanayotgan bo‘lsangiz, xabarlarni olish uchun shunchaki sinxronlash xususiyatini yoqing."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Sizga yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Wi-Fi tarmog‘iga ulangan qurilmangizda sinxronizatsiya yoqilsa, xabarlar yuklanadi."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Sizga yangi ovozli pochta xabarlari haqida bildirishnoma kelmaydi. Ovozli pochtani sinxronlash uchun parvoz rejimini o‘chiring."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ovozli pochtani tekshirish uchun mobil internet yoqilgan bo‘lishi lozim."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ovozli pochtani tekshirish uchun mobil internet yoqilgan bo‘lishi lozim."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Vizual ovozli pochtani faollashtirib bo‘lmadi"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Wi-Fi tarmog‘iga ulanish imkoni paydo bo‘lganda yoki mobil internet sifati yaxshilanganda qayta urinib ko‘ring. Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Mobil internet sifati yaxshilanganda qayta urinib ko‘ring. Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Tezkor Wi-Fi yoki mobil internetdan foydalanish imkoniyati paydo bo‘lganida, qayta urinib ko‘ring. Ovozli pochtani uyali qo‘ng‘iroq orqali ham tekshirish mumkin."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Tezkor mobil internetdan foydalanish imkoniyati paydo bo‘lganida, qayta urinib ko‘ring. Ovozli pochtani uyali qo‘ng‘iroq orqali ham tekshirish mumkin."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Ovozli pochtani qo‘ng‘iroq qilib ham tekshirishingiz mumkin."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Vizual ovozli pochtani yangilab bo‘lmadi"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Google esa, ovozli xabarlaringiz nusxasini zaxiralashni hamda ularni boshqarishni boshlaydi."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Ovozli pochta uchun PIN kod o‘rnatish"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Ovozli pochtaga har safar qo‘ng‘iroq qilinganda PIN kod so‘raladi."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Noma’lum xatolik"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Parvoz rejimi sozlamalari"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"PIN kodni o‘rnatish"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Qayta urinib ko‘rish"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Noma’lum xatolik yuz berdi"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali mijozlarni qo‘llab-quvvatlash markazi bilan bog‘laning va ularga xatolik kodi haqida xabar bering (kod: 9999)."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Vizual ovozli pochtadan foydalanish shartlari"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Vizual ovozli pochtadan foydalanish uchun Verizon Wireless xizmatidan foydalanish shartlarini qabul qilish lozim: \n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nVizual ovozli pochtadan foydalanish uchun Verizon Wireless xizmatidan foydalanish shartlarini qabul qilish lozim:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vizual ovozli pochtani yoqish"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Agar foydalanish shartlari qabul qilinmasa, vizual ovozli pochta o‘chirib qo‘yiladi."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Vizual ovozli pochta o‘chirib qo‘yilsin"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Agar Foydalanish shartlari qabul qilinmasa, ovozli xabarlarni transkripsiyalash xizmati o‘chirib qo‘yiladi."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Ovozli xabarlarni transkripsiyalash xususiyatini o‘chirib qo‘yish"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ovozli pochta xabarlarini *86 raqamiga qo‘ng‘iroq qilib tinglash mumkin. Davom ettirish uchun ovozli pochtaga yangi PIN kod o‘rnating."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"PIN kod o‘rnatish"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
index 029396e..0aed3fb 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-vi/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Tắt chế độ trên máy bay"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Đang kích hoạt thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Bạn có thể không nhận được thông báo thư thoại cho đến khi thư thoại kèm theo hình ảnh được kích hoạt hoàn toàn. Gọi thư thoại để truy xuất tin nhắn mới cho đến khi thư thoại được kích hoạt hoàn toàn."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Không kích hoạt được thư thoại kèm theo hình ảnh"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Đảm bảo điện thoại của bạn có kết nối di động và thử lại."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Đảm bảo điện thoại của bạn có kết nối mạng di động và thử lại."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Hãy tắt chế độ trên máy bay và thử lại."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Không có kết nối"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Bạn sẽ không được thông báo về thư thoại mới. Nếu đang dùng Wi-Fi, bạn có thể kiểm tra thư thoại bằng cách đồng bộ hóa ngay bây giờ."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Bạn sẽ không được thông báo về thư thoại mới. Nếu đang dùng Wi-Fi, bạn có thể kiểm tra thư thoại bằng cách đồng bộ hóa ngay bây giờ."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Bạn sẽ không được thông báo về thư thoại mới. Hãy tắt chế độ trên máy bay để đồng bộ hóa thư thoại của bạn."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Điện thoại của bạn cần kết nối dữ liệu di động để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Điện thoại của bạn cần kết nối dữ liệu di động để kiểm tra thư thoại."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Không kích hoạt được thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Hãy thử lại khi Wi-Fi hoặc kết nối di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Hãy thử lại khi kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Hãy thử lại khi Wi-Fi hoặc kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Hãy thử lại khi kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Bạn vẫn có thể gọi để kiểm tra thư thoại."</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Không cập nhật được thư thoại kèm theo hình ảnh"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Hộp thư của bạn đã gần đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Đặt mã PIN thư thoại của bạn"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Bạn cần có mã PIN thư thoại mỗi khi gọi để truy cập thư thoại của mình."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Lỗi không xác định"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Cài đặt chế độ trên máy bay"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Đặt mã PIN"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Thử lại"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Đã xảy ra lỗi"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số <xliff:g id="NUMBER">%1$s</xliff:g> và cho họ biết mã lỗi là 9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Điều khoản và điều kiện của thư thoại kèm theo hình ảnh"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Bạn phải chấp nhận điều khoản và điều kiện của Verizon Wireless để sử dụng thư thoại kèm theo hình ảnh:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nBạn phải chấp nhận điều khoản và điều kiện của Verizon Wireless để sử dụng thư thoại kèm theo hình ảnh:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Bật Thư thoại kèm theo hình ảnh"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"Thư thoại kèm theo hình ảnh sẽ bị tắt nếu điều khoản và điều kiện bị từ chối."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Tắt thư thoại kèm theo hình ảnh"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ghi âm thư thoại sẽ bị vô hiệu hóa nếu bạn từ chối điều khoản và điều kiện."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Vô hiệu hóa ghi âm thư thoại"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Bạn chỉ có thể truy cập thư thoại bằng cách gọi *86. Hãy đặt mã PIN thư thoại mới để tiếp tục."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Đặt mã PIN"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
index faa36de..48bc833 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rCN/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"关闭飞行模式"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"正在激活可视语音信箱"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"在可视语音信箱未完全激活前，您可能不会收到新语音邮件通知。在完全激活前，请呼叫语音信箱以获取新邮件。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"无法激活可视语音信箱"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"请确保您的手机已连接到移动网络，然后重试。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"请确保您的手机已连接到移动网络，然后重试。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"请关闭飞行模式，然后重试。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"无网络连接"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您将不会收到关于新语音邮件的通知。如果您已连接到 WLAN 网络，则可以立即同步以便查看语音邮件。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"您将不会收到关于新语音邮件的通知。如果您已连接到 WLAN 网络，则可以立即同步以便查看语音邮件。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您将不会收到关于新语音邮件的通知。请关闭飞行模式以便同步语音信箱。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"要查看语音邮件，您的手机需要连接到移动数据网络。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"要查看语音邮件，您的手机需要连接到移动数据网络。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"无法激活可视语音信箱"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"无法更新可视语音信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"请在 WLAN 或移动网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"请在移动数据网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"请在 WLAN 或移动网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"请在移动数据网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"无法更新可视语音信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您仍然可以通过拨打电话来查看语音邮件。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"无法更新可视语音信箱"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"您的邮箱快满了。要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"设置语音信箱 PIN 码"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必须使用语音信箱 PIN 码，才能访问您的语音信箱。"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"未知错误"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"飞行模式设置"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"设置 PIN 码"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"请重试"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"出了点问题"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"请拨打 <xliff:g id="NUMBER">%1$s</xliff:g> 联系客户服务人员，并告诉他们错误代码是 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"可视语音信箱条款及条件"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"您必须接受 Verizon Wireless 的条款及条件，才能使用可视语音信箱：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n您必须接受 Verizon Wireless 的条款及条件才能使用可视语音信箱：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"启用可视语音信箱"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果您拒绝接受条款及条件，可视语音信箱将被停用。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用可视语音信箱"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果您拒绝接受条款及条件，语音邮件转录功能将被停用。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用语音邮件转录功能"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"您只能通过拨打 *86 来访问语音信箱。请先设置新的语音信箱 PIN 码再继续操作。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"设置 PIN 码"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
index e51a0a9..f043746 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rHK/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"關閉飛行模式"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"正在啟用視像留言"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"視像留言完全啟用前，您可能無法接收留言通知。請致電留言信箱以取得新訊息，直至視像留言完全啟用。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"無法啟用視像留言"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"請確定您的手機有數據連線，然後再試一次。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"請確定您的手機有數據連線，然後再試一次。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"關閉飛行模式，然後再試一次。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"沒有連線"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您不會收到新留言通知。如果您使用的是 Wi-Fi，可以立即透過同步處理的方式查看是否有留言。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"您不會收到新留言通知。如果您使用的是 Wi-Fi，可以立即透過同步處理的方式查看是否有留言。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您不會收到新留言通知。請關閉飛行模式，以便同步處理留言信箱。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"您的手機需要有流動數據連線，才能查看留言信箱。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"您的手機需要有流動數據連線，才能查看留言。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"無法啟用視像留言"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您仍可撥號以查看留言信箱。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"無法更新視像留言信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"請在您的 Wi-Fi 或數據連線品質較佳時再試一次。您仍可撥號以查看留言信箱。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"請在您的數據連線品質較佳時再試一次。您仍可撥號以查看留言信箱。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"請在您的 Wi-Fi 或數據連線品質較佳時再試一次。您仍可撥號以查看留言。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"請在您的數據連線品質較佳時再試一次。您仍可撥號以查看留言。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"無法更新視像留言信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您仍可撥號以查看留言信箱。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"無法更新視像留言信箱"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"您的信箱快要滿了。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"設定留言信箱 PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必須輸入留言信箱 PIN 才可收聽留言。"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明錯誤"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"飛行模式設定"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"設定 PIN 碼"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"再試一次"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"發生問題"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"請致電 <xliff:g id="NUMBER">%1$s</xliff:g> 聯絡客戶服務，並提供錯誤代碼 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"視像留言條款及細則"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"您必須接受 Verizon Wireless 的條款及細則，才能使用視像留言：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n您必須接受 Verizon Wireless 條款及細則，才能使用視像留言：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"啟用視像留言"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果拒絕條款及細則，視像留言將會停用。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用視像留言"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果拒絕條款及細則，留言轉錄功能將會停用。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用留言轉錄功能"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"您只可以撥打 *86 使用留言信箱。請先設定新留言信箱 PIN 碼，然後繼續。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"設定 PIN 碼"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
index 7f2e1d6..06959b8 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zh-rTW/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"請關閉飛航模式"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"啟用視覺化語音信箱"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"您必須完整啟用視覺化語音信箱，才會收到語音留言通知。在未完整啟用這項功能之前，如要擷取新訊息，請撥打語音信箱號碼。"</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"無法啟用視覺化語音信箱"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"請確定您的手機能收到訊號，然後再試一次。"</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"請確認你的手機已連上行動網路，然後再試一次。"</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"請關閉飛航模式，然後再試一次。"</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"沒有訊號"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"您不會收到新的語音留言通知。如果您已連上 Wi-Fi，立即執行同步處理，就能檢查是否有語音留言。"</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"你不會收到新的語音留言通知。如果你已連上 Wi-Fi 網路，立即執行同步處理就能檢查是否有語音留言。"</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"您不會收到新的語音留言通知。請關閉飛航模式，以便同步處理語音留言。"</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"手機必須要有數據連線才能檢查語音留言。"</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"手機必須要有行動數據連線才能檢查語音留言。"</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"無法啟用視覺化語音信箱"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"您也可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"無法更新視覺化語音信箱"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"請在 Wi-Fi 連線品質較佳或手機訊號較強時再試一次。您也可以撥打電話來檢查語音留言。"</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"請在數據連線品質較佳時再試一次。您也可以撥打電話來檢查語音留言。"</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"請在 Wi‑Fi 或行動網路連線品質較佳時再試一次。你還是可以撥打電話來檢查語音留言。"</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"請在行動網路連線品質較佳時再試一次。你還是可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"無法更新視覺化語音信箱"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"您也可以撥打電話來檢查語音留言。"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"無法更新視覺化語音信箱"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"你的信箱容量幾乎已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。"</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"設定您的語音信箱 PIN 碼"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"您必須輸入語音信箱 PIN 碼才能存取您的語音信箱。"</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"不明錯誤"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"飛航模式設定"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"設定 PIN 碼"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"再試一次"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"發生錯誤"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"請撥打 <xliff:g id="NUMBER">%1$s</xliff:g> 與客服人員聯絡，並告訴對方錯誤代碼為 9999。"</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"視覺化語音信箱條款及細則"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"你必須接受 Verizon Wireless 的條款及細則，才能使用視覺化語音信箱：\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\n你必須接受 Verizon Wireless 的條款及細則才能使用視覺化語音信箱：\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"啟用視覺化語音信箱"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"如果你拒絕接受相關條款及細則，系統將停用視覺化語音信箱功能。"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"停用視覺化語音信箱"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"如果拒絕接受條款及細則，系統將停用語音信箱留言轉錄功能。"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"停用語音信箱留言轉錄"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"必須撥打 *86 才能聽取語音信箱。如要繼續進行，請先設定新的語音信箱密碼。"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"設定語音信箱密碼"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
index 8d3cd79..c9db3ad 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-zu/strings.xml
@@ -17,21 +17,20 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_error_turn_off_airplane_mode_title" msgid="335011175933917603">"Vala imodi yendiza"</string>
     <string name="voicemail_error_activating_title" msgid="2428457130578359186">"Yenza kusebenze ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_activating_message" msgid="7157030596259443393">"Kungenzeka ungatholi izaziso zevoyisimeyili kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili ebonakalayo. Shayela ivoyisimeyili ukuze uthole imilayezo emisha kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili."</string>
     <string name="voicemail_error_not_activate_no_signal_title" msgid="742273366199085615">"Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo"</string>
-    <string name="voicemail_error_not_activate_no_signal_message" msgid="4511975927252363280">"Qiniseka ukuthi ifoni yakho inokuxhumeka kweselula uphinde uzame futhi."</string>
+    <string name="voicemail_error_not_activate_no_signal_message" msgid="2929059808327964011">"Qiniseka ukuthi ifoni yakho inoxhumo lenethiwekhi leselula bese uyazama futhi."</string>
     <string name="voicemail_error_not_activate_no_signal_airplane_mode_message" msgid="2005255281543281215">"Vala imodi yendiza uphinde uzame futhi."</string>
     <string name="voicemail_error_no_signal_title" msgid="341954685733680219">"Akukho ukuxhumana"</string>
-    <string name="voicemail_error_no_signal_message" msgid="8557509373166292640">"Ngeke uze waziswe ngamavoyisimeyili amasha. Uma uku-Wi-Fi, ungahlolela ivoyisimeyili ngokuvumelanisa manje."</string>
+    <string name="voicemail_error_no_signal_message" msgid="2626509025723748371">"Ngeke uze waziswe ngamavoyisimeyili amasha. Uma uku-Wi-Fi, ungahlolela ivoyisimeyili ngokuvumelanisa manje."</string>
     <string name="voicemail_error_no_signal_airplane_mode_message" msgid="8553646558282754276">"Ngeke waziswe ngamavoyisimeyili amasha. Vala imodi yendiza ukuze uvumelanise ivoyisimeyili yakho."</string>
-    <string name="voicemail_error_no_signal_cellular_required_message" msgid="8461294934887808098">"Ifoni yakho idinga ukuxhumeka kwedatha yeselula ukuze ihlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_signal_cellular_required_message" msgid="6452586752169746399">"Ifoni yakho idinga ukuxhumeka kwedatha yeselula ukuze ihlole ivoyisimeyili."</string>
     <string name="voicemail_error_activation_failed_title" msgid="3823477898681399391">"Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_activation_failed_message" msgid="2188301459207765442">"Usengashaya ukuze uhlole ivoyisimeyili"</string>
     <string name="voicemail_error_no_data_title" msgid="8127858252892092732">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
-    <string name="voicemail_error_no_data_message" msgid="3723828868450752165">"Zama futhi uma i-Wi-Fi yakho noma ukuxhumeka kwakho kweselula kungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
-    <string name="voicemail_error_no_data_cellular_required_message" msgid="2952045163270555699">"Zama futhi uma ukuxhumeka kwakho kweselula sekungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_data_message" msgid="6634124460113498265">"Zama futhi uma i-Wi-Fi yakho noma ukuxhumeka kwakho kwedatha kungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
+    <string name="voicemail_error_no_data_cellular_required_message" msgid="2521491029817662357">"Zama futhi uma ukuxhumeka kwakho kwedaha sekungcono. Usengashaya ukuze uhlole ivoyisimeyili."</string>
     <string name="voicemail_error_bad_config_title" msgid="527594487104462966">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_error_bad_config_message" msgid="2692955418930476771">"Usengashaya ukuze uhlole ivoyisimeyili"</string>
     <string name="voicemail_error_communication_title" msgid="9183339646110368169">"Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo"</string>
@@ -50,7 +49,6 @@
     <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="9140680538578301853">"Ibhokisi lakho lemeyili cishe ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha nokwenza isipele imilayezo yakho yevoyisimeyili."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Setha iphini yakho yevoyisimeyili"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"Udinga iphini yevoyisimeyili noma kunini uma wenza ikholi ukufinyelela ivoyisimeyili yakho."</string>
-    <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Iphutha elingaziwa"</string>
     <string name="voicemail_action_turn_off_airplane_mode" msgid="6905706401164671086">"Izilungiselelo zemodi yendiza"</string>
     <string name="voicemail_action_set_pin" msgid="958510049866316228">"Setha iphini"</string>
     <string name="voicemail_action_retry" msgid="4450307484541052511">"Zama Futhi"</string>
@@ -102,9 +100,13 @@
     <string name="vvm3_error_imap_error_title" msgid="1952971680250515832">"Kukhona okungahambanga kahle"</string>
     <string name="vvm3_error_imap_error_message" msgid="6668651261796655388">"Sicela uxhumane Nesevisi Yekhasimende ku-<xliff:g id="NUMBER">%1$s</xliff:g> uphinde ubatshele ukuthi ikhodi yephutha ngu-9999."</string>
     <string name="verizon_terms_and_conditions_title" msgid="9074967311276321500">"Imigomo nemibandela ye-Visual Voicemail"</string>
-    <string name="verizon_terms_and_conditions_message" msgid="271780225159084419">"Kufanele wamukele imigomo nemibandela ye-Verizon Wireless ukuze usebenzise i-visual voicemail:\n\n%s"</string>
+    <string name="verizon_terms_and_conditions_message" msgid="120258835788235077">"%1$s\n\nKufanele wamukele imogomo nemibandela ye-Verizon Wireless ukuze usebenzise ivoyisimeyili yokubuka:\n\n%2$s"</string>
+    <string name="dialer_terms_and_conditions_title" msgid="311603424861921251">"Vula ivoyisimeyili yokubuka"</string>
+    <string name="dialer_terms_and_conditions_message" msgid="6207219973959897196">"%s"</string>
     <string name="verizon_terms_and_conditions_decline_dialog_message" msgid="7852059293806766767">"I-Visual voicemail izokhutshazwa uma imigomo nemibandela inqatshawa."</string>
     <string name="verizon_terms_and_conditions_decline_dialog_downgrade" msgid="8347128304508008823">"Khubaza i-visual voicemail"</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_message" msgid="1726573227032877573">"Ukubhalwa kweviyisimeyili kuizokhutshazwa uma imigomo nemibandela inqatshawa."</string>
+    <string name="dialer_terms_and_conditions_decline_dialog_downgrade" msgid="6694612247173639685">"Khuyaza ukubhalwa kwevoyisimeyili"</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message" msgid="2200388197966526000">"Ivoyisimeyili izofinyeleleka kuphela ngokushayela ku-*86. Setha iphinikhodi entsha yevoyisimeyili ukuze uqhubeke."</string>
     <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin" msgid="4320664492466296770">"Setha iphinikhodi"</string>
 </resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml
index 090311f..867bd2f 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
-  <dimen name="alert_icon_size">24dp</dimen>
-  <dimen name="alert_start_padding">16dp</dimen>
-  <dimen name="alert_top_padding">21dp</dimen>
   <dimen name="alert_main_padding">24dp</dimen>
-  <dimen name="alert_title_padding">12dp</dimen>
-  <dimen name="alert_action_vertical_padding">4dp</dimen>
-  <dimen name="alert_action_horizontal_padding">4dp</dimen>
   <dimen name="alert_action_between_padding">11dp</dimen>
-  <dimen name="alert_line_spacing">4dp</dimen>
 
   <!-- Dimensions for promo card -->
   <dimen name="voicemail_promo_card_icon_size">24dp</dimen>
-  <dimen name="voicemail_promo_card_start_padding">16dp</dimen>
-  <dimen name="voicemail_promo_card_top_padding">21dp</dimen>
   <dimen name="voicemail_promo_card_main_padding">24dp</dimen>
   <dimen name="voicemail_promo_card_title_padding">12dp</dimen>
   <dimen name="voicemail_promo_card_action_vertical_padding">4dp</dimen>
@@ -22,4 +29,6 @@
   <dimen name="voicemail_promo_card_line_spacing">4dp</dimen>
   <dimen name="voicemail_promo_card_title_text_size">16sp</dimen>
   <dimen name="voicemail_promo_card_message_size">14sp</dimen>
-</resources>
\ No newline at end of file
+
+  <dimen name="voicemail_tos_image_size">200dp</dimen>
+</resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
index 94d3dba..2f6a720 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
@@ -15,26 +15,24 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="voicemail_error_turn_off_airplane_mode_title">Turn off airplane mode</string>
-
   <string name="voicemail_error_activating_title">Activating visual voicemail</string>
   <string name="voicemail_error_activating_message">You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated.</string>
 
   <string name="voicemail_error_not_activate_no_signal_title">Can\'t activate visual voicemail</string>
-  <string name="voicemail_error_not_activate_no_signal_message">Make sure your phone has cellular connection and try again.</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Make sure your phone has a mobile network connection and try again.</string>
   <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Turn off airplane mode and try again.</string>
 
   <string name="voicemail_error_no_signal_title">No connection</string>
-  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi-Fi, you can check for voicemail by syncing now.</string>
+  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi\u2011Fi, you can check for voicemail by syncing now.</string>
   <string name="voicemail_error_no_signal_airplane_mode_message">You won\'t be notified for new voicemails. Turn off airplane mode to sync your voicemail.</string>
-  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a cellular data connection to check voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a mobile data connection to check voicemail.</string>
 
   <string name="voicemail_error_activation_failed_title">Can\'t activate visual voicemail</string>
   <string name="voicemail_error_activation_failed_message">You can still call to check voicemail.</string>
 
   <string name="voicemail_error_no_data_title">Can\'t update visual voicemail</string>
-  <string name="voicemail_error_no_data_message">Try again when your Wi-Fi or cellular connection is better. You can still call to check voicemail.</string>
-  <string name="voicemail_error_no_data_cellular_required_message">Try again when your cellular data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_message">Try again when your Wi\u2011Fi or mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Try again when your mobile data connection is better. You can still call to check voicemail.</string>
 
   <string name="voicemail_error_bad_config_title">Can\'t update visual voicemail</string>
   <string name="voicemail_error_bad_config_message">You can still call to check voicemail.</string>
@@ -63,8 +61,6 @@
   <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string>
   <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN anytime you call to access your voicemail.</string>
 
-  <string name="voicemail_error_unknown_title">Unknown error</string>
-
   <string name="voicemail_action_turn_off_airplane_mode">Airplane Mode Settings</string>
   <string name="voicemail_action_set_pin">Set PIN</string>
   <string name="voicemail_action_retry">Try Again</string>
@@ -141,7 +137,10 @@
   <string translatable="false" name="verizon_domestic_customer_support_display_number">(800) 922–0204</string>
 
   <string name="verizon_terms_and_conditions_title">Visual Voicemail Terms and Conditions</string>
-  <string name="verizon_terms_and_conditions_message">You must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%s</string>
+  <string name="verizon_terms_and_conditions_message">%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s</string>
+
+  <string name="dialer_terms_and_conditions_title">Turn on Visual Voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
 
   <string translatable="false" name="verizon_terms_and_conditions_1.1_english">
 Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
@@ -152,7 +151,7 @@
 \n
 Speech recordings may be collected and stored for a period of 30 days, solely for the purpose of testing and improving transcription technology and performance, subject to the Verizon Wireless Privacy Policy, which can be found at http://www.verizon.com/about/privacy/policy/\n
 \n
-You understand that by selecting ACCEPT, your messages will be stored and anyone in possession of this device will have access to your voice mail. You further understand that your voice mail messages may be stored in electronic format on this device. To limit unauthorized access to your voice mail, you should consider locking your phone when not in use. Not available in all areas or over Wi-Fi.\n
+You understand that by selecting ACCEPT, your messages will be stored and anyone in possession of this device will have access to your voice mail. You further understand that your voice mail messages may be stored in electronic format on this device. To limit unauthorized access to your voice mail, you should consider locking your phone when not in use. Not available in all areas or over Wi\u2011Fi.\n
 \n
 If you do not accept all of these terms and conditions, do not use Visual Voice Mail.  </string>
 
@@ -165,19 +164,35 @@
 \n
 Es posible que reunamos y almacenemos grabaciones de voz durante 30 días, con el único fin de probar y mejorar el rendimiento y la tecnología de la transcripción, sujeto a la Política de privacidad de Verizon Wireless, disponible en http://www.verizon.com/about/privacy/policy/.\n
 \n
-Entiende que, al seleccionar ACEPTAR, sus mensajes se almacenarán, y cualquier persona que disponga de este dispositivo tendrá acceso al buzón de voz. Entiende, además, que los mensajes de voz pueden almacenarse en formato electrónico en este dispositivo. Para limitar el acceso no autorizado al buzón de voz, debe considerar el bloqueo del teléfono cuando no está en uso. No está disponible en todas las áreas ni mediante Wi-Fi.\n
+Entiende que, al seleccionar ACEPTAR, sus mensajes se almacenarán, y cualquier persona que disponga de este dispositivo tendrá acceso al buzón de voz. Entiende, además, que los mensajes de voz pueden almacenarse en formato electrónico en este dispositivo. Para limitar el acceso no autorizado al buzón de voz, debe considerar el bloqueo del teléfono cuando no está en uso. No está disponible en todas las áreas ni mediante Wi\u2011Fi.\n
 \n
 Si no acepta todos estos términos y condiciones, no use el buzón de voz visual.
   </string>
 
-  <string translatable="false" name="verizon_terms_and_conditions_accept_english">Accept</string>
+  <string translatable="false" name="dialer_terms_and_conditions_1.0_english">
+  See and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service.
+  </string>
+
+  <string translatable="false" name="dialer_terms_and_conditions_1.0_spanish">
+  ***TRANSLATE TO SPANISH***\nSee and listen to your messages, without having to call voicemail.\nGet transcripts of your voicemail using Google’s transcription service.
+  </string>
+
+  <string translatable="false" name="verizon_terms_and_conditions_accept_english">Turn On</string>
   <string translatable="false" name="verizon_terms_and_conditions_accept_spanish">Aceptar</string>
-  <string translatable="false" name="verizon_terms_and_conditions_decline_english">Decline</string>
+  <string translatable="false" name="verizon_terms_and_conditions_decline_english">No Thanks</string>
   <string translatable="false" name="verizon_terms_and_conditions_decline_spanish">Rechazar</string>
 
+  <string translatable="false" name="dialer_terms_and_conditions_accept_english">Turn On</string>
+  <string translatable="false" name="dialer_terms_and_conditions_accept_spanish">Aceptar</string>
+  <string translatable="false" name="dialer_terms_and_conditions_decline_english">No Thanks</string>
+  <string translatable="false" name="dialer_terms_and_conditions_decline_spanish">Rechazar</string>
+
   <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the terms and conditions are declined.</string>
   <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable visual voicemail</string>
 
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Voicemail transcription will be disabled if the terms and conditions are declined.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable voicemail transcription</string>
+
   <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string>
   <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml
index c4a8542..257e93d 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values/styles.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<!--
+  ~ 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
+  -->
 
+<resources>
   <style name="ErrorActionStyle">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">48dp</item>
@@ -9,7 +24,23 @@
     <item name="android:paddingEnd">8dp</item>
     <item name="android:layout_marginStart">8dp</item>
     <item name="android:layout_marginEnd">8dp</item>
-    <item name="android:textColor">@color/dialtacts_theme_color</item>
+    <item name="android:textColor">@color/dialer_theme_color</item>
+    <item name="android:fontFamily">"sans-serif-medium"</item>
+    <item name="android:focusable">true</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="android:textSize">14sp</item>
+  </style>
+
+  <style name="ErrorActionDeclineStyle">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">48dp</item>
+    <item name="android:gravity">end|center_vertical</item>
+    <item name="android:paddingStart">8dp</item>
+    <item name="android:paddingEnd">8dp</item>
+    <item name="android:layout_marginStart">8dp</item>
+    <item name="android:layout_marginEnd">8dp</item>
+    <item name="android:textColor">@color/dialer_secondary_text_color</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
     <item name="android:focusable">true</item>
     <item name="android:singleLine">true</item>
@@ -23,4 +54,4 @@
     <item name="android:textSize">14sp</item>
     <item name="android:layout_height">@dimen/call_log_action_height</item>
   </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/app/widget/DialpadSearchEmptyContentView.java b/java/com/android/dialer/app/widget/DialpadSearchEmptyContentView.java
index 85fd5ec..5846b1f 100644
--- a/java/com/android/dialer/app/widget/DialpadSearchEmptyContentView.java
+++ b/java/com/android/dialer/app/widget/DialpadSearchEmptyContentView.java
@@ -21,6 +21,7 @@
 import android.widget.LinearLayout;
 import com.android.dialer.app.R;
 import com.android.dialer.util.OrientationUtil;
+import com.android.dialer.widget.EmptyContentView;
 
 /** Empty content view to be shown when dialpad is visible. */
 public class DialpadSearchEmptyContentView extends EmptyContentView {
diff --git a/java/com/android/dialer/app/widget/EmptyContentView.java b/java/com/android/dialer/app/widget/EmptyContentView.java
deleted file mode 100644
index cfc8665..0000000
--- a/java/com/android/dialer/app/widget/EmptyContentView.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2015 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.app.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import com.android.dialer.app.R;
-
-public class EmptyContentView extends LinearLayout implements View.OnClickListener {
-
-  /** Listener to call when action button is clicked. */
-  public interface OnEmptyViewActionButtonClickedListener {
-    void onEmptyViewActionButtonClicked();
-  }
-
-  public static final int NO_LABEL = 0;
-  public static final int NO_IMAGE = 0;
-
-  private ImageView mImageView;
-  private TextView mDescriptionView;
-  private TextView mActionView;
-  private OnEmptyViewActionButtonClickedListener mOnActionButtonClickedListener;
-
-  public EmptyContentView(Context context) {
-    this(context, null);
-  }
-
-  public EmptyContentView(Context context, AttributeSet attrs) {
-    this(context, attrs, 0);
-  }
-
-  public EmptyContentView(Context context, AttributeSet attrs, int defStyleAttr) {
-    this(context, attrs, defStyleAttr, 0);
-  }
-
-  public EmptyContentView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    inflateLayout();
-
-    // Don't let touches fall through the empty view.
-    setClickable(true);
-    mImageView = (ImageView) findViewById(R.id.emptyListViewImage);
-    mDescriptionView = (TextView) findViewById(R.id.emptyListViewMessage);
-    mActionView = (TextView) findViewById(R.id.emptyListViewAction);
-    mActionView.setOnClickListener(this);
-  }
-
-  public void setDescription(int resourceId) {
-    if (resourceId == NO_LABEL) {
-      mDescriptionView.setText(null);
-      mDescriptionView.setVisibility(View.GONE);
-    } else {
-      mDescriptionView.setText(resourceId);
-      mDescriptionView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  public void setImage(int resourceId) {
-    if (resourceId == NO_LABEL) {
-      mImageView.setImageDrawable(null);
-      mImageView.setVisibility(View.GONE);
-    } else {
-      mImageView.setImageResource(resourceId);
-      mImageView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  public void setActionLabel(int resourceId) {
-    if (resourceId == NO_LABEL) {
-      mActionView.setText(null);
-      mActionView.setVisibility(View.GONE);
-    } else {
-      mActionView.setText(resourceId);
-      mActionView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  public boolean isShowingContent() {
-    return mImageView.getVisibility() == View.VISIBLE
-        || mDescriptionView.getVisibility() == View.VISIBLE
-        || mActionView.getVisibility() == View.VISIBLE;
-  }
-
-  public void setActionClickedListener(OnEmptyViewActionButtonClickedListener listener) {
-    mOnActionButtonClickedListener = listener;
-  }
-
-  @Override
-  public void onClick(View v) {
-    if (mOnActionButtonClickedListener != null) {
-      mOnActionButtonClickedListener.onEmptyViewActionButtonClicked();
-    }
-  }
-
-  protected void inflateLayout() {
-    setOrientation(LinearLayout.VERTICAL);
-    final LayoutInflater inflater =
-        (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(R.layout.empty_content_view, this);
-  }
-
-}
diff --git a/java/com/android/dialer/app/widget/SearchEditTextLayout.java b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
index f83c482..95bd12a 100644
--- a/java/com/android/dialer/app/widget/SearchEditTextLayout.java
+++ b/java/com/android/dialer/app/widget/SearchEditTextLayout.java
@@ -52,7 +52,6 @@
   private View mVoiceSearchButtonView;
   private View mOverflowButtonView;
   private View mBackButtonView;
-  private View mExpandedSearchBox;
   private View mClearButtonView;
 
   private ValueAnimator mAnimator;
@@ -90,20 +89,27 @@
     mVoiceSearchButtonView = findViewById(R.id.voice_search_button);
     mOverflowButtonView = findViewById(R.id.dialtacts_options_menu_button);
     mBackButtonView = findViewById(R.id.search_back_button);
-    mExpandedSearchBox = findViewById(R.id.search_box_expanded);
+    mBackButtonView
+        .getResources()
+        .getDrawable(R.drawable.quantum_ic_arrow_back_vd_theme_24, null)
+        .setAutoMirrored(true);
     mClearButtonView = findViewById(R.id.search_close_button);
 
-    // Convert a long click into a click to expand the search box, and then long click on the
-    // search view. This accelerates the long-press scenario for copy/paste.
+    // Convert a long click into a click to expand the search box. Touch events are also
+    // forwarded to the searchView. This accelerates the long-press scenario for copy/paste.
     mCollapsed.setOnLongClickListener(
         new OnLongClickListener() {
           @Override
           public boolean onLongClick(View view) {
             mCollapsed.performClick();
-            mSearchView.performLongClick();
             return false;
           }
         });
+    mCollapsed.setOnTouchListener(
+        (v, event) -> {
+          mSearchView.onTouchEvent(event);
+          return false;
+        });
 
     mSearchView.setOnFocusChangeListener(
         new OnFocusChangeListener() {
@@ -212,7 +218,7 @@
       AnimUtils.crossFadeViews(mExpanded, mCollapsed, ANIMATION_DURATION);
       mAnimator = ValueAnimator.ofFloat(EXPAND_MARGIN_FRACTION_START, 0f);
       setMargins(EXPAND_MARGIN_FRACTION_START);
-      prepareAnimator(true);
+      prepareAnimator();
     } else {
       mExpanded.setVisibility(View.VISIBLE);
       mExpanded.setAlpha(1);
@@ -241,7 +247,7 @@
     if (animate) {
       AnimUtils.crossFadeViews(mCollapsed, mExpanded, ANIMATION_DURATION);
       mAnimator = ValueAnimator.ofFloat(0f, 1f);
-      prepareAnimator(false);
+      prepareAnimator();
     } else {
       mCollapsed.setVisibility(View.VISIBLE);
       mCollapsed.setAlpha(1);
@@ -279,7 +285,7 @@
     }
   }
 
-  private void prepareAnimator(final boolean expand) {
+  private void prepareAnimator() {
     if (mAnimator != null) {
       mAnimator.cancel();
     }
diff --git a/java/com/android/dialer/backup/AndroidManifest.xml b/java/com/android/dialer/backup/AndroidManifest.xml
index 1cbbe53..84992c0 100644
--- a/java/com/android/dialer/backup/AndroidManifest.xml
+++ b/java/com/android/dialer/backup/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
- ~ Copyright (C) 2016 The Android Open Source Project
+ ~ 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.
@@ -13,14 +13,13 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.dialer.backup">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.backup">
 
-  <application
-    android:backupAgent="com.android.dialer.backup.DialerBackupAgent"
-    android:fullBackupOnly="true"
-    android:restoreAnyVersion="true"
-    />
 
-</manifest>
+  <!-- Android backup service key -->
+  <!-- https://developer.android.com/google/backup/signup.html -->
+  <meta-data
+      android:name="com.google.android.backup.api_key"
+      android:value="AEdPqrEAAAAIn3-Y3JKit1mrzfvcdbVhUiJn2ICtKfhGYLy0Bg"/>
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/backup/DialerBackupAgent.java b/java/com/android/dialer/backup/DialerBackupAgent.java
deleted file mode 100644
index dec1ca1..0000000
--- a/java/com/android/dialer/backup/DialerBackupAgent.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2016 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.backup;
-
-import android.annotation.TargetApi;
-import android.app.backup.BackupAgent;
-import android.app.backup.BackupDataInput;
-import android.app.backup.BackupDataOutput;
-import android.app.backup.FullBackupDataOutput;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build.VERSION_CODES;
-import android.os.ParcelFileDescriptor;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.provider.VoicemailContract;
-import android.provider.VoicemailContract.Voicemails;
-import android.telecom.PhoneAccountHandle;
-import android.util.Pair;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.telecom.TelecomUtil;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * The Dialer backup agent to backup voicemails, and files under files, shared prefs and databases
- */
-public class DialerBackupAgent extends BackupAgent {
-  // File names suffix for backup/restore.
-  private static final String VOICEMAIL_BACKUP_FILE_SUFFIX = "_voicemail_backup.proto";
-  // File name formats for backup. It looks like 000000_voicemail_backup.proto, 0000001...
-  private static final String VOICEMAIL_BACKUP_FILE_FORMAT = "%06d" + VOICEMAIL_BACKUP_FILE_SUFFIX;
-  // Order by Date entries from database. We start backup from the newest.
-  private static final String ORDER_BY_DATE = "date DESC";
-  // Voicemail Uri Column
-  public static final String VOICEMAIL_URI = "voicemail_uri";
-  // Voicemail packages to backup
-  public static final String VOICEMAIL_SOURCE_PACKAGE = "com.google.android.dialer";
-
-  private long voicemailsBackedupSoFar = 0;
-  private long sizeOfVoicemailsBackedupSoFar = 0;
-  private boolean maxVoicemailBackupReached = false;
-
-  /**
-   * onBackup is used for Key/Value backup. Since we are using Dolly/Android Auto backup, we do not
-   * need to implement this method and Dolly should not be calling this. Instead Dolly will be
-   * calling onFullBackup.
-   */
-  @Override
-  public void onBackup(
-      ParcelFileDescriptor parcelFileDescriptor,
-      BackupDataOutput backupDataOutput,
-      ParcelFileDescriptor parcelFileDescriptor1)
-      throws IOException {
-    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_BACKUP);
-    Assert.fail("Android Backup should not call DialerBackupAgent.onBackup");
-  }
-
-  /**
-   * onRestore is used for Key/Value restore. Since we are using Dolly/Android Auto backup/restore,
-   * we need to implement this method only for backwards compatibility. Dolly should be calling
-   * onFileRestore during its restore.
-   */
-  @Override
-  public void onRestore(
-      BackupDataInput backupDataInput, int i, ParcelFileDescriptor parcelFileDescriptor)
-      throws IOException {
-    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_RESTORE);
-  }
-
-  @TargetApi(VERSION_CODES.M)
-  @Override
-  public void onFullBackup(FullBackupDataOutput data) throws IOException {
-    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_FULL_BACKUP);
-    LogUtil.i("DialerBackupAgent.onFullBackup", "performing dialer backup");
-    boolean autoBackupEnabled =
-        ConfigProviderBindings.get(this).getBoolean("enable_autobackup", true);
-    boolean vmBackupEnabled = ConfigProviderBindings.get(this).getBoolean("enable_vm_backup", true);
-    List<PhoneAccountHandle> phoneAccountsToArchive =
-        DialerBackupUtils.getPhoneAccountsToArchive(this);
-
-    if (autoBackupEnabled) {
-      if (!maxVoicemailBackupReached && vmBackupEnabled && !phoneAccountsToArchive.isEmpty()) {
-        voicemailsBackedupSoFar = 0;
-        sizeOfVoicemailsBackedupSoFar = 0;
-
-        LogUtil.i("DialerBackupAgent.onFullBackup", "autoBackup is enabled");
-        ContentResolver contentResolver = getContentResolver();
-        int limit = 1000;
-
-        Uri uri =
-            TelecomUtil.getCallLogUri(this)
-                .buildUpon()
-                .appendQueryParameter(Calls.LIMIT_PARAM_KEY, Integer.toString(limit))
-                .build();
-
-        LogUtil.i("DialerBackupAgent.onFullBackup", "backing up from: " + uri);
-
-        try (Cursor cursor =
-            contentResolver.query(
-                uri,
-                null,
-                String.format(
-                    "(%s = ? AND deleted = 0 AND  %s = ? AND ?)",
-                    Calls.TYPE, Voicemails.SOURCE_PACKAGE),
-                new String[] {
-                  Integer.toString(CallLog.Calls.VOICEMAIL_TYPE),
-                  VOICEMAIL_SOURCE_PACKAGE,
-                  DialerBackupUtils.getPhoneAccountClause(phoneAccountsToArchive)
-                },
-                ORDER_BY_DATE,
-                null)) {
-
-          if (cursor == null) {
-            LogUtil.i("DialerBackupAgent.onFullBackup", "cursor was null");
-            return;
-          }
-
-          LogUtil.i("DialerBackupAgent.onFullBackup", "cursor count: " + cursor.getCount());
-          if (cursor.moveToFirst()) {
-            int fileNum = 0;
-            do {
-              backupRow(
-                  data, cursor, String.format(Locale.US, VOICEMAIL_BACKUP_FILE_FORMAT, fileNum++));
-            } while (cursor.moveToNext() && !maxVoicemailBackupReached);
-          } else {
-            LogUtil.i("DialerBackupAgent.onFullBackup", "cursor.moveToFirst failed");
-          }
-        }
-      }
-      LogUtil.i(
-          "DialerBackupAgent.onFullBackup",
-          "vm files backed up: %d, vm size backed up:%d, "
-              + "max vm backup reached:%b, vm backup enabled:%b phone accounts to archive: %d",
-          voicemailsBackedupSoFar,
-          sizeOfVoicemailsBackedupSoFar,
-          maxVoicemailBackupReached,
-          vmBackupEnabled,
-          phoneAccountsToArchive.size());
-      super.onFullBackup(data);
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_FULL_BACKED_UP);
-    } else {
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_BACKUP_DISABLED);
-      LogUtil.i("DialerBackupAgent.onFullBackup", "autoBackup is disabled");
-    }
-  }
-
-  private void backupRow(FullBackupDataOutput data, Cursor cursor, String fileName)
-      throws IOException {
-
-    VoicemailInfo cursorRowInProto =
-        DialerBackupUtils.convertVoicemailCursorRowToProto(cursor, getContentResolver());
-
-    File file = new File(getFilesDir(), fileName);
-    DialerBackupUtils.writeProtoToFile(file, cursorRowInProto);
-
-    if (sizeOfVoicemailsBackedupSoFar + file.length()
-        > DialerBackupUtils.maxVoicemailSizeToBackup) {
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_MAX_VM_BACKUP_REACHED);
-      maxVoicemailBackupReached = true;
-      file.delete();
-      return;
-    }
-
-    backupFile(file, data);
-  }
-
-  // TODO: Write to FullBackupDataOutput directly (b/33849960)
-  private void backupFile(File file, FullBackupDataOutput data) throws IOException {
-    try {
-      super.fullBackupFile(file, data);
-      sizeOfVoicemailsBackedupSoFar = sizeOfVoicemailsBackedupSoFar + file.length();
-      voicemailsBackedupSoFar++;
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_VOICEMAIL_BACKED_UP);
-      LogUtil.i("DialerBackupAgent.backupFile", "file backed up:" + file.getAbsolutePath());
-    } finally {
-      file.delete();
-    }
-  }
-
-  // Being tracked in b/33839952
-  @Override
-  public void onQuotaExceeded(long backupDataBytes, long quotaBytes) {
-    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_QUOTA_EXCEEDED);
-    LogUtil.i("DialerBackupAgent.onQuotaExceeded", "does nothing");
-  }
-
-  @TargetApi(VERSION_CODES.M)
-  @Override
-  public void onRestoreFile(
-      ParcelFileDescriptor data, long size, File destination, int type, long mode, long mtime)
-      throws IOException {
-    LogUtil.i("DialerBackupAgent.onRestoreFile", "size:" + size + " destination: " + destination);
-
-    String fileName = destination.getName();
-    LogUtil.i("DialerBackupAgent.onRestoreFile", "file name: " + fileName);
-
-    if (ConfigProviderBindings.get(this).getBoolean("enable_autobackup", true)) {
-      if (fileName.endsWith(VOICEMAIL_BACKUP_FILE_SUFFIX)
-          && ConfigProviderBindings.get(this).getBoolean("enable_vm_restore", true)) {
-        if (DialerBackupUtils.canRestoreVoicemails(getContentResolver(), this)) {
-          try {
-            super.onRestoreFile(data, size, destination, type, mode, mtime);
-            restoreVoicemail(destination);
-            destination.delete();
-          } catch (IOException e) {
-            Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_RESTORE_IO_EXCEPTION);
-            LogUtil.e(
-                "DialerBackupAgent.onRestoreFile",
-                "could not restore voicemail - IOException: ",
-                e);
-          }
-        } else {
-          LogUtil.i(
-              "DialerBackupAgent.onRestoreFile", "build does not support restoring voicemails");
-        }
-
-      } else {
-        super.onRestoreFile(data, size, destination, type, mode, mtime);
-        LogUtil.i("DialerBackupAgent.onRestoreFile", "restored: " + fileName);
-        Logger.get(this).logImpression(DialerImpression.Type.BACKUP_RESTORED_FILE);
-      }
-    } else {
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_RESTORE_DISABLED);
-      LogUtil.i("DialerBackupAgent.onRestoreFile", "autoBackup is disabled");
-    }
-  }
-
-  @Override
-  public void onRestoreFinished() {
-    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_ON_RESTORE_FINISHED);
-    LogUtil.i("DialerBackupAgent.onRestoreFinished", "do nothing");
-  }
-
-  @TargetApi(VERSION_CODES.M)
-  private void restoreVoicemail(File file) throws IOException {
-    Pair<ContentValues, byte[]> pair =
-        DialerBackupUtils.convertVoicemailProtoFileToContentValueAndAudioBytes(
-            file, getApplicationContext());
-
-    if (pair == null) {
-      LogUtil.i("DialerBackupAgent.restoreVoicemail", "not restoring VM due to duplicate");
-      Logger.get(this)
-          .logImpression(DialerImpression.Type.BACKUP_ON_RESTORE_VM_DUPLICATE_NOT_RESTORING);
-      return;
-    }
-
-    // TODO: Uniquely identify backup agent as the creator of this voicemail b/34084298
-    try (OutputStream restoreStream =
-        getContentResolver()
-            .openOutputStream(
-                getContentResolver()
-                    .insert(VoicemailContract.Voicemails.CONTENT_URI, pair.first))) {
-      DialerBackupUtils.copyAudioBytesToContentUri(pair.second, restoreStream);
-      Logger.get(this).logImpression(DialerImpression.Type.BACKUP_RESTORED_VOICEMAIL);
-    }
-  }
-}
diff --git a/java/com/android/dialer/backup/DialerBackupUtils.java b/java/com/android/dialer/backup/DialerBackupUtils.java
deleted file mode 100644
index 17e82e4..0000000
--- a/java/com/android/dialer/backup/DialerBackupUtils.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright (C) 2016 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.backup;
-
-import android.annotation.TargetApi;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build.VERSION_CODES;
-import android.provider.VoicemailContract;
-import android.provider.VoicemailContract.Voicemails;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.util.Pair;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
-import com.android.dialer.common.LogUtil;
-import com.android.voicemail.VoicemailComponent;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
-import com.google.protobuf.ByteString;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/** Helper functions for DialerBackupAgent */
-public class DialerBackupUtils {
-  // Backup voicemails up to 20MB
-  static long maxVoicemailSizeToBackup = 20000000L;
-  static final String RESTORED_COLUMN = "restored";
-
-  private DialerBackupUtils() {}
-
-  public static void copyAudioBytesToContentUri(
-      @NonNull byte[] audioBytesArray, @NonNull OutputStream restoreStream) throws IOException {
-    LogUtil.i("DialerBackupUtils.copyStream", "audioByteArray length: " + audioBytesArray.length);
-
-    ByteArrayInputStream decodedStream = new ByteArrayInputStream(audioBytesArray);
-    LogUtil.i(
-        "DialerBackupUtils.copyStream", "decodedStream.available: " + decodedStream.available());
-
-    ByteStreams.copy(decodedStream, restoreStream);
-  }
-
-  public static @Nullable ByteString audioStreamToByteString(@NonNull InputStream stream)
-      throws IOException {
-    if (stream.available() > 0) {
-      return ByteString.readFrom(stream);
-    } else {
-      LogUtil.i("DialerBackupUtils.audioStreamToByteArray", "no audio stream to backup");
-    }
-    return ByteString.EMPTY;
-  }
-
-  public static void writeProtoToFile(@NonNull File file, @NonNull VoicemailInfo voicemailInfo)
-      throws IOException {
-    LogUtil.i(
-        "DialerBackupUtils.writeProtoToFile",
-        "backup " + voicemailInfo + " to " + file.getAbsolutePath());
-
-    byte[] bytes = voicemailInfo.toByteArray();
-    Files.write(bytes, file);
-  }
-
-  /** Only restore voicemails that have the restored column in calllog (NMR2+ builds) */
-  @TargetApi(VERSION_CODES.M)
-  public static boolean canRestoreVoicemails(ContentResolver contentResolver, Context context) {
-    try (Cursor cursor = contentResolver.query(Voicemails.CONTENT_URI, null, null, null, null)) {
-      // Restored column only exists in NMR2 and above builds.
-      if (cursor.getColumnIndex(RESTORED_COLUMN) != -1) {
-        LogUtil.i("DialerBackupUtils.canRestoreVoicemails", "Build supports restore");
-        return true;
-      } else {
-        LogUtil.i("DialerBackupUtils.canRestoreVoicemails", "Build does not support restore");
-        return false;
-      }
-    }
-  }
-
-  public static VoicemailInfo protoFileToVoicemailInfo(@NonNull File file) throws IOException {
-    byte[] byteArray = Files.toByteArray(file);
-    return VoicemailInfo.parseFrom(byteArray);
-  }
-
-  @TargetApi(VERSION_CODES.M)
-  public static VoicemailInfo convertVoicemailCursorRowToProto(
-      @NonNull Cursor cursor, @NonNull ContentResolver contentResolver) throws IOException {
-
-    VoicemailInfo.Builder voicemailInfo = VoicemailInfo.newBuilder();
-
-    for (int i = 0; i < cursor.getColumnCount(); ++i) {
-      String name = cursor.getColumnName(i);
-      String value = cursor.getString(i);
-
-      LogUtil.i(
-          "DialerBackupUtils.convertVoicemailCursorRowToProto",
-          "column index: %d, column name: %s, column value: %s",
-          i,
-          name,
-          value);
-
-      switch (name) {
-        case Voicemails.DATE:
-          voicemailInfo.setDate(value);
-          break;
-        case Voicemails.DELETED:
-          voicemailInfo.setDeleted(value);
-          break;
-        case Voicemails.DIRTY:
-          voicemailInfo.setDirty(value);
-          break;
-        case Voicemails.DIR_TYPE:
-          voicemailInfo.setDirType(value);
-          break;
-        case Voicemails.DURATION:
-          voicemailInfo.setDuration(value);
-          break;
-        case Voicemails.HAS_CONTENT:
-          voicemailInfo.setHasContent(value);
-          break;
-        case Voicemails.IS_READ:
-          voicemailInfo.setIsRead(value);
-          break;
-        case Voicemails.ITEM_TYPE:
-          voicemailInfo.setItemType(value);
-          break;
-        case Voicemails.LAST_MODIFIED:
-          voicemailInfo.setLastModified(value);
-          break;
-        case Voicemails.MIME_TYPE:
-          voicemailInfo.setMimeType(value);
-          break;
-        case Voicemails.NUMBER:
-          voicemailInfo.setNumber(value);
-          break;
-        case Voicemails.PHONE_ACCOUNT_COMPONENT_NAME:
-          voicemailInfo.setPhoneAccountComponentName(value);
-          break;
-        case Voicemails.PHONE_ACCOUNT_ID:
-          voicemailInfo.setPhoneAccountId(value);
-          break;
-        case Voicemails.SOURCE_DATA:
-          voicemailInfo.setSourceData(value);
-          break;
-        case Voicemails.SOURCE_PACKAGE:
-          voicemailInfo.setSourcePackage(value);
-          break;
-        case Voicemails.TRANSCRIPTION:
-          voicemailInfo.setTranscription(value);
-          break;
-        case DialerBackupAgent.VOICEMAIL_URI:
-          try (InputStream audioStream = contentResolver.openInputStream(Uri.parse(value))) {
-            voicemailInfo.setEncodedVoicemailKey(audioStreamToByteString(audioStream));
-          }
-          break;
-        default:
-          LogUtil.i(
-              "DialerBackupUtils.convertVoicemailCursorRowToProto",
-              "Not backing up column: %s, with value: %s",
-              name,
-              value);
-          break;
-      }
-    }
-    return voicemailInfo.build();
-  }
-
-  public static Pair<ContentValues, byte[]> convertVoicemailProtoFileToContentValueAndAudioBytes(
-      @NonNull File file, Context context) throws IOException {
-
-    VoicemailInfo voicemailInfo = DialerBackupUtils.protoFileToVoicemailInfo(file);
-    LogUtil.i(
-        "DialerBackupUtils.convertVoicemailProtoFileToContentValueAndEncodedAudio",
-        "file name: "
-            + file.getName()
-            + " voicemailInfo size: "
-            + voicemailInfo.getSerializedSize());
-
-    if (isDuplicate(context, voicemailInfo)) {
-      LogUtil.i(
-          "DialerBackupUtils.convertVoicemailProtoFileToContentValueAndEncodedAudio",
-          "voicemail already exists");
-      return null;
-    } else {
-      ContentValues contentValues = new ContentValues();
-
-      if (voicemailInfo.hasDate()) {
-        contentValues.put(Voicemails.DATE, voicemailInfo.getDate());
-      }
-      if (voicemailInfo.hasDeleted()) {
-        contentValues.put(Voicemails.DELETED, voicemailInfo.getDeleted());
-      }
-      if (!voicemailInfo.hasDirty()) {
-        contentValues.put(Voicemails.DIRTY, voicemailInfo.getDirty());
-      }
-      if (!voicemailInfo.hasDuration()) {
-        contentValues.put(Voicemails.DURATION, voicemailInfo.getDuration());
-      }
-      if (!voicemailInfo.hasIsRead()) {
-        contentValues.put(Voicemails.IS_READ, voicemailInfo.getIsRead());
-      }
-      if (!voicemailInfo.hasLastModified()) {
-        contentValues.put(Voicemails.LAST_MODIFIED, voicemailInfo.getLastModified());
-      }
-      if (!voicemailInfo.hasMimeType()) {
-        contentValues.put(Voicemails.MIME_TYPE, voicemailInfo.getMimeType());
-      }
-      if (!voicemailInfo.hasNumber()) {
-        contentValues.put(Voicemails.NUMBER, voicemailInfo.getNumber());
-      }
-      if (!voicemailInfo.hasPhoneAccountComponentName()) {
-        contentValues.put(
-            Voicemails.PHONE_ACCOUNT_COMPONENT_NAME, voicemailInfo.getPhoneAccountComponentName());
-      }
-      if (!voicemailInfo.hasPhoneAccountId()) {
-        contentValues.put(Voicemails.PHONE_ACCOUNT_ID, voicemailInfo.getPhoneAccountId());
-      }
-      if (!voicemailInfo.hasSourceData()) {
-        contentValues.put(Voicemails.SOURCE_DATA, voicemailInfo.getSourceData());
-      }
-      if (!voicemailInfo.hasSourcePackage()) {
-        contentValues.put(Voicemails.SOURCE_PACKAGE, voicemailInfo.getSourcePackage());
-      }
-      if (!voicemailInfo.hasTranscription()) {
-        contentValues.put(Voicemails.TRANSCRIPTION, voicemailInfo.getTranscription());
-      }
-      contentValues.put(VoicemailContract.Voicemails.HAS_CONTENT, 1);
-      contentValues.put(RESTORED_COLUMN, "1");
-      contentValues.put(Voicemails.SOURCE_PACKAGE, getSourcePackage(context, voicemailInfo));
-
-      LogUtil.i(
-          "DialerBackupUtils.convertVoicemailProtoFileToContentValueAndEncodedAudio",
-          "cv: " + contentValues);
-
-      return Pair.create(contentValues, voicemailInfo.getEncodedVoicemailKey().toByteArray());
-    }
-  }
-
-  /**
-   * We should be using the system package name as the source package if there is no endless VM/VM
-   * archive present on the device. This is to separate pre-O (no endless VM) and O+ (endless VM)
-   * devices. This ensures that the source of truth for VMs is the VM server when endless VM is not
-   * enabled, and when endless VM/archived VMs is present, the source of truth for VMs is the device
-   * itself.
-   */
-  private static String getSourcePackage(Context context, VoicemailInfo voicemailInfo) {
-    if (ConfigProviderBindings.get(context)
-        .getBoolean("voicemail_restore_force_system_source_package", false)) {
-      LogUtil.i("DialerBackupUtils.getSourcePackage", "forcing system source package");
-      return "com.android.phone";
-    }
-    if (ConfigProviderBindings.get(context)
-        .getBoolean("voicemail_restore_check_archive_for_source_package", true)) {
-      if ("1".equals(voicemailInfo.getArchived())) {
-        LogUtil.i(
-            "DialerBackupUtils.getSourcePackage",
-            "voicemail was archived, using app source package");
-        // Using our app's source package will prevent the archived voicemail from being deleted by
-        // the system when it syncs with the voicemail server. In most cases the user will not see
-        // duplicate voicemails because this voicemail was archived and likely deleted from the
-        // voicemail server.
-        return context.getPackageName();
-      } else {
-        // Use the system source package. This means that if the voicemail is not present on the
-        // voicemail server then the system will delete it when it syncs.
-        LogUtil.i(
-            "DialerBackupUtils.getSourcePackage",
-            "voicemail was not archived, using system source package");
-        return "com.android.phone";
-      }
-    }
-    // Use our app's source package. This means that if the system syncs voicemail from the server
-    // the user could potentially get duplicate voicemails.
-    LogUtil.i("DialerBackupUtils.getSourcePackage", "defaulting to using app source package");
-    return context.getPackageName();
-  }
-
-  @TargetApi(VERSION_CODES.M)
-  private static boolean isDuplicate(Context context, VoicemailInfo voicemailInfo) {
-    // This checks for VM that might already exist, and doesn't restore them
-    try (Cursor cursor =
-        context
-            .getContentResolver()
-            .query(
-                VoicemailContract.Voicemails.CONTENT_URI,
-                null,
-                String.format(
-                    "(%s = ? AND %s = ? AND %s = ?)",
-                    Voicemails.NUMBER, Voicemails.DATE, Voicemails.DURATION),
-                new String[] {
-                  voicemailInfo.getNumber(), voicemailInfo.getDate(), voicemailInfo.getDuration()
-                },
-                null,
-                null)) {
-      if (cursor.moveToFirst()
-          && ConfigProviderBindings.get(context)
-              .getBoolean("enable_vm_restore_no_duplicate", true)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public static String getPhoneAccountClause(List<PhoneAccountHandle> phoneAccountsToArchive) {
-    Assert.checkArgument(!phoneAccountsToArchive.isEmpty());
-    StringBuilder whereQuery = new StringBuilder();
-
-    whereQuery.append("(");
-
-    for (int i = 0; i < phoneAccountsToArchive.size(); i++) {
-      whereQuery.append(
-          Voicemails.PHONE_ACCOUNT_ID + " = " + phoneAccountsToArchive.get(i).getId());
-
-      if (phoneAccountsToArchive.size() > 1 && i < phoneAccountsToArchive.size() - 1) {
-        whereQuery.append(" OR ");
-      }
-    }
-    whereQuery.append(")");
-    return whereQuery.toString();
-  }
-
-  public static List<PhoneAccountHandle> getPhoneAccountsToArchive(Context context) {
-    List<PhoneAccountHandle> phoneAccountsToBackUp = new ArrayList<>();
-
-    for (PhoneAccountHandle handle :
-        context.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts()) {
-
-      if (VoicemailComponent.get(context)
-          .getVoicemailClient()
-          .isVoicemailArchiveEnabled(context, handle)) {
-        phoneAccountsToBackUp.add(handle);
-        LogUtil.i(
-            "DialerBackupUtils.getPhoneAccountsToArchive", "enabled for: " + handle.toString());
-      } else {
-        LogUtil.i(
-            "DialerBackupUtils.getPhoneAccountsToArchive", "not enabled for: " + handle.toString());
-      }
-    }
-    return phoneAccountsToBackUp;
-  }
-}
diff --git a/java/com/android/dialer/backup/DialerPersistentBackupAgent.java b/java/com/android/dialer/backup/DialerPersistentBackupAgent.java
new file mode 100644
index 0000000..18cb084
--- /dev/null
+++ b/java/com/android/dialer/backup/DialerPersistentBackupAgent.java
@@ -0,0 +1,91 @@
+/*
+ * 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.backup;
+
+import android.app.backup.BackupDataInput;
+import android.app.backup.BackupDataOutput;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.util.ArrayMap;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.google.android.libraries.backup.BackupKeyPredicate;
+import com.google.android.libraries.backup.BackupKeyPredicates;
+import com.google.android.libraries.backup.PersistentBackupAgentHelper;
+import java.io.IOException;
+import java.util.Map;
+
+/** Implementation of Key/Value Backup that powers Dialer's backup and restore. */
+public class DialerPersistentBackupAgent extends PersistentBackupAgentHelper {
+
+  private static final String[] BACKUP_NAMED_SHARED_PREFS = {
+    "com.google.android.dialer_preferences", "com.google.android.dialer", "com.android.dialer"
+  };
+
+  @NonNull private final String[] sharedPreferencesToBackup;
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  DialerPersistentBackupAgent(@NonNull String[] sharedPrefs) {
+    this.sharedPreferencesToBackup = Assert.isNotNull(sharedPrefs);
+    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_KEY_VALUE_BACKUP_AGENT_CONSTRUCTOR);
+  }
+
+  public DialerPersistentBackupAgent() {
+    this(BACKUP_NAMED_SHARED_PREFS);
+  }
+
+  @Override
+  public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor stateFile)
+      throws IOException {
+    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_KEY_VALUE_ON_RESTORE);
+    LogUtil.i("DialerPersistentBackupAgent.onRestore", "restore from version: " + appVersionCode);
+    super.onRestore(data, appVersionCode, stateFile);
+  }
+
+  @Override
+  public void onBackup(
+      ParcelFileDescriptor oldState, BackupDataOutput data, ParcelFileDescriptor newState)
+      throws IOException {
+    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_KEY_VALUE_ON_BACKUP);
+    LogUtil.i("DialerPersistentBackupAgent.onBackup", "onBackup being performed");
+    super.onBackup(oldState, data, newState);
+  }
+
+  @Override
+  public Map<String, BackupKeyPredicate> getBackupSpecification() {
+    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_KEY_VALUE_GET_BACKUP_SPECIFICATION);
+    LogUtil.i(
+        "DialerPersistentBackupAgent.getBackupSpecification",
+        "number of files being backed up: " + sharedPreferencesToBackup.length);
+
+    Map<String, BackupKeyPredicate> arrayMap = new ArrayMap<>();
+    for (String fileName : sharedPreferencesToBackup) {
+      LogUtil.i("DialerPersistentBackupAgent.getBackupSpecification", "arrayMap.put: " + fileName);
+      arrayMap.put(fileName, BackupKeyPredicates.alwaysTrue());
+    }
+
+    return arrayMap;
+  }
+
+  @Override
+  public void onRestoreFinished() {
+    Logger.get(this).logImpression(DialerImpression.Type.BACKUP_KEY_VALUE_ON_RESTORE_FINISHED);
+    super.onRestoreFinished();
+  }
+}
diff --git a/java/com/android/dialer/backup/proto/voicemail_info.proto b/java/com/android/dialer/backup/proto/voicemail_info.proto
deleted file mode 100644
index b74cce9..0000000
--- a/java/com/android/dialer/backup/proto/voicemail_info.proto
+++ /dev/null
@@ -1,30 +0,0 @@
-syntax = "proto2";
-
-option java_package = "com.android.dialer.backup";
-option java_multiple_files = true;
-option optimize_for = LITE_RUNTIME;
-
-package com.android.dialer.backup;
-
-// Next id: 20
-message VoicemailInfo {
-  optional string date = 1;
-  optional string deleted = 2;
-  optional string dirty = 3;
-  optional string dir_type = 4;
-  optional string duration = 5;
-  optional string has_content = 6;
-  optional string is_read = 7;
-  optional string item_type = 8;
-  optional string last_modified = 9;
-  optional string mime_type = 10;
-  optional string number = 11;
-  optional string phone_account_component_name = 12;
-  optional string phone_account_id = 13;
-  optional string source_data = 14;
-  optional string source_package = 15;
-  optional string transcription = 16;
-  optional string voicemail_uri = 17;
-  optional bytes encoded_voicemail_key = 18;
-  optional string archived = 19;
-}
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
index 595401c..50db7f7 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -18,10 +18,14 @@
 
 import com.android.dialer.binary.basecomponent.BaseDialerRootComponent;
 import com.android.dialer.calllog.CallLogModule;
+import com.android.dialer.common.concurrent.DialerExecutorModule;
+import com.android.dialer.configprovider.SharedPrefConfigProviderModule;
 import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule;
 import com.android.dialer.inject.ContextModule;
 import com.android.dialer.lightbringer.stub.StubLightbringerModule;
+import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
 import com.android.dialer.simulator.impl.SimulatorModule;
+import com.android.dialer.storage.StorageModule;
 import com.android.incallui.calllocation.stub.StubCallLocationModule;
 import com.android.incallui.maps.stub.StubMapsModule;
 import com.android.voicemail.impl.VoicemailModule;
@@ -34,7 +38,11 @@
   modules = {
     CallLogModule.class,
     ContextModule.class,
+    DialerExecutorModule.class,
+    PhoneNumberGeoUtilModule.class,
+    SharedPrefConfigProviderModule.class,
     SimulatorModule.class,
+    StorageModule.class,
     StubCallLocationModule.class,
     StubEnrichedCallModule.class,
     StubMapsModule.class,
diff --git a/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml b/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml
new file mode 100644
index 0000000..15870cb
--- /dev/null
+++ b/java/com/android/dialer/binary/aosp/testing/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.binary.aosp.testing">
+
+  <application>
+    <activity android:name="com.android.dialer.binary.aosp.testing.TestActivity"/>
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/binary/aosp/testing/TestActivity.java b/java/com/android/dialer/binary/aosp/testing/TestActivity.java
new file mode 100644
index 0000000..9cb26da
--- /dev/null
+++ b/java/com/android/dialer/binary/aosp/testing/TestActivity.java
@@ -0,0 +1,25 @@
+/*
+ * 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.binary.aosp.testing;
+
+import android.app.Activity;
+
+/**
+ * An empty Activity to use in tests. This can be useful when UI needs to be tested outside an
+ * Activity, either as a background or to keep the test framework running.
+ */
+public class TestActivity extends Activity {}
diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
index 2deb7fd..30b1e8a 100644
--- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
+++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
@@ -17,9 +17,15 @@
 package com.android.dialer.binary.basecomponent;
 
 import com.android.dialer.calllog.CallLogComponent;
+import com.android.dialer.calllog.database.CallLogDatabaseComponent;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.main.MainComponent;
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.simulator.SimulatorComponent;
+import com.android.dialer.storage.StorageComponent;
 import com.android.incallui.calllocation.CallLocationComponent;
 import com.android.incallui.maps.MapsComponent;
 import com.android.voicemail.VoicemailComponent;
@@ -31,8 +37,14 @@
 public interface BaseDialerRootComponent
     extends CallLocationComponent.HasComponent,
         CallLogComponent.HasComponent,
+        CallLogDatabaseComponent.HasComponent,
+        ConfigProviderComponent.HasComponent,
+        DialerExecutorComponent.HasComponent,
+        MainComponent.HasComponent,
         EnrichedCallComponent.HasComponent,
         MapsComponent.HasComponent,
+        PhoneNumberGeoUtilComponent.HasComponent,
         SimulatorComponent.HasComponent,
+        StorageComponent.HasComponent,
         VoicemailComponent.HasComponent,
         LightbringerComponent.HasComponent {}
diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java
index a4c2e7d..580e0a3 100644
--- a/java/com/android/dialer/binary/common/DialerApplication.java
+++ b/java/com/android/dialer/binary/common/DialerApplication.java
@@ -17,17 +17,17 @@
 package com.android.dialer.binary.common;
 
 import android.app.Application;
-import android.os.StrictMode;
 import android.os.Trace;
 import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
 import com.android.dialer.blocking.BlockedNumbersAutoMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.buildtype.BuildType;
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.common.concurrent.DefaultDialerExecutorFactory;
 import com.android.dialer.inject.HasRootComponent;
 import com.android.dialer.notification.NotificationChannelManager;
 import com.android.dialer.persistentlog.PersistentLogger;
+import com.android.dialer.strictmode.DialerStrictMode;
 
 /** A common application subclass for all Dialer build variants. */
 public abstract class DialerApplication extends Application implements HasRootComponent {
@@ -37,9 +37,8 @@
   @Override
   public void onCreate() {
     Trace.beginSection("DialerApplication.onCreate");
-    if (BuildType.get() == BuildType.BUGFOOD) {
-      enableStrictMode();
-    }
+    DialerStrictMode.onApplicationCreate(this);
+
     super.onCreate();
     new BlockedNumbersAutoMigrator(
             this.getApplicationContext(),
@@ -49,16 +48,12 @@
     CallLogComponent.get(this).callLogFramework().registerContentObservers(getApplicationContext());
     PersistentLogger.initialize(this);
 
-    NotificationChannelManager.getInstance().firstInitIfNeeded(this);
+    if (BuildCompat.isAtLeastO()) {
+      NotificationChannelManager.initChannels(this);
+    }
     Trace.endSection();
   }
 
-  private void enableStrictMode() {
-    StrictMode.setThreadPolicy(
-        new StrictMode.ThreadPolicy.Builder().detectAll().penaltyDeath().build());
-    StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyDeath().build());
-  }
-
   /**
    * Returns a new instance of the root component for the application. Sub classes should define a
    * root component that extends all the sub components "HasComponent" intefaces. The component
diff --git a/java/com/android/dialer/binary/google/AndroidManifest.xml b/java/com/android/dialer/binary/google/AndroidManifest.xml
new file mode 100644
index 0000000..12abe82
--- /dev/null
+++ b/java/com/android/dialer/binary/google/AndroidManifest.xml
@@ -0,0 +1,112 @@
+<!-- Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
+  coreApp="true"
+  package="com.google.android.google_stub_dialer"
+  android:versionCode="170000"
+  android:versionName="13.0">
+
+  <uses-sdk
+    android:minSdkVersion="23"
+    android:targetSdkVersion="26"/>
+
+  <uses-permission android:name="android.permission.CALL_PHONE"/>
+  <uses-permission android:name="android.permission.READ_CONTACTS"/>
+  <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+  <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+  <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+  <uses-permission android:name="android.permission.READ_PROFILE"/>
+  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+  <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+  <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+  <uses-permission android:name="android.permission.NFC"/>
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+  <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+  <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+  <uses-permission android:name="android.permission.VIBRATE"/>
+  <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+  <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
+  <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+  <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+  <uses-permission android:name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+  <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+  <!-- We use this to disable the status bar buttons of home, back and recent
+  during an incoming call. By doing so this allows us to not show the user
+  is viewing the activity in full screen alert, on a fresh system/factory
+  reset state of the app. -->
+  <uses-permission android:name="android.permission.STATUS_BAR"/>
+  <uses-permission android:name="android.permission.CAMERA"/>
+
+  <!-- This tells the activity manager to not delay any of our activity
+   start requests, even if they happen immediately after the user
+   presses home. -->
+  <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>
+
+  <!-- Permissions needed for badger count showing on launch icon. -->
+
+  <!--for Samsung-->
+  <uses-permission android:name="com.sec.android.provider.badge.permission.READ"/>
+  <uses-permission android:name="com.sec.android.provider.badge.permission.WRITE"/>
+
+  <!--for htc-->
+  <uses-permission android:name="com.htc.launcher.permission.READ_SETTINGS"/>
+  <uses-permission android:name="com.htc.launcher.permission.UPDATE_SHORTCUT"/>
+
+  <!--for sony-->
+  <uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE"/>
+  <uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE"/>
+
+  <!--for apex-->
+  <uses-permission android:name="com.anddoes.launcher.permission.UPDATE_COUNT"/>
+
+  <!--for solid-->
+  <uses-permission android:name="com.majeur.launcher.permission.UPDATE_BADGE"/>
+
+  <!--for huawei-->
+  <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
+  <uses-permission android:name="com.huawei.android.launcher.permission.READ_SETTINGS"/>
+  <uses-permission android:name="com.huawei.android.launcher.permission.WRITE_SETTINGS"/>
+
+  <!--for ZUK-->
+  <uses-permission android:name="android.permission.READ_APP_BADGE"/>
+
+  <!--for OPPO-->
+  <uses-permission android:name="com.oppo.launcher.permission.READ_SETTINGS"/>
+  <uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS"/>
+
+  <application
+    android:hardwareAccelerated="true"
+    android:icon="@mipmap/ic_launcher_phone"
+    android:label="@string/applicationLabel"
+    android:name="com.android.dialer.binary.google.GoogleStubDialerApplication"
+    android:supportsRtl="true"
+    android:usesCleartextTraffic="false">
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java b/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java
new file mode 100644
index 0000000..e9289af
--- /dev/null
+++ b/java/com/android/dialer/binary/google/GoogleStubDialerApplication.java
@@ -0,0 +1,37 @@
+/*
+ * 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.binary.google;
+
+import android.support.annotation.NonNull;
+import com.android.dialer.binary.common.DialerApplication;
+import com.android.dialer.inject.ContextModule;
+
+/**
+ * The application class for the Google Stub Dialer. This is a version of the Dialer app that
+ * depends on Google Play Services.
+ */
+public class GoogleStubDialerApplication extends DialerApplication {
+
+  /** Returns a new instance of the root component for the Google Stub Dialer. */
+  @Override
+  @NonNull
+  protected Object buildRootComponent() {
+    return DaggerGoogleStubDialerRootComponent.builder()
+        .contextModule(new ContextModule(this))
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
new file mode 100644
index 0000000..cf51377
--- /dev/null
+++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
@@ -0,0 +1,56 @@
+/*
+ * 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.binary.google;
+
+import com.android.dialer.binary.basecomponent.BaseDialerRootComponent;
+import com.android.dialer.calllog.CallLogModule;
+import com.android.dialer.common.concurrent.DialerExecutorModule;
+import com.android.dialer.configprovider.SharedPrefConfigProviderModule;
+import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule;
+import com.android.dialer.inject.ContextModule;
+import com.android.dialer.lightbringer.stub.StubLightbringerModule;
+import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
+import com.android.dialer.simulator.impl.SimulatorModule;
+import com.android.dialer.storage.StorageModule;
+import com.android.incallui.calllocation.impl.CallLocationModule;
+import com.android.incallui.maps.impl.MapsModule;
+import com.android.voicemail.impl.VoicemailModule;
+import dagger.Component;
+import javax.inject.Singleton;
+
+/**
+ * Root component for the Google Stub Dialer application. Unlike the AOSP variant, this component
+ * can pull in modules that depend on Google Play Services like the maps module.
+ */
+@Singleton
+@Component(
+  modules = {
+    CallLocationModule.class,
+    CallLogModule.class,
+    ContextModule.class,
+    DialerExecutorModule.class,
+    PhoneNumberGeoUtilModule.class,
+    SharedPrefConfigProviderModule.class,
+    SimulatorModule.class,
+    StorageModule.class,
+    StubEnrichedCallModule.class,
+    MapsModule.class,
+    VoicemailModule.class,
+    StubLightbringerModule.class
+  }
+)
+public interface GoogleStubDialerRootComponent extends BaseDialerRootComponent {}
diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
index fa74850..62bb9f3 100644
--- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
+++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
@@ -262,7 +262,7 @@
   }
 
   /*
-   * TODO: b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a
+   * TODO(maxwelb): b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a
    * temporary workaround, determine which column of the database to query based on whether the
    * number is e164 or not.
    */
@@ -297,7 +297,9 @@
   public void blockNumber(final OnBlockNumberListener listener, ContentValues values) {
     blockedNumberCache.clear();
     if (!FilteredNumberCompat.canAttemptBlockOperations(context)) {
-      listener.onBlockComplete(null);
+      if (listener != null) {
+        listener.onBlockComplete(null);
+      }
       return;
     }
     startInsert(
diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java
index 9e01127..548c965 100644
--- a/java/com/android/dialer/blocking/FilteredNumberCompat.java
+++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java
@@ -38,6 +38,7 @@
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberSources;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberTypes;
+import com.android.dialer.strictmode.DialerStrictMode;
 import com.android.dialer.telecom.TelecomUtil;
 import java.util.ArrayList;
 import java.util.List;
@@ -124,8 +125,10 @@
    *     android.provider.BlockedNumberContract} blocking, {@code false} otherwise.
    */
   public static boolean hasMigratedToNewBlocking(Context context) {
-    return PreferenceManager.getDefaultSharedPreferences(context)
-        .getBoolean(HAS_MIGRATED_TO_NEW_BLOCKING_KEY, false);
+    return DialerStrictMode.bypass(
+        () ->
+            PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(HAS_MIGRATED_TO_NEW_BLOCKING_KEY, false));
   }
 
   /**
@@ -270,7 +273,7 @@
     }
 
     // Great Wall blocking, must be primary user and the default or system dialer
-    // TODO: check that we're the system Dialer
+    // TODO(maxwelb): check that we're the system Dialer
     return TelecomUtil.isDefaultDialer(context)
         && safeBlockedNumbersContractCanCurrentUserBlockNumbers(context);
   }
diff --git a/java/com/android/dialer/blocking/FilteredNumbersUtil.java b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
index cdcf1f7..fba3b86 100644
--- a/java/com/android/dialer/blocking/FilteredNumbersUtil.java
+++ b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
@@ -16,7 +16,6 @@
 package com.android.dialer.blocking;
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,6 +26,7 @@
 import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.BuildCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
@@ -35,8 +35,8 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.PermissionsUtil;
 import java.util.concurrent.TimeUnit;
@@ -45,8 +45,7 @@
 public class FilteredNumbersUtil {
 
   public static final String CALL_BLOCKING_NOTIFICATION_TAG = "call_blocking";
-  public static final int CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_NOTIFICATION_ID =
-      R.id.notification_call_blocking_disabled_by_emergency_call;
+  public static final int CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_NOTIFICATION_ID = 10;
   // Pref key for storing the time of end of the last emergency call in milliseconds after epoch.\
   @VisibleForTesting
   public static final String LAST_EMERGENCY_CALL_MS_PREF_KEY = "last_emergency_call_ms";
@@ -243,8 +242,6 @@
               return;
             }
 
-            NotificationManager notificationManager =
-                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
             Notification.Builder builder =
                 new Notification.Builder(context)
                     .setSmallIcon(R.drawable.quantum_ic_block_white_24)
@@ -254,7 +251,9 @@
                         context.getString(R.string.call_blocking_disabled_notification_text))
                     .setAutoCancel(true);
 
-            NotificationChannelManager.applyChannel(builder, context, Channel.DEFAULT, null);
+            if (BuildCompat.isAtLeastO()) {
+              builder.setChannelId(NotificationChannelId.DEFAULT);
+            }
             builder.setContentIntent(
                 PendingIntent.getActivity(
                     context,
@@ -262,7 +261,8 @@
                     FilteredNumberCompat.createManageBlockedNumbersIntent(context),
                     PendingIntent.FLAG_UPDATE_CURRENT));
 
-            notificationManager.notify(
+            DialerNotificationManager.notify(
+                context,
                 CALL_BLOCKING_NOTIFICATION_TAG,
                 CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_NOTIFICATION_ID,
                 builder.build());
diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png
deleted file mode 100644
index 2ccc89d..0000000
--- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_block_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png
deleted file mode 100644
index dc0c995..0000000
--- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png b/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png
deleted file mode 100644
index 919a872..0000000
--- a/java/com/android/dialer/blocking/res/drawable-hdpi/ic_report_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/blocking/res/values-hu/strings.xml b/java/com/android/dialer/blocking/res/values-hu/strings.xml
index 1070454..7981d6c 100644
--- a/java/com/android/dialer/blocking/res/values-hu/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-hu/strings.xml
@@ -33,7 +33,7 @@
     <string name="block_number_undo" msgid="5158120911892491697">"VISSZAVONÁS"</string>
     <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Az importálás nem sikerült"</string>
     <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"A hívások tiltása funkció kikapcsolva 48 órára"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Letiltva vészhívás miatt."</string>
+    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Letiltva segélyhívás miatt."</string>
     <string name="block_report_number_alert_title" msgid="2740581989824959611">"Letiltja a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
     <string name="block_report_number_alert_details" msgid="2652479394593143562">"A jövőben nem fogad hívásokat erről a számról."</string>
     <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> A hívást spamként jelentjük be."</string>
diff --git a/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java
new file mode 100644
index 0000000..45d72e0
--- /dev/null
+++ b/java/com/android/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java
@@ -0,0 +1,30 @@
+/*
+ * 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.buildtype;
+
+import com.android.dialer.proguard.UsedByReflection;
+
+/** Gets the build type. */
+@UsedByReflection(value = "BuildType.java")
+public class BuildTypeAccessorImpl implements BuildTypeAccessor {
+
+  @Override
+  @BuildType.Type
+  public int getBuildType() {
+    return BuildType.BUGFOOD;
+  }
+}
diff --git a/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java
new file mode 100644
index 0000000..e1f2cdc
--- /dev/null
+++ b/java/com/android/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java
@@ -0,0 +1,30 @@
+/*
+ * 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.buildtype;
+
+import com.android.dialer.proguard.UsedByReflection;
+
+/** Gets the build type. */
+@UsedByReflection(value = "BuildType.java")
+public class BuildTypeAccessorImpl implements BuildTypeAccessor {
+
+  @Override
+  @BuildType.Type
+  public int getBuildType() {
+    return BuildType.DOGFOOD;
+  }
+}
diff --git a/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java
new file mode 100644
index 0000000..e5ad901
--- /dev/null
+++ b/java/com/android/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java
@@ -0,0 +1,30 @@
+/*
+ * 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.buildtype;
+
+import com.android.dialer.proguard.UsedByReflection;
+
+/** Gets the build type. */
+@UsedByReflection(value = "BuildType.java")
+public class BuildTypeAccessorImpl implements BuildTypeAccessor {
+
+  @Override
+  @BuildType.Type
+  public int getBuildType() {
+    return BuildType.FISHFOOD;
+  }
+}
diff --git a/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java b/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java
new file mode 100644
index 0000000..80a1cb7
--- /dev/null
+++ b/java/com/android/dialer/buildtype/test/BuildTypeAccessorImpl.java
@@ -0,0 +1,30 @@
+/*
+ * 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.buildtype;
+
+import com.android.dialer.proguard.UsedByReflection;
+
+/** Gets the build type. */
+@UsedByReflection(value = "BuildType.java")
+public class BuildTypeAccessorImpl implements BuildTypeAccessor {
+
+  @Override
+  @BuildType.Type
+  public int getBuildType() {
+    return BuildType.TEST;
+  }
+}
diff --git a/java/com/android/dialer/callcomposer/AndroidManifest.xml b/java/com/android/dialer/callcomposer/AndroidManifest.xml
index 369db6f..cce7110 100644
--- a/java/com/android/dialer/callcomposer/AndroidManifest.xml
+++ b/java/com/android/dialer/callcomposer/AndroidManifest.xml
@@ -17,7 +17,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.callcomposer">
 
-  <application>
+  <application android:theme="@style/Theme.AppCompat">
     <activity
       android:name="com.android.dialer.callcomposer.CallComposerActivity"
       android:exported="true"
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index 074fc6d..fa380cc 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -23,51 +23,63 @@
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
-import android.support.v4.view.ViewPager;
+import android.support.v4.util.Pair;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Base64;
+import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnLayoutChangeListener;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
-import android.view.WindowManager.LayoutParams;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.QuickContactBadge;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
+import android.widget.Toast;
 import com.android.dialer.callcomposer.CallComposerFragment.CallComposerListener;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.UiUtil;
+import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.EnrichedCallManager.State;
 import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.enrichedcall.Session.State;
 import com.android.dialer.enrichedcall.extensions.StateExtension;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.protos.ProtoParsers;
 import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.UriUtils;
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.widget.DialerToolbar;
+import com.android.dialer.widget.LockableViewPager;
+import com.android.incallui.callpending.CallPendingActivity;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.File;
 
@@ -86,10 +98,10 @@
     implements OnClickListener,
         OnPageChangeListener,
         CallComposerListener,
-        OnLayoutChangeListener,
         EnrichedCallManager.StateChangedListener {
 
   public static final String KEY_CONTACT_NAME = "contact_name";
+  private static final String KEY_IS_FIRST_CALL_COMPOSE = "is_first_call_compose";
 
   private static final int ENTRANCE_ANIMATION_DURATION_MILLIS = 500;
   private static final int EXIT_ANIMATION_DURATION_MILLIS = 500;
@@ -98,11 +110,27 @@
   private static final String ARG_CALL_COMPOSER_CONTACT_BASE64 = "CALL_COMPOSER_CONTACT_BASE64";
 
   private static final String ENTRANCE_ANIMATION_KEY = "entrance_animation_key";
+  private static final String SEND_AND_CALL_READY_KEY = "send_and_call_ready_key";
   private static final String CURRENT_INDEX_KEY = "current_index_key";
   private static final String VIEW_PAGER_STATE_KEY = "view_pager_state_key";
   private static final String SESSION_ID_KEY = "session_id_key";
 
-  private CallComposerContact contact;
+  private final Handler timeoutHandler = ThreadUtil.getUiThreadHandler();
+  private final Runnable sessionStartedTimedOut =
+      () -> {
+        LogUtil.i("CallComposerActivity.sessionStartedTimedOutRunnable", "session never started");
+        setFailedResultAndFinish();
+      };
+  private final Runnable placeTelecomCallRunnable =
+      () -> {
+        LogUtil.i("CallComposerActivity.placeTelecomCallRunnable", "upload timed out.");
+        placeTelecomCall();
+      };
+  // Counter for the number of message sent updates received from EnrichedCallManager
+  private int messageSentCounter;
+  private boolean pendingCallStarted;
+
+  private DialerContact contact;
   private Long sessionId = Session.NO_SESSION_ID;
 
   private TextView nameView;
@@ -113,23 +141,25 @@
   private View sendAndCall;
   private TextView sendAndCallText;
 
+  private ProgressBar loading;
   private ImageView cameraIcon;
   private ImageView galleryIcon;
   private ImageView messageIcon;
-  private ViewPager pager;
+  private LockableViewPager pager;
   private CallComposerPagerAdapter adapter;
 
   private FrameLayout background;
   private LinearLayout windowContainer;
 
+  private DialerExecutor<Uri> copyAndResizeExecutor;
   private FastOutSlowInInterpolator interpolator;
   private boolean shouldAnimateEntrance = true;
   private boolean inFullscreenMode;
   private boolean isSendAndCallHidingOrHidden = true;
-  private boolean layoutChanged;
+  private boolean sendAndCallReady;
   private int currentIndex;
 
-  public static Intent newIntent(Context context, CallComposerContact contact) {
+  public static Intent newIntent(Context context, DialerContact contact) {
     Intent intent = new Intent(context, CallComposerActivity.class);
     ProtoParsers.put(intent, ARG_CALL_COMPOSER_CONTACT, contact);
     return intent;
@@ -140,19 +170,20 @@
     super.onCreate(savedInstanceState);
     setContentView(R.layout.call_composer_activity);
 
-    nameView = (TextView) findViewById(R.id.contact_name);
-    numberView = (TextView) findViewById(R.id.phone_number);
-    contactPhoto = (QuickContactBadge) findViewById(R.id.contact_photo);
-    cameraIcon = (ImageView) findViewById(R.id.call_composer_camera);
-    galleryIcon = (ImageView) findViewById(R.id.call_composer_photo);
-    messageIcon = (ImageView) findViewById(R.id.call_composer_message);
-    contactContainer = (RelativeLayout) findViewById(R.id.contact_bar);
-    pager = (ViewPager) findViewById(R.id.call_composer_view_pager);
-    background = (FrameLayout) findViewById(R.id.background);
-    windowContainer = (LinearLayout) findViewById(R.id.call_composer_container);
-    toolbar = (DialerToolbar) findViewById(R.id.toolbar);
+    nameView = findViewById(R.id.contact_name);
+    numberView = findViewById(R.id.phone_number);
+    contactPhoto = findViewById(R.id.contact_photo);
+    cameraIcon = findViewById(R.id.call_composer_camera);
+    galleryIcon = findViewById(R.id.call_composer_photo);
+    messageIcon = findViewById(R.id.call_composer_message);
+    contactContainer = findViewById(R.id.contact_bar);
+    pager = findViewById(R.id.call_composer_view_pager);
+    background = findViewById(R.id.background);
+    windowContainer = findViewById(R.id.call_composer_container);
+    toolbar = findViewById(R.id.toolbar);
     sendAndCall = findViewById(R.id.send_and_call_button);
-    sendAndCallText = (TextView) findViewById(R.id.send_and_call_text);
+    sendAndCallText = findViewById(R.id.send_and_call_text);
+    loading = findViewById(R.id.call_composer_loading);
 
     interpolator = new FastOutSlowInInterpolator();
     adapter =
@@ -162,7 +193,6 @@
     pager.setAdapter(adapter);
     pager.addOnPageChangeListener(this);
 
-    background.addOnLayoutChangeListener(this);
     cameraIcon.setOnClickListener(this);
     galleryIcon.setOnClickListener(this);
     messageIcon.setOnClickListener(this);
@@ -172,17 +202,13 @@
 
     if (savedInstanceState != null) {
       shouldAnimateEntrance = savedInstanceState.getBoolean(ENTRANCE_ANIMATION_KEY);
+      sendAndCallReady = savedInstanceState.getBoolean(SEND_AND_CALL_READY_KEY);
       pager.onRestoreInstanceState(savedInstanceState.getParcelable(VIEW_PAGER_STATE_KEY));
       currentIndex = savedInstanceState.getInt(CURRENT_INDEX_KEY);
       sessionId = savedInstanceState.getLong(SESSION_ID_KEY, Session.NO_SESSION_ID);
       onPageSelected(currentIndex);
     }
 
-    int adjustMode =
-        isLandscapeLayout()
-            ? LayoutParams.SOFT_INPUT_ADJUST_PAN
-            : LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
-    getWindow().setSoftInputMode(adjustMode);
     // Since we can't animate the views until they are ready to be drawn, we use this listener to
     // track that and animate the call compose UI as soon as it's ready.
     ViewUtil.doOnPreDraw(
@@ -194,13 +220,42 @@
         });
 
     setMediaIconSelected(currentIndex);
+
+    copyAndResizeExecutor =
+        DialerExecutors.createUiTaskBuilder(
+                getFragmentManager(),
+                "copyAndResizeImageToSend",
+                new CopyAndResizeImageWorker(this.getApplicationContext()))
+            .onSuccess(this::onCopyAndResizeImageSuccess)
+            .onFailure(this::onCopyAndResizeImageFailure)
+            .build();
+  }
+
+  private void onCopyAndResizeImageSuccess(Pair<File, String> output) {
+    Uri shareableUri =
+        FileProvider.getUriForFile(
+            CallComposerActivity.this, Constants.get().getFileProviderAuthority(), output.first);
+
+    placeRCSCall(
+        MultimediaData.builder().setImage(grantUriPermission(shareableUri), output.second));
+  }
+
+  private void onCopyAndResizeImageFailure(Throwable throwable) {
+    // TODO(b/34279096) - gracefully handle message failure
+    LogUtil.e("CallComposerActivity.onCopyAndResizeImageFailure", "copy Failed", throwable);
   }
 
   @Override
   protected void onResume() {
     super.onResume();
     getEnrichedCallManager().registerStateChangedListener(this);
-    if (sessionId == Session.NO_SESSION_ID) {
+    if (pendingCallStarted) {
+      // User went into incall ui and pressed disconnect before the image was done uploading.
+      // Kill the activity and cancel the telecom call.
+      timeoutHandler.removeCallbacks(placeTelecomCallRunnable);
+      setResult(RESULT_OK);
+      finish();
+    } else if (sessionId == Session.NO_SESSION_ID) {
       LogUtil.i("CallComposerActivity.onResume", "creating new session");
       sessionId = getEnrichedCallManager().startCallComposerSession(contact.getNumber());
     } else if (getEnrichedCallManager().getSession(sessionId) == null) {
@@ -218,11 +273,16 @@
   }
 
   @Override
-  protected void onPause() {
-    super.onPause();
+  protected void onDestroy() {
+    super.onDestroy();
     getEnrichedCallManager().unregisterStateChangedListener(this);
+    timeoutHandler.removeCallbacksAndMessages(null);
   }
 
+  /**
+   * This listener is registered in onResume and removed in onDestroy, meaning that calls to this
+   * method can come after onStop and updates to UI could cause crashes.
+   */
   @Override
   public void onEnrichedCallStateChanged() {
     refreshUiForCallComposerState();
@@ -240,12 +300,50 @@
         "state: %s",
         StateExtension.toString(state));
 
-    if (state == EnrichedCallManager.STATE_START_FAILED
-        || state == EnrichedCallManager.STATE_CLOSED) {
-      setFailedResultAndFinish();
+    switch (state) {
+      case Session.STATE_STARTING:
+        timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis());
+        if (sendAndCallReady) {
+          showLoadingUi();
+        }
+        break;
+      case Session.STATE_STARTED:
+        timeoutHandler.removeCallbacks(sessionStartedTimedOut);
+        if (sendAndCallReady) {
+          sendAndCall();
+        }
+        break;
+      case Session.STATE_START_FAILED:
+      case Session.STATE_CLOSED:
+        if (pendingCallStarted) {
+          placeTelecomCall();
+        } else {
+          setFailedResultAndFinish();
+        }
+        break;
+      case Session.STATE_MESSAGE_SENT:
+        if (++messageSentCounter == 3) {
+          // When we compose EC with images, there are 3 steps:
+          //  1. Message sent with no data
+          //  2. Image uploaded
+          //  3. url sent
+          // Once we receive 3 message sent updates, we know that we can proceed with the call.
+          timeoutHandler.removeCallbacks(placeTelecomCallRunnable);
+          placeTelecomCall();
+        }
+        break;
+      case Session.STATE_MESSAGE_FAILED:
+      case Session.STATE_NONE:
+      default:
+        break;
     }
   }
 
+  @VisibleForTesting
+  public long getSessionStartedTimeoutMillis() {
+    return ConfigProviderBindings.get(this).getLong("ec_session_started_timeout", 10_000);
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
@@ -264,13 +362,15 @@
     } else if (view == sendAndCall) {
       sendAndCall();
     } else {
-      Assert.fail();
+      throw Assert.createIllegalStateFailException("View on click not implemented: " + view);
     }
   }
 
   @Override
   public void sendAndCall() {
     if (!sessionReady()) {
+      sendAndCallReady = true;
+      showLoadingUi();
       LogUtil.i("CallComposerActivity.onClick", "sendAndCall pressed, but the session isn't ready");
       Logger.get(this)
           .logImpression(
@@ -292,28 +392,8 @@
       GalleryComposerFragment galleryComposerFragment = (GalleryComposerFragment) fragment;
       // If the current data is not a copy, make one.
       if (!galleryComposerFragment.selectedDataIsCopy()) {
-        DialerExecutors.createUiTaskBuilder(
-                getFragmentManager(),
-                "copyAndResizeImageToSend",
-                new CopyAndResizeImageWorker(this.getApplicationContext()))
-            .onSuccess(
-                output -> {
-                  Uri shareableUri =
-                      FileProvider.getUriForFile(
-                          CallComposerActivity.this,
-                          Constants.get().getFileProviderAuthority(),
-                          output.first);
-
-                  builder.setImage(grantUriPermission(shareableUri), output.second);
-                  placeRCSCall(builder);
-                })
-            .onFailure(
-                throwable -> {
-                  // TODO(b/34279096) - gracefully handle message failure
-                  LogUtil.e("CallComposerActivity.onCopyFailed", "copy Failed", throwable);
-                })
-            .build()
-            .executeParallel(galleryComposerFragment.getGalleryData().getFileUri());
+        copyAndResizeExecutor.executeParallel(
+            galleryComposerFragment.getGalleryData().getFileUri());
       } else {
         Uri shareableUri =
             FileProvider.getUriForFile(
@@ -338,19 +418,65 @@
     }
   }
 
-  private boolean sessionReady() {
-    Session session = getEnrichedCallManager().getSession(sessionId);
-    if (session == null) {
-      return false;
-    }
-
-    return session.getState() == EnrichedCallManager.STATE_STARTED;
+  private void showLoadingUi() {
+    loading.setVisibility(View.VISIBLE);
+    pager.setSwipingLocked(true);
   }
 
-  private void placeRCSCall(MultimediaData.Builder builder) {
-    LogUtil.i("CallComposerActivity.placeRCSCall", "placing enriched call");
+  private boolean sessionReady() {
+    Session session = getEnrichedCallManager().getSession(sessionId);
+    return session != null && session.getState() == Session.STATE_STARTED;
+  }
+
+  @VisibleForTesting
+  public void placeRCSCall(MultimediaData.Builder builder) {
+    MultimediaData data = builder.build();
+    LogUtil.i("CallComposerActivity.placeRCSCall", "placing enriched call, data: " + data);
     Logger.get(this).logImpression(DialerImpression.Type.CALL_COMPOSER_ACTIVITY_PLACE_RCS_CALL);
-    getEnrichedCallManager().sendCallComposerData(sessionId, builder.build());
+
+    getEnrichedCallManager().sendCallComposerData(sessionId, data);
+    maybeShowPrivacyToast(data);
+    if (data.hasImageData()
+        && ConfigProviderBindings.get(this).getBoolean("enable_delayed_ec_images", true)
+        && !TelecomUtil.isInCall(this)) {
+      timeoutHandler.postDelayed(placeTelecomCallRunnable, getRCSTimeoutMillis());
+      startActivity(
+          CallPendingActivity.getIntent(
+              this,
+              contact.getNameOrNumber(),
+              contact.getDisplayNumber(),
+              contact.getNumberLabel(),
+              UriUtils.getLookupKeyFromUri(Uri.parse(contact.getContactUri())),
+              getString(R.string.call_composer_image_uploading),
+              Uri.parse(contact.getPhotoUri()),
+              sessionId));
+      pendingCallStarted = true;
+    } else {
+      placeTelecomCall();
+    }
+  }
+
+  private void maybeShowPrivacyToast(MultimediaData data) {
+    SharedPreferences preferences =
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this);
+    // Show a toast for privacy purposes if this is the first time a user uses call composer.
+    if (preferences.getBoolean(KEY_IS_FIRST_CALL_COMPOSE, true)) {
+      int privacyMessage =
+          data.hasImageData() ? R.string.image_sent_messages : R.string.message_sent_messages;
+      Toast toast = Toast.makeText(this, privacyMessage, Toast.LENGTH_LONG);
+      int yOffset = getResources().getDimensionPixelOffset(R.dimen.privacy_toast_y_offset);
+      toast.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM, 0, yOffset);
+      toast.show();
+      preferences.edit().putBoolean(KEY_IS_FIRST_CALL_COMPOSE, false).apply();
+    }
+  }
+
+  @VisibleForTesting
+  public long getRCSTimeoutMillis() {
+    return ConfigProviderBindings.get(this).getLong("ec_image_upload_timeout", 15_000);
+  }
+
+  private void placeTelecomCall() {
     TelecomUtil.placeCall(
         this,
         new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_COMPOSER).build());
@@ -360,7 +486,7 @@
 
   /** Give permission to Messenger to view our image for RCS purposes. */
   private Uri grantUriPermission(Uri uri) {
-    // TODO: Move this to the enriched call manager.
+    // TODO(sail): Move this to the enriched call manager.
     grantUriPermission(
         "com.google.android.apps.messaging", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
     return uri;
@@ -376,10 +502,6 @@
     }
     if (currentIndex == CallComposerPagerAdapter.INDEX_MESSAGE) {
       UiUtil.hideKeyboardFrom(this, windowContainer);
-    } else if (position == CallComposerPagerAdapter.INDEX_MESSAGE
-        && inFullscreenMode
-        && !isLandscapeLayout()) {
-      UiUtil.openKeyboardFrom(this, windowContainer);
     }
     currentIndex = position;
     CallComposerFragment fragment = (CallComposerFragment) adapter.instantiateItem(pager, position);
@@ -398,6 +520,7 @@
     super.onSaveInstanceState(outState);
     outState.putParcelable(VIEW_PAGER_STATE_KEY, pager.onSaveInstanceState());
     outState.putBoolean(ENTRANCE_ANIMATION_KEY, shouldAnimateEntrance);
+    outState.putBoolean(SEND_AND_CALL_READY_KEY, sendAndCallReady);
     outState.putInt(CURRENT_INDEX_KEY, currentIndex);
     outState.putLong(SESSION_ID_KEY, sessionId);
   }
@@ -424,28 +547,6 @@
     animateSendAndCall(fragment.shouldHide());
   }
 
-  // To detect when the keyboard changes.
-  @Override
-  public void onLayoutChange(
-      View view,
-      int left,
-      int top,
-      int right,
-      int bottom,
-      int oldLeft,
-      int oldTop,
-      int oldRight,
-      int oldBottom) {
-    // To prevent infinite layout change loops
-    if (layoutChanged) {
-      layoutChanged = false;
-      return;
-    }
-
-    layoutChanged = true;
-    showFullscreen(contactContainer.getTop() < 0 || inFullscreenMode);
-  }
-
   /**
    * Reads arguments from the fragment arguments and populates the necessary instance variables.
    * Copied from {@link com.android.contacts.common.dialog.CallSubjectDialog}.
@@ -456,14 +557,14 @@
       byte[] bytes =
           Base64.decode(intent.getStringExtra(ARG_CALL_COMPOSER_CONTACT_BASE64), Base64.DEFAULT);
       try {
-        contact = CallComposerContact.parseFrom(bytes);
+        contact = DialerContact.parseFrom(bytes);
       } catch (InvalidProtocolBufferException e) {
         throw Assert.createAssertionFailException(e.toString());
       }
     } else {
       contact =
           ProtoParsers.getTrusted(
-              intent, ARG_CALL_COMPOSER_CONTACT, CallComposerContact.getDefaultInstance());
+              intent, ARG_CALL_COMPOSER_CONTACT, DialerContact.getDefaultInstance());
     }
     updateContactInfo();
   }
@@ -634,12 +735,20 @@
                   public void onAnimationStart(Animator animation) {
                     isSendAndCallHidingOrHidden = shouldHide;
                     sendAndCall.setVisibility(View.VISIBLE);
+                    cameraIcon.setVisibility(View.VISIBLE);
+                    galleryIcon.setVisibility(View.VISIBLE);
+                    messageIcon.setVisibility(View.VISIBLE);
                   }
 
                   @Override
                   public void onAnimationEnd(Animator animation) {
                     if (isSendAndCallHidingOrHidden) {
                       sendAndCall.setVisibility(View.INVISIBLE);
+                    } else {
+                      // hide buttons to prevent overdrawing and talkback discoverability
+                      cameraIcon.setVisibility(View.GONE);
+                      galleryIcon.setVisibility(View.GONE);
+                      messageIcon.setVisibility(View.GONE);
                     }
                   }
 
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index f65207f..a5c65fd 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -17,7 +17,6 @@
 package com.android.dialer.callcomposer;
 
 import android.Manifest;
-import android.Manifest.permission;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Animatable;
@@ -89,17 +88,17 @@
       LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle bundle) {
     View root = inflater.inflate(R.layout.fragment_camera_composer, container, false);
     permissionView = root.findViewById(R.id.permission_view);
-    loading = (ProgressBar) root.findViewById(R.id.loading);
-    cameraView = (CameraMediaChooserView) root.findViewById(R.id.camera_view);
+    loading = root.findViewById(R.id.loading);
+    cameraView = root.findViewById(R.id.camera_view);
     shutter = cameraView.findViewById(R.id.camera_shutter_visual);
-    exitFullscreen = (ImageButton) cameraView.findViewById(R.id.camera_exit_fullscreen);
-    fullscreen = (ImageButton) cameraView.findViewById(R.id.camera_fullscreen);
-    swapCamera = (ImageButton) cameraView.findViewById(R.id.swap_camera_button);
-    capture = (ImageButton) cameraView.findViewById(R.id.camera_capture_button);
-    cancel = (ImageButton) cameraView.findViewById(R.id.camera_cancel_button);
-    focus = (RenderOverlay) cameraView.findViewById(R.id.focus_visual);
-    preview = (CameraPreviewHost) cameraView.findViewById(R.id.camera_preview);
-    previewImageView = (ImageView) root.findViewById(R.id.preview_image_view);
+    exitFullscreen = cameraView.findViewById(R.id.camera_exit_fullscreen);
+    fullscreen = cameraView.findViewById(R.id.camera_fullscreen);
+    swapCamera = cameraView.findViewById(R.id.swap_camera_button);
+    capture = cameraView.findViewById(R.id.camera_capture_button);
+    cancel = cameraView.findViewById(R.id.camera_cancel_button);
+    focus = cameraView.findViewById(R.id.focus_visual);
+    preview = cameraView.findViewById(R.id.camera_preview);
+    previewImageView = root.findViewById(R.id.preview_image_view);
 
     exitFullscreen.setOnClickListener(this);
     fullscreen.setOnClickListener(this);
@@ -107,11 +106,12 @@
     capture.setOnClickListener(this);
     cancel.setOnClickListener(this);
 
-    if (!PermissionsUtil.hasPermission(getContext(), permission.CAMERA)) {
+
+    if (!PermissionsUtil.hasCameraPermissions(getContext())) {
       LogUtil.i("CameraComposerFragment.onCreateView", "Permission view shown.");
       Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DISPLAYED);
-      ImageView permissionImage = (ImageView) permissionView.findViewById(R.id.permission_icon);
-      TextView permissionText = (TextView) permissionView.findViewById(R.id.permission_text);
+      ImageView permissionImage = permissionView.findViewById(R.id.permission_icon);
+      TextView permissionText = permissionView.findViewById(R.id.permission_text);
       allowPermission = permissionView.findViewById(R.id.allow);
 
       allowPermission.setOnClickListener(this);
@@ -131,6 +131,9 @@
   }
 
   private void setupCamera() {
+    if (!PermissionsUtil.hasCameraPrivacyToastShown(getContext())) {
+      PermissionsUtil.showCameraPermissionToast(getContext());
+    }
     CameraManager.get().setListener(this);
     preview.setShown();
     CameraManager.get().setRenderOverlay(focus);
@@ -323,7 +326,11 @@
   /** Updates the state of the buttons and overlays based on the current state of the view */
   private void updateViewState() {
     Assert.isNotNull(cameraView);
-    Assert.isNotNull(getContext());
+    if (isDetached() || getContext() == null) {
+      LogUtil.i(
+          "CameraComposerFragment.updateViewState", "Fragment detached, cannot update view state");
+      return;
+    }
 
     boolean isCameraAvailable = CameraManager.get().isCameraAvailable();
     boolean uriReadyOrProcessing = cameraUri != null || processingUri;
@@ -336,6 +343,12 @@
       previewImageView.setVisibility(View.GONE);
     }
 
+    if (cameraDirection == CameraInfo.CAMERA_FACING_FRONT) {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_rear));
+    } else {
+      swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_facing));
+    }
+
     if (cameraUri == null && isCameraAvailable) {
       CameraManager.get().resetPreview();
       cancel.setVisibility(View.GONE);
@@ -384,6 +397,7 @@
       Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_GRANTED);
       LogUtil.i("CameraComposerFragment.onRequestPermissionsResult", "Permission granted.");
       permissionView.setVisibility(View.GONE);
+      PermissionsUtil.setCameraPrivacyToastShown(getContext());
       setupCamera();
     } else if (requestCode == CAMERA_PERMISSION) {
       Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DENIED);
diff --git a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
index aeb8e03..725cea7 100644
--- a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
+++ b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
@@ -21,6 +21,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
+import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
@@ -47,17 +48,26 @@
   }
 
   /**
-   * @param input The input Uri is expected to be a image openable by {@link
-   *     android.content.ContentResolver#openInputStream(Uri)}.
+   * @param input The filepath where the image is located.
    * @return a Pair where the File contains the resized image, and the String is the result File's
    *     MIME type.
    */
   @Nullable
   @Override
   public Pair<File, String> doInBackground(@Nullable Uri input) throws Throwable {
+    // BitmapFactory.decodeStream strips exif data, so we need to save it here and apply it later.
+    int rotation = 0;
+    try {
+      rotation =
+          new ExifInterface(input.getPath())
+              .getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+    } catch (Exception ignored) {
+      // Couldn't get exif tags, not the end of the world
+    }
+
     try (InputStream inputStream = context.getContentResolver().openInputStream(input)) {
       Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
-      bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap);
+      bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap, exifToDegrees(rotation));
 
       File outputFile = DialerUtils.createShareableFile(context);
       try (OutputStream outputStream = new FileOutputStream(outputFile)) {
@@ -67,4 +77,17 @@
       }
     }
   }
+
+  private static int exifToDegrees(int exifOrientation) {
+    switch (exifOrientation) {
+      case ExifInterface.ORIENTATION_ROTATE_90:
+        return 90;
+      case ExifInterface.ORIENTATION_ROTATE_180:
+        return 180;
+      case ExifInterface.ORIENTATION_ROTATE_270:
+        return 270;
+      default:
+        return 0;
+    }
+  }
 }
diff --git a/java/com/android/dialer/callcomposer/GalleryCursorLoader.java b/java/com/android/dialer/callcomposer/GalleryCursorLoader.java
index f9990e1..d33bfb3 100644
--- a/java/com/android/dialer/callcomposer/GalleryCursorLoader.java
+++ b/java/com/android/dialer/callcomposer/GalleryCursorLoader.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.callcomposer;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.provider.MediaStore.Files;
@@ -28,7 +27,7 @@
 public class GalleryCursorLoader extends CursorLoader {
   public static final String MEDIA_SCANNER_VOLUME_EXTERNAL = "external";
   public static final String[] ACCEPTABLE_IMAGE_TYPES =
-      new String[] {"image/jpeg", "image/jpg", "image/png", "image/gif", "image/webp"};
+      new String[] {"image/jpeg", "image/jpg", "image/png", "image/webp"};
 
   private static final Uri STORAGE_URI = Files.getContentUri(MEDIA_SCANNER_VOLUME_EXTERNAL);
   private static final String SORT_ORDER = Media.DATE_MODIFIED + " DESC";
@@ -44,11 +43,10 @@
         SORT_ORDER);
   }
 
-  @SuppressLint("DefaultLocale")
   private static String createSelection() {
-    return String.format(
-        "mime_type IN ('image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp')"
-            + " AND media_type in (%d)",
-        FileColumns.MEDIA_TYPE_IMAGE);
+    return "mime_type IN ('image/jpeg', 'image/jpg', 'image/png', 'image/webp')"
+        + " AND media_type in ("
+        + FileColumns.MEDIA_TYPE_IMAGE
+        + ")";
   }
 }
diff --git a/java/com/android/dialer/callcomposer/MessageComposerFragment.java b/java/com/android/dialer/callcomposer/MessageComposerFragment.java
index 2a342bb..392f6e7 100644
--- a/java/com/android/dialer/callcomposer/MessageComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/MessageComposerFragment.java
@@ -24,11 +24,8 @@
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -36,17 +33,12 @@
 
 /** Fragment used to compose call with message fragment. */
 public class MessageComposerFragment extends CallComposerFragment
-    implements OnClickListener,
-        TextWatcher,
-        OnTouchListener,
-        OnLongClickListener,
-        OnEditorActionListener {
+    implements OnClickListener, TextWatcher, OnEditorActionListener {
   private static final String CHAR_LIMIT_KEY = "char_limit";
 
   public static final int NO_CHAR_LIMIT = -1;
 
   private EditText customMessage;
-  private boolean isLongClick = false;
   private int charLimit;
 
   public static MessageComposerFragment newInstance(int charLimit) {
@@ -73,8 +65,6 @@
     customMessage = (EditText) view.findViewById(R.id.custom_message);
 
     urgent.setOnClickListener(this);
-    customMessage.setOnTouchListener(this);
-    customMessage.setOnLongClickListener(this);
     customMessage.addTextChangedListener(this);
     customMessage.setOnEditorActionListener(this);
     if (charLimit != NO_CHAR_LIMIT) {
@@ -118,30 +108,6 @@
     getListener().composeCall(this);
   }
 
-  /**
-   * EditTexts take two clicks to dispatch an onClick() event, so instead we add an onTouchListener
-   * to listen for them. The caveat to this is that it also requires listening for onLongClicks to
-   * distinguish whether a MotionEvent came from a click or a long click.
-   */
-  @Override
-  public boolean onTouch(View view, MotionEvent event) {
-    if (event.getAction() == MotionEvent.ACTION_UP) {
-      if (isLongClick) {
-        isLongClick = false;
-      } else {
-        getListener().showFullscreen(true);
-      }
-    }
-    view.performClick();
-    return false;
-  }
-
-  @Override
-  public boolean onLongClick(View v) {
-    isLongClick = true;
-    return false;
-  }
-
   @Override
   public boolean shouldHide() {
     return TextUtils.isEmpty(getMessage());
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 4cc08ba..f79f654 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -35,6 +35,7 @@
 import com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -118,7 +119,7 @@
   /**
    * The task for opening the camera, so it doesn't block the UI thread Using AsyncTask rather than
    * SafeAsyncTask because the tasks need to be serialized, but don't need to be on the UI thread
-   * TODO: If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need
+   * TODO(blemmon): If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need
    * to create a dedicated thread, or synchronize the threads in the thread pool
    */
   private AsyncTask<Integer, Void, Camera> mOpenCameraTask;
@@ -457,9 +458,9 @@
             int height;
             if (mRotation == 90 || mRotation == 270) {
               // Is rotated, so swapping dimensions is desired
-              //noinspection SuspiciousNameCombination
+              // noinspection SuspiciousNameCombination
               width = size.height;
-              //noinspection SuspiciousNameCombination
+              // noinspection SuspiciousNameCombination
               height = size.width;
             } else {
               width = size.width;
@@ -467,9 +468,20 @@
             }
             LogUtil.i(
                 "CameraManager.onPictureTaken", "taken picture size: " + bytes.length + " bytes");
-            new ImagePersistTask(
-                    width, height, heightPercent, bytes, mCameraPreview.getContext(), callback)
-                .execute();
+            DialerExecutors.createNonUiTaskBuilder(
+                    new ImagePersistWorker(
+                        width, height, heightPercent, bytes, mCameraPreview.getContext()))
+                .onSuccess(
+                    (result) -> {
+                      callback.onMediaReady(
+                          result.getUri(), "image/jpeg", result.getWidth(), result.getHeight());
+                    })
+                .onFailure(
+                    (throwable) -> {
+                      callback.onMediaFailed(new Exception("Persisting image failed", throwable));
+                    })
+                .build()
+                .executeSerial(null);
           }
         };
 
@@ -509,62 +521,61 @@
     }.execute();
   }
 
-  /** Updates the orientation of the camera to match the orientation of the device */
-  private void updateCameraOrientation() {
-    if (mCamera == null || mCameraPreview == null || mTakingPicture) {
-      return;
+  /**
+   * Updates the orientation of the {@link Camera} w.r.t. the orientation of the device and the
+   * orientation that the physical camera is mounted on the device.
+   *
+   * @param camera that needs to be reorientated
+   * @param screenRotation rotation of the physical device
+   * @param cameraOrientation {@link CameraInfo#orientation}
+   * @param cameraIsFrontFacing {@link CameraInfo#CAMERA_FACING_FRONT}
+   * @return rotation that images returned from {@link
+   *     android.hardware.Camera.PictureCallback#onPictureTaken(byte[], Camera)} will be rotated.
+   */
+  @VisibleForTesting
+  static int updateCameraRotation(
+      @NonNull Camera camera,
+      int screenRotation,
+      int cameraOrientation,
+      boolean cameraIsFrontFacing) {
+    Assert.isNotNull(camera);
+    Assert.checkArgument(cameraOrientation % 90 == 0);
+
+    int rotation = screenRotationToDegress(screenRotation);
+    boolean portrait = rotation == 0 || rotation == 180;
+
+    if (!portrait && !cameraIsFrontFacing) {
+      rotation += 180;
+    }
+    rotation += cameraOrientation;
+    rotation %= 360;
+
+    // Rotate the camera
+    if (portrait && cameraIsFrontFacing) {
+      camera.setDisplayOrientation((rotation + 180) % 360);
+    } else {
+      camera.setDisplayOrientation(rotation);
     }
 
-    final WindowManager windowManager =
-        (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
+    // Rotate the images returned when a picture is taken
+    Camera.Parameters params = camera.getParameters();
+    params.setRotation(rotation);
+    camera.setParameters(params);
+    return rotation;
+  }
 
-    int degrees;
-    switch (windowManager.getDefaultDisplay().getRotation()) {
+  private static int screenRotationToDegress(int screenRotation) {
+    switch (screenRotation) {
       case Surface.ROTATION_0:
-        degrees = 0;
-        break;
+        return 0;
       case Surface.ROTATION_90:
-        degrees = 90;
-        break;
+        return 90;
       case Surface.ROTATION_180:
-        degrees = 180;
-        break;
+        return 180;
       case Surface.ROTATION_270:
-        degrees = 270;
-        break;
+        return 270;
       default:
-        throw Assert.createAssertionFailException("");
-    }
-
-    // The display orientation of the camera (this controls the preview image).
-    int orientation;
-
-    // The clockwise rotation angle relative to the orientation of the camera. This affects
-    // pictures returned by the camera in Camera.PictureCallback.
-    int rotation;
-    if (mCameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-      orientation = (mCameraInfo.orientation + degrees) % 360;
-      rotation = orientation;
-      // compensate the mirror but only for orientation
-      orientation = (360 - orientation) % 360;
-    } else { // back-facing
-      orientation = (mCameraInfo.orientation - degrees + 360) % 360;
-      rotation = orientation;
-    }
-    mRotation = rotation;
-    try {
-      mCamera.setDisplayOrientation(orientation);
-      final Camera.Parameters params = mCamera.getParameters();
-      params.setRotation(rotation);
-      mCamera.setParameters(params);
-    } catch (final RuntimeException e) {
-      LogUtil.e(
-          "CameraManager.updateCameraOrientation",
-          "RuntimeException in CameraManager.updateCameraOrientation",
-          e);
-      if (mListener != null) {
-        mListener.onCameraError(ERROR_OPENING_CAMERA, e);
-      }
+        throw Assert.createIllegalStateFailException("Invalid surface rotation.");
     }
   }
 
@@ -589,13 +600,19 @@
         mOrientationHandler.disable();
         mOrientationHandler = null;
       }
-      //      releaseMediaRecorder(true /* cleanupFile */);
       mFocusOverlayManager.onPreviewStopped();
       return;
     }
     try {
       mCamera.stopPreview();
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
 
       final Camera.Parameters params = mCamera.getParameters();
       final Camera.Size pictureSize = chooseBestPictureSize();
@@ -644,6 +661,14 @@
     }
   }
 
+  private int getScreenRotation() {
+    return mCameraPreview
+        .getContext()
+        .getSystemService(WindowManager.class)
+        .getDefaultDisplay()
+        .getRotation();
+  }
+
   public boolean isCameraAvailable() {
     return mCamera != null && !mTakingPicture && mIsHardwareAccelerationSupported;
   }
@@ -681,7 +706,14 @@
 
     @Override
     public void onOrientationChanged(final int orientation) {
-      updateCameraOrientation();
+      if (!mTakingPicture) {
+        mRotation =
+            updateCameraRotation(
+                mCamera,
+                getScreenRotation(),
+                mCameraInfo.orientation,
+                mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT);
+      }
     }
   }
 
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
deleted file mode 100644
index 31751e5..0000000
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2016 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.callcomposer.camera;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.net.Uri;
-import android.os.Build.VERSION_CODES;
-import android.support.v4.content.FileProvider;
-import com.android.dialer.callcomposer.camera.exif.ExifInterface;
-import com.android.dialer.callcomposer.camera.exif.ExifTag;
-import com.android.dialer.callcomposer.util.BitmapResizer;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.concurrent.FallibleAsyncTask;
-import com.android.dialer.constants.Constants;
-import com.android.dialer.util.DialerUtils;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/** Persisting image routine. */
-@TargetApi(VERSION_CODES.M)
-public class ImagePersistTask extends FallibleAsyncTask<Void, Void, Uri> {
-  private int mWidth;
-  private int mHeight;
-  private final float mHeightPercent;
-  private final byte[] mBytes;
-  private final Context mContext;
-  private final CameraManager.MediaCallback mCallback;
-
-  ImagePersistTask(
-      final int width,
-      final int height,
-      final float heightPercent,
-      final byte[] bytes,
-      final Context context,
-      final CameraManager.MediaCallback callback) {
-    Assert.checkArgument(heightPercent >= 0 && heightPercent <= 1);
-    Assert.isNotNull(bytes);
-    Assert.isNotNull(context);
-    Assert.isNotNull(callback);
-    mWidth = width;
-    mHeight = height;
-    mHeightPercent = heightPercent;
-    mBytes = bytes;
-    mContext = context;
-    mCallback = callback;
-  }
-
-  @Override
-  protected Uri doInBackgroundFallible(final Void... params) throws Exception {
-    File outputFile = DialerUtils.createShareableFile(mContext);
-
-    try (OutputStream outputStream = new FileOutputStream(outputFile)) {
-      if (mHeightPercent != 1.0f) {
-        writeClippedBitmap(outputStream);
-      } else {
-        Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length);
-        bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap);
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
-      }
-    }
-
-    return FileProvider.getUriForFile(
-        mContext, Constants.get().getFileProviderAuthority(), outputFile);
-  }
-
-  @Override
-  protected void onPostExecute(FallibleTaskResult<Uri> result) {
-    if (result.isFailure()) {
-      mCallback.onMediaFailed(new Exception("Persisting image failed", result.getThrowable()));
-    } else {
-      mCallback.onMediaReady(result.getResult(), "image/jpeg", mWidth, mHeight);
-    }
-  }
-
-  private void writeClippedBitmap(OutputStream outputStream) throws IOException {
-    int orientation = android.media.ExifInterface.ORIENTATION_UNDEFINED;
-    final ExifInterface exifInterface = new ExifInterface();
-    try {
-      exifInterface.readExif(mBytes);
-      final Integer orientationValue = exifInterface.getTagIntValue(ExifInterface.TAG_ORIENTATION);
-      if (orientationValue != null) {
-        orientation = orientationValue.intValue();
-      }
-    } catch (final IOException e) {
-      // Couldn't get exif tags, not the end of the world
-    }
-    Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length);
-    final int clippedWidth;
-    final int clippedHeight;
-    if (ExifInterface.getOrientationParams(orientation).invertDimensions) {
-      Assert.checkState(mWidth == bitmap.getHeight());
-      Assert.checkState(mHeight == bitmap.getWidth());
-      clippedWidth = (int) (mHeight * mHeightPercent);
-      clippedHeight = mWidth;
-    } else {
-      Assert.checkState(mWidth == bitmap.getWidth());
-      Assert.checkState(mHeight == bitmap.getHeight());
-      clippedWidth = mWidth;
-      clippedHeight = (int) (mHeight * mHeightPercent);
-    }
-    final int offsetTop = (bitmap.getHeight() - clippedHeight) / 2;
-    final int offsetLeft = (bitmap.getWidth() - clippedWidth) / 2;
-    mWidth = clippedWidth;
-    mHeight = clippedHeight;
-    Bitmap clippedBitmap =
-        Bitmap.createBitmap(clippedWidth, clippedHeight, Bitmap.Config.ARGB_8888);
-    clippedBitmap.setDensity(bitmap.getDensity());
-    final Canvas clippedBitmapCanvas = new Canvas(clippedBitmap);
-    final Matrix matrix = new Matrix();
-    matrix.postTranslate(-offsetLeft, -offsetTop);
-    clippedBitmapCanvas.drawBitmap(bitmap, matrix, null /* paint */);
-    clippedBitmapCanvas.save();
-    clippedBitmap = BitmapResizer.resizeForEnrichedCalling(clippedBitmap);
-    // EXIF data can take a big chunk of the file size and is often cleared by the
-    // carrier, only store orientation since that's critical
-    final ExifTag orientationTag = exifInterface.getTag(ExifInterface.TAG_ORIENTATION);
-    exifInterface.clearExif();
-    exifInterface.setTag(orientationTag);
-    exifInterface.writeExif(clippedBitmap, outputStream);
-
-    clippedBitmap.recycle();
-    bitmap.recycle();
-  }
-}
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
new file mode 100644
index 0000000..26b0bde
--- /dev/null
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2016 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.callcomposer.camera;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
+import android.support.v4.content.FileProvider;
+import com.android.dialer.callcomposer.camera.ImagePersistWorker.Result;
+import com.android.dialer.callcomposer.camera.exif.ExifInterface;
+import com.android.dialer.callcomposer.util.BitmapResizer;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.constants.Constants;
+import com.android.dialer.util.DialerUtils;
+import com.google.auto.value.AutoValue;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/** Persisting image routine. */
+@TargetApi(VERSION_CODES.M)
+public class ImagePersistWorker implements Worker<Void, Result> {
+  private int mWidth;
+  private int mHeight;
+  private final float mHeightPercent;
+  private final byte[] mBytes;
+  private final Context mContext;
+
+  @AutoValue
+  abstract static class Result {
+
+    public static Builder builder() {
+      return new AutoValue_ImagePersistWorker_Result.Builder();
+    }
+
+    @NonNull
+    abstract Uri getUri();
+
+    abstract int getWidth();
+
+    abstract int getHeight();
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder setUri(@NonNull Uri uri);
+
+      abstract Builder setWidth(int width);
+
+      abstract Builder setHeight(int height);
+
+      abstract Result build();
+    }
+  }
+
+  ImagePersistWorker(
+      final int width,
+      final int height,
+      final float heightPercent,
+      final byte[] bytes,
+      final Context context) {
+    Assert.checkArgument(heightPercent >= 0 && heightPercent <= 1);
+    Assert.isNotNull(bytes);
+    Assert.isNotNull(context);
+    mWidth = width;
+    mHeight = height;
+    mHeightPercent = heightPercent;
+    mBytes = bytes;
+    mContext = context;
+  }
+
+  @Override
+  public Result doInBackground(Void unused) throws Exception {
+    File outputFile = DialerUtils.createShareableFile(mContext);
+
+    try (OutputStream outputStream = new FileOutputStream(outputFile)) {
+      writeClippedBitmap(outputStream);
+    }
+
+    return Result.builder()
+        .setUri(
+            FileProvider.getUriForFile(
+                mContext, Constants.get().getFileProviderAuthority(), outputFile))
+        .setWidth(mWidth)
+        .setHeight(mHeight)
+        .build();
+  }
+
+  private void writeClippedBitmap(OutputStream outputStream) throws IOException {
+    int orientation = android.media.ExifInterface.ORIENTATION_UNDEFINED;
+    final ExifInterface exifInterface = new ExifInterface();
+    try {
+      exifInterface.readExif(mBytes);
+      final Integer orientationValue = exifInterface.getTagIntValue(ExifInterface.TAG_ORIENTATION);
+      if (orientationValue != null) {
+        orientation = orientationValue.intValue();
+      }
+    } catch (final IOException e) {
+      // Couldn't get exif tags, not the end of the world
+    }
+
+    ExifInterface.OrientationParams params = ExifInterface.getOrientationParams(orientation);
+    Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length);
+    final int clippedWidth;
+    final int clippedHeight;
+    if (params.invertDimensions) {
+      Assert.checkState(mWidth == bitmap.getHeight());
+      Assert.checkState(mHeight == bitmap.getWidth());
+      clippedWidth = (int) (mHeight * mHeightPercent);
+      clippedHeight = mWidth;
+    } else {
+      Assert.checkState(mWidth == bitmap.getWidth());
+      Assert.checkState(mHeight == bitmap.getHeight());
+      clippedWidth = mWidth;
+      clippedHeight = (int) (mHeight * mHeightPercent);
+    }
+
+    int offsetTop = (bitmap.getHeight() - clippedHeight) / 2;
+    int offsetLeft = (bitmap.getWidth() - clippedWidth) / 2;
+    mWidth = clippedWidth;
+    mHeight = clippedHeight;
+
+    Bitmap clippedBitmap =
+        Bitmap.createBitmap(bitmap, offsetLeft, offsetTop, clippedWidth, clippedHeight);
+    clippedBitmap = BitmapResizer.resizeForEnrichedCalling(clippedBitmap, params.rotation);
+    // EXIF data can take a big chunk of the file size and we've already manually rotated our image,
+    // so remove all of the exif data.
+    exifInterface.clearExif();
+    exifInterface.writeExif(clippedBitmap, outputStream);
+
+    clippedBitmap.recycle();
+    bitmap.recycle();
+  }
+}
diff --git a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
index 1c5ac38..a5edf33 100644
--- a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
+++ b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
@@ -389,7 +389,7 @@
       focusIndicator.showStart();
     } else {
       if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) {
-        // TODO: check HAL behavior and decide if this can be removed.
+        // TODO(blemmon): check HAL behavior and decide if this can be removed.
         focusIndicator.showSuccess(false);
       } else if (mState == STATE_SUCCESS) {
         focusIndicator.showSuccess(false);
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
index 92dee1c..1bf9519 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java
@@ -286,7 +286,7 @@
 
   /** Wrapper class to define some orientation parameters. */
   public static class OrientationParams {
-    int rotation = 0;
+    public int rotation = 0;
     int scaleX = 1;
     int scaleY = 1;
     public boolean invertDimensions = false;
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
index 23d748c..c728845 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
@@ -499,7 +499,7 @@
       mTiffStream.skip(4);
       return null;
     }
-    // TODO: handle numOfComp overflow
+    // TODO(blemmon): handle numOfComp overflow
     ExifTag tag =
         new ExifTag(
             tagId,
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
index a254ae9..9a03c10 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
@@ -187,7 +187,7 @@
 
   /** Gets the component count of this tag. */
 
-  // TODO: fix integer overflows with this
+  // TODO(blemmon): fix integer overflows with this
   int getComponentCount() {
     return mComponentCountActual;
   }
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
index a4198fc..8169a3d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
@@ -24,7 +24,7 @@
   <FrameLayout
     android:id="@+id/mediapicker_enabled"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <!-- Default to using the hardware rendered camera preview, we will fall back to
     SoftwareCameraPreview in CameraMediaChooserView if needed -->
@@ -37,14 +37,14 @@
     <com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay
       android:id="@+id/focus_visual"
       android:layout_width="match_parent"
-      android:layout_height="match_parent" />
+      android:layout_height="match_parent"/>
 
     <View
       android:id="@+id/camera_shutter_visual"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:background="@android:color/white"
-      android:visibility="gone" />
+      android:visibility="gone"/>
 
     <ImageView
       android:id="@+id/preview_image_view"
@@ -71,7 +71,8 @@
         android:layout_marginEnd="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_white_48"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_full_screen"/>
 
       <ImageButton
         android:id="@+id/camera_exit_fullscreen"
@@ -82,7 +83,8 @@
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_exit_white_48"
         android:visibility="gone"
-        android:background="?android:selectableItemBackgroundBorderless"/>
+        android:background="?android:selectableItemBackgroundBorderless"
+        android:contentDescription="@string/description_camera_switch_preview_screen"/>
 
       <ImageButton
         android:id="@+id/camera_capture_button"
@@ -93,7 +95,7 @@
         android:background="?android:selectableItemBackgroundBorderless"
         android:src="@drawable/ic_capture"
         android:scaleType="fitXY"
-        android:contentDescription="@string/camera_take_picture"/>
+        android:contentDescription="@string/description_camera_take_picture"/>
 
       <ImageButton
         android:id="@+id/swap_camera_button"
@@ -103,8 +105,7 @@
         android:layout_marginStart="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/front_back_switch_button_animation"
-        android:background="@drawable/transparent_button_background"
-        android:contentDescription="@string/camera_switch_camera_rear"/>
+        android:background="@drawable/transparent_button_background"/>
 
       <ImageButton
         android:id="@+id/camera_cancel_button"
@@ -116,7 +117,7 @@
         android:visibility="gone"
         android:background="@drawable/transparent_button_background"
         android:src="@drawable/quantum_ic_undo_white_48"
-        android:contentDescription="@string/camera_cancel_recording" />
+        android:contentDescription="@string/description_camera_cancel_photo" />
     </FrameLayout>
   </FrameLayout>
 
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
index 3892a20..f6326c1 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skakel na volskerm-kamera oor"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knoppie is nou voorste kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knoppie is nou agterste kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop video-opname"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Gebruik tans voorste kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Gebruik tans agterste kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Neem foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skakel oor na volskerm-kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skakel oor na kameravoorskou"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skakel oor na voorste kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skakel oor na agterste kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Neem foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Neem foto weer"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
index e271798..87c70c7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ወደ ሙሉ ማያ ገጽ ካሜራ ቀይር"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"አዝራር አሁን የፊት ካሜራ ነው"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"አዝራር አሁን የኋላ ካሜራ ነው"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ቪዲዮ መቅዳትን አቁም"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"የፊት ካሜራ በመጠቀም ላይ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"የኋላ ካሜራ በመጠቀም ላይ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ወደ የፊት ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ወደ የኋላ ካሜራ ይቀይሩ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ፎቶ ያንሱ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ፎቶ በድጋሚ ያንሱ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
index a045a11..fa27db7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"التبديل إلى الكاميرا بملء الشاشة"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"يشير الزر الآن إلى الكاميرا الأمامية"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"يشير الزر الآن إلى الكاميرا الخلفية"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"إيقاف تسجيل الفيديو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استخدام الكاميرا الأمامية"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استخدام الكاميرا الخلفية"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"التقاط صورة"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"التبديل إلى الكاميرا بملء الشاشة"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"التبديل إلى معاينة الكاميرا"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"تبديل إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"تبديل مرة أخرى إلى الكاميرا الأمامية"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"التقاط صورة"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"إعادة التقاط الصورة"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
index 514463c..bfbf204 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekranlı kameraya keçin"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düymə indi ön kameradır"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düymə indi arxa kameradır"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video qeydi dayandırın"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera istifadə olunur"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arxa kamera istifadə olunur"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoşəkil çəkin"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekranlı kameraya keçin"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizləməsinə keçin"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya keçin"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arxa kameraya keçin"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto çəkin"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotonu yenidən çəkin"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
index aad8d9d..565b188 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pređite na prikaz kamere preko celog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme sad aktivira prednju kameru"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme sad aktivira zadnju kameru"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavite snimanje videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristimo prednju kameru"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristimo zadnju kameru"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimite sliku"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebacite na prikaz kamere preko celog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebacite na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebacite na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebacite na zadnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimite sliku"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimite sliku"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
index 108ab7f..f15bbb9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пераключыцца на поўнаэкранную камеру"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Кнопка зараз замацавана за пярэдняй камерай"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Кнопка зараз замацавана за задняй камерай"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спыніць запіс відэа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Выкарыстанне пярэдняй камеры"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Выкарыстанне задняй камеры"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зрабіць фота"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пераключыцца на поўнаэкранную камеру"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пераключыцца ў рэжым перадпрагляду камеры"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пераключыцца на пярэднюю камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пераключыцца на заднюю камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зрабіць фота"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зрабіць фота яшчэ раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
index e965ed9..92352ff 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Превключване към камера на цял екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Бутонът сега е за предната камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Бутонът сега е за задната камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Спиране на видеозаписа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Използва се предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Използва се задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Правене на снимка"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Превключване към камера на цял екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Превключване към визуализация на камерата"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Превключване към предната камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Превключване към задната камера."</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимане"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Повторно снимане"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
index 447b7e3..83774c7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"পূর্ণ স্ক্রীন ক্যামেরাতে পাল্টান"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"বোতামটিকে এখন সামনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"বোতামটিকে এখন পিছনের ক্যামেরার জন্য ব্যবহার করা হবে"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ভিডিও রেকর্ডিং বন্ধ করুন"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"সামনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"পিছনের ক্যামেরা ব্যবহার করা হচ্ছে"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ফটো তুলুন"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ক্যামেরার পূর্বরূপ মোডে পাল্টান"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"সামনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"পিছনের ক্যামেরাতে পাল্টান"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ফটো তুলুন"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"আবার ফটো তুলুন"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
index 8946f4f..c77a5de 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na kameru preko cijelog ekrana"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dugme je sada prednja kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dugme je sada zadnja kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Koristi se prednja kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Koristi se zadnja kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na kameru preko cijelog ekrana"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled kamere"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednju kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnju kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
index 6d8ffdc..39c069b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Canvia a la càmera en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botó ara és la càmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botó ara és la càmera posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deixa d\'enregistrar el vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"S\'està utilitzant la càmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"S\'està utilitzant la càmera posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fes una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Canvia a la càmera en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Canvia a la previsualització de la càmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Canvia a la càmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Canvia a la càmera posterior"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fes una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Torna a fer la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
index 0e31108..222eb81 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Přepnout na fotoaparát na celou obrazovku"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačítko nyní funguje pro přední fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačítko nyní funguje pro zadní fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastavit natáčení videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používá se přední fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používá se zadní fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Vyfotit"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Přepnout na fotoaparát na celou obrazovku"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Přepnout na náhled fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Přepnout na přední fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Přepnout na zadní fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Vyfotit"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znovu vyfotit"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
index ca5a79e..0de7e08 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skift til kamera i fuld skærm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen er nu frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen er nu bagsidekamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stands optagelse af video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruger frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruger bagsidekameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tag billede"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skift til kamera i fuld skærm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skift til forhåndsvisning af kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skift til kamera på forsiden"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skift til kamera på bagsiden"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tag billede"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tag billedet om"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
index 53d22eb..1b0d639 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Zur Vollbildkamera wechseln"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Schaltfläche ist jetzt Frontkamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Schaltfläche ist jetzt Rückkamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoaufzeichnung beenden"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Frontkamera wird verwendet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Rückkamera wird verwendet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto aufnehmen"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Zur Vollbildkamera wechseln"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Zur Kameravorschau wechseln"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Zur Frontkamera wechseln"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Zur Rückkamera wechseln"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto aufnehmen"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto neu aufnehmen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
index 5763dec..d657f93 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Το κουμπί είναι τώρα η μπροστινή κάμερα"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Το κουμπί είναι τώρα η πίσω κάμερα"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Διακοπή εγγραφής βίντεο"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Χρήση μπροστινής κάμερας"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Χρήση πίσω κάμερας"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Εναλλαγή σε προεπισκόπηση κάμερας"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Εναλλαγή σε κάμερα πρόσοψης"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Εναλλαγή σε πίσω κάμερα"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Λήψη φωτογραφίας"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Επανάληψη λήψης φωτογραφίας"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
index 5b8b4aa..9e76a69 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Switch to full-screen camera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Button is now front-facing camera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Button is now rear-facing camera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stop recording video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Using front-facing camera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Using rear-facing camera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Take photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
index a98e74c..f103564 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón cambió a la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón cambió a la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tomar una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tomar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Volver a tomar foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
index 5c4391e..5afb8c8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar a cámara en pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"El botón se usa ahora para la cámara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"El botón se usa ahora para la cámara trasera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Detener la grabación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estás utilizando la cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estás utilizando la cámara trasera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Hacer una foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a la cámara en pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a la vista previa de la cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a la cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a la cámara trasera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Hacer una foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repetir la foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
index d82dcd5..d4c37fe 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Täisekraaniga kaamerale lülitamine"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nuppu kasutatakse nüüd esikaamera jaoks"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nuppu kasutatakse nüüd tagakaamera jaoks"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video salvestamise peatamine"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Esikaamera kasutamine"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tagakaamera kasutamine"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto jäädvustamine"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Täisekraaniga kaamerale lülitumine"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kaamera eelvaatele lülitumine"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Esikaamerale lülitumine"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Tagakaamerale lülitumine"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto jäädvustamine"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto uuesti jäädvustamine"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
index b3c20c9..4271983 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Erabili pantaila osoko kamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Orain, aurreko kamera erabiltzeko da botoia"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Orain, atzeko kamera erabiltzeko da botoia"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Utzi bideoa grabatzeari"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Aurreko kamera erabiltzen"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Atzeko kamera erabiltzen"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Atera argazkia"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Erabili pantaila osoko kamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Erabili kameraren aurrebista"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Erabili aurreko kamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Erabili atzeko kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Atera argazkia"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atera berriro argazkia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
index 24e757b..5d58771 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"جابه‌جایی به دوربین تمام صفحه"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"اکنون دکمه، دوربین جلو است"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"اکنون دکمه، دوربین عقب است"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"توقف ضبط ویدیو"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"استفاده از دوربین جلو"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"استفاده از دوربین عقب"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"عکس گرفتن"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"رفتن به دوربین تمام صفحه"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"رفتن به پیش‌نمایش دوربین"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"رفتن به دوربین جلو"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"رفتن به دوربین عقب"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"عکس گرفتن"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"عکس گرفتن مجدد"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
index 5a3ddd8..9d7cb09 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Siirry koko näytön kameraan"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Painikkeeseen on nyt määritetty etukamera."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Painikkeeseen on nyt määritetty takakamera."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Lopeta videon tallentaminen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Etukamera käytössä"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Takakamera käytössä"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ota kuva"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Siirry koko näytön kameraan"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Siirry kameran esikatseluun"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Vaihda etukameraan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Vaihda takakameraan"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ota kuva"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ota kuva uudelleen"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
index f0e644e..b202840 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer au mode plein écran de l\'appareil photo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton est maintenant utilisé pour l\'appareil photo avant"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton est maintenant utilisé pour l\'appareil photo arrière"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Utilisation de la caméra avant"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Utilisation de la caméra arrière"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer au mode Plein écran de l\'appareil photo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer au mode Aperçu de l\'appareil photo"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passer à l\'appareil photo avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passer à l\'appareil photo arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
index 72de07f..a9cfe71 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passer en caméra plein écran"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Le bouton affiche désormais la caméra frontale."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Le bouton affiche désormais la caméra arrière."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Arrêter l\'enregistrement vidéo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Caméra frontale activée"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Caméra arrière activée"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Prendre une photo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer en mode plein écran"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer en mode aperçu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Utiliser la caméra avant"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Utiliser la caméra arrière"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
index 2ab1ef0..3568a0f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Cambiar á cámara de pantalla completa"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Agora o botón é a cámara dianteira"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Agora o botón é a cámara traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Deter gravación de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Estase utilizando a cámara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Estase utilizando a cámara traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambia á cámara de pantalla completa"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambia á vista previa da cámara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambia á cámara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambia á cámara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tira unha foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repite a foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
index 60780d9..88037b5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"બટન હવે આગળનો કૅમેરો છે"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"બટન હવે પાછળનો કૅમેરો છે"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"વિડિઓ રેકોર્ડિંગ બંધ કરો"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"આગળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"પાછળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ફોટો લો"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"પાછળના કૅમેરા પર સ્વિચ કરો"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ફોટો લો"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ફોટો ફરીથી લો"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
index cf89a7d..09a441f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कैमरा पर स्विच करें"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब सामने का कैमरा है"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पीछे का कैमरा है"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"वीडियो रिकॉर्ड करना बंद करें"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"आगे वाले कैमरे का उपयोग करना"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पीछे वाले कैमरे का उपयोग करना"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फ़ोटो लें"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कैमरे में बदलें"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कैमरा पूर्वावलोकन में बदलें"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"सामने वाले कैमरे में बदलें"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पीछे वाले कैमरे में बदलें"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फ़ोटो लें"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फि‍र से फ़ोटो लें"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
index 3d59fd4..2dca9bd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prebaci na fotoaparat na punom zaslonu"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb je sada za prednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb je sada za stražnji fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zaustavi snimanje videozapisa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Upotreba prednje kamere"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Upotreba stražnje kamere"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Snimi fotografiju"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na prikaz fotoaparata preko cijelog zaslona"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednji fotoaparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnji fotoaparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovno snimi fotografiju"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
index 1639ca7..5007b3f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Váltás teljes képernyős kameranézetre"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"A gomb beállítása jelenleg: elülső kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"A gomb beállítása jelenleg: hátsó kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videofelvétel leállítása"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Első kamera használata"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Hátsó kamera használata"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotó készítése"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Váltás teljes képernyős kameranézetre"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Váltás kamera-előnézetre"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Váltás az első kamerára"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Váltás a hátsó kamerára"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotó készítése"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Új felvétel"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
index 1da5c68..2c1bd79 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Միացնել լիաէկրան ռեժիմը"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Կոճակն այժմ առջևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Կոճակն այժմ հետևի տեսախցիկը միացնելու կոճակն է"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Դադարեցնել տեսագրումը"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Օգտագործվում է առջևի տեսախցիկը"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Օգտագործվում է հետևի տեսախցիկը"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Լուսանկարել"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Միացնել լիաէկրան ռեժիմը"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Միացնել նախադիտման ռեժիմը"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Միացնել առջևի տեսախցիկը"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Միացնել հետևի տեսախցիկը"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Լուսանկարել"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Նորից լուսանկարել"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
index 6073d8e..4c922cd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Beralih ke kamera layar penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tombol kini berfungsi untuk kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tombol kini berfungsi untuk kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merekam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera layar penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratinjau kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil ulang foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
index d16b2e2..c796d22 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Skipta yfir í myndavél á öllum skjánum"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hnappurinn er nú fremri myndavél"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hnappurinn er nú aftari myndavél"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Stöðva upptöku myndskeiðs"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Notar fremri myndavél"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Notar aftari myndavél"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Taka mynd"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skipta yfir í myndavél á öllum skjánum"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skipta yfir í forskoðun á myndavél"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skipta yfir í fremri myndavél"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skipta yfir í aftari myndavél"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Taka mynd"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Taka mynd aftur"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
index 63fac07..abf5d3f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Passa alla fotocamera a schermo intero"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Il pulsante viene ora utilizzato per la fotocamera frontale"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Il pulsante viene ora utilizzato per la fotocamera posteriore"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Interrompi registrazione video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"In uso la fotocamera frontale"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"In uso la fotocamera posteriore"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Scatta foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passa alla fotocamera a schermo intero"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passa all\'anteprima della fotocamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passa alla fotocamera anteriore"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passa alla fotocamera posteriore"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Scatta foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Scatta foto di nuovo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
index 3db2e94..e6aed2e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"מעבר למצלמה במסך מלא"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"הלחצן מוגדר עכשיו למצלמה הקדמית"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"הלחצן מוגדר עכשיו למצלמה האחורית"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"עצירה של צילום הווידאו"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"באמצעות המצלמה הקדמית"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"באמצעות המצלמה האחורית"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"צילום תמונה"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"מעבר למצלמה במסך מלא"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"מעבר לתצוגה מקדימה של המצלמה"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"מעבר למצלמה הקדמית"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"מעבר למצלמה האחורית"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"צילום תמונה"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"צילום מחדש של התמונה"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
index ffb3a17..85ef3c8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"全画面カメラに切り替え"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"現在、ボタンは前面カメラになっています"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"現在、ボタンは背面カメラになっています"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"録画を停止"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"前面カメラを使用しています"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"背面カメラを使用しています"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"写真を撮る"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"全画面カメラに切り替えます"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"カメラのプレビューに切り替えます"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"前面カメラに切り替えます"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"背面カメラに切り替えます"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"写真を撮影します"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"写真を撮り直します"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
index 6a94b65..edaf33f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"სრულეკრანიან კამერაზე გადართვა"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ახლა ღილაკი გამოიყენება წინა კამერისთვის"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ახლა ღილაკი გამოიყენება უკანა კამერისთვის"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ვიდეოს ჩაწერის შეჩერება"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"თქვენ იყენებთ წინა კამერას"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"თქვენ იყენებთ უკანა კამერას"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ფოტოს გადაღება"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"სრულეკრანიან კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"კამერის წინასწარ ხედზე გადართვა"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"წინა კამერაზე გადართვა"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"უკანა კამერაზე გადართვა"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ფოტოს გადაღება"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ფოტოს ხელახლა გადაღება"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
index 22b89fd..795a063 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Толық экранды камераға ауысу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Түйме – енді алдыңғы камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Түйме – енді артқы камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Бейне жазуды тоқтату"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Алдыңғы камера қолданылуда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Артқы камера қолданылуда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Суретке түсіру"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Толық экранды камераға ауысу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераның алдын ала көру режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Камераның анфас режиміне ауысу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Камераның қалыпты режиміне ауысу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Суретке түсіру"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Суретке қайта түсіру"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
index dd547dd..377f885 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ឥឡូវ ប៊ូតុង​ស្ថិត​នៅ​​កាមេរ៉ា​មុខ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ឥឡូវ ប៊ូតុងស្ថិត​នៅ​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"បញ្ឈប់​ការ​ថត​វីដេអូ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"កំពុង​ប្រើ​ប្រាស់​កាមេរ៉ា​មុខ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"កំពុង​ប្រើប្រាស់​​​កាមេរ៉ា​ក្រោយ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ថតរូប"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ប្តូរទៅកាមេរ៉ាខាងក្រោយ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ថតរូប"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ថតរូប​ឡើងវិញ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
index 471cfc9..1f5d1ea 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ಬಟನ್ ಈಗ ಮುಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ಬಟನ್ ಈಗ ಹಿಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ವೀಡಿಯೊ ರೆಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ಮುಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ಹಿಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
index bb5e64d..1b675e7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"전체화면 카메라로 전환"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"현재 버튼: 전면 카메라"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"현재 버튼: 후면 카메라"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"동영상 녹화 중지"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"전면 카메라 사용 중"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"후면 카메라 사용 중"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"사진 촬영"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"전체화면 카메라로 전환"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"카메라 미리보기로 전환"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"전면 카메라로 전환"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"후면 카메라로 전환"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"사진 찍기"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"사진 다시 찍기"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
index fca2893..771f576 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Камераны толук экранга которуу"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Азыр баскычта \"Маңдайкы камера\" деп жазылып турат"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Азыр баскычта \"Арткы камера\" деп жазылып турат"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео жаздырууну токтотуу"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Маңдайкы камера колдонулууда"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арткы камера колдонулууда"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сүрөткө тартуу"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Камераны толук экранга которуу"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераны алдын ала көрүү режимине которуу"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Маңдайкы камерага которуу"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Арткы камерага которуу"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сүрөткө тартуу"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Кайра сүрөткө тартуу"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
index 0257e75..6bfdf4e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ຕອນນີ້ເປັນປຸ່ມກ້ອງໜ້າແລ້ວ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ຕອນນີ້ເປັນປຸ່ມກ້ອງຫຼັງແລ້ວ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ຢຸດການບັນທຶກວິດີໂອ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ກຳລັງໃຊ້ກ້ອງໜ້າ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ກຳລັງໃຊ້ກ້ອງຫຼັງ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ຖ່າຍຮູບ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ຖ່າຍຮູບໃໝ່"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
index 62c6de9..6ff3b0d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Dabar tai yra priekinio fotoaparato mygtukas"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Dabar tai yra užpakalinio fotoaparato mygtukas"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sustabdyti vaizdo įrašymą"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Naudojamas priekinis fotoaparatas"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Naudojamas užpakalinis fotoaparatas"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografuoti"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Perjungti į fotoaparato peržiūrą"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Perjungti į priekinį fotoaparatą"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Perjungti į užpakalinį fotoaparatą"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografuoti"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotografuoti iš naujo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
index 4800f6b..d6d4782 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Pārslēgties uz pilnekrāna kameru"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Poga tagad tiek izmantota priekšējai kamerai"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Poga tagad tiek izmantota aizmugurējai kamerai"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Pārtraukt videoklipa ierakstīšanu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Tiek izmantota priekšējā kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Tiek izmantota aizmugurējā kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Pārslēgt uz pilnekrāna kameru"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Pārslēgt uz kameras priekšskatījumu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Pārslēgt uz priekšējo kameru"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Pārslēgt uz aizmugurējo kameru"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Uzņemt fotoattēlu"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atkārtoti uzņemt fotoattēlu"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
index 82c466f..a0f84a0 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Префрлете на камера на цел екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Копчето е сега предна камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Копчето е сега задна камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Сопрете со снимање видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Се користи предната камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Се користи задната камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Фотографирај"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Префрлете на камера на цел екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Префрлете на преглед на камера"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Префрлете на предна камера"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Префрлете на задна камера"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Фотографирај"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Фотографирај пак"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
index 0423da2..77c0a4f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ബട്ടൺ അമർത്തിയാൻ മുൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ബട്ടൺ അമർത്തിയാൻ പിൻ ക്യാമറ ലഭിക്കും"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"വീഡിയോ റെക്കോർഡുചെയ്യൽ നിർത്തുക"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"മുൻവശത്തെ ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"പിൻഭാഗത്തുള്ള ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"മുൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"പിൻ ക്യാമറയിലേക്ക് മാറുക"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ഫോട്ടോ എടുക്കുക"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ഫോട്ടോ വീണ്ടുമെടുക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
index 024e004..1894634 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Товчлуур нь урд талын камер боллоо"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Товчлуур нь ард талын камер боллоо"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Видео бичилтийг зогсоох"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Урд камер ашиглаж байна"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Арын камер ашиглаж байна"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зураг авах"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камерын урьдчилан үзэх рүү сэлгэх"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Урд талын камер руу сэлгэх"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Ар талын камер руу сэлгэх"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зураг авах"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зураг дахин авах"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
index bc9c2fb..24c1931 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटण आता पुढील कॅमेरा आहे"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटण आता मागील कॅमेरा आहे"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"व्हिडिओ रेकॉर्ड करणे थांबवा"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"समोरील कॅमेरा वापरत आहे"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"मागील कॅमेरा वापरत आहे"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"फोटो घ्‍या"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कॅमेरा पूर्वावलोकनावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"समोरील कॅमऱ्यावर स्विच करा"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"मागील कॅमेर्‍यावर स्‍विच करा"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"फोटो घ्‍या"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फोटो पुन्हा घ्या"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
index 3245b9c..44806f5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tukar kepada kamera skrin penuh"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butang kini kamera depan"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butang kini kamera belakang"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Berhenti merakam video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Menggunakan kamera depan"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Menggunakan kamera belakang"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ambil foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera skrin penuh"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratonton kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera menghadap depan"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera menghadap belakang"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil semula foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
index 884c0c8..7112abc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ခလုတ်မှာ အရှေ့ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ခလုတ်မှာ အနောက်ကင်မရာအတွက် ဖြစ်သွားပါပြီ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ဗီဒီယိုရိုက်ကူးခြင်း ရပ်ရန်"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"အရှေ့ကင်မရာကို သုံးနေသည်"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"အနောက်ကင်မရာကို သုံးနေသည်"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"အရှေ့ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"အနောက်ကင်မရာသို့ ပြောင်းရန်"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ဓာတ်ပုံပြန်ရိုက်ရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
index bfa58ed..5e5fb60 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
index 1362b32..d8ea795 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"बटन अब अगाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"बटन अब पछाडिको क्यामेराका लागि हो"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"भिडियो रेकर्ड रोक्नुहोस्"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"अगाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"पछाडिको क्यामेरा प्रयोग गरिँदै"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"अगाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पछाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"पुन: तस्बिर खिच्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
index 94f2718..0369fed 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Overschakelen naar camera op volledig scherm"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"De knop wordt nu gebruikt voor de camera aan de voorzijde"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"De knop wordt nu gebruikt voor de camera aan de achterzijde"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video-opname stoppen"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"De camera aan de voorzijde wordt gebruikt"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"De camera aan de achterzijde wordt gebruikt"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Foto maken"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Overschakelen naar camera op volledig scherm"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Overschakelen naar cameravoorbeeld"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Overschakelen naar camera aan voorzijde"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Overschakelen naar camera aan achterzijde"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto maken"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto opnieuw maken"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
index bfa58ed..5e5fb60 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Bytt til fullskjermkamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Nå er knappen frontkameraet"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Nå er knappen det bakre kameraet"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Slutt å filme"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Bruker frontkameraet"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Bruker det bakre kameraet"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta et bilde"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
index 4296c98..e1247e0 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰਾ \'ਤੇ ਜਾਓ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ਬਟਨ ਹੁਣ ਮੂਹਰਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ਬਟਨ ਹੁਣ ਪਿਛਲਾ ਕੈਮਰਾ ਹੈ"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ਮੂਹਰਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"ਪਿਛਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
index 0e03e2d..b85afa6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Włącz aparat pełnoekranowy"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Przycisk włącza teraz przedni aparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Przycisk włącza teraz tylny aparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zatrzymaj nagrywanie filmu"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Używany jest przedni aparat"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Używany jest tylny aparat"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Zrób zdjęcie"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Przełącz na aparat pełnoekranowy"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Przełącz na podgląd aparatu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Przełącz na przedni aparat"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Przełącz na tylny aparat"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Zrób zdjęcie"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Zrób nowe zdjęcie"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
index 7c1fa07..59f457c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
index 661b4d9..71f651d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Mudar para a câmara de ecrã completo"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão é agora utilizado para a câmara frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão é agora utilizado para a câmara posterior"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar a gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"A utilizar a câmara frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"A utilizar a câmara posterior"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Mudar para a câmara de ecrã completo"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Mudar para a pré-visualização da câmara"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Mudar para a câmara frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Mudar para a câmara traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar nova foto"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
index 7c1fa07..59f457c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Alternar para câmera em tela cheia"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"O botão agora está na câmera frontal"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"O botão agora está na câmera traseira"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Parar gravação de vídeo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Usando a câmera frontal"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Usando a câmera traseira"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Tirar foto"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
index 98d0050..f491f28 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Comutați la camera pe ecran complet"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Acum butonul este pentru camera foto frontală."</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Acum butonul este pentru camera foto posterioară."</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Opriți înregistrarea video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Este folosită camera foto frontală"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Este folosită camera foto posterioară"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotografiați"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Comutați la camera pe ecran complet"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Comutați la previzualizarea camerei"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Comutați la camera frontală"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Comutați la camera posterioară"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografiați"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Refaceți fotografia"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
index a4c7206..9de3cab 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Перейти в полноэкранный режим"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Сейчас на кнопке написано: Фронтальная камера"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Сейчас на кнопке написано: Основная камера"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Остановить запись видео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Используется фронтальная камера"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Используется основная камера"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Сделать снимок"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Переключиться в полноэкранный режим"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Переключиться в режим предварительного просмотра"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Переключиться на фронтальную камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Переключиться на основную камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сделать снимок"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Новый снимок"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
index 6cc5eef..1747d1a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"බොත්තම දැන් ඉදිරිපස කැමරාවයි"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"බොත්තම දැන් පිටුපස කැමරාවයි"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"වීඩියෝව පටිගත කිරීම නැවැත්වීම"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ඉදිරිපස කැමරාව භාවිත කරමින්"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"පසුපස කැමරාව භාවිත කරමින්"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ඡායාරූපය ගන්න"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"කැමරා පෙරදසුන වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ඡායාරූපය ගැනීම"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ඡායාරූපය නැවත ගැනීම"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
index 916158b..a053e2f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Prepnúť na fotoaparát na celej obrazovke"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Tlačidlo sa nachádza v polohe Predný fotoaparát"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Tlačidlo sa nachádza v polohe Zadný fotoaparát"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Zastaviť zaznamenávanie videa"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Používa sa predný fotoaparát"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Používa sa zadný fotoaparát"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Odfotiť"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prepnúť na fotoaparát na celej obrazovke"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prepnúť na ukážku z fotoaparátu"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prepnúť na predný fotoaparát"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prepnúť na zadný fotoaparát"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Odfotiť"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova odfotiť"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
index ef1fe20..b50aaae 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Preklopi v celozaslonski način fotoaparata"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Gumb zdaj upravlja sprednji fotoaparat"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Gumb zdaj upravlja hrbtni fotoaparat"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ustavi snemanje videoposnetka"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Uporaba fotoaparata spredaj"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Uporaba fotoaparata zadaj"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Posnemi fotografijo"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Preklopi v celozaslonski način fotoaparata"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Preklopi v predogled fotoaparata"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Preklopi na fotoaparat na sprednji strani"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Preklopi na fotoaparat na zadnji strani"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Posnemi fotografijo"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova posnemi fotografijo"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
index ff8cb87..4be0317 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Kalo në kamerën me ekran të plotë"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Butoni tani është kamera e përparme"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Butoni tani është kamera e pasme"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ndalo regjistrimin e videos"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Po përdor kamerën e përparme"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Po përdor kamerën e pasme"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Bëj një fotografi"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Kalo në kamerën me ekran të plotë"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kalo te pamja paraprake e kamerës"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Kalo te kamera e përparme"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Kalo te kamera e pasme"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Bëj një fotografi"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Bëje përsëri fotografinë"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
index 17150b4..4afcbe9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Пређите на приказ камере преко целог екрана"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Дугме сад активира предњу камеру"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Дугме сад активира задњу камеру"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зауставите снимање видеа"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Користимо предњу камеру"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Користимо задњу камеру"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Снимите слику"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пребаците на приказ камере преко целог екрана"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пребаците на преглед камере"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пребаците на предњу камеру"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пребаците на задњу камеру"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимите слику"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Поново снимите слику"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
index 3091479..8bd00cc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Byt till fullskärmskamera"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Knappen är nu framåtvänd kamera"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Knappen är nu bakåtvänd kamera"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Sluta spela in video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Använder främre kamera"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Använder bakre kamera"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Ta en bild"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Växla till helskärmskamera"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Växla till förhandsgranskning i kameran"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Växla till den framåtvända kameran"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Växla till den bakåtvända kameran"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta en bild"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta en ny bild"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
index 8608b75..c951ac6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Badilisha utumie kamera ya skrini nzima"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Kitufe hiki sasa ni kamera ya mbele"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Kitufe hiki sasa ni kamera ya nyuma"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Acha kurekodi video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Inatumia kamera ya mbele"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Inatumia kamera ya nyuma"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Piga picha"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Badili utumie kamera ya skrini nzima"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Badili utumie onyesha la kuchungulia la kamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Badili utumie kamera ya mbele"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Badili utumie kamera ya nyuma"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Piga picha"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Piga picha tena"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
index 9c42144..374cfcf 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"முழுத் திரை கேமராவிற்கு மாறும்"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"இப்போது முன்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"இப்போது பின்புறக் கேமராவைக் குறிக்கும் பொத்தான்"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"வீடியோ ரெக்கார்டு செய்யப்படுவதை நிறுத்தும்"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"முன்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"பின்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"படமெடுக்கும்"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"முன்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"பின்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"படமெடுக்கும் பொத்தான்"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"மீண்டும் படமெடுக்கும் பொத்தான்"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
index 4587593..099fa67 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"బటన్ ఇప్పుడు ముందువైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"బటన్ ఇప్పుడు వెనుకవైపు కెమెరాగా పని చేస్తోంది"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"వీడియో రికార్డింగ్‌ను ఆపివేస్తుంది"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"ముందు కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"వెనుక కెమెరాను ఉపయోగిస్తున్నాము"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"కెమెరా పరిదృశ్యానికి మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ముందువైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"వెనుకవైపు కెమెరాకు మారుస్తుంది"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ఫోటో తీస్తుంది"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ఫోటోను మళ్లీ తీస్తుంది"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
index 9b1150f..62c69a3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"สลับไปยังกล้องแบบเต็มหน้าจอ"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"ขณะนี้ปุ่มเป็นกล้องหน้า"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"ขณะนี้ปุ่มเป็นกล้องหลัง"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"หยุดการบันทึกวิดีโอ"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"กำลังใช้กล้องหน้า"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"กำลังใช้กล้องหลัง"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"ถ่ายภาพ"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"เปลี่ยนเป็นกล้องหน้า"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"เปลี่ยนเป็นกล้องหลัง"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"ถ่ายภาพ"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ถ่ายภาพอีกครั้ง"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
index 5fd98c1..2f6fb83 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Lumilipat sa camera na full screen"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Ang button ay para na sa camera sa harap"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Ang button ay para na sa camera sa likod"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Ihinihinto ang pagre-record ng video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ginagamit ang camera sa harap"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Ginagamit ang camera sa likuran"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Kumuha ng larawan"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Lumipat sa camera na full screen"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Lumipat sa preview ng camera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Lumipat sa camera na nasa harap"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Lumipat sa camera na nasa likod"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Kumuha ng larawan"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Kunang muli"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
index 80b0b94..da54ac8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Tam ekran kameraya geçer"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Düğme artık ön kamera için kullanılıyor"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Düğme artık arka kamera için kullanılıyor"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Video kaydını durdurur"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Ön kamera kullanılıyor"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Arka kamera kullanılıyor"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Fotoğraf çeker"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekran kameraya geçer"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizlemesine geçer"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya geçer"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arka kameraya geçer"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotoğraf çeker"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotoğrafı yeniden çeker"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
index c250615..cea540a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Показ зображення з камери на весь екран"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Зараз це кнопка камери на передній панелі"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Зараз це кнопка камери на задній панелі"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Зупинення запису відео"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Використання фронтальної камери"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Використання задньої камери"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Зйомка фото"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Показ зображення з камери на весь екран"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Попередній перегляд зображення з камери"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Перейти до фронтальної камери"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Перейти до задньої камери"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зробити фото"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зробити фото ще раз"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
index edd4178..585a55a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"بٹن اب فرنٹ کیمرا ہے"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"بٹن اب بیک کیمرا ہے"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"ویڈیو ریکارڈ کرنے کو روکیں"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"فرنٹ کیمرا استعمال ہو رہا ہے"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"بیک کیمرا استعمال ہو رہا ہے"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"تصویر لیں"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"کیمرہ پیش منظر پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"فرنٹ والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"عقب والے کیمرے پر سوئچ کریں"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"تصویر لیں"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"دوبارہ تصویر لیں"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
index 0377673..8441d88 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"To‘liq ekranli rejimga o‘tish"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Endi bu old kamera tugmasi"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Endi bu orqa kamera tugmasi"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Videoga olishni to‘xtatish"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Old kameradan foydalanilmoqda"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Orqa kameradan foydalanilmoqda"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Suratga olish"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"To‘liq ekranli rejimga o‘tish"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Oldindan ko‘rish rejimiga o‘tish"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Old kamerani yoqish"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Orqa kamerani yoqish"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Rasmga olish"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Yangi rasmga olish"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
index 81a0e62..0546664 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Chuyển sang máy ảnh toàn màn hình"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Hiện tại, nút ở chế độ máy ảnh mặt trước"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Hiện tại, nút ở chế độ máy ảnh mặt sau"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Dừng quay video"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Đang sử dụng máy ảnh trước"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Đang sử dụng máy ảnh sau"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Chụp ảnh"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Chuyển sang máy ảnh toàn màn hình"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Chuyển sang chế độ xem trước máy ảnh"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Chuyển sang máy ảnh mặt trước"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Chuyển sang máy ảnh mặt sau"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Chụp ảnh"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Chụp lại ảnh"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
index 311569c..24e9c1a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切换到全屏相机模式"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"点按按钮可切换到前置摄像头"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"点按按钮可切换到后置摄像头"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止录制视频"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"正在使用前置摄像头"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"正在使用后置摄像头"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切换到全屏相机模式"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切换到相机预览模式"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切换到前置摄像头"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切换到后置摄像头"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重拍照片"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
index 890a18f..0310b10 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全屏攝像"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄製影片"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"使用前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"使用後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍照"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
index 30fa03b..d41ddda 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"切換至全螢幕相機"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"按鈕目前設定為前置鏡頭"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"按鈕目前設定為後置鏡頭"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"停止錄影"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"目前使用的是前置鏡頭"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"目前使用的是後置鏡頭"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"拍攝相片"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽畫面"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
index 33a9284..6e147b7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ ~ Copyright (C) 2016 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
+  -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_switch_full_screen" msgid="8940026902611470063">"Shintshela kukhamera yesikrini esigcwele"</string>
-    <string name="camera_switch_camera_facing" msgid="6965029101223590384">"Inkinobho manje iyikhamera yangaphambili"</string>
-    <string name="camera_switch_camera_rear" msgid="2518207979995455566">"Inkinobho manje iyikhamera yangemuva"</string>
-    <string name="camera_cancel_recording" msgid="1957458244979306869">"Misa ukurekhoda ividiyo"</string>
-    <string name="using_front_camera" msgid="6734227994972108992">"Isebenzisa ikhamera yangaphambili"</string>
-    <string name="using_back_camera" msgid="2143070243242164971">"Isebenzisa ikhamera yangemuva"</string>
-    <string name="camera_take_picture" msgid="2366908858042883376">"Thatha isithombe"</string>
+    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Shintshela kukhamera yesikrini esigcwele"</string>
+    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Shintshela ekuhloleni kuqala kwekhamera"</string>
+    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Shintshela kwikhamera yangaphambili"</string>
+    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Shintshela kwikhamera ebheke emuva"</string>
+    <string name="description_camera_take_picture" msgid="3953639532118936286">"Thatha isithombe"</string>
+    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Thatha kabusha isithombe"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
index 09d4a58..e3d5c24 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml
@@ -16,7 +16,7 @@
   -->
 <resources>
   <dimen name="camera_view_button_margin">22dp</dimen>
-  <dimen name="camera_view_button_size">46dp</dimen>
+  <dimen name="camera_view_button_size">48dp</dimen>
   <dimen name="capture_button_size">84dp</dimen>
   <dimen name="capture_button_bottom_margin">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
index 999fe8f..4db7968 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml
@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2016 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
+ -->
 <resources>
   <!-- Content description of button to switch to full screen camera -->
-  <string name="camera_switch_full_screen">Switch to full screen camera</string>
+  <string name="description_camera_switch_full_screen">Switch to full screen camera</string>
+  <!-- Content description of button to resize camera from fullscreen to only a preview -->
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
   <!-- Content description of button when after swapped to front -->
-  <string name="camera_switch_camera_facing">Button is now front camera</string>
+  <string name="description_camera_switch_camera_facing">Switch to front facing camera</string>
   <!-- Content description of button when after swapped to back -->
-  <string name="camera_switch_camera_rear">Button is now back camera</string>
-  <!-- Content description of button to cancel recording video -->
-  <string name="camera_cancel_recording">Stop recording video</string>
-  <!-- Accessibility announcement for when we are using the front facing camera -->
-  <string name="using_front_camera">Using front camera</string>
-  <!-- Accessibility announcement for when we are using the back camera -->
-  <string name="using_back_camera">Using back camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to back facing camera</string>
   <!-- Content description of button to take a photo -->
-  <string name="camera_take_picture">Take photo</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <!-- Content description of button to cancel a photo -->
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto b/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto
deleted file mode 100644
index 99766aa..0000000
--- a/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto2";
-
-option java_package = "com.android.dialer.callcomposer";
-option java_multiple_files = true;
-option optimize_for = LITE_RUNTIME;
-
-package com.android.dialer.callcomposer;
-
-message CallComposerContact {
-  optional fixed64 photo_id = 1;
-  optional string photo_uri = 2;
-  optional string contact_uri = 3;
-  optional string name_or_number = 4;
-  optional string number = 6;
-  optional string display_number = 7;
-  optional string number_label = 8;
-  optional int32 contact_type = 9;
-}
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index c3f1102..48d6368 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License
   -->
 <FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/background"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@color/call_composer_background_color">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/call_composer_background_color">
 
   <LinearLayout
     android:id="@+id/call_composer_container"
@@ -43,6 +43,8 @@
         android:layout_marginTop="@dimen/call_composer_contact_container_margin_top"
         android:paddingTop="@dimen/call_composer_contact_container_padding_top"
         android:paddingBottom="@dimen/call_composer_contact_container_padding_bottom"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:background="@color/dialer_theme_color">
 
         <TextView
@@ -50,6 +52,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:gravity="center"
+          android:maxLines="1"
+          android:ellipsize="end"
           android:textColor="@color/background_dialer_white"
           android:textSize="@dimen/call_composer_name_text_size"/>
 
@@ -58,6 +62,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:gravity="center"
+          android:maxLines="1"
+          android:ellipsize="end"
           android:textColor="@color/background_dialer_white"
           android:textSize="@dimen/call_composer_number_text_size"/>
       </LinearLayout>
@@ -70,10 +76,22 @@
         android:background="@drawable/call_composer_contact_border"/>
     </RelativeLayout>
 
-    <android.support.v4.view.ViewPager
-      android:id="@+id/call_composer_view_pager"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/call_composer_view_pager_height"/>
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+      <com.android.dialer.widget.LockableViewPager
+          android:id="@+id/call_composer_view_pager"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/call_composer_view_pager_height"/>
+
+      <ProgressBar
+          android:id="@+id/call_composer_loading"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:visibility="gone"/>
+    </FrameLayout>
   </LinearLayout>
 
   <FrameLayout
@@ -87,7 +105,7 @@
         android:layout_height="@dimen/call_composer_media_bar_height"
         android:orientation="horizontal"
         android:gravity="center_horizontal"
-        android:background="@color/dialer_secondary_color"
+        android:background="@color/dialer_theme_color_dark"
         android:clickable="true">
 
       <ImageView
@@ -96,7 +114,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_camera_alt_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_camera"/>
 
       <ImageView
           android:id="@+id/call_composer_photo"
@@ -104,7 +123,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_photo_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_photo"/>
 
       <ImageView
           android:id="@+id/call_composer_message"
@@ -112,7 +132,8 @@
           android:layout_height="match_parent"
           android:scaleType="center"
           android:src="@drawable/quantum_ic_message_white_24"
-          android:background="?android:attr/selectableItemBackgroundBorderless"/>
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/description_call_composer_message"/>
     </LinearLayout>
 
     <FrameLayout
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
index 77c7a58..39c2d0d 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
@@ -51,7 +51,6 @@
       android:background="@color/call_composer_divider"/>
 
   <RelativeLayout
-      android:orientation="horizontal"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content">
 
@@ -70,7 +69,7 @@
       android:background="@color/background_dialer_white"
       android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
       android:layout_toStartOf="@+id/remaining_characters"
-      android:inputType="textShortMessage"
+      android:inputType="textShortMessage|textCapSentences"
       android:imeOptions="flagNoExtractUi|actionSend"/>
 
     <TextView
diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
index 81f97fd..fd7cd5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Deel en bel"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"prent <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"prent"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Neem \'n foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kon nie kameraprent laai nie"</string>
     <string name="allow" msgid="8637148297403066623">"Laat toe"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot kamera om \'n foto te neem"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot media om \'n prent te deel"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto is via Boodskappe gestuur"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Boodskap is via Boodskappe gestuur"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Stuur tans prent …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
index c442490..b412109 100644
--- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"ያጋሩ እና ይደውሉ"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ምስል <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ምስል"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ፎቶ አንሳ"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"የካሜራ ምስልን መጫን አልተቻለም"</string>
     <string name="allow" msgid="8637148297403066623">"ፍቀድ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ፎቶ በመልዕክቶች በኩል ተልኳል"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"መልዕክት በመልዕክቶች በኩል ተልኳል"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ምስል በመላክ ላይ…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
index ba43f0f..ee811bd 100644
--- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"المشاركة والاتصال"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"الصورة <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"صورة"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"التقاط صورة"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"يتعذر تحميل صورة الكاميرا"</string>
     <string name="allow" msgid="8637148297403066623">"سماح"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"‏صورة مرسلة عبر Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"‏رسالة مرسلة عبر Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"جارٍ إرسال الصورة..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
index 2f913d9..2d1a26c 100644
--- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Paylaşın və zəng edin"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"şəkil <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"şəkil"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Şəkil çəkin"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamera şəklini yükləmək olmur"</string>
     <string name="allow" msgid="8637148297403066623">"İcazə verin"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Şəkil çəkmək üçün kameraya giriş icazəsi verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Şəkil göndərilir..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
index c357d50..fbe93d2 100644
--- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Deli i pozovi"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"slika, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Slikajte"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Učitavanje slike sa kamere nije uspelo"</string>
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Odobrite pristup Kameri da biste snimili sliku"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Odobrite pristup Medijima da biste delili sliku"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Slika je poslata preko Messages-a"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslata preko Messages-a"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Šalje se slika…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
index bb3244b..5197f71 100644
--- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Абагуліць і выклікаць"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"відарыс <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"відарыс"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Зрабіць фота"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Не ўдалося загрузіць відарыс з камеры"</string>
     <string name="allow" msgid="8637148297403066623">"Дазволіць"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Каб зрабіць фота, адкрыйце доступ да Камеры"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Фота адпраўлена праз праграму \"Паведамленні\""</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Паведамленне адпраўлена праз праграму \"Паведамленні\""</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Адпраўка відарыса..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
index 1bc05cd..7b431ce 100644
--- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Споделяне и обаждане"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"изображение от <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Правене на снимка"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Изображението от камерата не можа да се зареди"</string>
     <string name="allow" msgid="8637148297403066623">"Разрешаване"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да направите снимка, разрешете достъп до Камера"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите изображение, разрешете достъп до Медии"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Снимката е изпратена чрез Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Съобщението е изпратено чрез Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Изображението се изпраща…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
index e991b3b..17559b4 100644
--- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"শেয়ার এবং কল করুন"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ছবি <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ছবি"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"একটি ফটো তুলুন"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ক্যামেরার ছবি লোড করা গেল না"</string>
     <string name="allow" msgid="8637148297403066623">"অনুমতি দিন"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Messages এর সাহায্যে ফটো পাঠানো হয়েছে"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ফটো পাঠানো হচ্ছে…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
index 7d0b8d2..d486f94 100644
--- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Podijeli i pozovi"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Snimi fotografiju"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nije moguće učitati sliku s kamere"</string>
     <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da snimite fotografiju, dajte pristup Kameri"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Da podijelite sliku, dozvolite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je poslana putem aplikacije Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslana putem aplikacije Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
index 4fa52ad..6b77b18 100644
--- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Comparteix i truca"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imatge del dia <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imatge"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fes una foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"No s\'ha pogut carregar la imatge de la càmera"</string>
     <string name="allow" msgid="8637148297403066623">"Permet"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dóna accés a la càmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dóna accés al contingut multimèdia"</string>
+    <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dona accés a la càmera"</string>
+    <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dona accés al contingut multimèdia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada mitjançant Missatges"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Missatge enviat mitjançant Missatges"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"S\'està enviant la imatge…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
index 93ae0c1..9169537 100644
--- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Sdílet a zavolat"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"obrázek <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázek"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotit"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Obrázek z fotoaparátu se nepodařilo načíst"</string>
     <string name="allow" msgid="8637148297403066623">"Povolit"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Chcete-li pořídit fotku, povolte přístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pokud chcete sdílet fotku, povolte přístup k mediálním souborům"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka poslaná v aplikaci Zprávy"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Zpráva poslaná v aplikaci Zprávy"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odesílání obrázku…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
index b1e3e6d..f720d59 100644
--- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"billede <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"billede"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tag et billede"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabilledet kan ikke indlæses"</string>
     <string name="allow" msgid="8637148297403066623">"Tillad"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Du skal give adgang til kameraet for at tage et billede"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Du skal give adgang til medier for at dele et billede"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoet blev sendt via Beskeder"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Beskeden blev sendt via Beskeder"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Billedet sendes…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
index 9b9c13a..3f3767e 100644
--- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Teilen und anrufen"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"Bild: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Bild"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Foto aufnehmen"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabild konnte nicht geladen werden"</string>
     <string name="allow" msgid="8637148297403066623">"Zulassen"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto über Messages gesendet"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Nachricht über Messages gesendet."</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Bild wird gesendet…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
index 45fce84..9a8ed5d 100644
--- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Κοινοποίηση και κλήση"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"εικόνα <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"εικόνα"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Λήψη φωτογραφίας"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής"</string>
     <string name="allow" msgid="8637148297403066623">"Να επιτρέπεται"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Η φωτογραφία στάλθηκε μέσω του Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Το μήνυμα στάλθηκε μέσω του Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Αποστολή εικόνας…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
index c34cbbd..4e4edcf 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Take a photo"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
index c34cbbd..4e4edcf 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Take a photo"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
index c34cbbd..4e4edcf 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Take a photo"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
     <string name="allow" msgid="8637148297403066623">"Allow"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
index 797d001..f06f5f0 100644
--- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tomar una foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"No se pudo cargar la imagen de la cámara"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tomar una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada por Mensajes"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje de texto enviado por Mensajes"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagen…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
index 8a4e7d6..a8b9195 100644
--- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Hacer fotos"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"No se ha podido cargar la imagen de la cámara"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para hacer una foto, permite el acceso a la cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensajes"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje enviado a través de Mensajes"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando la imagen…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
index 17b77a2..24548fb 100644
--- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Jaga ja helista"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"pilt: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"pilt"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Foto jäädvustamine"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kaamera kujutist ei õnnestunud laadida"</string>
     <string name="allow" msgid="8637148297403066623">"Luba"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Foto jäädvustamiseks lubage juurdepääs kaamerale"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pildi jagamiseks lubage juurdepääs meediale"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto saadeti rakenduse Messages kaudu"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Sõnum saadeti rakenduse Messages kaudu"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kujutise saatmine …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
index be2aba7..012c62c 100644
--- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Partekatu eta deitu"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"irudiaren data: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"irudia"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Atera argazki bat"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Ezin izan da kargatu kamerako irudia"</string>
     <string name="allow" msgid="8637148297403066623">"Baimendu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Argazkiak ateratzeko, eman kamera atzitzeko baimena"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Irudiak partekatzeko, eman multimedia-edukirako sarbidea"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Mezuak aplikazioaren bidez bidali da argazkia"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mezuak aplikazioaren bidez bidali da mezua"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Irudia bidaltzen…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
index 9d588b2..eb97796 100644
--- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"اشتراک‌گذاری و تماس"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"عکس گرفتن"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"تصویر دوربین بار نشد"</string>
     <string name="allow" msgid="8637148297403066623">"مجاز است"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"برای عکس گرفتن، به دوربین اجازه دسترسی بدهید"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"عکس ارسال‌شده ازطریق «پیام‌ها»"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"پیام ارسال‌شده ازطریق «پیام‌ها»"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"درحال ارسال تصویر…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
index 98821bc..892bd96 100644
--- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Jaa ja soita"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"kuva (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kuva"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Ota kuva"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamerakuvan lataus epäonnistui."</string>
     <string name="allow" msgid="8637148297403066623">"Salli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Jos haluat ottaa valokuvan, salli kameran käyttö."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Jos haluat jakaa kuvan, salli kuvien käyttö."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Kuva lähetettiin Messages-sovelluksen kautta"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Viesti lähetettiin Messages-sovelluksen kautta"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Lähetetään kuvaa…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
index 29c001d..000d6eb 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"image : <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Prendre une photo"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de l\'appareil photo"</string>
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, autorisez l\'accès à l\'appareil photo"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, autorisez l\'accès au contenu multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée au moyen de l\'application Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé au moyen de l\'application Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image en cours…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
index ab56289..40b89a3 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Prendre une photo"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de la caméra"</string>
     <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, accordez l\'accès à l\'appareil photo."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, accordez l\'accès aux fichiers multimédia."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée via l\'application Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé via l\'application Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
index 5c86768..55bf5aa 100644
--- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Compartir e chamar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"Imaxe do <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Imaxe"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tirar unha foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Non se puido cargar a imaxe da cámara"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para sacar unha foto, concede permiso de acceso á cámara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensaxes"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaxe enviada a través de Mensaxes"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imaxe…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
index c948d2e..13f4c84 100644
--- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"શેર કરો અને કૉલ કરો"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"છબી <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"છબી"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"એક ફોટો લો"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"કૅમેરા છબી લોડ કરી શકાઈ નથી"</string>
     <string name="allow" msgid="8637148297403066623">"મંજૂરી આપો"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Messages મારફતે ફોટો મોકલ્યો"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messages મારફતે સંદેશ મોકલ્યો"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"છબી મોકલી રહ્યાં છીએ..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
index 6cfdb16..5d39d03 100644
--- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"साझा करें और कॉल करें"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"चित्र <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"चित्र"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"कोई फ़ोटो लें"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"कैमरे का चित्र लोड नहीं किया जा सका"</string>
     <string name="allow" msgid="8637148297403066623">"अनुमति दें"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"चित्र भेजा जा रहा है…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
index 613f1f4..5514388 100644
--- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Dijeli i pozovi"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Snimi fotografiju"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Slika se ne može učitati"</string>
     <string name="allow" msgid="8637148297403066623">"Omogući"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Da biste snimili fotografiju, dopustite pristup Fotoaparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Za dijeljenje slike dopustite pristup Medijima"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija poslana putem Poruka"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka poslana putem Poruka"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
index 451fcb4..caf7577 100644
--- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Megosztás és hívás"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"kép: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kép"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotó készítése"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nem lehetett betölteni a kamera képét"</string>
     <string name="allow" msgid="8637148297403066623">"Engedélyezés"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotó készítéséhez adjon hozzáférést a fényképezőgéphez"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kép megosztásához adjon hozzáférést a médiafájlokhoz"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotó elküldve a Messages alkalmazásban"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Üzenet elküldve a Messages alkalmazásban"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kép küldése…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
index 43793d6..ae7e6ad 100644
--- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Կիսվել և զանգել"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"պատկեր <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"պատկեր"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Լուսանկարել"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Չհաջողվեց բեռնել տեսախցիկի պատկերը"</string>
     <string name="allow" msgid="8637148297403066623">"Թույլատրել"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Լուսանկարն ուղարկվել է Messages-ի միջոցով"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Պատկերի ուղարկում…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
index 4f90810..3d3cba7 100644
--- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Bagikan dan telepon"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"gambar <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"gambar"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Mengambil foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuat gambar kamera"</string>
     <string name="allow" msgid="8637148297403066623">"Izinkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses ke Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk membagikan gambar, berikan akses ke Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto dikirim lewat Message"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Pesan dikirim lewat Message"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Mengirim gambar…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
index 5ca3050..ae3e123 100644
--- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Deila og hringja"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"mynd <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"mynd"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Taka mynd"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Ekki var hægt að hlaða mynd frá myndavél"</string>
     <string name="allow" msgid="8637148297403066623">"Leyfa"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Til að taka mynd skaltu veita myndavélinni aðgang"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Til að deila mynd skaltu veita margmiðlunarefni aðgang"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Mynd send með Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Skilaboð send með Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sendir mynd…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
index 40c893f..f06b0d8 100644
--- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Condividi e chiama"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"immagine: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"immagine"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Scatta una foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Impossibile caricare l\'immagine della fotocamera"</string>
     <string name="allow" msgid="8637148297403066623">"Consenti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Per poter scattare una foto devi concedere l\'accesso alla fotocamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto inviata tramite Messaggi"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messaggio inviato tramite Messaggi"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Invio dell\'immagine…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
index e1557dc..8ed808b 100644
--- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"שתף והתקשר"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"תמונה <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"תמונה"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"צלם תמונה"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"לא ניתן לטעון את התמונה מהמצלמה"</string>
     <string name="allow" msgid="8637148297403066623">"אפשר"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"‏התמונה נשלחה דרך אפליקציית Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"‏ההודעה נשלחה דרך אפליקציית Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"התמונה נשלחת…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
index bc8161d..61ad0ce 100644
--- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"共有して発信"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"画像（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"画像"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"写真を撮る"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"カメラ内の画像を読み込めませんでした"</string>
     <string name="allow" msgid="8637148297403066623">"許可"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"写真を撮るには、まずカメラへのアクセスを許可してください"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"画像を共有するには、まずメディアへのアクセスを許可してください"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Android メッセージで写真が送信されました"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Android メッセージでメッセージが送信されました"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"画像を送信しています…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
index 79f39ab..4d65fa3 100644
--- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"გაზიარება და დარეკვა"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"სურათი, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"სურათი"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ფოტოს გადაღება"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"კამერის სურათი ვერ ჩაიტვირთა"</string>
     <string name="allow" msgid="8637148297403066623">"ნების დართვა"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ფოტოს გადასაღებად მიეცით კამერაზე წვდომა"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"სურათის გასაზიარებლად მიეცით მედიაზე წვდომა"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ფოტო გაიგზავნა Messages აპიდან"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"შეტყობინება გაიგზავნა Messages აპიდან"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"მიმდინარეობს სურათის გაგზავნა…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
index ffe045f..80f9caa 100644
--- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Бөлісу және қоңырау шалу"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"сурет, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сурет"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Суретке түсіру"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Камера суреті жүктелмеді"</string>
     <string name="allow" msgid="8637148297403066623">"Рұқсат беру"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Суретке түсіру үшін камераға кіруге рұқсат беріңіз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Сурет Messages арқылы жіберілді"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Хабар Messages арқылы жіберілді"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сурет жіберілуде..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
index 4444bce..b16534c 100644
--- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"ចែករំលែក និង​ហៅ​ទូរសព្ទ"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"រូបភាព <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"រូបភាព"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ថតរូប"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ"</string>
     <string name="allow" msgid="8637148297403066623">"អនុញ្ញាត"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើស​រូបថត"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"កំពុង​ផ្ញើ​រូបភាព..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
index f50bdcc..59de5e7 100644
--- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ಚಿತ್ರ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ಚಿತ್ರ"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ಫೋಟೋ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
     <string name="allow" msgid="8637148297403066623">"ಅನುಮತಿಸಿ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
index d710afa..7df4a70 100644
--- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"공유 및 전화 걸기"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"이미지 <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"이미지"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"사진 찍기"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"카메라 이미지를 로드할 수 없습니다."</string>
     <string name="allow" msgid="8637148297403066623">"허용"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"메시지를 통해 전송된 사진"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"메시지를 통해 전송된 메시지"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"이미지 전송 중…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
index c7c0533..1a8a395 100644
--- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Бөлүшүү жана чалуу"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"сүрөт, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сүрөт"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Сүрөткө тартуу"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Камерадан сүрөт жүктөлгөн жок"</string>
     <string name="allow" msgid="8637148297403066623">"Уруксат берүү"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сүрөт жөнөтүлүүдө..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
index 9c49460..42ae0f1 100644
--- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"ແບ່ງປັນ ແລະ ໂທ"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ຮູບ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ຮູບ"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ຖ່າຍຮູບ"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້"</string>
     <string name="allow" msgid="8637148297403066623">"ອະນຸຍາດ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ກຳລັງສົ່ງຮູບພາບ..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
index 0b011f7..59112d3 100644
--- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Bendrinti ir skambinti"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"vaizdas (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"vaizdas"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotografuoti"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nepavyko įkelti fotoaparato vaizdo"</string>
     <string name="allow" msgid="8637148297403066623">"Leisti"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Nuotrauka išsiųsta naudojant „Messages“"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Pranešimas išsiųstas naudojant „Messages“"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Siunčiamas vaizdas..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
index 8593ca0..8aa9540 100644
--- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Kopīgot un zvanīt"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"attēls, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"attēls"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Uzņemt fotoattēlu"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nevarēja ielādēt kameras attēlu."</string>
     <string name="allow" msgid="8637148297403066623">"Atļaut"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai."</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam."</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Ziņojums nosūtīts, izmantojot lietotni Ziņojumi"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tiek sūtīts attēls…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
index 40d7c62..126b44c 100644
--- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Сподели и повикај"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"слика од <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Фотографирајте"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Не можеше да се вчита слика од камерата"</string>
     <string name="allow" msgid="8637148297403066623">"Дозволете"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"За да фотографирате, дозволете пристап до „Камера“"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите слика, дозволете пристап до Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографијата е испратена преку Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Пораката е испратена преку Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Се испраќа слика…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
index 0a0833d..67175cc 100644
--- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ചിത്രം <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ചിത്രം"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ഒരു ഫോട്ടോ എടുക്കുക"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല"</string>
     <string name="allow" msgid="8637148297403066623">"അനുവദിക്കുക"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"മെസേജ് വഴി ഫോട്ടോ അയച്ചു"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"മെസേജ് വഴി സന്ദേശം അയച്ചു"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ചിത്രം അയയ്‌ക്കുന്നു..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
index 54a292d..1de1f11 100644
--- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Хуваалцаад залгах"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"зураг <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зураг"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Зураг авах"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Камерын дүрсийг ачаалж чадсангүй"</string>
     <string name="allow" msgid="8637148297403066623">"Зөвшөөрөх"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Зургийг Зурвасаар дамжуулан илгээсэн"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Зурвасыг Зурвасаар дамжуулан илгээсэн"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Зураг илгээж байна..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
index 7f8c5d7..40a794d 100644
--- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"सामायिक करा आणि कॉल करा"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"प्रतिमा <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"प्रतिमा"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"एक फोटो घ्या"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"कॅमेरा प्रतिमा लोड करणे शक्य झाले नाही"</string>
     <string name="allow" msgid="8637148297403066623">"अनुमती द्या"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Messages द्वारे फोटो पाठविला"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messages द्वारे संदेश पाठविला"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"इमेज पाठवत आहे…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
index 0927cde..1f37e15 100644
--- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Kongsi dan hubungi"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imej <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imej"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Ambil foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuatkan imej kamera"</string>
     <string name="allow" msgid="8637148297403066623">"Benarkan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses kepada Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk berkongsi imej, berikan akses kepada Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Photo dihantar melalui Mesej"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mesej dihantar melalui Mesej"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Menghantar imej…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
index 6608e9a..5f8de84 100644
--- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ပုံ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ပုံ"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ကင်မရာမှပုံကို မရယူနိုင်ပါ"</string>
     <string name="allow" msgid="8637148297403066623">"ခွင့်ပြုရန်"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ပုံပို့နေသည်…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
index 693e7fd..c9e1296 100644
--- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Ta et bilde"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
index 37dd681..71d40a6 100644
--- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"आदान-प्रदान र कल गर्नुहोस्"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"छवि <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"छवि"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"एउटा तस्बिर खिच्नुहोस्"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"क्यामेराको छवि लोड गर्न सकिएन"</string>
     <string name="allow" msgid="8637148297403066623">"अनुमति दिनुहोस्"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Messages मार्फत पठाइएको तस्बिर"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messages मार्फत पठाइएको सन्देश"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"छवि पठाइँदै…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
index ebb00c4..59c09a3 100644
--- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Delen en bellen"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"afbeelding van <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"afbeelding"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Een foto maken"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kan camera-afbeelding niet laden"</string>
     <string name="allow" msgid="8637148297403066623">"Toestaan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot Camera om een foto te maken"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot Media om een afbeelding te delen"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto verzonden via Berichten"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Bericht verzonden via Berichten"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Afbeelding verzenden…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
index 693e7fd..c9e1296 100644
--- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Ta et bilde"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
     <string name="allow" msgid="8637148297403066623">"Tillat"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
index bf6be36..0a51a63 100644
--- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"ਚਿੱਤਰ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ਚਿੱਤਰ"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ਕੋਈ ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
     <string name="allow" msgid="8637148297403066623">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ਫ਼ੋਟੋ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"ਸੁਨੇਹਾ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
index ba74628..130dd8c 100644
--- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Udostępnij i zadzwoń"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"zdjęcie – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"zdjęcie"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Robienie zdjęć"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nie udało się wczytać zdjęcia z aparatu"</string>
     <string name="allow" msgid="8637148297403066623">"Zezwól"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Aby zrobić zdjęcie, zezwól na dostęp do aparatu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Aby udostępnić zdjęcie, zezwól na dostęp do multimediów"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Zdjęcie zostało wysłane przez Wiadomości"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Tekst został wysłany przez Wiadomości"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Wysyłam obraz…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
index 9feee7d..a090d15 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tirar uma foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
index 8b12d65..34b3a96 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Partilhar e ligar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tirar uma foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Não foi possível carregar a imagem da câmara"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, conceda acesso à Câmara"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para partilhar uma imagem, conceda acesso a Multimédia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada através da aplicação Mensagens"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada através da aplicação Mensagens"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"A enviar imagem…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
index 9feee7d..a090d15 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Tirar uma foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
     <string name="allow" msgid="8637148297403066623">"Permitir"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
index 744ef80..29de0ed 100644
--- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Trimiteți și apelați"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imagine din <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagine"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotografiați"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Nu s-a putut încărca imaginea de la camera foto"</string>
     <string name="allow" msgid="8637148297403066623">"Permiteți"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Pentru a fotografia, permiteți accesul la Camera foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Pentru a trimite o imagine, permiteți accesul la Conținutul media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografie trimisă prin Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj trimis prin Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Se trimite imaginea…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
index 1abbc49..ffdfb29 100644
--- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Поделиться и позвонить"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"изображение, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Перейти в режим фото"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Не удалось загрузить изображение с камеры"</string>
     <string name="allow" msgid="8637148297403066623">"Разрешить"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Чтобы сделать снимок, предоставьте доступ к камере"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Чтобы поделиться изображением, предоставьте доступ к мультимедиа"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Фото отправлено через Android Сообщения"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Сообщение отправлено через Android Сообщения"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Отправка изображения…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
index 48a4474..cdea197 100644
--- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"බෙදා ගෙන අමතන්න"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"රූපය <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"රූපය"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ඡායාරූපයක් ගන්න"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"කැමරා රූපය පූරණය කළ නොහැකි විය"</string>
     <string name="allow" msgid="8637148297403066623">"ඉඩ දෙන්න"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Messages හරහා ඡායාරූපය යවන ලදී"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Messages හරහා පණිවිඩය යවන ලදී"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"රූපය යවමින්..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
index 2fb13c1..e478e63 100644
--- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Zdieľať a volať"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"obrázok – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázok"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Odfotiť"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Obrázok z fotoaparátu sa nepodarilo načítať"</string>
     <string name="allow" msgid="8637148297403066623">"Povoliť"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ak chcete fotiť, povoľte prístup k fotoaparátu"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ak chcete zdieľať obrázok, povoľte prístup k médiám"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka bola odoslaná prostredníctvom Správ"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Správa bola odoslaná prostredníctvom Správ"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odosiela sa obrázok…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
index 34126ab..85dd23d 100644
--- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Klic s skupno rabo"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotografiranje"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Slike fotoaparata ni bilo mogoče naložiti"</string>
     <string name="allow" msgid="8637148297403066623">"Dovoli"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Če želite posneti fotografijo, omogočite dostop do fotoaparata"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je bila poslana prek aplikacije Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Sporočilo je bila poslano prek aplikacije Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Pošiljanje slike …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
index 35dd197..aba7c81 100644
--- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Ndaj dhe telefono"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"imazh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imazh"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Bëj një fotografi"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Imazhi i kamerës nuk mund të ngarkohej"</string>
     <string name="allow" msgid="8637148297403066623">"Lejo"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Për të shkrepur një fotografi, jep qasjen te Kamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Për të ndarë një imazh, jep qasjen te Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografia u dërgua nëpërmjet \"Mesazheve\""</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mesazhi u dërgua nëpërmjet \"Mesazheve\""</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Imazhi po dërgohet..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
index 4fa34ed..ead04fc 100644
--- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Дели и позови"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"слика, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Сликајте"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Учитавање слике са камере није успело"</string>
     <string name="allow" msgid="8637148297403066623">"Дозволи"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Одобрите приступ Камери да бисте снимили слику"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Одобрите приступ Медијима да бисте делили слику"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Слика је послата преко Messages-а"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Порука је послата преко Messages-а"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Шаље се слика…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
index de33531..0e37b29 100644
--- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Dela och ring"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"bild den <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bild"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Ta ett foto"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Det gick inte att läsa in kamerabild"</string>
     <string name="allow" msgid="8637148297403066623">"Tillåt"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Bevilja åtkomst till Kamera om du vill ta ett foto"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Bevilja åtkomst till Media om du vill dela en bild"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotot har skickats via Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Meddelandet har skickats via Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Skickar bild …"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
index e99fd06..03a7eac 100644
--- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Shiriki na upige simu"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"picha <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"picha"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Piga picha"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Imeshindwa kupakia picha ya kamera"</string>
     <string name="allow" msgid="8637148297403066623">"Ruhusu"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ruhusu programu ifikie Kamera ili uweze kupiga picha"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie Midia ili uweze kushiriki picha"</string>
+    <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie hifadhi ili uweze kushiriki picha"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Picha imetumwa kupitia Programu ya Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Ujumbe umetumwa kupitia Programu ya Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Inatuma picha…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
index 4078148..e006ff9 100644
--- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"பகிர்ந்து அழை"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"படம், <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"படம்"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"படமெடுக்கும்"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"கேமரா படத்தை ஏற்ற முடியவில்லை"</string>
     <string name="allow" msgid="8637148297403066623">"அனுமதி"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"படத்தை அனுப்புகிறது…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
index 101429c..b3f4666 100644
--- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"భాగస్వా. చేసి, కాల్ చేయి"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"చిత్రం <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"చిత్రం"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ఫోటో తీస్తుంది"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు"</string>
     <string name="allow" msgid="8637148297403066623">"అనుమతించు"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"చిత్రాన్ని పంపుతోంది…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
index a004d33..125a24b 100644
--- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"แชร์และโทร"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"รูปภาพเมื่อวันที่ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"รูปภาพ"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ถ่ายภาพ"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"ไม่สามารถโหลดภาพจากกล้องได้"</string>
     <string name="allow" msgid="8637148297403066623">"อนุญาต"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"ส่งรูปภาพผ่าน Messages แล้ว"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"ส่งข้อความผ่าน Messages แล้ว"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"กำลังส่งรูปภาพ..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
index e902a2f..7e7dac6 100644
--- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Ibahagi at tumawag"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"larawan <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"larawan"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Kumuha ng isang larawan"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Hindi mai-load ang larawan ng camera"</string>
     <string name="allow" msgid="8637148297403066623">"Payagan"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Upang kumuha ng larawan, magbigay ng access sa Camera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Upang magbahagi ng imahe, magbigay ng access sa Media"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Larawang ipinadala sa pamamagitan ng Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaheng ipinadala sa pamamagitan ng Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ipinapadala ang larawan…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
index 0dfe8b2..99523d5 100644
--- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Paylaş ve telefon et"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"resim <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"resim"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Fotoğraf çeker"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamera görüntüsü yüklenemedi"</string>
     <string name="allow" msgid="8637148297403066623">"İzin ver"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Fotoğraf çekmek için Kamera\'ya erişim izni verin"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Resim paylaşmak için Medya\'ya erişim izni verin"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoğraf, Mesajlar uygulaması üzerinden gönderildi"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj, Mesajlar uygulaması üzerinden gönderildi"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Resim gönderiliyor…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
index 20898c3..fa57d3d 100644
--- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Надіслати й зателефонувати"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"зображення <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зображення"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Зйомка фото"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Не вдалося завантажити зображення з камери"</string>
     <string name="allow" msgid="8637148297403066623">"Дозволити"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Щоб сфотографувати, надайте доступ до камери"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Щоб поділитися зображенням, надайте доступ до медіа-вмісту"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографію надіслано через додаток Повідомлення"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Текст надіслано через додаток Повідомлення"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Надсилання зображення…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
index 92a2f8c..2677bd2 100644
--- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"اشتراک کریں اور کال کریں"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"ایک تصویر لیں"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"کیمرے کی تصویر لوڈ نہیں ہو سکی"</string>
     <string name="allow" msgid="8637148297403066623">"اجازت دیں"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"تصویر لینے کیلئے کیمرا کو رسائی دیں"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"تصویر پیغامات کے ذریعے بھیجی گئی"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"پیغام پیغامات کے ذریعے بھیجا گیا"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"تصویر بھیجی جا رہی ہے…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
index 8450162..79152b5 100644
--- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Ulashish va chaqirish"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"tasvir, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"tasvir"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Surat rejimiga o‘tish"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Kamera orqali olingan suratni yuklab bo‘lmadi"</string>
     <string name="allow" msgid="8637148297403066623">"Ruxsat berish"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Suratga olish uchun kameraga kirshga ruxsat bering"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Rasm Android Xabarlar orqali yuborildi"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Xabar Android Xabarlar orqali yuborildi"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tasvir yuborilmoqda…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
index 2d060bd..f065f17 100644
--- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Chia sẻ và gọi"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"hình ảnh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"hình ảnh"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Chụp ảnh"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Không thể tải hình ảnh trong máy ảnh"</string>
     <string name="allow" msgid="8637148297403066623">"Cho phép"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Đã gửi ảnh qua Messages"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Đã gửi tin nhắn qua Messages"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Đang gửi hình ảnh..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
index a6c2f90..0bb323f 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"分享并拨打电话"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"图片（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"图片"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"拍摄照片"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"无法加载相机图片"</string>
     <string name="allow" msgid="8637148297403066623">"允许"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"要拍摄照片，请授予相机使用权限"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"要分享图片，请授予媒体访问权限"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"已通过“信息”应用发送照片"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"已通过“信息”应用发送短信"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在发送图片…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
index 8f66f4f..5b70bbc 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"分享並通話"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"拍照"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予「相機」存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予「媒體」存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"已透過「訊息」傳送相片"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"已透過「訊息」傳送訊息"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
index a3af5af..3f1eaf0 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"分享及撥號"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"拍攝相片"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
     <string name="allow" msgid="8637148297403066623">"允許"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予相機存取權"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予媒體存取權"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"透過訊息應用程式傳送的相片"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"透過訊息應用程式傳送的訊息"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
index 2cce688..682febc 100644
--- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
@@ -25,9 +25,14 @@
     <string name="share_and_call" msgid="8934144481838868674">"Yabelana uphinde ushaye"</string>
     <string name="gallery_item_description" msgid="7600601724204579471">"isithombe sangomhla ka-<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
     <string name="gallery_item_description_no_date" msgid="2059198895441426838">"isithombe"</string>
-    <string name="camera_switch_to_still_mode" msgid="1881982437979592567">"Thatha isithombe"</string>
     <string name="camera_media_failure" msgid="8979549551450965882">"Ayikwazanga ukulayisha isithombe sekhamera"</string>
     <string name="allow" msgid="8637148297403066623">"Vumela"</string>
     <string name="camera_permission_text" msgid="7863231776480341614">"Ukuze uthathe isithombe, nika ukufinyelela kukhamera"</string>
     <string name="gallery_permission_text" msgid="4102566850658919346">"Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya"</string>
+    <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string>
+    <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string>
+    <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string>
+    <string name="image_sent_messages" msgid="6520870555040566229">"Isithombe sithunyelwe ngemilayezo"</string>
+    <string name="message_sent_messages" msgid="6286576951151541098">"Umlayezo uthunyelwe ngemilayezo"</string>
+    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ithumela isithombe..."</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values/colors.xml b/java/com/android/dialer/callcomposer/res/values/colors.xml
index 89e55b7..8393c55 100644
--- a/java/com/android/dialer/callcomposer/res/values/colors.xml
+++ b/java/com/android/dialer/callcomposer/res/values/colors.xml
@@ -20,5 +20,4 @@
   <color name="call_composer_divider">#12000000</color>
   <color name="compose_and_call_background">#00BC35</color>
   <color name="gallery_item_image_color">#607D8B</color>
-  <color name="gallery_item_background_color">#ECEFF1</color>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/values/dimens.xml b/java/com/android/dialer/callcomposer/res/values/dimens.xml
index d555400..f4c2c3b 100644
--- a/java/com/android/dialer/callcomposer/res/values/dimens.xml
+++ b/java/com/android/dialer/callcomposer/res/values/dimens.xml
@@ -15,15 +15,15 @@
   ~ limitations under the License
   -->
 <resources>
-  <dimen name="call_composer_view_pager_height">306dp</dimen>
+  <dimen name="call_composer_view_pager_height">292dp</dimen>
 
   <!-- Contact bar -->
   <dimen name="call_composer_contact_photo_border_thickness">2dp</dimen>
-  <dimen name="call_composer_contact_photo_size">116dp</dimen>
-  <dimen name="call_composer_contact_container_margin_top">58dp</dimen>
-  <dimen name="call_composer_contact_container_padding_top">58dp</dimen>
-  <dimen name="call_composer_contact_container_padding_bottom">18dp</dimen>
-  <dimen name="call_composer_name_text_size">32sp</dimen>
+  <dimen name="call_composer_contact_photo_size">112dp</dimen>
+  <dimen name="call_composer_contact_container_margin_top">56dp</dimen>
+  <dimen name="call_composer_contact_container_padding_top">56dp</dimen>
+  <dimen name="call_composer_contact_container_padding_bottom">16dp</dimen>
+  <dimen name="call_composer_name_text_size">28sp</dimen>
   <dimen name="call_composer_number_text_size">16sp</dimen>
   <dimen name="call_composer_contact_container_elevation">2dp</dimen>
 
@@ -32,9 +32,7 @@
   <dimen name="call_composer_media_bar_height">48dp</dimen>
 
   <!-- Send and Call button -->
-  <dimen name="send_and_call_icon_size">18dp</dimen>
   <dimen name="send_and_call_text_size">16sp</dimen>
-  <dimen name="send_and_call_padding">8dp</dimen>
   <dimen name="send_and_call_drawable_padding">4dp</dimen>
 
   <!-- Message Composer -->
@@ -56,4 +54,6 @@
   <dimen name="permission_item_margin">8dp</dimen>
   <dimen name="permission_allow_padding">16dp</dimen>
   <dimen name="min_touch_target_size">48dp</dimen>
+
+  <dimen name="privacy_toast_y_offset">108dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml
index cc7762b..f01e908 100644
--- a/java/com/android/dialer/callcomposer/res/values/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values/strings.xml
@@ -31,8 +31,6 @@
   <string name="gallery_item_description">image <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
   <!-- Accessibility description for each image in the gallery when no date is present. -->
   <string name="gallery_item_description_no_date">image</string>
-  <!-- Content description of button to switch camera to picture more -->
-  <string name="camera_switch_to_still_mode">Take a photo</string>
   <!-- Error toast message shown when a camera image failed to attach to the message -->
   <string name="camera_media_failure">Couldn\'t load camera image</string>
   <!-- Text for a button to ask for device permissions -->
@@ -41,4 +39,19 @@
   <string name="camera_permission_text">To take a photo, give access to Camera</string>
   <!-- Text presented to the user explaining that we need device storage permission to view photos -->
   <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <!-- Content description of button to show ui for taking a photo -->
+  <string name="description_call_composer_camera">Take a picture</string>
+  <!-- Content description of button to show ui for selecting a photo from the user's gallery -->
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <!-- Content description of button to show ui for sending a message -->
+  <string name="description_call_composer_message">Send a message</string>
+  <!-- When a user makes a call with a photo attached, we send the photo through the app "Messages".
+    This string is shown in a toast for privacy reasons. -->
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <!-- When a user makes a call with text attached, we send the text through the app "Messages".
+    This string is shown in a toast for privacy reasons. -->
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <!-- When a user places a call with an image attached, we show them the in call screen and
+      display this string "Image uploading..." to let them know why the call hasn't started. -->
+  <string name="call_composer_image_uploading">Sending image\u2026</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml
index 29ac4dd..a03ee48 100644
--- a/java/com/android/dialer/callcomposer/res/values/styles.xml
+++ b/java/com/android/dialer/callcomposer/res/values/styles.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 <resources>
-  <style name="Theme.AppCompat.CallComposer" parent="Theme.AppCompat.NoActionBar">
+  <style name="Theme.AppCompat.CallComposer" parent="DialerThemeBase.NoActionBar">
     <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
@@ -34,7 +34,8 @@
   <style name="message_composer_textview">
     <item name="android:textSize">@dimen/message_compose_item_text_size</item>
     <item name="android:textColor">@color/dialer_primary_text_color</item>
-    <item name="android:padding">@dimen/message_composer_item_padding</item>
+    <item name="android:paddingStart">@dimen/message_composer_item_padding</item>
+    <item name="android:paddingEnd">@dimen/message_composer_item_padding</item>
     <item name="android:background">@drawable/item_background_material_light</item>
     <item name="android:gravity">center_vertical</item>
   </style>
diff --git a/java/com/android/dialer/callcomposer/util/BitmapResizer.java b/java/com/android/dialer/callcomposer/util/BitmapResizer.java
index 658462d..84ada51 100644
--- a/java/com/android/dialer/callcomposer/util/BitmapResizer.java
+++ b/java/com/android/dialer/callcomposer/util/BitmapResizer.java
@@ -17,6 +17,7 @@
 package com.android.dialer.callcomposer.util;
 
 import android.graphics.Bitmap;
+import android.graphics.Matrix;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
@@ -28,40 +29,44 @@
   /**
    * Returns a bitmap that is a resized version of the parameter image. The image will only be
    * resized down and sized to be appropriate for an enriched call.
+   *
+   * @param image to be resized
+   * @param rotation degrees to rotate the image clockwise
+   * @return resized image
    */
-  public static Bitmap resizeForEnrichedCalling(Bitmap image) {
+  public static Bitmap resizeForEnrichedCalling(Bitmap image, int rotation) {
     Assert.isWorkerThread();
 
     int width = image.getWidth();
     int height = image.getHeight();
 
+    Matrix matrix = new Matrix();
+    matrix.postRotate(rotation);
+
     LogUtil.i(
         "BitmapResizer.resizeForEnrichedCalling", "starting height: %d, width: %d", height, width);
 
     if (width <= MAX_OUTPUT_RESOLUTION && height <= MAX_OUTPUT_RESOLUTION) {
       LogUtil.i("BitmapResizer.resizeForEnrichedCalling", "no resizing needed");
-      return image;
+      return Bitmap.createBitmap(image, 0, 0, width, height, matrix, true);
     }
 
+    float ratio = 1;
     if (width > height) {
       // landscape
-      float ratio = width / (float) MAX_OUTPUT_RESOLUTION;
-      width = MAX_OUTPUT_RESOLUTION;
-      height = (int) (height / ratio);
-    } else if (height > width) {
-      // portrait
-      float ratio = height / (float) MAX_OUTPUT_RESOLUTION;
-      height = MAX_OUTPUT_RESOLUTION;
-      width = (int) (width / ratio);
+      ratio = MAX_OUTPUT_RESOLUTION / (float) width;
     } else {
-      // square
-      height = MAX_OUTPUT_RESOLUTION;
-      width = MAX_OUTPUT_RESOLUTION;
+      // portrait & square
+      ratio = MAX_OUTPUT_RESOLUTION / (float) height;
     }
 
     LogUtil.i(
-        "BitmapResizer.resizeForEnrichedCalling", "ending height: %d, width: %d", height, width);
+        "BitmapResizer.resizeForEnrichedCalling",
+        "ending height: %f, width: %f",
+        height * ratio,
+        width * ratio);
 
-    return Bitmap.createScaledBitmap(image, width, height, true);
+    matrix.postScale(ratio, ratio);
+    return Bitmap.createBitmap(image, 0, 0, width, height, matrix, true);
   }
 }
diff --git a/java/com/android/dialer/calldetails/AndroidManifest.xml b/java/com/android/dialer/calldetails/AndroidManifest.xml
index adaac40..9cf656e 100644
--- a/java/com/android/dialer/calldetails/AndroidManifest.xml
+++ b/java/com/android/dialer/calldetails/AndroidManifest.xml
@@ -16,16 +16,12 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.calldetails">
-  <application>
+  <application android:theme="@style/Theme.AppCompat">
     <activity
       android:label="@string/call_details"
+      android:exported="false"
       android:name="com.android.dialer.calldetails.CallDetailsActivity"
-      android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-        <data android:mimeType="vnd.android.cursor.item/calls"/>
-      </intent-filter>
+      android:theme="@style/DialerThemeBase.NoActionBar">
     </activity>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java
index 7eab951..569aaa5 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -23,38 +23,65 @@
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.view.MenuItem;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager.HistoricalDataChangedListener;
+import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.postcall.PostCall;
 import com.android.dialer.protos.ProtoParsers;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /** Displays the details of a specific call log entry. */
-public class CallDetailsActivity extends AppCompatActivity implements OnMenuItemClickListener {
+public class CallDetailsActivity extends AppCompatActivity
+    implements OnMenuItemClickListener,
+        CallDetailsFooterViewHolder.ReportCallIdListener,
+        HistoricalDataChangedListener {
 
+  public static final String EXTRA_PHONE_NUMBER = "phone_number";
+  public static final String EXTRA_HAS_ENRICHED_CALL_DATA = "has_enriched_call_data";
   private static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries";
   private static final String EXTRA_CONTACT = "contact";
+  private static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id";
   private static final String TASK_DELETE = "task_delete";
 
-  private List<CallDetailsEntry> entries;
+  private CallDetailsEntries entries;
+  private DialerContact contact;
+  private CallDetailsAdapter adapter;
+
+  public static boolean isLaunchIntent(Intent intent) {
+    return intent.getComponent() != null
+        && CallDetailsActivity.class.getName().equals(intent.getComponent().getClassName());
+  }
 
   public static Intent newInstance(
-      Context context, @NonNull CallDetailsEntries details, @NonNull CallComposerContact contact) {
+      Context context,
+      @NonNull CallDetailsEntries details,
+      @NonNull DialerContact contact,
+      boolean canReportCallerId) {
     Assert.isNotNull(details);
     Assert.isNotNull(contact);
 
     Intent intent = new Intent(context, CallDetailsActivity.class);
     ProtoParsers.put(intent, EXTRA_CONTACT, contact);
     ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, details);
+    intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
     return intent;
   }
 
@@ -62,30 +89,65 @@
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.call_details_activity);
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    Toolbar toolbar = findViewById(R.id.toolbar);
     toolbar.inflateMenu(R.menu.call_details_menu);
     toolbar.setOnMenuItemClickListener(this);
     toolbar.setTitle(R.string.call_details);
+    toolbar.setNavigationOnClickListener(
+        v -> {
+          PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON);
+          finish();
+        });
     onHandleIntent(getIntent());
   }
 
   @Override
+  protected void onResume() {
+    super.onResume();
+
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
+    PostCall.promptUserForMessageIfNecessary(this, findViewById(R.id.recycler_view));
+
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .registerHistoricalDataChangedListener(this);
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .requestAllHistoricalData(contact.getNumber(), entries);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .unregisterHistoricalDataChangedListener(this);
+  }
+
+  @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
     onHandleIntent(intent);
   }
 
   private void onHandleIntent(Intent intent) {
-    CallComposerContact contact =
-        ProtoParsers.getTrusted(intent, EXTRA_CONTACT, CallComposerContact.getDefaultInstance());
+    contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance());
     entries =
         ProtoParsers.getTrusted(
-                intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance())
-            .getEntriesList();
+            intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance());
+    adapter = new CallDetailsAdapter(this, contact, entries.getEntriesList(), this);
 
-    RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+    RecyclerView recyclerView = findViewById(R.id.recycler_view);
     recyclerView.setLayoutManager(new LinearLayoutManager(this));
-    recyclerView.setAdapter(new CallDetailsAdapter(this, contact, entries));
+    recyclerView.setAdapter(adapter);
+    PerformanceReport.logOnScrollStateChange(recyclerView);
   }
 
   @Override
@@ -99,6 +161,73 @@
     return false;
   }
 
+  @Override
+  public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+    super.onBackPressed();
+  }
+
+  @Override
+  public void reportCallId(String number) {
+    ReportDialogFragment.newInstance(number).show(getFragmentManager(), null);
+  }
+
+  @Override
+  public boolean canReportCallerId(String number) {
+    return getIntent().getExtras().getBoolean(EXTRA_CAN_REPORT_CALLER_ID, false);
+  }
+
+  @Override
+  public void onHistoricalDataChanged() {
+    Map<CallDetailsEntry, List<HistoryResult>> mappedResults =
+        getAllHistoricalData(contact.getNumber(), entries);
+
+    adapter.updateCallDetailsEntries(
+        generateAndMapNewCallDetailsEntriesHistoryResults(
+                contact.getNumber(), entries, mappedResults)
+            .getEntriesList());
+  }
+
+  @NonNull
+  private Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData(
+      @Nullable String number, @NonNull CallDetailsEntries entries) {
+    if (number == null) {
+      return Collections.emptyMap();
+    }
+
+    Map<CallDetailsEntry, List<HistoryResult>> historicalData =
+        EnrichedCallComponent.get(this)
+            .getEnrichedCallManager()
+            .getAllHistoricalData(number, entries);
+    if (historicalData == null) {
+      return Collections.emptyMap();
+    }
+    return historicalData;
+  }
+
+  private static CallDetailsEntries generateAndMapNewCallDetailsEntriesHistoryResults(
+      @Nullable String number,
+      @NonNull CallDetailsEntries callDetailsEntries,
+      @NonNull Map<CallDetailsEntry, List<HistoryResult>> mappedResults) {
+    if (number == null) {
+      return callDetailsEntries;
+    }
+    CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();
+    for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
+      CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);
+      List<HistoryResult> results = mappedResults.get(entry);
+      if (results != null) {
+        newEntry.addAllHistoryResults(mappedResults.get(entry));
+        LogUtil.v(
+            "CallLogAdapter.generateAndMapNewCallDetailsEntriesHistoryResults",
+            "mapped %d results",
+            newEntry.getHistoryResultsList().size());
+      }
+      mutableCallDetailsEntries.addEntries(newEntry.build());
+    }
+    return mutableCallDetailsEntries.build();
+  }
+
   /** Delete specified calls from the call log. */
   private class DeleteCallsTask extends AsyncTask<Void, Void, Void> {
 
@@ -106,7 +235,7 @@
 
     DeleteCallsTask() {
       StringBuilder callIds = new StringBuilder();
-      for (CallDetailsEntry entry : entries) {
+      for (CallDetailsEntry entry : entries.getEntriesList()) {
         if (callIds.length() != 0) {
           callIds.append(",");
         }
@@ -124,6 +253,15 @@
 
     @Override
     public void onPostExecute(Void result) {
+      Intent data = new Intent();
+      data.putExtra(EXTRA_PHONE_NUMBER, contact.getNumber());
+      for (CallDetailsEntry entry : entries.getEntriesList()) {
+        if (entry.getHistoryResultsCount() > 0) {
+          data.putExtra(EXTRA_HAS_ENRICHED_CALL_DATA, true);
+          break;
+        }
+      }
+      setResult(RESULT_OK, data);
       finish();
     }
   }
diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
index 7250779..6455874 100644
--- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java
+++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
@@ -22,30 +22,36 @@
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.calllogutils.CallTypeHelper;
 import com.android.dialer.common.Assert;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.lightbringer.LightbringerComponent;
 import java.util.List;
 
 /** Adapter for RecyclerView in {@link CallDetailsActivity}. */
-public class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
   private static final int HEADER_VIEW_TYPE = 1;
   private static final int CALL_ENTRY_VIEW_TYPE = 2;
   private static final int FOOTER_VIEW_TYPE = 3;
 
-  private final CallComposerContact contact;
-  private final List<CallDetailsEntry> callDetailsEntries;
+  private final DialerContact contact;
+  private final CallDetailsFooterViewHolder.ReportCallIdListener listener;
   private final CallTypeHelper callTypeHelper;
+  private List<CallDetailsEntry> callDetailsEntries;
 
-  public CallDetailsAdapter(
+  CallDetailsAdapter(
       Context context,
-      @NonNull CallComposerContact contact,
-      @NonNull List<CallDetailsEntry> callDetailsEntries) {
+      @NonNull DialerContact contact,
+      @NonNull List<CallDetailsEntry> callDetailsEntries,
+      CallDetailsFooterViewHolder.ReportCallIdListener listener) {
     this.contact = Assert.isNotNull(contact);
     this.callDetailsEntries = callDetailsEntries;
-    callTypeHelper = new CallTypeHelper(context.getResources());
+    this.listener = listener;
+    callTypeHelper =
+        new CallTypeHelper(
+            context.getResources(), LightbringerComponent.get(context).getLightbringer());
   }
 
   @Override
@@ -60,10 +66,10 @@
             inflater.inflate(R.layout.call_details_entry, parent, false));
       case FOOTER_VIEW_TYPE:
         return new CallDetailsFooterViewHolder(
-            inflater.inflate(R.layout.call_details_footer, parent, false));
+            inflater.inflate(R.layout.call_details_footer, parent, false), listener);
       default:
-        Assert.fail("No ViewHolder available for viewType: " + viewType);
-        return null;
+        throw Assert.createIllegalStateFailException(
+            "No ViewHolder available for viewType: " + viewType);
     }
   }
 
@@ -99,4 +105,9 @@
   public int getItemCount() {
     return callDetailsEntries.size() + 2; // Header + footer
   }
+
+  void updateCallDetailsEntries(List<CallDetailsEntry> entries) {
+    callDetailsEntries = entries;
+    notifyDataSetChanged();
+  }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
index bc989ea..084bd66 100644
--- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
@@ -28,7 +28,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
-import com.android.dialer.calllogutils.CallEntryFormatter;
+import com.android.dialer.calllogutils.CallLogDates;
+import com.android.dialer.calllogutils.CallLogDurations;
 import com.android.dialer.calllogutils.CallTypeHelper;
 import com.android.dialer.calllogutils.CallTypeIconsView;
 import com.android.dialer.common.LogUtil;
@@ -36,7 +37,6 @@
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult.Type;
 import com.android.dialer.oem.MotorolaUtils;
-import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 
@@ -57,7 +57,7 @@
 
   private final ImageView multimediaImage;
 
-  // TODO: Display this when location is stored - b/36160042
+  // TODO(maxwelb): Display this when location is stored - b/36160042
   @SuppressWarnings("unused")
   private final TextView multimediaAttachmentsNumber;
 
@@ -88,32 +88,33 @@
       CallTypeHelper callTypeHelper,
       boolean showMultimediaDivider) {
     int callType = entry.getCallType();
-    boolean isVideoCall =
-        (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO
-            && CallUtil.isVideoEnabled(context);
+    boolean isVideoCall = (entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO;
     boolean isPulledCall =
         (entry.getFeatures() & Calls.FEATURES_PULLED_EXTERNALLY)
             == Calls.FEATURES_PULLED_EXTERNALLY;
+    boolean isLightbringerCall = entry.getIsLightbringerCall();
 
     callTime.setTextColor(getColorForCallType(context, callType));
     callTypeIcon.clear();
     callTypeIcon.add(callType);
-    callTypeIcon.setShowVideo((entry.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO);
+    callTypeIcon.setShowVideo(isVideoCall);
     callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.getFeatures()));
     callTypeIcon.setShowWifi(
         MotorolaUtils.shouldShowWifiIconInCallLog(context, entry.getFeatures()));
 
-    callTypeText.setText(callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall));
-    callTime.setText(CallEntryFormatter.formatDate(context, entry.getDate()));
+    callTypeText.setText(
+        callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall, isLightbringerCall));
+    callTime.setText(CallLogDates.formatDate(context, entry.getDate()));
+
     if (CallTypeHelper.isMissedCallType(callType)) {
       callDuration.setVisibility(View.GONE);
     } else {
       callDuration.setVisibility(View.VISIBLE);
       callDuration.setText(
-          CallEntryFormatter.formatDurationAndDataUsage(
+          CallLogDurations.formatDurationAndDataUsage(
               context, entry.getDuration(), entry.getDataUsage()));
       callDuration.setContentDescription(
-          CallEntryFormatter.formatDurationAndDataUsageA11y(
+          CallLogDurations.formatDurationAndDataUsageA11y(
               context, entry.getDuration(), entry.getDataUsage()));
     }
     setMultimediaDetails(number, entry, showMultimediaDivider);
diff --git a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
index 3f89436..9d3f4bc 100644
--- a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
@@ -26,33 +26,41 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 
 /** ViewHolder container for {@link CallDetailsActivity} footer. */
-public class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder
-    implements OnClickListener {
+final class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
+  private final ReportCallIdListener listener;
   private final View container;
   private final View copy;
   private final View edit;
+  private final View reportCallerId;
 
   private String number;
 
-  public CallDetailsFooterViewHolder(View view) {
+  CallDetailsFooterViewHolder(View view, ReportCallIdListener listener) {
     super(view);
+    this.listener = listener;
     container = view.findViewById(R.id.footer_container);
     copy = view.findViewById(R.id.call_detail_action_copy);
     edit = view.findViewById(R.id.call_detail_action_edit_before_call);
+    reportCallerId = view.findViewById(R.id.call_detail_action_report_caller_id);
 
     copy.setOnClickListener(this);
     edit.setOnClickListener(this);
+    reportCallerId.setOnClickListener(this);
   }
 
   public void setPhoneNumber(String number) {
     this.number = number;
     if (TextUtils.isEmpty(number)) {
       container.setVisibility(View.GONE);
+    } else if (listener.canReportCallerId(number)) {
+      reportCallerId.setVisibility(View.VISIBLE);
     }
   }
 
@@ -60,14 +68,32 @@
   public void onClick(View view) {
     Context context = view.getContext();
     if (view == copy) {
+      PerformanceReport.recordClick(UiAction.Type.COPY_NUMBER_IN_CALL_DETAIL);
+
       Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_COPY_NUMBER);
       ClipboardUtils.copyText(context, null, number, true);
     } else if (view == edit) {
+      PerformanceReport.recordClick(UiAction.Type.EDIT_NUMBER_BEFORE_CALL_IN_CALL_DETAIL);
+      // Dialpad will be filled with this number, but we don't want to record it as user action
+      PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+
       Logger.get(context).logImpression(DialerImpression.Type.CALL_DETAILS_EDIT_BEFORE_CALL);
       Intent dialIntent = new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(number));
       DialerUtils.startActivityWithErrorToast(context, dialIntent);
+    } else if (view == reportCallerId) {
+      listener.reportCallId(number);
     } else {
       Assert.fail("View on click not implemented: " + view);
     }
   }
+
+  /** Listener for reporting caller id */
+  interface ReportCallIdListener {
+
+    /** Tell listener that the user requested to report caller id info as inaccurate. */
+    void reportCallId(String number);
+
+    /** returns true if the number can be reported as inaccurate. */
+    boolean canReportCallerId(String number);
+  }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
index 4d9aacf..410a3a0 100644
--- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
@@ -19,17 +19,19 @@
 import android.content.Context;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
+import android.telecom.PhoneAccount;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
 
@@ -40,23 +42,29 @@
   private final View callBackButton;
   private final TextView nameView;
   private final TextView numberView;
+  private final TextView networkView;
   private final QuickContactBadge contactPhoto;
   private final Context context;
 
-  private CallComposerContact contact;
+  private DialerContact contact;
 
   CallDetailsHeaderViewHolder(View container) {
     super(container);
     context = container.getContext();
     callBackButton = container.findViewById(R.id.call_back_button);
-    nameView = (TextView) container.findViewById(R.id.contact_name);
-    numberView = (TextView) container.findViewById(R.id.phone_number);
-    contactPhoto = (QuickContactBadge) container.findViewById(R.id.quick_contact_photo);
+    nameView = container.findViewById(R.id.contact_name);
+    numberView = container.findViewById(R.id.phone_number);
+    networkView = container.findViewById(R.id.network);
+    contactPhoto = container.findViewById(R.id.quick_contact_photo);
+
     callBackButton.setOnClickListener(this);
+    Logger.get(context)
+        .logQuickContactOnTouch(
+            contactPhoto, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_DETAILS, true);
   }
 
   /** Populates the contact info fields based on the current contact information. */
-  void updateContactInfo(CallComposerContact contact) {
+  void updateContactInfo(DialerContact contact) {
     this.contact = contact;
     ContactPhotoManager.getInstance(context)
         .loadDialerThumbnailOrPhoto(
@@ -67,8 +75,6 @@
             contact.getNameOrNumber(),
             contact.getContactType());
 
-    contactPhoto.setContentDescription(
-        context.getString(R.string.description_contact_photo_details, contact.getNameOrNumber()));
     nameView.setText(contact.getNameOrNumber());
     if (!TextUtils.isEmpty(contact.getDisplayNumber())) {
       numberView.setVisibility(View.VISIBLE);
@@ -85,6 +91,14 @@
       numberView.setText(null);
     }
 
+    if (!TextUtils.isEmpty(contact.getSimDetails().getNetwork())) {
+      networkView.setVisibility(View.VISIBLE);
+      networkView.setText(contact.getSimDetails().getNetwork());
+      if (contact.getSimDetails().getColor() != PhoneAccount.NO_HIGHLIGHT_COLOR) {
+        networkView.setTextColor(contact.getSimDetails().getColor());
+      }
+    }
+
     if (TextUtils.isEmpty(contact.getNumber())) {
       callBackButton.setVisibility(View.GONE);
     }
@@ -98,7 +112,7 @@
           view.getContext(),
           new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_DETAILS).build());
     } else {
-      Assert.fail("View OnClickListener not implemented: " + view);
+      throw Assert.createIllegalStateFailException("View OnClickListener not implemented: " + view);
     }
   }
 }
diff --git a/java/com/android/dialer/calldetails/ReportDialogFragment.java b/java/com/android/dialer/calldetails/ReportDialogFragment.java
new file mode 100644
index 0000000..0861c9d
--- /dev/null
+++ b/java/com/android/dialer/calldetails/ReportDialogFragment.java
@@ -0,0 +1,165 @@
+/*
+ * 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.calldetails;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
+import com.android.dialer.phonenumbercache.PhoneNumberCache;
+
+/** Dialog for reporting an inaccurate caller id information in {@link CallDetailsActivity}. */
+public class ReportDialogFragment extends DialogFragment {
+
+  private static final String KEY_NUMBER = "number";
+  private TextView name;
+  private TextView numberView;
+
+  private CachedNumberLookupService cachedNumberLookupService;
+  private CachedNumberLookupService.CachedContactInfo info;
+  private String number;
+
+  public static ReportDialogFragment newInstance(String number) {
+    ReportDialogFragment fragment = new ReportDialogFragment();
+    Bundle bundle = new Bundle();
+    bundle.putString(KEY_NUMBER, number);
+    fragment.setArguments(bundle);
+    return fragment;
+  }
+
+  @Override
+  public void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+    setRetainInstance(true);
+    number = getArguments().getString(KEY_NUMBER);
+    cachedNumberLookupService = PhoneNumberCache.get(getContext()).getCachedNumberLookupService();
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    LayoutInflater inflater = getActivity().getLayoutInflater();
+    View view = inflater.inflate(R.layout.caller_id_report_dialog, null, false);
+    name = view.findViewById(R.id.name);
+    numberView = view.findViewById(R.id.number);
+
+    lookupContactInfo(number);
+
+    AlertDialog reportDialog =
+        new AlertDialog.Builder(getActivity())
+            .setTitle(R.string.report_caller_id_dialog_title)
+            .setPositiveButton(android.R.string.ok, (dialog, which) -> positiveClick(dialog))
+            .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+            .setView(view)
+            .create();
+
+    reportDialog.setOnShowListener(dialog -> onShow(getContext(), reportDialog));
+    return reportDialog;
+  }
+
+  private void positiveClick(DialogInterface dialog) {
+    startReportCallerIdWorker();
+    dialog.dismiss();
+  }
+
+  private static void onShow(Context context, AlertDialog dialog) {
+    int buttonTextColor = context.getColor(R.color.dialer_theme_color);
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(buttonTextColor);
+    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(buttonTextColor);
+  }
+
+  private void lookupContactInfo(String number) {
+    Worker<String, CachedContactInfo> worker =
+        number1 -> cachedNumberLookupService.lookupCachedContactFromNumber(getContext(), number1);
+    SuccessListener<CachedContactInfo> successListener = this::setCachedContactInfo;
+    DialerExecutorComponent.get(getContext())
+        .dialerExecutorFactory()
+        .createUiTaskBuilder(getFragmentManager(), "lookup_contact_info", worker)
+        .onSuccess(successListener)
+        .build()
+        .executeParallel(number);
+  }
+
+  private void setCachedContactInfo(CachedContactInfo info) {
+    this.info = info;
+    if (info != null) {
+      name.setText(info.getContactInfo().name);
+      numberView.setText(info.getContactInfo().number);
+    } else {
+      numberView.setText(number);
+      name.setVisibility(View.GONE);
+    }
+  }
+
+  private void startReportCallerIdWorker() {
+    Worker<Context, Pair<Context, Boolean>> worker = this::reportCallerId;
+    SuccessListener<Pair<Context, Boolean>> successListener = this::onReportCallerId;
+    DialerExecutorComponent.get(getContext())
+        .dialerExecutorFactory()
+        .createUiTaskBuilder(getFragmentManager(), "report_caller_id", worker)
+        .onSuccess(successListener)
+        .build()
+        .executeParallel(getActivity());
+  }
+
+  private Pair<Context, Boolean> reportCallerId(Context context) {
+    if (cachedNumberLookupService.reportAsInvalid(context, info)) {
+      info.getContactInfo().isBadData = true;
+      cachedNumberLookupService.addContact(context, info);
+      LogUtil.d("ReportUploadTask.doInBackground", "Contact reported.");
+      return new Pair<>(context, true);
+    } else {
+      return new Pair<>(context, false);
+    }
+  }
+
+  private void onReportCallerId(Pair<Context, Boolean> output) {
+    Context context = output.first;
+    boolean wasReport = output.second;
+    if (wasReport) {
+      Logger.get(context).logImpression(DialerImpression.Type.CALLER_ID_REPORTED);
+      Toast.makeText(context, R.string.report_caller_id_toast, Toast.LENGTH_SHORT).show();
+    } else {
+      Logger.get(context).logImpression(DialerImpression.Type.CALLER_ID_REPORT_FAILED);
+      Toast.makeText(context, R.string.report_caller_id_failed, Toast.LENGTH_SHORT).show();
+    }
+  }
+
+  @Override
+  public void onDestroyView() {
+    if (getDialog() != null && getRetainInstance()) {
+      // Prevent dialog from dismissing on rotate.
+      getDialog().setDismissMessage(null);
+    }
+    super.onDestroyView();
+  }
+}
diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto
index e254b77..587fd35 100644
--- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto
+++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto
@@ -4,6 +4,7 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
 import "java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto";
 
 package com.android.dialer.calldetails;
@@ -17,6 +18,7 @@
     optional int64 duration = 5;
     optional int64 data_usage = 6;
     repeated enrichedcall.historyquery.proto.HistoryResult history_results = 7;
+    optional bool is_lightbringer_call = 8;
   }
 
   repeated CallDetailsEntry entries = 1;
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
index ccfa4e7..fbca3f8 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
@@ -41,4 +41,13 @@
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_edit_grey600_24"
       android:text="@string/call_details_edit_number"/>
+
+  <TextView
+      android:id="@+id/call_detail_action_report_caller_id"
+      style="@style/CallDetailsActionItemStyle"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:drawableStart="@drawable/quantum_ic_report_grey600_24"
+      android:text="@string/call_details_report_call_id"
+      android:visibility="gone"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
new file mode 100644
index 0000000..09d3c2b
--- /dev/null
+++ b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/name"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="24dp"
+      android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+  <TextView
+      android:id="@+id/number"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="24dp"
+      android:textAppearance="?android:attr/textAppearanceMedium"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
index bb89b36..b01a6cc 100644
--- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml
+++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
@@ -29,10 +29,9 @@
       android:id="@+id/quick_contact_photo"
       android:layout_width="@dimen/call_details_contact_photo_size"
       android:layout_height="@dimen/call_details_contact_photo_size"
-      android:layout_marginTop="2dp"
+      android:layout_centerVertical="true"
       android:padding="@dimen/call_details_contact_photo_padding"
-      android:focusable="true"
-      android:contentDescription="@string/description_quick_contact_for"/>
+      android:focusable="true"/>
 
   <LinearLayout
       android:orientation="vertical"
@@ -47,8 +46,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
         style="@style/PrimaryText"/>
 
     <TextView
@@ -57,6 +54,14 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"
         style="@style/SecondaryText"/>
+
+    <TextView
+        android:id="@+id/network"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/photo_text_margin"
+        android:visibility="gone"
+        style="@style/SecondaryText"/>
   </LinearLayout>
 
   <ImageView
@@ -66,8 +71,8 @@
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
       android:background="?android:attr/selectableItemBackgroundBorderless"
-      android:contentDescription="@string/description_call_log_call_action"
+      android:contentDescription="@string/call"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_call_white_24"
       android:tint="@color/secondary_text_color"/>
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/values-af/strings.xml b/java/com/android/dialer/calldetails/res/values-af/strings.xml
index 86bef4b..3d15e5b 100644
--- a/java/com/android/dialer/calldetails/res/values-af/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-af/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Vee uit"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopieer nommer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Wysig nommer voordat jy bel"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Bel"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Gee foutiewe nommer aan"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Het \'n foto gestuur"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Het \'n foto ontvang"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakbesonderhede vir <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Gee verkeerde nommer aan"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kon nie nommer aangee nie"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nommer is aangegee"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-am/strings.xml b/java/com/android/dialer/calldetails/res/values-am/strings.xml
index 2a23945..2103353 100644
--- a/java/com/android/dialer/calldetails/res/values-am/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-am/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ሰርዝ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ቁጥር ቅዳ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ከመደወል በፊት ቁጥር አርትዕ ያድርጉ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ጥሪ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ትክክለኛ ያልሆነ ቁጥርን ሪፓርት አድርግ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"አንድ ፎቶ ተልኳል"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"አንድ ፎቶ ደርሷል"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"የ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> የእውቂያ ዝርዝሮች"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"የተሳሳተ ቁጥርን ሪፖርት ያድርጉ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ቁጥሩን ሪፖርት ማድረግ አልተቻለም"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ቁጥሩ ሪፖርት ተደርጓል"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ar/strings.xml b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
index 6b0d8a7..066b89c 100644
--- a/java/com/android/dialer/calldetails/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"نسخ الرقم"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"تعديل الرقم قبل الاتصال"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"الاتصال"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"الإبلاغ عن رقم غير دقيق"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"تم إرسال صورة"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"تم تلقي صورة"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"تفاصيل الاتصال بالمستخدم <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"الإبلاغ عن رقم غير صحيح"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"تعذر الإبلاغ عن الرقم"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"تم الإبلاغ عن الرقم"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-az/strings.xml b/java/com/android/dialer/calldetails/res/values-az/strings.xml
index 479837c..e9aaf14 100644
--- a/java/com/android/dialer/calldetails/res/values-az/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-az/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Silin"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nömrəni kopyalayın"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Zəng etmədən öncə nömrəyə düzəliş edin"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Zəng edin"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Qeyri-dəqiq nömrəni bildirin"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto göndərildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto alındı"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üçün kontakt detalları"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış nömrəni bildirin"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nömrəni bildirmək mümkün olmadı"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nömrə bildirildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
index 01141ff..780e674 100644
--- a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Izmenite broj pre poziva"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Pozovi"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netačan broj"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Slika je poslata"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Slika je primljena"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakt informacije za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijavite netačan broj"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijavljivanje broja nije uspelo"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-be/strings.xml b/java/com/android/dialer/calldetails/res/values-be/strings.xml
index 683f29b..6c6724c 100644
--- a/java/com/android/dialer/calldetails/res/values-be/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-be/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Выдаліць"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Скапіраваць нумар"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Рэдагаваць нумар перад выклікам"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Выклік"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Падаць заяву аб недакладным нумары"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Адпраўлена фота"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Атрымана фота"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Кантактныя даныя абанента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Падаць заяву аб няправільным нумары"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не ўдалося падаць заяву аб нумары"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Аб нумары пададзена заява"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bg/strings.xml b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
index 9cd70e2..547fdbb 100644
--- a/java/com/android/dialer/calldetails/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Изтриване"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копиране на номера"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Редактиране на номера преди обаждане"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Обаждане"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Подаване на сигнал за неточен номер"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Изпратена бе снимка"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Получена бе снимка"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Подробности за контакта за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Подаване на сигнал за неправилен номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Сигналът за номера не можа да бъде подаден"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"За номера бе подаден сигнал"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bn/strings.xml b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
index 148f61a..65798f5 100644
--- a/java/com/android/dialer/calldetails/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"মুছুন"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"নম্বর কপি করুন"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"কল করার আগে নম্বর সম্পাদন করুন"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"কল করুন"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ভুল নম্বর প্রতিবেদন করুন"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"একটি ফটো পাঠিয়েছেন"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"একটি ফটো পেয়েছেন"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> পরিচিতির বিশদ বিবরণ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ভুল নম্বর প্রতিবেদন করুন"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"নম্বরটির প্রতিবেদন করা যায়নি"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"নম্বরটির প্রতিবেদন করা হয়েছে"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bs/strings.xml b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
index 6f164b2..10ef7aa 100644
--- a/java/com/android/dialer/calldetails/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Uredi broj prije poziva"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Poziv"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavite nevažeći broj"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Fotografija poslana"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Fotografija primljena"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalji o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava pogrešnog broja"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ca/strings.xml b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
index 0e33e60..59bd297 100644
--- a/java/com/android/dialer/calldetails/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Suprimeix"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copia el número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edita el número abans de trucar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Truca"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informa d\'un número incorrecte"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"S\'ha enviat una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"S\'ha rebut una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Dades de contacte de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informa d\'un número incorrecte"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No s\'ha pogut informar del número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"S\'ha informat del número"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-cs/strings.xml b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
index 9747ee1..d4748fc 100644
--- a/java/com/android/dialer/calldetails/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Smazat"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovat číslo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Před voláním upravit číslo"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Zavolat"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásit nesprávné číslo"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Byla poslána fotka"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Byla přijata fotka"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Podrobnosti kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásit nesprávné číslo"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo se nepodařilo nahlásit"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bylo nahlášeno"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-da/strings.xml b/java/com/android/dialer/calldetails/res/values-da/strings.xml
index 41bc252..5de4486 100644
--- a/java/com/android/dialer/calldetails/res/values-da/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-da/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slet"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummer før opkald"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ring op"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér et forkert nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Der blev sendt et billede"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Der blev modtaget et billede"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktoplysninger for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér forkert nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det forkerte nummer kunne ikke rapporteres"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret blev rapporteret"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-de/strings.xml b/java/com/android/dialer/calldetails/res/values-de/strings.xml
index 014666b..3c30d8e 100644
--- a/java/com/android/dialer/calldetails/res/values-de/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-de/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Löschen"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopieren"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer vor Anruf bearbeiten"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Anrufen"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Falsche Nummer melden"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Hat ein Foto gesendet"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Hat ein Foto empfangen"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktdetails für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Falsche Nummer melden"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nummer konnte nicht gemeldet werden"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeldet"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-el/strings.xml b/java/com/android/dialer/calldetails/res/values-el/strings.xml
index 6b51fc7..e5097d1 100644
--- a/java/com/android/dialer/calldetails/res/values-el/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-el/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Διαγραφή"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Αντιγραφή αριθμού"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Επεξεργασία αριθμού πριν από την κλήση"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Κλήση"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Αναφορά ανακριβούς αριθμού"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Έγινε αποστολή φωτογραφίας"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Έγινε λήψη φωτογραφίας"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Στοιχεία επικοινωνίας επαφής <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Αναφορά λανθασμένου αριθμού"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Δεν ήταν δυνατή η αναφορά του αριθμού"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Υποβλήθηκε αναφορά για τον αριθμό"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
index 2d5210e..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
index 2d5210e..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
index 2d5210e..45deb49 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Call"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
index d9db282..778868e 100644
--- a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Borrar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Llamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número incorrecto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviaste una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recibiste una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Datos de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se pudo informar el número."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es/strings.xml b/java/com/android/dialer/calldetails/res/values-es/strings.xml
index e72e898..5cecffa 100644
--- a/java/com/android/dialer/calldetails/res/values-es/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Llamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Notificar un número incorrecto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Se ha enviado una foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Se ha recibido una foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Información de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Notificar un número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se ha podido notificar el número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número notificado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-et/strings.xml b/java/com/android/dialer/calldetails/res/values-et/strings.xml
index 496459d..c8f52ae 100644
--- a/java/com/android/dialer/calldetails/res/values-et/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-et/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Kustuta"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopeeri number"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Muuda numbrit enne helistamist"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Kõne"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Valest numbrist teavitamine"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Saatis foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Sai foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontakti <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üksikasjad"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Valest numbrist teavitamine"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numbrist ei õnnestunud teavitada"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numbrist teavitati"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-eu/strings.xml b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
index 913082f..5184e64 100644
--- a/java/com/android/dialer/calldetails/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ezabatu"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiatu zenbakia"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editatu zenbakia deitu aurretik"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Deia"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Jakinarazi zenbakiaren informazioa okerra dela"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Argazki bat bidali duzu"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Argazki bat jaso duzu"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktuaren xehetasunak"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Jakinarazi zenbakia okerra dela"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ezin izan da bidali jakinarazpena"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Bidali da jakinarazpena"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fa/strings.xml b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
index cad85a2..b37b2b5 100644
--- a/java/com/android/dialer/calldetails/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"کپی کردن شماره"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ویرایش شماره قبل از تماس"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"تماس"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"گزارش شماره نادرست"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"عکسی ارسال کرد"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"عکسی دریافت کرد"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"جزئیات تماس <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"گزارش شماره نادرست"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"شماره گزارش نشد"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"شماره گزارش شد"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fi/strings.xml b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
index c16110d..ead2c6a 100644
--- a/java/com/android/dialer/calldetails/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Poista"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopioi numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Muokkaa numeroa ennen puhelua"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Soita"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ilmoita epätarkasta numerosta"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Lähetetty kuva"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Vastaanotettu kuva"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ilmoita väärästä numerosta"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numerosta ilmoittaminen epäonnistui."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numeroa koskeva ilmoitus lähetettiin."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
index 676861f..714fb7b 100644
--- a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant de passer l\'appel"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Appeler"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro inexact"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Photo envoyée"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Photo reçue"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"« <xliff:g id="MESSAGE">%1$s</xliff:g> »"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Coordonnées de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numéro signalé"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr/strings.xml b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
index 606cb10..f612341 100644
--- a/java/com/android/dialer/calldetails/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant d\'appeler"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Appeler"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro incorrect"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Envoi d\'une photo"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Réception d\'une photo"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Coordonnées associées à <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Signalement du numéro effectué"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gl/strings.xml b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
index aa5ff14..7f79834 100644
--- a/java/com/android/dialer/calldetails/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de chamar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Chamar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar dun número impreciso"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviouse unha foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recibiuse unha foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalles de contacto de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar dun número incorrecto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Non se puido marcar o número como inadecuado"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Marcouse o número como inadecuado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gu/strings.xml b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
index ccb8755..9299705 100644
--- a/java/com/android/dialer/calldetails/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"કાઢી નાખો"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"નંબર કૉપિ કરો"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"કૉલ કરો"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"અચોક્કસ નંબરની જાણ કરો"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"એક ફોટો મોકલ્યો"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"એક ફોટો પ્રાપ્ત કર્યો"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટે સંપર્ક વિગતો"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ખોટા નંબરની જાણ કરો"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"નંબરની જાણ કરી શકાઈ નથી"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"નંબરની જાણ કરી"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hi/strings.xml b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
index 517fbe5..08099fe 100644
--- a/java/com/android/dialer/calldetails/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"हटाएं"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करें"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करने से पहले नंबर संपादित करें"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"कॉल करें"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत जानकारी देने वाले नंबर की रिपोर्ट करें"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"फ़ोटो भेजी गई"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"फ़ोटो मिली"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का संपर्क विवरण"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नंबर की रिपोर्ट करें"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबर की रिपोर्ट नहीं की जा सकी"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबर की रिपोर्ट की गई"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hr/strings.xml b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
index 687a65e..6537181 100644
--- a/java/com/android/dialer/calldetails/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Brisanje"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiranje broja"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Uređivanje broja prije poziva"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Poziv"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijava netočnog broja"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Šalje fotografiju"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Prima fotografiju"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Pojedinosti o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava netočnog broja"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hu/strings.xml b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
index 66863e8..43afbe3 100644
--- a/java/com/android/dialer/calldetails/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Törlés"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Szám másolása"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Szám szerkesztése hívás előtt"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Telefonhívás"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pontatlan szám bejelentése"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Küldött egy fotót"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Kapott egy fotót"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> részletes adatai."</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Helytelen szám bejelentése"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nem sikerült bejelenteni a számot"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Szám bejelentve"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hy/strings.xml b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
index a1e84e9..05022ca 100644
--- a/java/com/android/dialer/calldetails/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ջնջել"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Պատճենել համարը"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Փոփոխել համարը զանգելուց առաջ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Զանգ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Հաղորդել սխալ համարի մասին"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Ուղարկվել է լուսանկար"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Ստացվել է լուսանկար"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Հաղորդում սխալ համարի մասին"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Չհաջողվեց ուղարկել հաղորդումը"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Հաղորդումն ուղարկվեց"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-in/strings.xml b/java/com/android/dialer/calldetails/res/values-in/strings.xml
index ba58ba0..eaeb273 100644
--- a/java/com/android/dialer/calldetails/res/values-in/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-in/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Hapus"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nomor"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nomor sebelum menelepon"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Telepon"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nomor yang tidak akurat"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Mengirim foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Menerima foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detail kontak <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nomor yang salah"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nomor"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nomor dilaporkan"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-is/strings.xml b/java/com/android/dialer/calldetails/res/values-is/strings.xml
index 0770814..ac522d5 100644
--- a/java/com/android/dialer/calldetails/res/values-is/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-is/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eyða"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Afrita númer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Breyta númeri áður en hringt er"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Hringja"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Tilkynna rangt númer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Sendi mynd"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Tók á móti mynd"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Tengiliðaupplýsingar um <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Tilkynna rangt númer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ekki tókst að tilkynna númerið"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Númer tilkynnt"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-it/strings.xml b/java/com/android/dialer/calldetails/res/values-it/strings.xml
index 97af251..40c2245 100644
--- a/java/com/android/dialer/calldetails/res/values-it/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-it/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Elimina"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copia numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modifica numero prima di chiamare"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Chiama"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Segnala numero sbagliato"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto inviata"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto ricevuta"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Dettagli contatto <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Segnala numero errato"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossibile segnalare il numero"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numero segnalato"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-iw/strings.xml b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
index 329eded..ffc4d47 100644
--- a/java/com/android/dialer/calldetails/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"מחק"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"העתק את המספר"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ערוך את המספר לפני השיחה"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"התקשר"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"דיווח על מספר לא מדויק"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"נשלחה תמונה"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"התקבלה תמונה"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"פרטי ההתקשרות של <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"דיווח על מספר שגוי"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"לא ניתן היה לדווח על המספר"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"המספר דווח"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ja/strings.xml b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
index 7aef345..24fcf2c 100644
--- a/java/com/android/dialer/calldetails/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"削除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"電話番号をコピー"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"発信前に電話番号を編集"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"発信"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"情報が間違っている番号を報告"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"写真を送信しました"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"写真を受信しました"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>の連絡先の詳細"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"間違った番号の報告"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"番号を報告できませんでした"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"番号を報告しました"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ka/strings.xml b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
index 1cd7bc2..3d92f61 100644
--- a/java/com/android/dialer/calldetails/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"წაშლა"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ნომრის კოპირება"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ნომრის რედაქტირება დარეკვამდე"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"დარეკვა"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"არაზუსტი ნომრის შეტყობინება"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ფოტო გაიგზავნა"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"მიღებულია ფოტო"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის საკონტაქტო დეტალები"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"არასწორი ნომრის შეტყობინება"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ნომრის შეტყობინება ვერ მოხერხდა"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ნომერი შეტყობინებულია"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kk/strings.xml b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
index 1923cf7..c29daeb 100644
--- a/java/com/android/dialer/calldetails/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Жою"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Нөмірді көшіру"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Нөмірді қоңырау шалуға дейін өзгерту"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Қоңырау шалу"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Қате нөмір туралы хабарлау"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Сурет жіберілді"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Сурет қабылданды"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> контакт деректері"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Қате нөмір туралы хабарлау"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Нөмір туралы хабар жіберілмеді"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Нөмір туралы хабар жіберілді"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-km/strings.xml b/java/com/android/dialer/calldetails/res/values-km/strings.xml
index e047279..d5ea830 100644
--- a/java/com/android/dialer/calldetails/res/values-km/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-km/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"លុប"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ថតចម្លងលេខទូរសព្ទ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"កែ​លេខ​ មុន​ពេល​ហៅទូរសព្ទ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ហៅទូរសព្ទ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"រាយការណ៍លេខមិនត្រឹមត្រូវ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"បានផ្ញើរូបថត"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"បាន​ទទួល​រូបថត"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"ព័ត៌មាន​ទំនាក់​ទំនង​លម្អិត​សម្រាប់ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"រាយការណ៍​លេខ​មិន​ត្រឹមត្រូវ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"មិន​អាច​រាយការណ៍​លេខ​បាន​ទេ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"បាន​រាយការណ៍​លេខ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kn/strings.xml b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
index 66c0d63..aeff715 100644
--- a/java/com/android/dialer/calldetails/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ಅಳಿಸಿ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ಕರೆಮಾಡಿ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ನಿಖರವಾಗಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ಫೋಟೋ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ಫೋಟೋ ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ತಪ್ಪಾದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ಸಂಖ್ಯೆಯನ್ನು ವರದಿ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ವರದಿ ಮಾಡಲಾದ ಸಂಖ್ಯೆ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ko/strings.xml b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
index 35c5038..f45d712 100644
--- a/java/com/android/dialer/calldetails/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"삭제"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"전화번호 복사"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"통화하기 전에 번호 수정"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"전화걸기"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"잘못된 번호 신고하기"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"사진 전송됨"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"사진 수신됨"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"잘못된 번호 신고"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"번호를 신고할 수 없습니다."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"번호가 신고되었습니다."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ky/strings.xml b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
index fe37b33..9735abc 100644
--- a/java/com/android/dialer/calldetails/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Жок кылуу"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Номерди көчүрүү"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Чалуудан мурун номерди түзөтүү"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Чалуу"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Номердеги ката жөнүндө кабар берүү"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Сүрөт жөнөтүлдү"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Сүрөт алынды"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> байланыш маалыматтары"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Туура эмес номер жөнүндө кабарлоо"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Туура эмес номер жөнүндө кабар жөнөтүлбөй койду"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Туура эмес номер жөнүндө кабар берүү"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lo/strings.xml b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
index 85b636a..880510e 100644
--- a/java/com/android/dialer/calldetails/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"​ລຶບ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ສຳເນົາເບີໂທ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ແກ້ໄຂເບີກ່ອນໂທ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ໂທ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ລາຍງານເບີໂທທີ່ບໍ່ຖືກຕ້ອງ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ສົ່ງຮູບພາບ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ໄດ້ຮັບຮູບພາບແລ້ວ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"ລາຍລະອຽດ​ການຕິດຕໍ່​ສຳລັບ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"​ລາຍ​ງານ​ເບີ​ໂທບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ບໍ່ສາມາດລາຍງານເບີໂທໄດ້"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ລາຍງານເບີໂທແລ້ວ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lt/strings.xml b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
index 9c8ad7b..2f195de 100644
--- a/java/com/android/dialer/calldetails/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ištrinti"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopijuoti numerį"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redaguoti numerį prieš skambinant"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Skambinti"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pranešti apie netikslų numerį"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Išsiuntė nuotrauką"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Gavo nuotrauką"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Išsami kontaktinė informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Pranešimas apie netinkamą numerį"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nepavyko pranešti apie numerį"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Apie numerį pranešta"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lv/strings.xml b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
index d878393..e119b12 100644
--- a/java/com/android/dialer/calldetails/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Dzēst"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopēt numuru"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediģēt numuru pirms zvanīšanas"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Zvanīt"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ziņot par neprecīzu numuru"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Nosūtīja fotoattēlu"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Saņēma fotoattēlu"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktpersonas informācija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ziņošana par nepareizu numuru"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nevarēja nosūtīt ziņojumu par numuru"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ziņojums par numuru nosūtīts"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mk/strings.xml b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
index 9388ae0..2458e08 100644
--- a/java/com/android/dialer/calldetails/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Избриши"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај го бројот"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Измени го бројот пред повикот"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Повикај"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријавете погрешен број"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Испрати фотографија"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Прими фотографија"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Детали за контакт за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавете неточен број"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не можеше да пријави бројот"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Бројот е пријавен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ml/strings.xml b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
index d296911..8164a21 100644
--- a/java/com/android/dialer/calldetails/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ഇല്ലാതാക്കുക"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"നമ്പർ പകർത്തുക"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"കോൾ ചെയ്യുന്നതിന് മുമ്പായി നമ്പർ എഡിറ്റുചെയ്യുക"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"കോള്‍ ചെയ്യുക"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"കൃത്യമല്ലാത്ത നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ഒരു ഫോട്ടോ അയച്ചു"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ഒരു ഫോട്ടോ ലഭിച്ചു"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> എന്നതിന്റെ കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"തെറ്റായ നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"നമ്പർ റിപ്പോർട്ടുചെയ്യാനായില്ല"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"നമ്പർ റിപ്പോർട്ടുചെയ്‌തു"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mn/strings.xml b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
index cb264e0..242f6ab 100644
--- a/java/com/android/dialer/calldetails/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Устгах"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Дугаар хуулах"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Залгахын өмнө дугаар засах"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Залгах"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Тодорхой бус дугаарыг мэдээлэх"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Зураг илгээсэн"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Зураг хүлээн авсан"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н харилцагчийн мэдээлэл"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Буруу дугаарыг мэдээлэх"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Дугаарыг мэдээлж чадсангүй"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Дугаарыг мэдээлсэн"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mr/strings.xml b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
index 5c31e36..d869e13 100644
--- a/java/com/android/dialer/calldetails/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"हटवा"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करा"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करण्यापूर्वी नंबर संपादित करा"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"कॉल करा"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"चुकीच्या नंबरचा अहवाल द्या"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"एक फोटो पाठविला"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"एक फोटो प्राप्त झाला"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"चुकीच्या नंबरचा अहवाल द्या"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबरचा अहवाल देऊ शकलो नाही"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबरचा अहवाल दिला"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ms/strings.xml b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
index da17d6e..7c0bfdd 100644
--- a/java/com/android/dialer/calldetails/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Padam"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nombor"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nombor sebelum panggilan"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Panggil"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nombor yang tidak tepat"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Menghantar foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto diterima"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Butiran hubungan untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nombor yang tidak betul"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nombor"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nombor dilaporkan"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-my/strings.xml b/java/com/android/dialer/calldetails/res/values-my/strings.xml
index 75508d8..34a57d5 100644
--- a/java/com/android/dialer/calldetails/res/values-my/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-my/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ဖျက်ရန်"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"နံပါတ်ကိုကူးယူရန်"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"မခေါ်ဆိုမီ နံပါတ်ကိုပြင်ဆင်ရန်"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ခေါ်ဆိုရန်"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"မတိကျသော နံပါတ်ကို တိုင်ကြားရန်"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ဓာတ်ပုံ ပို့လိုက်သည်"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ဓာတ်ပုံ လက်ခံရရှိသည်"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ၏ အဆက်အသွယ် အသေးစိတ်"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"မမှန်ကန်သည့် နံပါတ်ကို တိုင်ကြားရန်"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"နံပါတ်ကို မတိုင်ကြားနိုင်ပါ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"နံပါတ်ကို တိုင်ကြားပြီးပါပြီ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nb/strings.xml b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
index 022025f..53ffd3a 100644
--- a/java/com/android/dialer/calldetails/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slett"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ring"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ne/strings.xml b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
index 8fe355b..f8e10ca 100644
--- a/java/com/android/dialer/calldetails/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"मेट्नुहोस्"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"नम्बर प्रतिलिपि गर्नुहोस्"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"कल गर्नु अघि नम्बर सम्पादन गर्नुहोस्"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"कल"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"एउटा तस्बिर पठाइयो"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"एउटा तस्बिर प्राप्त भयो"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का सम्पर्क विवरणहरू"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"नम्बरको रिपोर्ट गर्न सकिएन"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"नम्बरको रिपोर्ट गरियो"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nl/strings.xml b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
index 71657b8..b8cb7fe 100644
--- a/java/com/android/dialer/calldetails/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Verwijderen"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopiëren"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer bewerken vóór bellen"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Bellen"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Onjuist nummer melden"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Foto verzonden"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Foto ontvangen"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Contactgegevens voor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Incorrect nummer melden"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kan nummer niet melden"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeld"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-no/strings.xml b/java/com/android/dialer/calldetails/res/values-no/strings.xml
index 022025f..53ffd3a 100644
--- a/java/com/android/dialer/calldetails/res/values-no/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-no/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Slett"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ring"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pa/strings.xml b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
index d4f1759..b488d53 100644
--- a/java/com/android/dialer/calldetails/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ਮਿਟਾਓ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"ਨੰਬਰ ਕਾਪੀ ਕਰੋ"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"ਕਾਲ ਕਰੋ"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ਇੱਕ ਫ਼ੋਟੋ ਭੇਜੀ ਗਈ"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ਇੱਕ ਫ਼ੋਟੋ ਪ੍ਰਾਪਤ ਹੋਈ"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pl/strings.xml b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
index 9644600..790dade 100644
--- a/java/com/android/dialer/calldetails/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Usuń"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiuj numer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Edytuj numer, zanim zadzwonisz"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Zadzwoń"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Zgłoś niedokładny numer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Wysłano zdjęcie"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Odebrano zdjęcie"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Informacje kontaktowe: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Zgłoś nieprawidłowy numer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nie udało się zgłosić numeru"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numer został zgłoszony"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
index 467973d..7cd3282 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Excluir"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ligar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
index cfbbc02..5749ebb 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar o número antes de efetuar a chamada"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Telefonar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Denunciar número incorreto"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Denunciar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível denunciar o número."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número denunciado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt/strings.xml b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
index 467973d..7cd3282 100644
--- a/java/com/android/dialer/calldetails/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Excluir"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ligar"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ro/strings.xml b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
index e9281ae..00ab0a3 100644
--- a/java/com/android/dialer/calldetails/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Ștergeți"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Copiați numărul"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Modificați numărul înainte de apelare"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Apelați"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raportați numărul ca incorect"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"A fost trimisă o fotografie."</string>
     <string name="received_a_photo" msgid="3528953225576480505">"A fost primită o fotografie."</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detalii de contact pentru <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raportați un număr incorect"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numărul nu a putut fi raportat."</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numărul a fost raportat."</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ru/strings.xml b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
index bf981e2..b31b832 100644
--- a/java/com/android/dialer/calldetails/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Удалить"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Скопировать номер"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Изменить номер перед вызовом"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Позвонить"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Сообщить об ошибке в номере"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Отправлена фотография"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Получена фотография"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Неверный номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не удалось отправить отчет о неверном номере"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Отчет о неверном номере отправлен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-si/strings.xml b/java/com/android/dialer/calldetails/res/values-si/strings.xml
index 5fdca0d..62968ab 100644
--- a/java/com/android/dialer/calldetails/res/values-si/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-si/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"මකන්න"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"අංකය පිටපත් කරන්න"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"ඇමතුමට පෙර අංකය සංස්කරණය කරන්න"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"අමතන්න"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"වැරදි අංකය වාර්තා කරන්න"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ඡායාරූපයක් යැවිණි"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ඡායාරූපයක් ලැබිණි"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා සම්බන්ධතා විස්තර"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"වැරදි අංකය වාර්තා කරන්න"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"අංකය වාර්තා කිරීමට නොහැකි විය"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"අංකය වාර්තා කරන ලදී"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sk/strings.xml b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
index db04787..ee62cbd 100644
--- a/java/com/android/dialer/calldetails/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Odstrániť"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovať číslo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Pred volaním upraviť číslo"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Volať"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásiť nesprávne číslo"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Bola odoslaná fotka"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Bola prijatá fotka"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> – podrobnosti kontaktu"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásenie nesprávneho čísla"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo sa nepodarilo nahlásiť"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bolo nahlásené"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sl/strings.xml b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
index 98975f4..70b0e59 100644
--- a/java/com/android/dialer/calldetails/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj številko"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Pred klicanjem uredi številko"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Pokliči"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netočno številko"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Poslana fotografija"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Prejeta fotografija"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"»<xliff:g id="MESSAGE">%1$s</xliff:g>«"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Podrobnosti stika za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava napačne številke"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Številke ni bilo mogoče prijaviti"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Številka je prijavljena"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sq/strings.xml b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
index dd9915d..a3de4f1 100644
--- a/java/com/android/dialer/calldetails/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Fshi"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopjo numrin"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redakto numrin para telefonatës"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Telefono"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raporto numrin e pasaktë"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"U dërgua një fotografi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"U mor një fotografi"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Detajet e kontaktit për <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raporto numrin e pasaktë"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numri nuk mund të raportohej"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numri u raportua"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sr/strings.xml b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
index 7f4005d..54c1550 100644
--- a/java/com/android/dialer/calldetails/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Избриши"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај број"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Измените број пре позива"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Позови"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријави нетачан број"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Слика је послата"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Слика је примљена"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Контакт информације за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавите нетачан број"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Пријављивање броја није успело"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Број је пријављен"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sv/strings.xml b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
index 3967b4f..a7e1c12 100644
--- a/java/com/android/dialer/calldetails/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Radera"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiera nummer"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Redigera nummer före samtal"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Ring"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportera felaktigt nummer"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Skickade ett foto"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Tog emot ett foto"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Kontaktuppgifter för <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportera felaktigt nummer"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det gick inte att rapportera nummer"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer rapporterat"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sw/strings.xml b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
index e5df823..f19fb7b 100644
--- a/java/com/android/dialer/calldetails/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Futa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Nakili nambari"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Hariri nambari kabla ya kupiga"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Piga simu"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ripoti nambari isiyo sahihi"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Picha imetumwa"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Picha imepokelewa"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Maelezo ya <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ripoti nambari isiyosahihi"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Imeshindwa kuripoti nambari"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nambari imeripotiwa"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ta/strings.xml b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
index 840ad87..7f625f8 100644
--- a/java/com/android/dialer/calldetails/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"நீக்கு"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"எண்ணை நகலெடு"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"அழைப்பதற்கு முன் எண்ணைத் திருத்து"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"அழை"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"துல்லியமற்ற எண் எனப் புகாரளி"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"படம் அனுப்பப்பட்டது"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"படம் பெறப்பட்டது"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>க்கான தொடர்பு விவரங்கள்"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"தவறான எண் எனப் புகாரளி"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"எண்ணைப் புகாரளிக்க முடியவில்லை"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"எண் புகாரளிக்கப்பட்டது"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-te/strings.xml b/java/com/android/dialer/calldetails/res/values-te/strings.xml
index 3054444..d6fc792 100644
--- a/java/com/android/dialer/calldetails/res/values-te/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-te/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"తొలగించు"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"నంబర్‌ను కాపీ చేయి"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"కాల్ చేసే ముందు నంబర్‌ను సవరించు"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"కాల్ చేయి"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"అనిర్దిష్టంగా ఉండే నంబర్‌ను నివేదించు"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ఫోటో పంపబడింది"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ఫోటో స్వీకరించబడింది"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> యొక్క సంప్రదింపు వివరాలు"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"చెల్లని నంబర్‌ను నివేదించండి"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"నంబర్‌ను నివేదించడం సాధ్యపడలేదు"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"నంబర్ నివేదించబడింది"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-th/strings.xml b/java/com/android/dialer/calldetails/res/values-th/strings.xml
index c565eba..7bbcd12 100644
--- a/java/com/android/dialer/calldetails/res/values-th/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-th/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"ลบ"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"คัดลอกหมายเลข"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"แก้ไขหมายเลขก่อนโทร"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"โทร"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"รายงานหมายเลขที่ผิดพลาด"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ส่งรูปภาพแล้ว"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ได้รับรูปภาพแล้ว"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"รายละเอียดที่ติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"รายงานหมายเลขที่ไม่ถูกต้อง"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"ไม่สามารถรายงานหมายเลข"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"รายงานหมายเลขแล้ว"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tl/strings.xml b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
index 81c148e..969a33a 100644
--- a/java/com/android/dialer/calldetails/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"I-delete"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopyahin ang numero"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"I-edit ang numero bago tumawag"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Tumawag"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Iulat ang hindi wastong numero"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Nagpadala ng larawan"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Nakatanggap ng larawan"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Mga detalye sa pakikipag-ugnayan para kay/sa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Iulat ang hindi tamang numero"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Hindi maiulat ang numero"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inulat ang numero"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tr/strings.xml b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
index ade4018..9976312 100644
--- a/java/com/android/dialer/calldetails/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Sil"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Numarayı kopyala"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Telefon etmeden önce numarayı düzenleyin"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Telefon eder"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Hatalı numarayı bildir"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Bir fotoğraf gönderildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Bir fotoğraf alındı"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> için kişi ayrıntıları"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış numarayı bildir"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numara bildirilemedi"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numara bildirildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uk/strings.xml b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
index 6538d66..d37a54e 100644
--- a/java/com/android/dialer/calldetails/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Видалити"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Копіювати номер"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Редагувати номер перед дзвінком"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Виклик"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Повідомити про неправильний номер"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Надіслано фотографію"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Отримано фотографію"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Відомості про контакт <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Повідомити про неправильний номер"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не вдалося повідомити про неправильний номер"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ви повідомили про неправильний номер"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ur/strings.xml b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
index 90c3a59..960bef4 100644
--- a/java/com/android/dialer/calldetails/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"حذف کریں"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"نمبر کاپی کریں"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"کال کرنے سے پہلے نمبر میں ترمیم کریں"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"کال"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"غلط نمبر کی رپورٹ کریں"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"ایک تصویر بھیجی"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"ایک تصویر موصول ہوئی"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> کیلئے رابطہ کی تفصیلات"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"غلط نمبر کی اطلاع دیں"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"نمبر کی اطلاع نہیں دی جا سکی"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"نمبر کی اطلاع دے دی گئی"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uz/strings.xml b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
index 7b443ca..57f0526 100644
--- a/java/com/android/dialer/calldetails/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
@@ -20,10 +20,12 @@
     <string name="call_details" msgid="5063658079729839605">"Chaqiruv tafsilotlari"</string>
     <string name="delete" msgid="2141020674108406737">"O‘chirib tashlash"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Raqamni nusxalash"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Qo‘ng‘iroq qilishdan oldin raqamni tahrirlash"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Qo‘ng‘iroq qilish"</string>
+    <string name="call_details_edit_number" msgid="8718476514903513624">"Chaqiruvdan oldin raqamni tahrirlash"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raqamdagi xatolik haqida xabar berish"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Rasm yuborildi"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Rasm qabul qilindi"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontakt ma’lumotlari"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Noto‘g‘ri raqam"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Raqamdagi xatolik haqida xabar yuborib bo‘lmadi"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Raqamdagi xatolik haqida xabar yuborildi"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-vi/strings.xml b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
index 7a95021..6adae2b 100644
--- a/java/com/android/dialer/calldetails/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Xóa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Sao chép số"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Chỉnh sửa số trước khi gọi"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Gọi"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Báo cáo số không chính xác"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Đã gửi một ảnh"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Đã nhận một ảnh"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Chi tiết liên hệ cho <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Báo cáo số không chính xác"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Không thể báo cáo số"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Đã báo cáo số"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
index aad695a..1edb5e1 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"删除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"复制号码"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"拨打电话之前修改号码"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"拨打电话"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"报告错误的号码"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"发送了一张照片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"收到了一张照片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>的详细联系信息"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"报告错误号码"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"无法报告错误的号码"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已报告错误的号码"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
index eb5b606..a82e070 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"刪除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"在撥打前編輯號碼"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"通話"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"報告錯誤號碼"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"已傳送相片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"已收到相片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡人詳細資料"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"報告不正確的號碼"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法報告號碼"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已報告號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
index fd426c0..3b9dd56 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"刪除"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"撥打電話前編輯號碼"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"撥號"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"回報號碼錯誤"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"傳送了 1 張相片"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"收到了 1 張相片"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡詳細資料"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"回報不正確的號碼"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法回報號碼"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"已回報號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zu/strings.xml b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
index d41d1f5..25e0cea 100644
--- a/java/com/android/dialer/calldetails/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
@@ -21,9 +21,11 @@
     <string name="delete" msgid="2141020674108406737">"Susa"</string>
     <string name="call_details_copy_number" msgid="4265479408878990796">"Kopisha inombolo"</string>
     <string name="call_details_edit_number" msgid="8718476514903513624">"Hlela inombolo ngaphambi kokushaya ucingo"</string>
-    <string name="description_call_log_call_action" msgid="1421313064764221900">"Shaya"</string>
+    <string name="call_details_report_call_id" msgid="8857541295264421217">"Bika inombolo engalungile"</string>
     <string name="sent_a_photo" msgid="3978670717462979502">"Uthumele isithombe"</string>
     <string name="received_a_photo" msgid="3528953225576480505">"Uthole isithombe"</string>
     <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="description_contact_photo_details" msgid="3035869307063629315">"Imininingwane yokuxhumana ka-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
+    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Bika inombolo engalungile"</string>
+    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ayikwazanga ukubika inombolo"</string>
+    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inombolo ibikiwe"</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values/dimens.xml b/java/com/android/dialer/calldetails/res/values/dimens.xml
index f85d02f..694c8f4 100644
--- a/java/com/android/dialer/calldetails/res/values/dimens.xml
+++ b/java/com/android/dialer/calldetails/res/values/dimens.xml
@@ -15,8 +15,6 @@
   ~ limitations under the License
   -->
 <resources>
-  <dimen name="call_details_primary_text_size">16sp</dimen>
-  <dimen name="call_details_secondary_text_size">14sp</dimen>
   <dimen name="call_details_top_margin">6dp</dimen>
 
   <!-- contact container -->
@@ -28,13 +26,11 @@
   <dimen name="call_back_button_size">48dp</dimen>
 
   <!-- call entry container -->
-  <dimen name="call_entry_icon_size">24dp</dimen>
   <dimen name="call_entry_padding">16dp</dimen>
   <dimen name="call_entry_bottom_padding">14dp</dimen>
   <dimen name="call_entry_text_left_margin">72dp</dimen>
 
   <!-- EC container -->
-  <dimen name="call_details_ec_text_size">12sp</dimen>
   <dimen name="ec_container_height">48dp</dimen>
   <dimen name="ec_photo_size">40dp</dimen>
   <dimen name="ec_divider_top_bottom_margin">8dp</dimen>
diff --git a/java/com/android/dialer/calldetails/res/values/strings.xml b/java/com/android/dialer/calldetails/res/values/strings.xml
index 4471605..1441efd 100644
--- a/java/com/android/dialer/calldetails/res/values/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values/strings.xml
@@ -27,9 +27,8 @@
   <!-- Label for action to edit a number before calling it. [CHAR LIMIT=48] -->
   <string name="call_details_edit_number">Edit number before call</string>
 
-  <!-- String describing the phone icon on a call log list item. When tapped, it will place a
-       call to the number represented by that call log entry. [CHAR LIMIT=NONE]-->
-  <string name="description_call_log_call_action">Call</string>
+  <!-- Label for action to report a number with inaccurate caller id information. [CHAR LIMIT=48] -->
+  <string name="call_details_report_call_id">Report inaccurate number</string>
 
   <!-- String shown when the call details show a image that was sent -->
   <string name="sent_a_photo">Sent a photo</string>
@@ -40,10 +39,14 @@
   <!-- Messages shown to the user are wrapped in quotes, e.g. the user would see "Some text" -->
   <string name="message_in_quotes">\"<xliff:g id="message">%1$s</xliff:g>\"</string>
 
-  <!-- String describing the button to access the contact details for a name or number.
+  <!-- Title of dialog that confirms whether a user wants to report an incorrect number.
+       [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_dialog_title">Report incorrect number</string>
 
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-  -->
-  <string name="description_contact_photo_details">Contact details for <xliff:g id="nameOrNumber">%1$s</xliff:g></string>
+  <!-- Toast that appears when a caller id report fails to send. Could be due to network error or
+       authentication error. [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_failed">Couldn\'t report number</string>
+
+  <!-- Toast message which appears when a contact's caller id is reported as incorrect. [CHAR LIMIT=NONE] -->
+  <string name="report_caller_id_toast">Number reported</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml
index 4fffe1a..1a2b529 100644
--- a/java/com/android/dialer/calldetails/res/values/styles.xml
+++ b/java/com/android/dialer/calldetails/res/values/styles.xml
@@ -15,24 +15,6 @@
   ~ limitations under the License
   -->
 <resources>
-  <style name="PrimaryText">
-    <item name="android:textColor">#DE000000</item>
-    <item name="android:textSize">@dimen/call_details_primary_text_size</item>
-    <item name="android:maxLines">1</item>
-  </style>
-
-  <style name="SecondaryText">
-    <item name="android:textColor">#8A000000</item>
-    <item name="android:textSize">@dimen/call_details_secondary_text_size</item>
-    <item name="android:maxLines">1</item>
-  </style>
-
-  <style name="ECText">
-    <item name="android:textColor">#8A000000</item>
-    <item name="android:textSize">@dimen/call_details_ec_text_size</item>
-    <item name="android:maxLines">1</item>
-  </style>
-
   <style name="CallDetailsActionItemStyle">
     <item name="android:foreground">?android:attr/selectableItemBackground</item>
     <item name="android:clickable">true</item>
diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java
index 6066f66..b5b680e 100644
--- a/java/com/android/dialer/callintent/CallIntentBuilder.java
+++ b/java/com/android/dialer/callintent/CallIntentBuilder.java
@@ -22,11 +22,14 @@
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.CallUtil;
 
 /** Creates an intent to start a new outgoing call. */
@@ -36,12 +39,41 @@
   @Nullable private PhoneAccountHandle phoneAccountHandle;
   private boolean isVideoCall;
   private String callSubject;
+  private boolean allowAssistedDial;
+
+  private static int lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+  private static int lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+  private static int lightbringerButtonAppearInSearchCount = 0;
 
   public CallIntentBuilder(@NonNull Uri uri, @NonNull CallSpecificAppData callSpecificAppData) {
     this.uri = Assert.isNotNull(uri);
-    this.callSpecificAppData = Assert.isNotNull(callSpecificAppData);
+    Assert.isNotNull(callSpecificAppData);
     Assert.checkArgument(
         callSpecificAppData.getCallInitiationType() != CallInitiationType.Type.UNKNOWN_INITIATION);
+
+    CallSpecificAppData.Builder builder =
+        CallSpecificAppData.newBuilder(callSpecificAppData)
+            .setLightbringerButtonAppearInExpandedCallLogItemCount(
+                lightbringerButtonAppearInExpandedCallLogItemCount)
+            .setLightbringerButtonAppearInCollapsedCallLogItemCount(
+                lightbringerButtonAppearInCollapsedCallLogItemCount)
+            .setLightbringerButtonAppearInSearchCount(lightbringerButtonAppearInSearchCount);
+    lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+    lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+    lightbringerButtonAppearInSearchCount = 0;
+
+    if (PerformanceReport.isRecording()) {
+      builder
+          .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch())
+          .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick())
+          .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions())
+          .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps())
+          .setStartingTabIndex(PerformanceReport.getStartingTabIndex())
+          .build();
+      PerformanceReport.stopRecording();
+    }
+
+    this.callSpecificAppData = builder.build();
   }
 
   public CallIntentBuilder(@NonNull Uri uri, CallInitiationType.Type callInitiationType) {
@@ -71,6 +103,11 @@
     return this;
   }
 
+  public CallIntentBuilder setAllowAssistedDial(boolean allowAssistedDial) {
+    this.allowAssistedDial = allowAssistedDial;
+    return this;
+  }
+
   public CallIntentBuilder setCallSubject(String callSubject) {
     this.callSubject = callSubject;
     return this;
@@ -85,6 +122,11 @@
     Bundle extras = new Bundle();
     extras.putLong(Constants.EXTRA_CALL_CREATED_TIME_MILLIS, SystemClock.elapsedRealtime());
     CallIntentParser.putCallSpecificAppData(extras, callSpecificAppData);
+
+    if (allowAssistedDial) {
+      extras.putBoolean(TelephonyManagerCompat.ALLOW_ASSISTED_DIAL, true);
+    }
+
     intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, extras);
 
     if (phoneAccountHandle != null) {
@@ -104,4 +146,38 @@
         CallSpecificAppData.newBuilder().setCallInitiationType(callInitiationType).build();
     return callSpecificAppData;
   }
+
+  public static void increaseLightbringerCallButtonAppearInExpandedCallLogItemCount() {
+    CallIntentBuilder.lightbringerButtonAppearInExpandedCallLogItemCount++;
+  }
+
+  public static void increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount() {
+    CallIntentBuilder.lightbringerButtonAppearInCollapsedCallLogItemCount++;
+  }
+
+  public static void increaseLightbringerCallButtonAppearInSearchCount() {
+    CallIntentBuilder.lightbringerButtonAppearInSearchCount++;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInExpandedCallLogItemCount() {
+    return lightbringerButtonAppearInExpandedCallLogItemCount;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInCollapsedCallLogItemCount() {
+    return lightbringerButtonAppearInCollapsedCallLogItemCount;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInSearchCount() {
+    return lightbringerButtonAppearInSearchCount;
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void clearLightbringerCounts() {
+    lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+    lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+    lightbringerButtonAppearInSearchCount = 0;
+  }
 }
diff --git a/java/com/android/dialer/callintent/CallIntentParser.java b/java/com/android/dialer/callintent/CallIntentParser.java
index 01afce0..336adb6 100644
--- a/java/com/android/dialer/callintent/CallIntentParser.java
+++ b/java/com/android/dialer/callintent/CallIntentParser.java
@@ -19,12 +19,13 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.protos.ProtoParsers;
 
 /** Parses data for a call extra to get any dialer specific app data. */
 public class CallIntentParser {
-  static final String EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER =
-      "com.android.dialer.callintent.CALL_SPECIFIC_APP_DATA_WRAPPER";
+
+
   @Nullable
   public static CallSpecificAppData getCallSpecificAppData(@Nullable Bundle extras) {
     if (extras == null) {
@@ -35,19 +36,20 @@
       return null;
     }
 
+    if (extras.getByteArray(Constants.EXTRA_CALL_SPECIFIC_APP_DATA) == null) {
+      LogUtil.i(
+          "CallIntentParser.getCallSpecificAppData",
+          "unexpected null byte array for call specific app data proto");
+      return null;
+    }
+
     return ProtoParsers.getTrusted(
-        extras.getBundle(Constants.EXTRA_CALL_SPECIFIC_APP_DATA),
-        EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER,
-        CallSpecificAppData.getDefaultInstance());
+        extras, Constants.EXTRA_CALL_SPECIFIC_APP_DATA, CallSpecificAppData.getDefaultInstance());
   }
 
   public static void putCallSpecificAppData(
       @NonNull Bundle extras, @NonNull CallSpecificAppData callSpecificAppData) {
-    // We wrap our bundle for consumers that may not have access to ProtoParsers in their class
-    // loader. This is necessary to prevent ClassNotFoundException's
-    Bundle wrapperBundle = new Bundle();
-    ProtoParsers.put(wrapperBundle, EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER, callSpecificAppData);
-    extras.putBundle(Constants.EXTRA_CALL_SPECIFIC_APP_DATA, wrapperBundle);
+    ProtoParsers.put(extras, Constants.EXTRA_CALL_SPECIFIC_APP_DATA, callSpecificAppData);
   }
 
   private CallIntentParser() {}
diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto
index 994399f..32e4e49 100644
--- a/java/com/android/dialer/callintent/call_initiation_type.proto
+++ b/java/com/android/dialer/callintent/call_initiation_type.proto
@@ -4,9 +4,11 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
 package com.android.dialer.callintent;
 
 
+
 // Different ways a call can be initiated.
 message CallInitiationType {
   enum Type {
@@ -56,5 +58,7 @@
     MISSED_CALL_NOTIFICATION = 15;
 
     CALL_SUBJECT_DIALOG = 16;
+
+    IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE = 17;
   }
 }
diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto
index 20ffc1f..065a7ab 100644
--- a/java/com/android/dialer/callintent/call_specific_app_data.proto
+++ b/java/com/android/dialer/callintent/call_specific_app_data.proto
@@ -4,17 +4,44 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
 package com.android.dialer.callintent;
 
 import "java/com/android/dialer/callintent/call_initiation_type.proto";
+import "java/com/android/dialer/callintent/speed_dial_contact_type.proto";
+import "java/com/android/dialer/logging/ui_action.proto";
 
 // Miscellaneous data that's included in a new outgoing call initiated by
 // Dialer. The system will pass this data to the InCallUi which can use it
 // for logging or for something else.
+// Next tag: 15
 message CallSpecificAppData {
   optional CallInitiationType.Type call_initiation_type = 1;
 
   optional int32 position_of_selected_search_result = 2;
 
   optional int32 characters_in_search_string = 3;
+
+  repeated SpeedDialContactType.Type speed_dial_contact_type = 4;
+  optional int32 speed_dial_contact_position = 5;
+
+  optional int64 time_since_app_launch = 6;
+  optional int64 time_since_first_click = 7;
+  // The following two list should be of the same length
+  // (adding another message is not allowed here)
+  repeated com.android.dialer.logging.UiAction.Type
+      ui_actions_since_app_launch = 8;
+  repeated int64 ui_action_timestamps_since_app_launch = 9;
+
+  optional int32 starting_tab_index = 10;
+
+  // For recording the appearance of video call button
+  optional int32 lightbringer_button_appear_in_expanded_call_log_item_count =
+      11;
+  optional int32 lightbringer_button_appear_in_collapsed_call_log_item_count =
+      12;
+  optional int32 lightbringer_button_appear_in_search_count = 13;
+
+  // Indicates that the call is open to modification from assisted dialing.
+  optional bool allow_assisted_dialing = 14;
 }
diff --git a/java/com/android/dialer/callintent/speed_dial_contact_type.proto b/java/com/android/dialer/callintent/speed_dial_contact_type.proto
new file mode 100644
index 0000000..ecb1c3f
--- /dev/null
+++ b/java/com/android/dialer/callintent/speed_dial_contact_type.proto
@@ -0,0 +1,21 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.callintent";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.callintent;
+
+
+
+// The type of speed call contact (favorites). Applies to initiation type
+// SPEED_DIAL only.
+message SpeedDialContactType {
+  enum Type {
+    UNDEFINED = 0;
+    PINNED_CONTACT = 1;
+    STARRED_CONTACT = 2;
+    FREQUENT_CONTACT = 3;
+  }
+}
diff --git a/java/com/android/dialer/calllog/CallLogComponent.java b/java/com/android/dialer/calllog/CallLogComponent.java
index 5cdd2b4..c7db2a1 100644
--- a/java/com/android/dialer/calllog/CallLogComponent.java
+++ b/java/com/android/dialer/calllog/CallLogComponent.java
@@ -25,6 +25,8 @@
 
   public abstract CallLogFramework callLogFramework();
 
+  public abstract RefreshAnnotatedCallLogWorker getRefreshAnnotatedCallLogWorker();
+
   public static CallLogComponent get(Context context) {
     return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
         .callLogComponent();
diff --git a/java/com/android/dialer/calllog/CallLogFramework.java b/java/com/android/dialer/calllog/CallLogFramework.java
index 508413b..788e56b 100644
--- a/java/com/android/dialer/calllog/CallLogFramework.java
+++ b/java/com/android/dialer/calllog/CallLogFramework.java
@@ -21,9 +21,10 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.MainThread;
 import android.support.annotation.Nullable;
+import com.android.dialer.buildtype.BuildType;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -38,7 +39,6 @@
 public final class CallLogFramework implements CallLogDataSource.ContentObserverCallbacks {
 
   static final String PREF_FORCE_REBUILD = "callLogFrameworkForceRebuild";
-  static final String PREF_LAST_REBUILD_TIMESTAMP_MILLIS = "callLogFrameworkLastRebuild";
 
   private final DataSources dataSources;
 
@@ -49,20 +49,20 @@
     this.dataSources = dataSources;
   }
 
-  public boolean isNewCallLogEnabled(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean("enable_new_call_log_tab", false);
-  }
-
   /** Registers the content observers for all data sources. */
   public void registerContentObservers(Context appContext) {
     LogUtil.enterBlock("CallLogFramework.registerContentObservers");
 
-    if (!isNewCallLogEnabled(appContext)) {
-      return;
-    }
-
-    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
-      dataSource.registerContentObservers(appContext, this);
+    // This is the same condition used in MainImpl#isNewUiEnabled. It means that bugfood/debug
+    // users will have "new call log" content observers firing. These observers usually do simple
+    // things like writing shared preferences.
+    // TODO(zachh): Find a way to access Main#isNewUiEnabled without creating a circular dependency.
+    if (BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled()) {
+      for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+        dataSource.registerContentObservers(appContext, this);
+      }
+    } else {
+      LogUtil.i("CallLogFramework.registerContentObservers", "not registering content observers");
     }
   }
 
diff --git a/java/com/android/dialer/calllog/CallLogModule.java b/java/com/android/dialer/calllog/CallLogModule.java
index d7473a7..2f2f16d 100644
--- a/java/com/android/dialer/calllog/CallLogModule.java
+++ b/java/com/android/dialer/calllog/CallLogModule.java
@@ -17,11 +17,9 @@
 package com.android.dialer.calllog;
 
 import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.calllog.datasources.contacts.ContactsDataSource;
 import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
-import com.android.dialer.common.concurrent.DefaultDialerExecutorFactory;
-import com.android.dialer.common.concurrent.DialerExecutorFactory;
-import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import java.util.Arrays;
@@ -32,10 +30,6 @@
 @Module
 public abstract class CallLogModule {
 
-  @Binds
-  abstract DialerExecutorFactory bindDialerExecutorFactory(
-      DefaultDialerExecutorFactory defaultDialerExecutorFactory);
-
   @Provides
   static DataSources provideCallLogDataSources(
       SystemCallLogDataSource systemCallLogDataSource, ContactsDataSource contactsDataSource) {
diff --git a/java/com/android/dialer/calllog/DataSources.java b/java/com/android/dialer/calllog/DataSources.java
deleted file mode 100644
index 21d1901..0000000
--- a/java/com/android/dialer/calllog/DataSources.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.calllog;
-
-import com.android.dialer.calllog.datasources.CallLogDataSource;
-import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
-import java.util.List;
-
-/** Immutable lists of data sources used to populate the annotated call log. */
-interface DataSources {
-
-  SystemCallLogDataSource getSystemCallLogDataSource();
-
-  List<CallLogDataSource> getDataSourcesIncludingSystemCallLog();
-
-  List<CallLogDataSource> getDataSourcesExcludingSystemCallLog();
-}
diff --git a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
index f9f0c99..2732466 100644
--- a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
+++ b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
@@ -18,91 +18,84 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.OperationApplicationException;
 import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
+import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.support.annotation.WorkerThread;
-import com.android.dialer.calllog.database.AnnotatedCallLog;
-import com.android.dialer.calllog.database.CallLogMutations;
+import com.android.dialer.calllog.database.CallLogDatabaseComponent;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.inject.ApplicationContext;
 import javax.inject.Inject;
 
 /**
  * Worker which brings the annotated call log up to date, if necessary.
  *
- * <p>Accepts a boolean which indicates if the dirty check should be skipped, and returns true if
- * the annotated call log was updated.
+ * <p>Accepts a boolean which indicates if the dirty check should be skipped.
  */
-public class RefreshAnnotatedCallLogWorker implements Worker<Boolean, Boolean> {
+public class RefreshAnnotatedCallLogWorker implements Worker<Boolean, Void> {
 
   private final Context appContext;
   private final DataSources dataSources;
 
   @Inject
-  public RefreshAnnotatedCallLogWorker(Context appContext, DataSources dataSources) {
+  RefreshAnnotatedCallLogWorker(@ApplicationContext Context appContext, DataSources dataSources) {
     this.appContext = appContext;
     this.dataSources = dataSources;
   }
 
   @Override
-  public Boolean doInBackground(Boolean skipDirtyCheck) {
-    LogUtil.enterBlock("RefreshAnnotatedCallLogWorker.doInBackgroundFallible");
+  public Void doInBackground(Boolean skipDirtyCheck)
+      throws RemoteException, OperationApplicationException {
+    LogUtil.enterBlock("RefreshAnnotatedCallLogWorker.doInBackground");
 
     long startTime = System.currentTimeMillis();
-    boolean annotatedCallLogUpdated = checkDirtyAndRebuildIfNecessary(appContext, skipDirtyCheck);
+    checkDirtyAndRebuildIfNecessary(appContext, skipDirtyCheck);
     LogUtil.i(
-        "RefreshAnnotatedCallLogWorker.doInBackgroundFallible",
-        "updated? %s, took %dms",
-        annotatedCallLogUpdated,
+        "RefreshAnnotatedCallLogWorker.doInBackground",
+        "took %dms",
         System.currentTimeMillis() - startTime);
-    return annotatedCallLogUpdated;
+    return null;
   }
 
   @WorkerThread
-  private boolean checkDirtyAndRebuildIfNecessary(Context appContext, boolean skipDirtyCheck) {
+  private void checkDirtyAndRebuildIfNecessary(Context appContext, boolean skipDirtyCheck)
+      throws RemoteException, OperationApplicationException {
     Assert.isWorkerThread();
 
     long startTime = System.currentTimeMillis();
 
     SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
-    long lastRebuildTimeMillis =
-        sharedPreferences.getLong(CallLogFramework.PREF_LAST_REBUILD_TIMESTAMP_MILLIS, 0);
-    if (lastRebuildTimeMillis == 0) {
-      LogUtil.i(
-          "RefreshAnnotatedCallLogWorker.checkDirtyAndRebuildIfNecessary",
-          "annotated call log has never been built, marking it dirty");
-    }
+    // Default to true. If the pref doesn't exist, the annotated call log hasn't been created and
+    // we just skip isDirty checks and force a rebuild.
     boolean forceRebuildPrefValue =
-        sharedPreferences.getBoolean(CallLogFramework.PREF_FORCE_REBUILD, false);
+        sharedPreferences.getBoolean(CallLogFramework.PREF_FORCE_REBUILD, true);
     if (forceRebuildPrefValue) {
       LogUtil.i(
           "RefreshAnnotatedCallLogWorker.checkDirtyAndRebuildIfNecessary",
-          "call log has been marked dirty");
+          "annotated call log has been marked dirty or does not exist");
     }
 
-    boolean isDirty =
-        lastRebuildTimeMillis == 0
-            || skipDirtyCheck
-            || forceRebuildPrefValue
-            || isDirty(appContext);
+    boolean isDirty = skipDirtyCheck || forceRebuildPrefValue || isDirty(appContext);
+
     LogUtil.i(
         "RefreshAnnotatedCallLogWorker.checkDirtyAndRebuildIfNecessary",
         "isDirty took: %dms",
         System.currentTimeMillis() - startTime);
     if (isDirty) {
       startTime = System.currentTimeMillis();
-      rebuild(appContext, lastRebuildTimeMillis);
+      rebuild(appContext);
       LogUtil.i(
           "RefreshAnnotatedCallLogWorker.checkDirtyAndRebuildIfNecessary",
           "rebuild took: %dms",
           System.currentTimeMillis() - startTime);
-      return true; // Annotated call log was updated.
     }
-    return false; // Annotated call log was not updated.
   }
 
   @WorkerThread
@@ -129,52 +122,58 @@
 
   @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
   @WorkerThread
-  private void rebuild(Context appContext, long lastRebuildTimeMillis) {
+  private void rebuild(Context appContext) throws RemoteException, OperationApplicationException {
     Assert.isWorkerThread();
 
-    // TODO: Start a transaction?
-    try (SQLiteDatabase database = AnnotatedCallLog.getWritableDatabase(appContext)) {
+    CallLogMutations mutations = new CallLogMutations();
 
-      CallLogMutations mutations = new CallLogMutations();
+    // System call log data source must go first!
+    CallLogDataSource systemCallLogDataSource = dataSources.getSystemCallLogDataSource();
+    String dataSourceName = getName(systemCallLogDataSource);
+    LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "filling %s", dataSourceName);
+    long startTime = System.currentTimeMillis();
+    systemCallLogDataSource.fill(appContext, mutations);
+    LogUtil.i(
+        "RefreshAnnotatedCallLogWorker.rebuild",
+        "%s.fill took: %dms",
+        dataSourceName,
+        System.currentTimeMillis() - startTime);
 
-      // System call log data source must go first!
-      CallLogDataSource systemCallLogDataSource = dataSources.getSystemCallLogDataSource();
-      String dataSourceName = getName(systemCallLogDataSource);
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesExcludingSystemCallLog()) {
+      dataSourceName = getName(dataSource);
       LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "filling %s", dataSourceName);
-      long startTime = System.currentTimeMillis();
-      systemCallLogDataSource.fill(appContext, database, lastRebuildTimeMillis, mutations);
+      startTime = System.currentTimeMillis();
+      dataSource.fill(appContext, mutations);
       LogUtil.i(
-          "RefreshAnnotatedCallLogWorker.rebuild",
+          "CallLogFramework.rebuild",
           "%s.fill took: %dms",
           dataSourceName,
           System.currentTimeMillis() - startTime);
+    }
+    LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "applying mutations to database");
+    startTime = System.currentTimeMillis();
+    CallLogDatabaseComponent.get(appContext)
+        .mutationApplier()
+        .applyToDatabase(mutations, appContext);
+    LogUtil.i(
+        "RefreshAnnotatedCallLogWorker.rebuild",
+        "applyToDatabase took: %dms",
+        System.currentTimeMillis() - startTime);
 
-      for (CallLogDataSource dataSource : dataSources.getDataSourcesExcludingSystemCallLog()) {
-        dataSourceName = getName(dataSource);
-        LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "filling %s", dataSourceName);
-        startTime = System.currentTimeMillis();
-        dataSource.fill(appContext, database, lastRebuildTimeMillis, mutations);
-        LogUtil.i(
-            "CallLogFramework.rebuild",
-            "%s.fill took: %dms",
-            dataSourceName,
-            System.currentTimeMillis() - startTime);
-      }
-      LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "applying mutations to database");
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      dataSourceName = getName(dataSource);
+      LogUtil.i("RefreshAnnotatedCallLogWorker.rebuild", "onSuccessfulFill'ing %s", dataSourceName);
       startTime = System.currentTimeMillis();
-      mutations.applyToDatabase(database);
+      dataSource.onSuccessfulFill(appContext);
       LogUtil.i(
-          "RefreshAnnotatedCallLogWorker.rebuild",
-          "applyToDatabase took: %dms",
+          "CallLogFramework.rebuild",
+          "%s.onSuccessfulFill took: %dms",
+          dataSourceName,
           System.currentTimeMillis() - startTime);
     }
 
     SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
-    sharedPreferences
-        .edit()
-        .putBoolean(CallLogFramework.PREF_FORCE_REBUILD, false)
-        .putLong(CallLogFramework.PREF_LAST_REBUILD_TIMESTAMP_MILLIS, System.currentTimeMillis())
-        .commit();
+    sharedPreferences.edit().putBoolean(CallLogFramework.PREF_FORCE_REBUILD, false).apply();
   }
 
   private static String getName(CallLogDataSource dataSource) {
diff --git a/java/com/android/dialer/calllog/database/AndroidManifest.xml b/java/com/android/dialer/calllog/database/AndroidManifest.xml
new file mode 100644
index 0000000..396a6d9
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<!--
+ ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.calllog.database">
+
+  <application>
+
+    <provider
+        android:authorities="com.android.dialer.annotatedcalllog"
+        android:exported="false"
+        android:multiprocess="false"
+        android:name=".AnnotatedCallLogContentProvider"/>
+
+  </application>
+</manifest>
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLog.java b/java/com/android/dialer/calllog/database/AnnotatedCallLog.java
deleted file mode 100644
index 7dca44a..0000000
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLog.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.calllog.database;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.WorkerThread;
-import com.android.dialer.common.Assert;
-
-/** Static methods and constants for interacting with the annotated call log table. */
-public final class AnnotatedCallLog {
-
-  private static final String DATABASE_NAME = "annotated_call_log.db";
-
-  public static final String TABLE_NAME = "AnnotatedCallLog";
-
-  /** Column names for the annotated call log table. */
-  public static final class Columns {
-    public static final String ID = "_id";
-    public static final String TIMESTAMP = "timestamp";
-    public static final String CONTACT_NAME = "contact_name";
-  }
-
-  private AnnotatedCallLog() {}
-
-  @WorkerThread
-  public static SQLiteDatabase getWritableDatabase(Context appContext) {
-    Assert.isWorkerThread();
-
-    return new AnnotatedCallLogDatabaseHelper(appContext, DATABASE_NAME).getWritableDatabase();
-  }
-
-  @WorkerThread
-  public static SQLiteDatabase getReadableDatabase(Context appContext) {
-    Assert.isWorkerThread();
-
-    return new AnnotatedCallLogDatabaseHelper(appContext, DATABASE_NAME).getReadableDatabase();
-  }
-}
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
new file mode 100644
index 0000000..9a3d2e2
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
@@ -0,0 +1,333 @@
+/*
+ * 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.calllog.database;
+
+import android.annotation.TargetApi;
+import android.content.ContentProvider;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.OperationApplicationException;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+
+/** {@link ContentProvider} for the annotated call log. */
+public class AnnotatedCallLogContentProvider extends ContentProvider {
+
+  /**
+   * We sometimes run queries where we potentially pass every ID into a where clause using the
+   * (?,?,?,...) syntax. The maximum number of host parameters is 999, so that's the maximum size
+   * this table can be. See https://www.sqlite.org/limits.html for more details.
+   */
+  private static final int MAX_ROWS = 999;
+
+  private static final int ANNOTATED_CALL_LOG_TABLE_CODE = 1;
+  private static final int ANNOTATED_CALL_LOG_TABLE_ID_CODE = 2;
+  private static final int COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE = 3;
+
+  private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+
+  static {
+    uriMatcher.addURI(
+        AnnotatedCallLogContract.AUTHORITY, AnnotatedCallLog.TABLE, ANNOTATED_CALL_LOG_TABLE_CODE);
+    uriMatcher.addURI(
+        AnnotatedCallLogContract.AUTHORITY,
+        AnnotatedCallLog.TABLE + "/#",
+        ANNOTATED_CALL_LOG_TABLE_ID_CODE);
+    uriMatcher.addURI(
+        AnnotatedCallLogContract.AUTHORITY,
+        CoalescedAnnotatedCallLog.TABLE,
+        COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE);
+  }
+
+  private AnnotatedCallLogDatabaseHelper databaseHelper;
+  private Coalescer coalescer;
+
+  private final ThreadLocal<Boolean> applyingBatch = new ThreadLocal<>();
+
+  /** Ensures that only a single notification is generated from {@link #applyBatch(ArrayList)}. */
+  private boolean isApplyingBatch() {
+    return applyingBatch.get() != null && applyingBatch.get();
+  }
+
+  @Override
+  public boolean onCreate() {
+    databaseHelper = new AnnotatedCallLogDatabaseHelper(getContext(), MAX_ROWS);
+    coalescer = CallLogDatabaseComponent.get(getContext()).coalescer();
+    return true;
+  }
+
+  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
+  @Nullable
+  @Override
+  public Cursor query(
+      @NonNull Uri uri,
+      @Nullable String[] projection,
+      @Nullable String selection,
+      @Nullable String[] selectionArgs,
+      @Nullable String sortOrder) {
+    SQLiteDatabase db = databaseHelper.getReadableDatabase();
+    SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+    queryBuilder.setTables(AnnotatedCallLog.TABLE);
+    int match = uriMatcher.match(uri);
+    switch (match) {
+      case ANNOTATED_CALL_LOG_TABLE_ID_CODE:
+        queryBuilder.appendWhere(AnnotatedCallLog._ID + "=" + ContentUris.parseId(uri));
+        // fall through
+      case ANNOTATED_CALL_LOG_TABLE_CODE:
+        Cursor cursor =
+            queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
+        if (cursor != null) {
+          cursor.setNotificationUri(
+              getContext().getContentResolver(), AnnotatedCallLog.CONTENT_URI);
+        } else {
+          LogUtil.w("AnnotatedCallLogContentProvider.query", "cursor was null");
+        }
+        return cursor;
+      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
+        Assert.checkArgument(
+            projection == CoalescedAnnotatedCallLog.ALL_COLUMNS,
+            "only ALL_COLUMNS projection supported for coalesced call log");
+        Assert.checkArgument(selection == null, "selection not supported for coalesced call log");
+        Assert.checkArgument(
+            selectionArgs == null, "selection args not supported for coalesced call log");
+        Assert.checkArgument(sortOrder == null, "sort order not supported for coalesced call log");
+        try (Cursor allAnnotatedCallLogRows =
+            queryBuilder.query(
+                db, null, null, null, null, null, AnnotatedCallLog.TIMESTAMP + " DESC")) {
+          Cursor coalescedRows = coalescer.coalesce(allAnnotatedCallLogRows);
+          coalescedRows.setNotificationUri(
+              getContext().getContentResolver(), CoalescedAnnotatedCallLog.CONTENT_URI);
+          return coalescedRows;
+        }
+      default:
+        throw new IllegalArgumentException("Unknown uri: " + uri);
+    }
+  }
+
+  @Nullable
+  @Override
+  public String getType(@NonNull Uri uri) {
+    return AnnotatedCallLog.CONTENT_ITEM_TYPE;
+  }
+
+  @Nullable
+  @Override
+  public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+    // Javadoc states values is not nullable, even though it is annotated as such (b/38123194)!
+    Assert.checkArgument(values != null);
+
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
+    int match = uriMatcher.match(uri);
+    switch (match) {
+      case ANNOTATED_CALL_LOG_TABLE_CODE:
+        Assert.checkArgument(
+            values.get(AnnotatedCallLog._ID) != null, "You must specify an _ID when inserting");
+        break;
+      case ANNOTATED_CALL_LOG_TABLE_ID_CODE:
+        Long idFromUri = ContentUris.parseId(uri);
+        Long idFromValues = values.getAsLong(AnnotatedCallLog._ID);
+        Assert.checkArgument(
+            idFromValues == null || idFromValues.equals(idFromUri),
+            "_ID from values %d does not match ID from URI: %s",
+            idFromValues,
+            uri);
+        if (idFromValues == null) {
+          values.put(AnnotatedCallLog._ID, idFromUri);
+        }
+        break;
+      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
+        throw new UnsupportedOperationException("coalesced call log does not support inserting");
+      default:
+        throw new IllegalArgumentException("Unknown uri: " + uri);
+    }
+    long id = database.insert(AnnotatedCallLog.TABLE, null, values);
+    if (id < 0) {
+      LogUtil.w(
+          "AnnotatedCallLogContentProvider.insert",
+          "error inserting row with id: %d",
+          values.get(AnnotatedCallLog._ID));
+      return null;
+    }
+    Uri insertedUri = ContentUris.withAppendedId(AnnotatedCallLog.CONTENT_URI, id);
+    if (!isApplyingBatch()) {
+      notifyChange(insertedUri);
+    }
+    return insertedUri;
+  }
+
+  @Override
+  public int delete(
+      @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
+    final int match = uriMatcher.match(uri);
+    switch (match) {
+      case ANNOTATED_CALL_LOG_TABLE_CODE:
+        break;
+      case ANNOTATED_CALL_LOG_TABLE_ID_CODE:
+        Assert.checkArgument(selection == null, "Do not specify selection when deleting by ID");
+        Assert.checkArgument(
+            selectionArgs == null, "Do not specify selection args when deleting by ID");
+        long id = ContentUris.parseId(uri);
+        Assert.checkArgument(id != -1, "error parsing id from uri %s", uri);
+        selection = getSelectionWithId(id);
+        break;
+      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
+        throw new UnsupportedOperationException("coalesced call log does not support deleting");
+      default:
+        throw new IllegalArgumentException("Unknown uri: " + uri);
+    }
+    int rows = database.delete(AnnotatedCallLog.TABLE, selection, selectionArgs);
+    if (rows > 0) {
+      if (!isApplyingBatch()) {
+        notifyChange(uri);
+      }
+    } else {
+      LogUtil.w("AnnotatedCallLogContentProvider.delete", "no rows deleted");
+    }
+    return rows;
+  }
+
+  @Override
+  public int update(
+      @NonNull Uri uri,
+      @Nullable ContentValues values,
+      @Nullable String selection,
+      @Nullable String[] selectionArgs) {
+    // Javadoc states values is not nullable, even though it is annotated as such (b/38123194)!
+    Assert.checkArgument(values != null);
+
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
+    int match = uriMatcher.match(uri);
+    switch (match) {
+      case ANNOTATED_CALL_LOG_TABLE_CODE:
+        break;
+      case ANNOTATED_CALL_LOG_TABLE_ID_CODE:
+        Assert.checkArgument(
+            !values.containsKey(AnnotatedCallLog._ID), "Do not specify _ID when updating by ID");
+        Assert.checkArgument(selection == null, "Do not specify selection when updating by ID");
+        Assert.checkArgument(
+            selectionArgs == null, "Do not specify selection args when updating by ID");
+        selection = getSelectionWithId(ContentUris.parseId(uri));
+        break;
+      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
+        throw new UnsupportedOperationException("coalesced call log does not support updating");
+      default:
+        throw new IllegalArgumentException("Unknown uri: " + uri);
+    }
+    int rows = database.update(AnnotatedCallLog.TABLE, values, selection, selectionArgs);
+    if (rows > 0) {
+      if (!isApplyingBatch()) {
+        notifyChange(uri);
+      }
+    } else {
+      LogUtil.w("AnnotatedCallLogContentProvider.update", "no rows updated");
+    }
+    return rows;
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * <p>Note: When applyBatch is used with the AnnotatedCallLog, only a single notification for the
+   * content URI is generated, not individual notifications for each affected URI.
+   */
+  @NonNull
+  @Override
+  public ContentProviderResult[] applyBatch(@NonNull ArrayList<ContentProviderOperation> operations)
+      throws OperationApplicationException {
+    ContentProviderResult[] results = new ContentProviderResult[operations.size()];
+    if (operations.isEmpty()) {
+      return results;
+    }
+
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
+    try {
+      applyingBatch.set(true);
+      database.beginTransaction();
+      for (int i = 0; i < operations.size(); i++) {
+        ContentProviderOperation operation = operations.get(i);
+        int match = uriMatcher.match(operation.getUri());
+        switch (match) {
+          case ANNOTATED_CALL_LOG_TABLE_CODE:
+          case ANNOTATED_CALL_LOG_TABLE_ID_CODE:
+            // These are allowed values, continue.
+            break;
+          case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
+            throw new UnsupportedOperationException(
+                "coalesced call log does not support applyBatch");
+          default:
+            throw new IllegalArgumentException("Unknown uri: " + operation.getUri());
+        }
+        ContentProviderResult result = operation.apply(this, results, i);
+        if (operations.get(i).isInsert()) {
+          if (result.uri == null) {
+            throw new OperationApplicationException("error inserting row");
+          }
+        } else if (result.count == 0) {
+          /*
+           * The batches built by MutationApplier happen to contain operations in order of:
+           *
+           * 1. Inserts
+           * 2. Updates
+           * 3. Deletes
+           *
+           * Let's say the last row in the table is row Z, and MutationApplier wishes to update it,
+           * as well as insert row A. When row A gets inserted, row Z will be deleted via the
+           * trigger if the table is full. Then later, when we try to process the update for row Z,
+           * it won't exist.
+           */
+          LogUtil.w(
+              "AnnotatedCallLogContentProvider.applyBatch",
+              "update or delete failed, possibly because row got cleaned up");
+        }
+        results[i] = result;
+      }
+      database.setTransactionSuccessful();
+    } finally {
+      applyingBatch.set(false);
+      database.endTransaction();
+    }
+    notifyChange(AnnotatedCallLog.CONTENT_URI);
+    return results;
+  }
+
+  private String getSelectionWithId(long id) {
+    return AnnotatedCallLog._ID + "=" + id;
+  }
+
+  private void notifyChange(Uri uri) {
+    getContext().getContentResolver().notifyChange(uri, null);
+    // Any time the annotated call log changes, we need to also notify observers of the
+    // CoalescedAnnotatedCallLog, since that is just a massaged in-memory view of the real annotated
+    // call log table.
+    getContext().getContentResolver().notifyChange(CoalescedAnnotatedCallLog.CONTENT_URI, null);
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
index 7b28e55..e1ec0f6 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
@@ -16,37 +16,75 @@
 
 package com.android.dialer.calllog.database;
 
-import static com.android.dialer.calllog.database.AnnotatedCallLog.Columns.CONTACT_NAME;
-import static com.android.dialer.calllog.database.AnnotatedCallLog.Columns.ID;
-import static com.android.dialer.calllog.database.AnnotatedCallLog.Columns.TIMESTAMP;
-
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.common.LogUtil;
+import java.util.Locale;
 
 /** {@link SQLiteOpenHelper} for the AnnotatedCallLog database. */
 class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper {
+  private final int maxRows;
 
-  AnnotatedCallLogDatabaseHelper(Context appContext, String databaseName) {
-    super(appContext, databaseName, null, 1);
+  AnnotatedCallLogDatabaseHelper(Context appContext, int maxRows) {
+    super(appContext, "annotated_call_log.db", null, 1);
+    this.maxRows = maxRows;
   }
 
-  private static final String CREATE_SQL =
+  private static final String CREATE_TABLE_SQL =
       new StringBuilder()
-          .append("create table if not exists " + AnnotatedCallLog.TABLE_NAME + " (")
-          .append(ID + " integer primary key, ")
-          .append(TIMESTAMP + " integer, ")
-          .append(CONTACT_NAME + " string")
+          .append("create table if not exists " + AnnotatedCallLog.TABLE + " (")
+          // Common columns.
+          .append(AnnotatedCallLog._ID + " integer primary key, ")
+          .append(AnnotatedCallLog.TIMESTAMP + " integer, ")
+          .append(AnnotatedCallLog.NAME + " string, ")
+          .append(AnnotatedCallLog.FORMATTED_NUMBER + " string, ")
+          .append(AnnotatedCallLog.PHOTO_URI + " string, ")
+          .append(AnnotatedCallLog.PHOTO_ID + " integer, ")
+          .append(AnnotatedCallLog.LOOKUP_URI + " string, ")
+          .append(AnnotatedCallLog.NUMBER_TYPE_LABEL + " string, ")
+          .append(AnnotatedCallLog.IS_READ + " integer, ")
+          .append(AnnotatedCallLog.NEW + " integer, ")
+          .append(AnnotatedCallLog.GEOCODED_LOCATION + " string, ")
+          .append(AnnotatedCallLog.PHONE_ACCOUNT_LABEL + " string, ")
+          .append(AnnotatedCallLog.PHONE_ACCOUNT_COLOR + " integer, ")
+          .append(AnnotatedCallLog.FEATURES + " integer, ")
+          .append(AnnotatedCallLog.IS_BUSINESS + " integer, ")
+          .append(AnnotatedCallLog.IS_VOICEMAIL + " integer, ")
+          // Columns only in AnnotatedCallLog
+          .append(AnnotatedCallLog.NUMBER + " blob, ")
+          .append(AnnotatedCallLog.TYPE + " integer")
           .append(");")
           .toString();
 
+  /** Deletes all but the first maxRows rows (by timestamp) to keep the table a manageable size. */
+  private static final String CREATE_TRIGGER_SQL =
+      "create trigger delete_old_rows after insert on "
+          + AnnotatedCallLog.TABLE
+          + " when (select count(*) from "
+          + AnnotatedCallLog.TABLE
+          + ") > %d"
+          + " begin delete from "
+          + AnnotatedCallLog.TABLE
+          + " where "
+          + AnnotatedCallLog._ID
+          + " in (select "
+          + AnnotatedCallLog._ID
+          + " from "
+          + AnnotatedCallLog.TABLE
+          + " order by timestamp limit (select count(*)-%d"
+          + " from "
+          + AnnotatedCallLog.TABLE
+          + " )); end;";
+
   @Override
   public void onCreate(SQLiteDatabase db) {
     LogUtil.enterBlock("AnnotatedCallLogDatabaseHelper.onCreate");
     long startTime = System.currentTimeMillis();
-    db.execSQL(CREATE_SQL);
-    // TODO: Consider logging impression.
+    db.execSQL(CREATE_TABLE_SQL);
+    db.execSQL(String.format(Locale.US, CREATE_TRIGGER_SQL, maxRows, maxRows));
+    // TODO(zachh): Consider logging impression.
     LogUtil.i(
         "AnnotatedCallLogDatabaseHelper.onCreate",
         "took: %dms",
diff --git a/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java b/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java
new file mode 100644
index 0000000..ede4691
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java
@@ -0,0 +1,40 @@
+/*
+ * 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.calllog.database;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component for database package. */
+@Subcomponent
+public abstract class CallLogDatabaseComponent {
+
+  public abstract Coalescer coalescer();
+
+  public abstract MutationApplier mutationApplier();
+
+  public static CallLogDatabaseComponent get(Context context) {
+    return ((CallLogDatabaseComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .callLogDatabaseComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    CallLogDatabaseComponent callLogDatabaseComponent();
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/CallLogMutations.java b/java/com/android/dialer/calllog/database/CallLogMutations.java
deleted file mode 100644
index ec020c6..0000000
--- a/java/com/android/dialer/calllog/database/CallLogMutations.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.calllog.database;
-
-import android.content.ContentValues;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.WorkerThread;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-import com.android.dialer.common.Assert;
-
-/** A collection of mutations to the annotated call log. */
-public final class CallLogMutations {
-
-  private final ArrayMap<Integer, ContentValues> inserts = new ArrayMap<>();
-  private final ArrayMap<Integer, ContentValues> updates = new ArrayMap<>();
-  private final ArraySet<Integer> deletes = new ArraySet<>();
-
-  /** @param contentValues an entire row not including the ID */
-  public void insert(int id, ContentValues contentValues) {
-    inserts.put(id, contentValues);
-  }
-
-  /** @param contentValues the specific columns to update, not including the ID. */
-  public void update(int id, ContentValues contentValues) {
-    // TODO: Consider merging automatically.
-    updates.put(id, contentValues);
-  }
-
-  public void delete(int id) {
-    deletes.add(id);
-  }
-
-  public boolean isEmpty() {
-    return inserts.isEmpty() && updates.isEmpty() && deletes.isEmpty();
-  }
-
-  @WorkerThread
-  public void applyToDatabase(SQLiteDatabase writableDatabase) {
-    Assert.isWorkerThread();
-
-    // TODO: Implementation.
-  }
-}
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java
new file mode 100644
index 0000000..63fa9f8
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/Coalescer.java
@@ -0,0 +1,194 @@
+/*
+ * 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.calllog.database;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
+import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.DataSources;
+import com.android.dialer.common.Assert;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import javax.inject.Inject;
+
+/**
+ * Coalesces call log rows by combining some adjacent rows.
+ *
+ * <p>Applies the business which logic which determines which adjacent rows should be coalasced, and
+ * then delegates to each data source to determine how individual columns should be aggregated.
+ */
+public class Coalescer {
+
+  private final DataSources dataSources;
+
+  @Inject
+  Coalescer(DataSources dataSources) {
+    this.dataSources = dataSources;
+  }
+
+  /**
+   * Reads the entire {@link AnnotatedCallLog} database into memory from the provided {@code
+   * allAnnotatedCallLog} parameter and then builds and returns a new {@link MatrixCursor} which is
+   * the result of combining adjacent rows which should be collapsed for display purposes.
+   *
+   * @param allAnnotatedCallLogRowsSortedByTimestampDesc all {@link AnnotatedCallLog} rows, sorted
+   *     by timestamp descending
+   * @return a new {@link MatrixCursor} containing the {@link CoalescedAnnotatedCallLog} rows to
+   *     display
+   */
+  @WorkerThread
+  @NonNull
+  Cursor coalesce(@NonNull Cursor allAnnotatedCallLogRowsSortedByTimestampDesc) {
+    Assert.isWorkerThread();
+
+    // Note: This method relies on rowsShouldBeCombined to determine which rows should be combined,
+    // but delegates to data sources to actually aggregate column values.
+
+    DialerPhoneNumberUtil dialerPhoneNumberUtil =
+        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+
+    MatrixCursor allCoalescedRowsMatrixCursor =
+        new MatrixCursor(
+            CoalescedAnnotatedCallLog.ALL_COLUMNS,
+            Assert.isNotNull(allAnnotatedCallLogRowsSortedByTimestampDesc).getCount());
+
+    if (allAnnotatedCallLogRowsSortedByTimestampDesc.moveToFirst()) {
+      int coalescedRowId = 0;
+
+      List<ContentValues> currentRowGroup = new ArrayList<>();
+
+      do {
+        ContentValues currentRow =
+            cursorRowToContentValues(allAnnotatedCallLogRowsSortedByTimestampDesc);
+
+        if (currentRowGroup.isEmpty()) {
+          currentRowGroup.add(currentRow);
+          continue;
+        }
+
+        ContentValues previousRow = currentRowGroup.get(currentRowGroup.size() - 1);
+
+        if (!rowsShouldBeCombined(dialerPhoneNumberUtil, previousRow, currentRow)) {
+          ContentValues coalescedRow = coalesceRowsForAllDataSources(currentRowGroup);
+          coalescedRow.put(CoalescedAnnotatedCallLog.NUMBER_CALLS, currentRowGroup.size());
+          addContentValuesToMatrixCursor(
+              coalescedRow, allCoalescedRowsMatrixCursor, coalescedRowId++);
+          currentRowGroup.clear();
+        }
+        currentRowGroup.add(currentRow);
+      } while (allAnnotatedCallLogRowsSortedByTimestampDesc.moveToNext());
+
+      // Deal with leftover rows.
+      ContentValues coalescedRow = coalesceRowsForAllDataSources(currentRowGroup);
+      coalescedRow.put(CoalescedAnnotatedCallLog.NUMBER_CALLS, currentRowGroup.size());
+      addContentValuesToMatrixCursor(coalescedRow, allCoalescedRowsMatrixCursor, coalescedRowId);
+    }
+    return allCoalescedRowsMatrixCursor;
+  }
+
+  private static ContentValues cursorRowToContentValues(Cursor cursor) {
+    ContentValues values = new ContentValues();
+    String[] columns = cursor.getColumnNames();
+    int length = columns.length;
+    for (int i = 0; i < length; i++) {
+      if (cursor.getType(i) == Cursor.FIELD_TYPE_BLOB) {
+        values.put(columns[i], cursor.getBlob(i));
+      } else {
+        values.put(columns[i], cursor.getString(i));
+      }
+    }
+    return values;
+  }
+
+  /**
+   * @param row1 a row from {@link AnnotatedCallLog}
+   * @param row2 a row from {@link AnnotatedCallLog}
+   */
+  private static boolean rowsShouldBeCombined(
+      DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) {
+    // Don't combine rows which don't use the same phone account.
+    if (!Objects.equals(
+        row1.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_LABEL),
+        row2.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_LABEL))) {
+      return false;
+    }
+    DialerPhoneNumber number1;
+    DialerPhoneNumber number2;
+    try {
+      byte[] number1Bytes = row1.getAsByteArray(AnnotatedCallLog.NUMBER);
+      byte[] number2Bytes = row2.getAsByteArray(AnnotatedCallLog.NUMBER);
+
+      if (number1Bytes == null || number2Bytes == null) {
+        // Empty numbers should not be combined.
+        return false;
+      }
+
+      number1 = DialerPhoneNumber.parseFrom(number1Bytes);
+      number2 = DialerPhoneNumber.parseFrom(number2Bytes);
+    } catch (InvalidProtocolBufferException e) {
+      throw Assert.createAssertionFailException("error parsing DialerPhoneNumber proto", e);
+    }
+
+    if (!number1.hasDialerInternalPhoneNumber() && !number2.hasDialerInternalPhoneNumber()) {
+      // Empty numbers should not be combined.
+      return false;
+    }
+
+    if (!number1.hasDialerInternalPhoneNumber() || !number2.hasDialerInternalPhoneNumber()) {
+      // An empty number should not be combined with a non-empty number.
+      return false;
+    }
+    return dialerPhoneNumberUtil.isExactMatch(number1, number2);
+  }
+
+  /**
+   * Delegates to data sources to aggregate individual columns to create a new coalesced row.
+   *
+   * @param individualRows {@link AnnotatedCallLog} rows sorted by timestamp descending
+   * @return a {@link CoalescedAnnotatedCallLog} row
+   */
+  private ContentValues coalesceRowsForAllDataSources(List<ContentValues> individualRows) {
+    ContentValues coalescedValues = new ContentValues();
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      coalescedValues.putAll(dataSource.coalesce(individualRows));
+    }
+    return coalescedValues;
+  }
+
+  /**
+   * @param contentValues a {@link CoalescedAnnotatedCallLog} row
+   * @param matrixCursor represents {@link CoalescedAnnotatedCallLog}
+   */
+  private static void addContentValuesToMatrixCursor(
+      ContentValues contentValues, MatrixCursor matrixCursor, int rowId) {
+    MatrixCursor.RowBuilder rowBuilder = matrixCursor.newRow();
+    rowBuilder.add(CoalescedAnnotatedCallLog._ID, rowId);
+    for (Map.Entry<String, Object> entry : contentValues.valueSet()) {
+      rowBuilder.add(entry.getKey(), entry.getValue());
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/MutationApplier.java b/java/com/android/dialer/calllog/database/MutationApplier.java
new file mode 100644
index 0000000..21c8a50
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/MutationApplier.java
@@ -0,0 +1,105 @@
+/*
+ * 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.calllog.database;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map.Entry;
+import javax.inject.Inject;
+
+/** Applies {@link CallLogMutations} to the annotated call log. */
+public class MutationApplier {
+
+  @Inject
+  MutationApplier() {}
+
+  /** Applies the provided {@link CallLogMutations} to the annotated call log. */
+  @WorkerThread
+  public void applyToDatabase(CallLogMutations mutations, Context appContext)
+      throws RemoteException, OperationApplicationException {
+    Assert.isWorkerThread();
+
+    if (mutations.isEmpty()) {
+      return;
+    }
+
+    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+
+    if (!mutations.getInserts().isEmpty()) {
+      LogUtil.i(
+          "CallLogMutations.applyToDatabase", "inserting %d rows", mutations.getInserts().size());
+      for (Entry<Long, ContentValues> entry : mutations.getInserts().entrySet()) {
+        long id = entry.getKey();
+        ContentValues contentValues = entry.getValue();
+        operations.add(
+            ContentProviderOperation.newInsert(
+                    ContentUris.withAppendedId(AnnotatedCallLog.CONTENT_URI, id))
+                .withValues(contentValues)
+                .build());
+      }
+    }
+
+    if (!mutations.getUpdates().isEmpty()) {
+      LogUtil.i(
+          "CallLogMutations.applyToDatabase", "updating %d rows", mutations.getUpdates().size());
+      for (Entry<Long, ContentValues> entry : mutations.getUpdates().entrySet()) {
+        long id = entry.getKey();
+        ContentValues contentValues = entry.getValue();
+        operations.add(
+            ContentProviderOperation.newUpdate(
+                    ContentUris.withAppendedId(AnnotatedCallLog.CONTENT_URI, id))
+                .withValues(contentValues)
+                .build());
+      }
+    }
+
+    if (!mutations.getDeletes().isEmpty()) {
+      LogUtil.i(
+          "CallLogMutations.applyToDatabase", "deleting %d rows", mutations.getDeletes().size());
+      String[] questionMarks = new String[mutations.getDeletes().size()];
+      Arrays.fill(questionMarks, "?");
+
+      String whereClause =
+          (AnnotatedCallLog._ID + " in (") + TextUtils.join(",", questionMarks) + ")";
+
+      String[] whereArgs = new String[mutations.getDeletes().size()];
+      int i = 0;
+      for (long id : mutations.getDeletes()) {
+        whereArgs[i++] = String.valueOf(id);
+      }
+
+      operations.add(
+          ContentProviderOperation.newDelete(AnnotatedCallLog.CONTENT_URI)
+              .withSelection(whereClause, whereArgs)
+              .build());
+    }
+
+    appContext.getContentResolver().applyBatch(AnnotatedCallLogContract.AUTHORITY, operations);
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/annotated_call_log.proto b/java/com/android/dialer/calllog/database/annotated_call_log.proto
new file mode 100644
index 0000000..de2bc5f
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/annotated_call_log.proto
@@ -0,0 +1,15 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+// DIALER_SCRUB.UNCOMMENT_IN_OPEN_SOURCE option optimize_for = LITE_RUNTIME;
+
+package com.android.dialer;
+
+// A list of android.provider.CallLog.Calls.TYPE values ordered from newest to
+// oldest.
+message CallTypes {
+  repeated int32 type = 1;
+}
diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
new file mode 100644
index 0000000..25950f6
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
@@ -0,0 +1,259 @@
+/*
+ * 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.calllog.database.contract;
+
+import android.net.Uri;
+import android.provider.BaseColumns;
+import com.android.dialer.constants.Constants;
+import java.util.Arrays;
+
+/** Contract for the AnnotatedCallLog content provider. */
+public class AnnotatedCallLogContract {
+  public static final String AUTHORITY = Constants.get().getAnnotatedCallLogProviderAuthority();
+
+  public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
+
+  /**
+   * Columns shared by {@link AnnotatedCallLog} and {@link CoalescedAnnotatedCallLog}.
+   *
+   * <p>When adding columns be sure to update {@link #ALL_COMMON_COLUMNS}.
+   */
+  interface CommonColumns extends BaseColumns {
+
+    /**
+     * Timestamp of the entry, in milliseconds.
+     *
+     * <p>Type: INTEGER (long)
+     */
+    String TIMESTAMP = "timestamp";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#CACHED_NAME}.
+     *
+     * <p>This is exactly how it should appear to the user. If the user's locale or name display
+     * preferences change, this column should be rewritten.
+     *
+     * <p>Type: TEXT
+     */
+    String NAME = "name";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#CACHED_FORMATTED_NUMBER}.
+     *
+     * <p>Type: TEXT
+     */
+    String FORMATTED_NUMBER = "formatted_number";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#CACHED_PHOTO_URI}.
+     *
+     * <p>TYPE: TEXT
+     */
+    String PHOTO_URI = "photo_uri";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#CACHED_PHOTO_ID}.
+     *
+     * <p>Type: INTEGER (long)
+     */
+    String PHOTO_ID = "photo_id";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#CACHED_LOOKUP_URI}.
+     *
+     * <p>TYPE: TEXT
+     */
+    String LOOKUP_URI = "lookup_uri";
+
+    // TODO(zachh): If we need to support photos other than local contacts', add a (blob?) column.
+
+    /**
+     * The number type as a string to be displayed to the user, for example "Home" or "Mobile".
+     *
+     * <p>This column should be updated for the appropriate language when the locale changes.
+     *
+     * <p>TYPE: TEXT
+     */
+    String NUMBER_TYPE_LABEL = "number_type_label";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#IS_READ}.
+     *
+     * <p>TYPE: INTEGER (boolean)
+     */
+    String IS_READ = "is_read";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#NEW}.
+     *
+     * <p>Type: INTEGER (boolean)
+     */
+    String NEW = "new";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#GEOCODED_LOCATION}.
+     *
+     * <p>TYPE: TEXT
+     */
+    String GEOCODED_LOCATION = "geocoded_location";
+
+    /**
+     * String suitable for display which indicates the phone account used to make the call.
+     *
+     * <p>TYPE: TEXT
+     */
+    String PHONE_ACCOUNT_LABEL = "phone_account_label";
+
+    /**
+     * The color int for the phone account.
+     *
+     * <p>TYPE: INTEGER (int)
+     */
+    String PHONE_ACCOUNT_COLOR = "phone_account_color";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#FEATURES}.
+     *
+     * <p>TYPE: INTEGER (int)
+     */
+    String FEATURES = "features";
+
+    /**
+     * True if a caller ID data source informed us that this is a business number. This is used to
+     * determine if a generic business avatar should be shown vs. a generic person avatar.
+     *
+     * <p>TYPE: INTEGER (boolean)
+     */
+    String IS_BUSINESS = "is_business";
+
+    /**
+     * True if this was a call to voicemail. This is used to determine if the voicemail avatar
+     * should be displayed.
+     *
+     * <p>TYPE: INTEGER (boolean)
+     */
+    String IS_VOICEMAIL = "is_voicemail";
+
+    String[] ALL_COMMON_COLUMNS =
+        new String[] {
+          _ID,
+          TIMESTAMP,
+          NAME,
+          FORMATTED_NUMBER,
+          PHOTO_URI,
+          PHOTO_ID,
+          LOOKUP_URI,
+          NUMBER_TYPE_LABEL,
+          IS_READ,
+          NEW,
+          GEOCODED_LOCATION,
+          PHONE_ACCOUNT_LABEL,
+          PHONE_ACCOUNT_COLOR,
+          FEATURES,
+          IS_BUSINESS,
+          IS_VOICEMAIL
+        };
+  }
+
+  /**
+   * AnnotatedCallLog table.
+   *
+   * <p>This contains all of the non-coalesced call log entries.
+   */
+  public static final class AnnotatedCallLog implements CommonColumns {
+
+    public static final String TABLE = "AnnotatedCallLog";
+
+    /** The content URI for this table. */
+    public static final Uri CONTENT_URI =
+        Uri.withAppendedPath(AnnotatedCallLogContract.CONTENT_URI, TABLE);
+
+    /** The MIME type of a {@link android.content.ContentProvider#getType(Uri)} single entry. */
+    public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/annotated_call_log";
+
+    /**
+     * The phone number called or number the call came from, encoded as a {@link
+     * com.android.dialer.DialerPhoneNumber} proto. The number may be empty if it was an incoming
+     * call and the number was unknown.
+     *
+     * <p>This column is only present in the annotated call log, and not the coalesced annotated
+     * call log. The coalesced version uses a formatted number string rather than proto bytes.
+     *
+     * <p>Type: BLOB
+     */
+    public static final String NUMBER = "number";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#TYPE}.
+     *
+     * <p>Type: INTEGER (int)
+     */
+    public static final String TYPE = "type";
+  }
+
+  /**
+   * Coalesced view of the AnnotatedCallLog table.
+   *
+   * <p>This is an in-memory view of the {@link AnnotatedCallLog} with some adjacent entries
+   * collapsed.
+   *
+   * <p>When adding columns be sure to update {@link #COLUMNS_ONLY_IN_COALESCED_CALL_LOG}.
+   */
+  public static final class CoalescedAnnotatedCallLog implements CommonColumns {
+
+    public static final String TABLE = "CoalescedAnnotatedCallLog";
+
+    /** The content URI for this table. */
+    public static final Uri CONTENT_URI =
+        Uri.withAppendedPath(AnnotatedCallLogContract.CONTENT_URI, TABLE);
+
+    /** The MIME type of a {@link android.content.ContentProvider#getType(Uri)} single entry. */
+    public static final String CONTENT_ITEM_TYPE =
+        "vnd.android.cursor.item/coalesced_annotated_call_log";
+
+    /**
+     * Number of AnnotatedCallLog rows represented by this CoalescedAnnotatedCallLog row.
+     *
+     * <p>Type: INTEGER
+     */
+    public static final String NUMBER_CALLS = "number_calls";
+
+    /**
+     * The call types of the most recent 3 calls, encoded as a CallTypes proto.
+     *
+     * <p>TYPE: BLOB
+     */
+    public static final String CALL_TYPES = "call_types";
+
+    /**
+     * Columns that are only in the {@link CoalescedAnnotatedCallLog} but not the {@link
+     * AnnotatedCallLog}.
+     */
+    private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG =
+        new String[] {NUMBER_CALLS, CALL_TYPES};
+
+    /** All columns in the {@link CoalescedAnnotatedCallLog}. */
+    public static final String[] ALL_COLUMNS =
+        concat(ALL_COMMON_COLUMNS, COLUMNS_ONLY_IN_COALESCED_CALL_LOG);
+  }
+
+  private static String[] concat(String[] first, String[] second) {
+    String[] result = Arrays.copyOf(first, first.length + second.length);
+    System.arraycopy(second, 0, result, first.length, second.length);
+    return result;
+  }
+}
diff --git a/java/com/android/dialer/calllog/datasources/CallLogDataSource.java b/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
index 13d0b84..3fff3ba 100644
--- a/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
@@ -16,13 +16,39 @@
 
 package com.android.dialer.calllog.datasources;
 
+import android.content.ContentValues;
 import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.MainThread;
 import android.support.annotation.WorkerThread;
-import com.android.dialer.calllog.database.CallLogMutations;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;
+import java.util.List;
 
-/** A source of data for one or more columns in the annotated call log. */
+/**
+ * A source of data for one or more columns in the annotated call log.
+ *
+ * <p>Data sources have three lifecycle operations, which are always called on the same thread and
+ * in the same order for a particular "checkDirtyAndRebuild" cycle. However, not all operations are
+ * always invoked.
+ *
+ * <ol>
+ *   <li>{@link #isDirty(Context)}: Invoked only if the framework doesn't yet know if a rebuild is
+ *       necessary.
+ *   <li>{@link #fill(Context, CallLogMutations)}: Invoked only if the framework determined a
+ *       rebuild is necessary.
+ *   <li>{@link #onSuccessfulFill(Context)}: Invoked if and only if fill was previously called and
+ *       the mutations provided by the previous fill operation succeeded in being applied.
+ * </ol>
+ *
+ * <p>Because {@link #isDirty(Context)} is not always invoked, {@link #fill(Context,
+ * CallLogMutations)} shouldn't rely on any state saved during {@link #isDirty(Context)}. It
+ * <em>is</em> safe to assume that {@link #onSuccessfulFill(Context)} refers to the previous fill
+ * operation.
+ *
+ * <p>The same data source objects may be reused across multiple checkDirtyAndRebuild cycles, so
+ * implementors should take care to clear any internal state at the start of a new cycle.
+ *
+ * <p>{@link #coalesce(List)} may be called from any worker thread at any time.
+ */
 public interface CallLogDataSource {
 
   /**
@@ -35,6 +61,8 @@
    * <p>Most implementations of this method will rely on some sort of last modified timestamp. If it
    * is impossible for a data source to be modified without the dialer application being notified,
    * this method may immediately return false.
+   *
+   * @see CallLogDataSource class doc for complete lifecyle information
    */
   @WorkerThread
   boolean isDirty(Context appContext);
@@ -43,16 +71,39 @@
    * Computes the set of mutations necessary to update the annotated call log with respect to this
    * data source.
    *
+   * @see CallLogDataSource class doc for complete lifecyle information
    * @param mutations the set of mutations which this method should contribute to. Note that it may
    *     contain inserts from the system call log, and these inserts should be modified by each data
    *     source.
    */
   @WorkerThread
-  void fill(
-      Context appContext,
-      SQLiteDatabase readableDatabase,
-      long lastRebuildTimeMillis,
-      CallLogMutations mutations);
+  void fill(Context appContext, CallLogMutations mutations);
+
+  /**
+   * Called after database mutations have been applied to all data sources. This is useful for
+   * saving state such as the timestamp of the last row processed in an underlying database. Note
+   * that all mutations across all data sources are applied in a single transaction.
+   *
+   * @see CallLogDataSource class doc for complete lifecyle information
+   */
+  @WorkerThread
+  void onSuccessfulFill(Context appContext);
+
+  /**
+   * Combines raw annotated call log rows into a single coalesced row.
+   *
+   * <p>May be called by any worker thread at any time so implementations should take care to be
+   * threadsafe. (Ideally no state should be required to implement this.)
+   *
+   * @param individualRowsSortedByTimestampDesc group of fully populated rows from {@link
+   *     AnnotatedCallLogContract.AnnotatedCallLog} which need to be combined for display purposes.
+   *     This method should not modify this list.
+   * @return a partial {@link AnnotatedCallLogContract.CoalescedAnnotatedCallLog} row containing
+   *     only columns which this data source is responsible for, which is the result of aggregating
+   *     {@code individualRowsSortedByTimestampDesc}.
+   */
+  @WorkerThread
+  ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc);
 
   @MainThread
   void registerContentObservers(
diff --git a/java/com/android/dialer/calllog/datasources/CallLogMutations.java b/java/com/android/dialer/calllog/datasources/CallLogMutations.java
new file mode 100644
index 0000000..148601d
--- /dev/null
+++ b/java/com/android/dialer/calllog/datasources/CallLogMutations.java
@@ -0,0 +1,110 @@
+/*
+ * 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.calllog.datasources;
+
+import android.content.ContentValues;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+
+/** A collection of mutations to the annotated call log. */
+public final class CallLogMutations {
+
+  private final ArrayMap<Long, ContentValues> inserts = new ArrayMap<>();
+  private final ArrayMap<Long, ContentValues> updates = new ArrayMap<>();
+  private final ArraySet<Long> deletes = new ArraySet<>();
+
+  /**
+   * @param contentValues an entire row not including the ID
+   * @throws IllegalStateException if this {@link CallLogMutations} already contains an insert,
+   *     update, or delete with the provided id
+   */
+  public void insert(long id, ContentValues contentValues) {
+    Assert.checkArgument(!inserts.containsKey(id), "Can't insert row already scheduled for insert");
+    Assert.checkArgument(!updates.containsKey(id), "Can't insert row scheduled for update");
+    Assert.checkArgument(!deletes.contains(id), "Can't insert row scheduled for delete");
+
+    inserts.put(id, contentValues);
+  }
+
+  /**
+   * Stores a database update using the provided ID and content values. If this {@link
+   * CallLogMutations} object already contains an update with the specified ID, the existing content
+   * values are merged with the provided ones, with the provided ones overwriting the existing ones
+   * for values with the same key.
+   *
+   * @param contentValues the specific columns to update, not including the ID.
+   * @throws IllegalStateException if this {@link CallLogMutations} already contains an insert or
+   *     delete with the provided id
+   */
+  public void update(long id, ContentValues contentValues) {
+    Assert.checkArgument(!inserts.containsKey(id), "Can't update row scheduled for insert");
+    Assert.checkArgument(!deletes.contains(id), "Can't delete row scheduled for delete");
+
+    ContentValues existingContentValues = updates.get(id);
+    if (existingContentValues != null) {
+      existingContentValues.putAll(contentValues);
+    } else {
+      updates.put(id, contentValues);
+    }
+  }
+
+  /**
+   * @throws IllegalStateException if this {@link CallLogMutations} already contains an insert,
+   *     update, or delete with the provided id
+   */
+  public void delete(long id) {
+    Assert.checkArgument(!inserts.containsKey(id), "Can't delete row scheduled for insert");
+    Assert.checkArgument(!updates.containsKey(id), "Can't delete row scheduled for update");
+    Assert.checkArgument(!deletes.contains(id), "Can't delete row already scheduled for delete");
+
+    deletes.add(id);
+  }
+
+  public boolean isEmpty() {
+    return inserts.isEmpty() && updates.isEmpty() && deletes.isEmpty();
+  }
+
+  /**
+   * Get the pending inserts.
+   *
+   * @return the pending inserts where the key is the annotated call log database ID and the values
+   *     are values to be inserted (not including the ID)
+   */
+  public ArrayMap<Long, ContentValues> getInserts() {
+    return inserts;
+  }
+
+  /**
+   * Get the pending updates.
+   *
+   * @return the pending updates where the key is the annotated call log database ID and the values
+   *     are values to be updated (not including the ID)
+   */
+  public ArrayMap<Long, ContentValues> getUpdates() {
+    return updates;
+  }
+
+  /**
+   * Get the pending deletes.
+   *
+   * @return the annotated call log database IDs corresponding to the rows to be deleted
+   */
+  public ArraySet<Long> getDeletes() {
+    return deletes;
+  }
+}
diff --git a/java/com/android/dialer/calllog/datasources/DataSources.java b/java/com/android/dialer/calllog/datasources/DataSources.java
new file mode 100644
index 0000000..911ca3f
--- /dev/null
+++ b/java/com/android/dialer/calllog/datasources/DataSources.java
@@ -0,0 +1,30 @@
+/*
+ * 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.calllog.datasources;
+
+import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
+import java.util.List;
+
+/** Immutable lists of data sources used to populate the annotated call log. */
+public interface DataSources {
+
+  SystemCallLogDataSource getSystemCallLogDataSource();
+
+  List<CallLogDataSource> getDataSourcesIncludingSystemCallLog();
+
+  List<CallLogDataSource> getDataSourcesExcludingSystemCallLog();
+}
diff --git a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
index 355940f..f0384b0 100644
--- a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java
@@ -16,13 +16,14 @@
 
 package com.android.dialer.calllog.datasources.contacts;
 
+import android.content.ContentValues;
 import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.MainThread;
 import android.support.annotation.WorkerThread;
-import com.android.dialer.calllog.database.CallLogMutations;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.CallLogMutations;
 import com.android.dialer.common.Assert;
+import java.util.List;
 import javax.inject.Inject;
 
 /** Responsible for maintaining the contacts related columns in the annotated call log. */
@@ -36,7 +37,7 @@
   public boolean isDirty(Context appContext) {
     Assert.isWorkerThread();
 
-    // TODO: Implementation.
+    // TODO(zachh): Implementation.
     return false;
   }
 
@@ -44,17 +45,26 @@
   @Override
   public void fill(
       Context appContext,
-      SQLiteDatabase readableDatabase,
-      long lastRebuildTimeMillis,
       CallLogMutations mutations) {
     Assert.isWorkerThread();
-    // TODO: Implementation.
+    // TODO(zachh): Implementation.
+  }
+
+  @Override
+  public void onSuccessfulFill(Context appContext) {
+    // TODO(zachh): Implementation.
+  }
+
+  @Override
+  public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
+    // TODO(zachh): Implementation.
+    return new ContentValues();
   }
 
   @MainThread
   @Override
   public void registerContentObservers(
       Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
-    // TODO: Guard against missing permissions during callback registration.
+    // TODO(zachh): Guard against missing permissions during callback registration.
   }
 }
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
index ea6663f..1bdbb8a 100644
--- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
@@ -16,28 +16,59 @@
 
 package com.android.dialer.calllog.datasources.systemcalllog;
 
+import android.Manifest.permission;
+import android.annotation.TargetApi;
+import android.content.ContentValues;
 import android.content.Context;
 import android.database.ContentObserver;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.ColorInt;
 import android.support.annotation.MainThread;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
-import com.android.dialer.calllog.database.CallLogMutations;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import com.android.dialer.CallTypes;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.calllog.datasources.util.RowCombiner;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.android.dialer.theme.R;
 import com.android.dialer.util.PermissionsUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 import javax.inject.Inject;
 
 /**
  * Responsible for defining the rows in the annotated call log and maintaining the columns in it
  * which are derived from the system call log.
  */
+@SuppressWarnings("MissingPermission")
 public class SystemCallLogDataSource implements CallLogDataSource {
 
+  @VisibleForTesting
+  static final String PREF_LAST_TIMESTAMP_PROCESSED = "systemCallLogLastTimestampProcessed";
+
+  @Nullable private Long lastTimestampProcessed;
+
   @Inject
   public SystemCallLogDataSource() {}
 
@@ -47,10 +78,13 @@
       Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
     Assert.isMainThread();
 
+    LogUtil.enterBlock("SystemCallLogDataSource.registerContentObservers");
+
     if (!PermissionsUtil.hasCallLogReadPermissions(appContext)) {
       LogUtil.i("SystemCallLogDataSource.registerContentObservers", "no call log permissions");
       return;
     }
+    // TODO(zachh): Need to somehow register observers if user enables permission after launch?
 
     appContext
         .getContentResolver()
@@ -71,23 +105,328 @@
      * column is unused). This means that we can't detect deletes without scanning the entire table,
      * which would be too slow. So, we just rely on content observers to trigger rebuilds when any
      * change is made to the system call log.
+     *
+     * Just return false unless the table has never been written to.
      */
-    return false;
+    return !PreferenceManager.getDefaultSharedPreferences(appContext)
+        .contains(PREF_LAST_TIMESTAMP_PROCESSED);
   }
 
   @WorkerThread
   @Override
-  public void fill(
-      Context appContext,
-      SQLiteDatabase readableDatabase,
-      long lastRebuildTimeMillis,
-      CallLogMutations mutations) {
+  public void fill(Context appContext, CallLogMutations mutations) {
     Assert.isWorkerThread();
 
-    // This data source should always run first so the mutations should always be empty.
-    Assert.checkState(mutations.isEmpty());
+    lastTimestampProcessed = null;
 
-    // TODO: Implementation.
+    if (!PermissionsUtil.hasPermission(appContext, permission.READ_CALL_LOG)) {
+      LogUtil.i("SystemCallLogDataSource.fill", "no call log permissions");
+      return;
+    }
+
+    // This data source should always run first so the mutations should always be empty.
+    Assert.checkArgument(mutations.isEmpty());
+
+    Set<Long> annotatedCallLogIds = getAnnotatedCallLogIds(appContext);
+
+    LogUtil.i(
+        "SystemCallLogDataSource.fill",
+        "found %d existing annotated call log ids",
+        annotatedCallLogIds.size());
+
+    handleInsertsAndUpdates(appContext, mutations, annotatedCallLogIds);
+    handleDeletes(appContext, annotatedCallLogIds, mutations);
+  }
+
+  @WorkerThread
+  @Override
+  public void onSuccessfulFill(Context appContext) {
+    // If a fill operation was a no-op, lastTimestampProcessed could still be null.
+    if (lastTimestampProcessed != null) {
+      PreferenceManager.getDefaultSharedPreferences(appContext)
+          .edit()
+          .putLong(PREF_LAST_TIMESTAMP_PROCESSED, lastTimestampProcessed)
+          .apply();
+    }
+  }
+
+  @Override
+  public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
+    // TODO(zachh): Complete implementation.
+    ContentValues coalescedValues =
+        new RowCombiner(individualRowsSortedByTimestampDesc)
+            .useMostRecentLong(AnnotatedCallLog.TIMESTAMP)
+            .useMostRecentLong(AnnotatedCallLog.NEW)
+            .useMostRecentString(AnnotatedCallLog.NUMBER_TYPE_LABEL)
+            .useMostRecentString(AnnotatedCallLog.NAME)
+            .useMostRecentString(AnnotatedCallLog.FORMATTED_NUMBER)
+            .useMostRecentString(AnnotatedCallLog.PHOTO_URI)
+            .useMostRecentLong(AnnotatedCallLog.PHOTO_ID)
+            .useMostRecentString(AnnotatedCallLog.LOOKUP_URI)
+            .useMostRecentString(AnnotatedCallLog.GEOCODED_LOCATION)
+            .useSingleValueString(AnnotatedCallLog.PHONE_ACCOUNT_LABEL)
+            .useSingleValueLong(AnnotatedCallLog.PHONE_ACCOUNT_COLOR)
+            .combine();
+
+    CallTypes.Builder callTypes = CallTypes.newBuilder();
+    // Store a maximum of 3 call types since that's all we show to users via icons.
+    for (int i = 0; i < 3 && i < individualRowsSortedByTimestampDesc.size(); i++) {
+      callTypes.addType(
+          individualRowsSortedByTimestampDesc.get(i).getAsInteger(AnnotatedCallLog.TYPE));
+    }
+    coalescedValues.put(CoalescedAnnotatedCallLog.CALL_TYPES, callTypes.build().toByteArray());
+
+    return coalescedValues;
+  }
+
+  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
+  private void handleInsertsAndUpdates(
+      Context appContext, CallLogMutations mutations, Set<Long> existingAnnotatedCallLogIds) {
+    long previousTimestampProcessed =
+        PreferenceManager.getDefaultSharedPreferences(appContext)
+            .getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L);
+
+    DialerPhoneNumberUtil dialerPhoneNumberUtil =
+        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+
+    // TODO(zachh): Really should be getting last 1000 by timestamp, not by last modified.
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                Calls.CONTENT_URI, // Excludes voicemail
+                new String[] {
+                  Calls._ID,
+                  Calls.DATE,
+                  Calls.LAST_MODIFIED,
+                  Calls.NUMBER,
+                  Calls.TYPE,
+                  Calls.COUNTRY_ISO,
+                  Calls.CACHED_NAME,
+                  Calls.CACHED_FORMATTED_NUMBER,
+                  Calls.CACHED_PHOTO_URI,
+                  Calls.CACHED_PHOTO_ID,
+                  Calls.CACHED_LOOKUP_URI,
+                  Calls.CACHED_NUMBER_TYPE,
+                  Calls.CACHED_NUMBER_LABEL,
+                  Calls.IS_READ,
+                  Calls.NEW,
+                  Calls.GEOCODED_LOCATION,
+                  Calls.PHONE_ACCOUNT_COMPONENT_NAME,
+                  Calls.PHONE_ACCOUNT_ID,
+                  Calls.FEATURES
+                },
+                Calls.LAST_MODIFIED + " > ?",
+                new String[] {String.valueOf(previousTimestampProcessed)},
+                Calls.LAST_MODIFIED + " DESC LIMIT 1000")) {
+
+      if (cursor == null) {
+        LogUtil.e("SystemCallLogDataSource.handleInsertsAndUpdates", "null cursor");
+        return;
+      }
+
+      LogUtil.i(
+          "SystemCallLogDataSource.handleInsertsAndUpdates",
+          "found %d entries to insert/update",
+          cursor.getCount());
+
+      if (cursor.moveToFirst()) {
+        int idColumn = cursor.getColumnIndexOrThrow(Calls._ID);
+        int dateColumn = cursor.getColumnIndexOrThrow(Calls.DATE);
+        int lastModifiedColumn = cursor.getColumnIndexOrThrow(Calls.LAST_MODIFIED);
+        int numberColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER);
+        int typeColumn = cursor.getColumnIndexOrThrow(Calls.TYPE);
+        int countryIsoColumn = cursor.getColumnIndexOrThrow(Calls.COUNTRY_ISO);
+        int cachedNameColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_NAME);
+        int cachedFormattedNumberColumn =
+            cursor.getColumnIndexOrThrow(Calls.CACHED_FORMATTED_NUMBER);
+        int cachedPhotoUriColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_PHOTO_URI);
+        int cachedPhotoIdColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_PHOTO_ID);
+        int cachedLookupUriColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_LOOKUP_URI);
+        int cachedNumberTypeColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_NUMBER_TYPE);
+        int cachedNumberLabelColumn = cursor.getColumnIndexOrThrow(Calls.CACHED_NUMBER_LABEL);
+        int isReadColumn = cursor.getColumnIndexOrThrow(Calls.IS_READ);
+        int newColumn = cursor.getColumnIndexOrThrow(Calls.NEW);
+        int geocodedLocationColumn = cursor.getColumnIndexOrThrow(Calls.GEOCODED_LOCATION);
+        int phoneAccountComponentColumn =
+            cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_COMPONENT_NAME);
+        int phoneAccountIdColumn = cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_ID);
+        int featuresColumn = cursor.getColumnIndexOrThrow(Calls.FEATURES);
+
+        // The cursor orders by LAST_MODIFIED DESC, so the first result is the most recent timestamp
+        // processed.
+        lastTimestampProcessed = cursor.getLong(lastModifiedColumn);
+        do {
+          long id = cursor.getLong(idColumn);
+          long date = cursor.getLong(dateColumn);
+          String numberAsStr = cursor.getString(numberColumn);
+          long type = cursor.getInt(typeColumn);
+          String countryIso = cursor.getString(countryIsoColumn);
+          String cachedName = cursor.getString(cachedNameColumn);
+          String formattedNumber = cursor.getString(cachedFormattedNumberColumn);
+          String cachedPhotoUri = cursor.getString(cachedPhotoUriColumn);
+          long cachedPhotoId = cursor.getLong(cachedPhotoIdColumn);
+          String cachedLookupUri = cursor.getString(cachedLookupUriColumn);
+          int cachedNumberType = cursor.getInt(cachedNumberTypeColumn);
+          String cachedNumberLabel = cursor.getString(cachedNumberLabelColumn);
+          int isRead = cursor.getInt(isReadColumn);
+          int isNew = cursor.getInt(newColumn);
+          String geocodedLocation = cursor.getString(geocodedLocationColumn);
+          String phoneAccountComponentName = cursor.getString(phoneAccountComponentColumn);
+          String phoneAccountId = cursor.getString(phoneAccountIdColumn);
+          int features = cursor.getInt(featuresColumn);
+
+          ContentValues contentValues = new ContentValues();
+          contentValues.put(AnnotatedCallLog.TIMESTAMP, date);
+
+          if (!TextUtils.isEmpty(numberAsStr)) {
+            byte[] numberAsProtoBytes =
+                dialerPhoneNumberUtil.parse(numberAsStr, countryIso).toByteArray();
+            // TODO(zachh): Need to handle post-dial digits; different on N and M.
+            contentValues.put(AnnotatedCallLog.NUMBER, numberAsProtoBytes);
+          }
+
+          contentValues.put(AnnotatedCallLog.TYPE, type);
+          contentValues.put(AnnotatedCallLog.NAME, cachedName);
+          contentValues.put(AnnotatedCallLog.FORMATTED_NUMBER, formattedNumber);
+          contentValues.put(AnnotatedCallLog.PHOTO_URI, cachedPhotoUri);
+          contentValues.put(AnnotatedCallLog.PHOTO_ID, cachedPhotoId);
+          contentValues.put(AnnotatedCallLog.LOOKUP_URI, cachedLookupUri);
+
+          // Phone.getTypeLabel returns "Custom" if given (0, null) which is not of any use. Just
+          // omit setting the label if there's no information for it.
+          if (cachedNumberType != 0 || cachedNumberLabel != null) {
+            contentValues.put(
+                AnnotatedCallLog.NUMBER_TYPE_LABEL,
+                Phone.getTypeLabel(appContext.getResources(), cachedNumberType, cachedNumberLabel)
+                    .toString());
+          }
+          contentValues.put(AnnotatedCallLog.IS_READ, isRead);
+          contentValues.put(AnnotatedCallLog.NEW, isNew);
+          contentValues.put(AnnotatedCallLog.GEOCODED_LOCATION, geocodedLocation);
+          populatePhoneAccountLabelAndColor(
+              appContext, contentValues, phoneAccountComponentName, phoneAccountId);
+          contentValues.put(AnnotatedCallLog.FEATURES, features);
+
+          if (existingAnnotatedCallLogIds.contains(id)) {
+            mutations.update(id, contentValues);
+          } else {
+            mutations.insert(id, contentValues);
+          }
+        } while (cursor.moveToNext());
+      } // else no new results, do nothing.
+    }
+  }
+
+  private void populatePhoneAccountLabelAndColor(
+      Context appContext,
+      ContentValues contentValues,
+      String phoneAccountComponentName,
+      String phoneAccountId) {
+    PhoneAccountHandle phoneAccountHandle =
+        PhoneAccountUtils.getAccount(phoneAccountComponentName, phoneAccountId);
+    if (phoneAccountHandle == null) {
+      return;
+    }
+    String label = PhoneAccountUtils.getAccountLabel(appContext, phoneAccountHandle);
+    if (TextUtils.isEmpty(label)) {
+      return;
+    }
+    contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_LABEL, label);
+
+    @ColorInt int color = PhoneAccountUtils.getAccountColor(appContext, phoneAccountHandle);
+    if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) {
+      color =
+          appContext
+              .getResources()
+              .getColor(R.color.dialer_secondary_text_color, appContext.getTheme());
+    }
+    contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_COLOR, color);
+  }
+
+  private static void handleDeletes(
+      Context appContext, Set<Long> existingAnnotatedCallLogIds, CallLogMutations mutations) {
+    Set<Long> systemCallLogIds =
+        getIdsFromSystemCallLogThatMatch(appContext, existingAnnotatedCallLogIds);
+    LogUtil.i(
+        "SystemCallLogDataSource.handleDeletes",
+        "found %d matching entries in system call log",
+        systemCallLogIds.size());
+    Set<Long> idsInAnnotatedCallLogNoLongerInSystemCallLog = new ArraySet<>();
+    idsInAnnotatedCallLogNoLongerInSystemCallLog.addAll(existingAnnotatedCallLogIds);
+    idsInAnnotatedCallLogNoLongerInSystemCallLog.removeAll(systemCallLogIds);
+
+    LogUtil.i(
+        "SystemCallLogDataSource.handleDeletes",
+        "found %d call log entries to remove",
+        idsInAnnotatedCallLogNoLongerInSystemCallLog.size());
+
+    for (long id : idsInAnnotatedCallLogNoLongerInSystemCallLog) {
+      mutations.delete(id);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
+  private static Set<Long> getAnnotatedCallLogIds(Context appContext) {
+    ArraySet<Long> ids = new ArraySet<>();
+
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                AnnotatedCallLog.CONTENT_URI,
+                new String[] {AnnotatedCallLog._ID},
+                null,
+                null,
+                null)) {
+
+      if (cursor == null) {
+        LogUtil.e("SystemCallLogDataSource.getAnnotatedCallLogIds", "null cursor");
+        return ids;
+      }
+
+      if (cursor.moveToFirst()) {
+        int idColumn = cursor.getColumnIndexOrThrow(AnnotatedCallLog._ID);
+        do {
+          ids.add(cursor.getLong(idColumn));
+        } while (cursor.moveToNext());
+      }
+    }
+    return ids;
+  }
+
+  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
+  private static Set<Long> getIdsFromSystemCallLogThatMatch(
+      Context appContext, Set<Long> matchingIds) {
+    ArraySet<Long> ids = new ArraySet<>();
+
+    String[] questionMarks = new String[matchingIds.size()];
+    Arrays.fill(questionMarks, "?");
+    String whereClause = (Calls._ID + " in (") + TextUtils.join(",", questionMarks) + ")";
+    String[] whereArgs = new String[matchingIds.size()];
+    int i = 0;
+    for (long id : matchingIds) {
+      whereArgs[i++] = String.valueOf(id);
+    }
+
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(Calls.CONTENT_URI, new String[] {Calls._ID}, whereClause, whereArgs, null)) {
+
+      if (cursor == null) {
+        LogUtil.e("SystemCallLogDataSource.getIdsFromSystemCallLog", "null cursor");
+        return ids;
+      }
+
+      if (cursor.moveToFirst()) {
+        int idColumn = cursor.getColumnIndexOrThrow(Calls._ID);
+        do {
+          ids.add(cursor.getLong(idColumn));
+        } while (cursor.moveToNext());
+      }
+      return ids;
+    }
   }
 
   private static class CallLogObserver extends ContentObserver {
diff --git a/java/com/android/dialer/calllog/datasources/util/RowCombiner.java b/java/com/android/dialer/calllog/datasources/util/RowCombiner.java
new file mode 100644
index 0000000..adb7a07
--- /dev/null
+++ b/java/com/android/dialer/calllog/datasources/util/RowCombiner.java
@@ -0,0 +1,73 @@
+/*
+ * 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.calllog.datasources.util;
+
+import android.content.ContentValues;
+import com.android.dialer.common.Assert;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/** Convenience class for aggregating row values. */
+public class RowCombiner {
+  private final List<ContentValues> individualRowsSortedByTimestampDesc;
+  private final ContentValues combinedRow = new ContentValues();
+
+  public RowCombiner(List<ContentValues> individualRowsSortedByTimestampDesc) {
+    Assert.checkArgument(!individualRowsSortedByTimestampDesc.isEmpty());
+    this.individualRowsSortedByTimestampDesc = individualRowsSortedByTimestampDesc;
+  }
+
+  /** Use the most recent value for the specified column. */
+  public RowCombiner useMostRecentLong(String columnName) {
+    combinedRow.put(columnName, individualRowsSortedByTimestampDesc.get(0).getAsLong(columnName));
+    return this;
+  }
+
+  /** Use the most recent value for the specified column. */
+  public RowCombiner useMostRecentString(String columnName) {
+    combinedRow.put(columnName, individualRowsSortedByTimestampDesc.get(0).getAsString(columnName));
+    return this;
+  }
+
+  /** Asserts that all column values for the given column name are the same, and uses it. */
+  public RowCombiner useSingleValueString(String columnName) {
+    Iterator<ContentValues> iterator = individualRowsSortedByTimestampDesc.iterator();
+    String singleValue = iterator.next().getAsString(columnName);
+    while (iterator.hasNext()) {
+      String current = iterator.next().getAsString(columnName);
+      Assert.checkState(Objects.equals(singleValue, current), "Values different for " + columnName);
+    }
+    combinedRow.put(columnName, singleValue);
+    return this;
+  }
+
+  /** Asserts that all column values for the given column name are the same, and uses it. */
+  public RowCombiner useSingleValueLong(String columnName) {
+    Iterator<ContentValues> iterator = individualRowsSortedByTimestampDesc.iterator();
+    Long singleValue = iterator.next().getAsLong(columnName);
+    while (iterator.hasNext()) {
+      Long current = iterator.next().getAsLong(columnName);
+      Assert.checkState(Objects.equals(singleValue, current), "Values different for " + columnName);
+    }
+    combinedRow.put(columnName, singleValue);
+    return this;
+  }
+
+  public ContentValues combine() {
+    return combinedRow;
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/AndroidManifest.xml b/java/com/android/dialer/calllog/ui/AndroidManifest.xml
index 2281677..eaf71ab 100644
--- a/java/com/android/dialer/calllog/ui/AndroidManifest.xml
+++ b/java/com/android/dialer/calllog/ui/AndroidManifest.xml
@@ -13,4 +13,4 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest package="com.android.dialer.calllog"/>
+<manifest package="com.android.dialer.calllog.ui"/>
diff --git a/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java b/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java
deleted file mode 100644
index cd8622e..0000000
--- a/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.calllog.ui;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.CursorLoader;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
-import com.android.dialer.calllog.database.AnnotatedCallLog;
-import com.android.dialer.calllog.database.AnnotatedCallLog.Columns;
-
-/** CursorLoader which reads the annotated call log. */
-class AnnotatedCallLogCursorLoader extends CursorLoader {
-
-  AnnotatedCallLogCursorLoader(Context context) {
-    super(context);
-  }
-
-  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
-  @Override
-  public Cursor loadInBackground() {
-    try (SQLiteDatabase readableDatabase = AnnotatedCallLog.getReadableDatabase(getContext())) {
-      return readableDatabase.rawQuery(
-          "SELECT * FROM "
-              + AnnotatedCallLog.TABLE_NAME
-              + " ORDER BY "
-              + Columns.TIMESTAMP
-              + " DESC",
-          null /* selectionArgs */);
-    }
-  }
-}
diff --git a/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java b/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
new file mode 100644
index 0000000..d893383
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
@@ -0,0 +1,151 @@
+/*
+ * 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.calllog.ui;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.v4.content.CursorLoader;
+import com.android.dialer.CallTypes;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
+import com.android.dialer.common.Assert;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+/** CursorLoader for the coalesced annotated call log. */
+final class CoalescedAnnotatedCallLogCursorLoader extends CursorLoader {
+
+  /** Indexes for CoalescedAnnotatedCallLog.ALL_COLUMNS */
+  private static final int ID = 0;
+
+  private static final int TIMESTAMP = 1;
+  private static final int NAME = 2;
+  private static final int FORMATTED_NUMBER = 3;
+  private static final int PHOTO_URI = 4;
+  private static final int PHOTO_ID = 5;
+  private static final int LOOKUP_URI = 6;
+  private static final int NUMBER_TYPE_LABEL = 7;
+  private static final int IS_READ = 8;
+  private static final int NEW = 9;
+  private static final int GEOCODED_LOCATION = 10;
+  private static final int PHONE_ACCOUNT_LABEL = 11;
+  private static final int PHONE_ACCOUNT_COLOR = 12;
+  private static final int FEATURES = 13;
+  private static final int IS_BUSINESS = 14;
+  private static final int IS_VOICEMAIL = 15;
+  private static final int NUMBER_CALLS = 16;
+  private static final int CALL_TYPES = 17;
+
+  /** Convenience class for accessing values using an abbreviated syntax. */
+  static final class Row {
+    private final Cursor cursor;
+
+    Row(Cursor cursor) {
+      this.cursor = cursor;
+    }
+
+    long id() {
+      return cursor.getInt(ID);
+    }
+
+    long timestamp() {
+      return cursor.getLong(TIMESTAMP);
+    }
+
+    String name() {
+      return cursor.getString(NAME);
+    }
+
+    String formattedNumber() {
+      return cursor.getString(FORMATTED_NUMBER);
+    }
+
+    String photoUri() {
+      return cursor.getString(PHOTO_URI);
+    }
+
+    long photoId() {
+      return cursor.getLong(PHOTO_ID);
+    }
+
+    String lookupUri() {
+      return cursor.getString(LOOKUP_URI);
+    }
+
+    String numberTypeLabel() {
+      return cursor.getString(NUMBER_TYPE_LABEL);
+    }
+
+    boolean isRead() {
+      return cursor.getInt(IS_READ) == 1;
+    }
+
+    boolean isNew() {
+      return cursor.getInt(NEW) == 1;
+    }
+
+    String geocodedLocation() {
+      return cursor.getString(GEOCODED_LOCATION);
+    }
+
+    String phoneAccountLabel() {
+      return cursor.getString(PHONE_ACCOUNT_LABEL);
+    }
+
+    @ColorInt
+    int phoneAccountColor() {
+      return cursor.getInt(PHONE_ACCOUNT_COLOR);
+    }
+
+    int features() {
+      return cursor.getInt(FEATURES);
+    }
+
+    boolean isBusiness() {
+      return cursor.getInt(IS_BUSINESS) == 1;
+    }
+
+    boolean isVoicemail() {
+      return cursor.getInt(IS_VOICEMAIL) == 1;
+    }
+
+    int numberCalls() {
+      return cursor.getInt(NUMBER_CALLS);
+    }
+
+    @NonNull
+    CallTypes callTypes() {
+      try {
+        return CallTypes.parseFrom(cursor.getBlob(CALL_TYPES));
+      } catch (InvalidProtocolBufferException e) {
+        throw Assert.createAssertionFailException("Couldn't parse call types", e);
+      }
+    }
+  }
+
+  CoalescedAnnotatedCallLogCursorLoader(Context context) {
+    // CoalescedAnnotatedCallLog requires that PROJECTION be ALL_COLUMNS and the following params be
+    // null.
+    super(
+        context,
+        CoalescedAnnotatedCallLog.CONTENT_URI,
+        CoalescedAnnotatedCallLog.ALL_COLUMNS,
+        null,
+        null,
+        null);
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/HeaderViewHolder.java b/java/com/android/dialer/calllog/ui/HeaderViewHolder.java
new file mode 100644
index 0000000..e4fe029
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/HeaderViewHolder.java
@@ -0,0 +1,36 @@
+/*
+ * 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.calllog.ui;
+
+import android.support.annotation.StringRes;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.View;
+import android.widget.TextView;
+
+/** ViewHolder for {@link NewCallLogAdapter} to display "Today" or "Older" divider row. */
+final class HeaderViewHolder extends ViewHolder {
+
+  private TextView headerTextView;
+
+  HeaderViewHolder(View view) {
+    super(view);
+    headerTextView = view.findViewById(R.id.new_call_log_header_text);
+  }
+
+  void setHeader(@StringRes int header) {
+    headerTextView.setText(header);
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
new file mode 100644
index 0000000..b922a6e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
@@ -0,0 +1,155 @@
+/*
+ * 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.calllog.ui;
+
+import android.database.Cursor;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import com.android.dialer.calllogutils.CallLogDates;
+import com.android.dialer.common.Assert;
+import com.android.dialer.time.Clock;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** {@link RecyclerView.Adapter} for the new call log fragment. */
+final class NewCallLogAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+  /** IntDef for the different types of rows that can be shown in the call log. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({RowType.HEADER_TODAY, RowType.HEADER_OLDER, RowType.CALL_LOG_ENTRY})
+  @interface RowType {
+    /** Header that displays "Today". */
+    int HEADER_TODAY = 1;
+    /** Header that displays "Older". */
+    int HEADER_OLDER = 2;
+    /** A row representing a call log entry (which could represent one or more calls). */
+    int CALL_LOG_ENTRY = 3;
+  }
+
+  private final Cursor cursor;
+  private final Clock clock;
+
+  /** Null when the "Today" header should not be displayed. */
+  @Nullable private final Integer todayHeaderPosition;
+  /** Null when the "Older" header should not be displayed. */
+  @Nullable private final Integer olderHeaderPosition;
+
+  NewCallLogAdapter(Cursor cursor, Clock clock) {
+    this.cursor = cursor;
+    this.clock = clock;
+
+    // Calculate header adapter positions by reading cursor.
+    long currentTimeMillis = clock.currentTimeMillis();
+    if (cursor.moveToNext()) {
+      CoalescedAnnotatedCallLogCursorLoader.Row firstRow =
+          new CoalescedAnnotatedCallLogCursorLoader.Row(cursor);
+      if (CallLogDates.isSameDay(currentTimeMillis, firstRow.timestamp())) {
+        this.todayHeaderPosition = 0;
+        int adapterPosition = 2; // Accounted for "Today" header and first row.
+        while (cursor.moveToNext()) {
+          CoalescedAnnotatedCallLogCursorLoader.Row row =
+              new CoalescedAnnotatedCallLogCursorLoader.Row(cursor);
+          if (CallLogDates.isSameDay(currentTimeMillis, row.timestamp())) {
+            adapterPosition++;
+          } else {
+            this.olderHeaderPosition = adapterPosition;
+            return;
+          }
+        }
+        this.olderHeaderPosition = null; // Didn't find any "Older" rows.
+      } else {
+        this.todayHeaderPosition = null; // Didn't find any "Today" rows.
+        this.olderHeaderPosition = 0;
+      }
+    } else { // There are no rows, just need to set these because they are final.
+      this.todayHeaderPosition = null;
+      this.olderHeaderPosition = null;
+    }
+  }
+
+  @Override
+  public ViewHolder onCreateViewHolder(ViewGroup viewGroup, @RowType int viewType) {
+    switch (viewType) {
+      case RowType.HEADER_TODAY:
+      case RowType.HEADER_OLDER:
+        return new HeaderViewHolder(
+            LayoutInflater.from(viewGroup.getContext())
+                .inflate(R.layout.new_call_log_header, viewGroup, false));
+      case RowType.CALL_LOG_ENTRY:
+        return new NewCallLogViewHolder(
+            LayoutInflater.from(viewGroup.getContext())
+                .inflate(R.layout.new_call_log_entry, viewGroup, false),
+            clock);
+      default:
+        throw Assert.createUnsupportedOperationFailException("Unsupported view type: " + viewType);
+    }
+  }
+
+  @Override
+  public void onBindViewHolder(ViewHolder viewHolder, int position) {
+    if (viewHolder instanceof HeaderViewHolder) {
+      HeaderViewHolder headerViewHolder = (HeaderViewHolder) viewHolder;
+      @RowType int viewType = getItemViewType(position);
+      if (viewType == RowType.HEADER_OLDER) {
+        headerViewHolder.setHeader(R.string.new_call_log_header_older);
+      } else if (viewType == RowType.HEADER_TODAY) {
+        headerViewHolder.setHeader(R.string.new_call_log_header_today);
+      } else {
+        throw Assert.createIllegalStateFailException(
+            "Unexpected view type " + viewType + " at position: " + position);
+      }
+      return;
+    }
+    NewCallLogViewHolder newCallLogViewHolder = (NewCallLogViewHolder) viewHolder;
+    int previousHeaders = 0;
+    if (todayHeaderPosition != null && position > todayHeaderPosition) {
+      previousHeaders++;
+    }
+    if (olderHeaderPosition != null && position > olderHeaderPosition) {
+      previousHeaders++;
+    }
+    cursor.moveToPosition(position - previousHeaders);
+    newCallLogViewHolder.bind(cursor);
+  }
+
+  @Override
+  @RowType
+  public int getItemViewType(int position) {
+    if (todayHeaderPosition != null && position == todayHeaderPosition) {
+      return RowType.HEADER_TODAY;
+    }
+    if (olderHeaderPosition != null && position == olderHeaderPosition) {
+      return RowType.HEADER_OLDER;
+    }
+    return RowType.CALL_LOG_ENTRY;
+  }
+
+  @Override
+  public int getItemCount() {
+    int numberOfHeaders = 0;
+    if (todayHeaderPosition != null) {
+      numberOfHeaders++;
+    }
+    if (olderHeaderPosition != null) {
+      numberOfHeaders++;
+    }
+    return cursor.getCount() + numberOfHeaders;
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
index b8f2b13..ab73813 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
@@ -15,32 +15,38 @@
  */
 package com.android.dialer.calllog.ui;
 
-import android.app.Fragment;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.Context;
-import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.ListView;
-import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.CallLogFramework;
 import com.android.dialer.calllog.CallLogFramework.CallLogUi;
-import com.android.dialer.calllog.database.AnnotatedCallLog.Columns;
 import com.android.dialer.common.LogUtil;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.DialerExecutorFactory;
 
 /** The "new" call log fragment implementation, which is built on top of the annotated call log. */
 public final class NewCallLogFragment extends Fragment
     implements CallLogUi, LoaderCallbacks<Cursor> {
 
-  private CursorAdapter cursorAdapter;
+  /*
+   * This is a reasonable time that it might take between related call log writes, that also
+   * shouldn't slow down single-writes too much. For example, when populating the database using
+   * the simulator, using this value results in ~6 refresh cycles (on a release build) to write 120
+   * call log entries.
+   */
+  private static final long WAIT_MILLIS = 100L;
+
+  private DialerExecutor<Boolean> refreshAnnotatedCallLogTask;
+  private RecyclerView recyclerView;
 
   public NewCallLogFragment() {
     LogUtil.enterBlock("NewCallLogFragment.NewCallLogFragment");
@@ -52,8 +58,28 @@
 
     LogUtil.enterBlock("NewCallLogFragment.onCreate");
 
-    CallLogFramework callLogFramework = CallLogComponent.get(getContext()).callLogFramework();
+    CallLogComponent component = CallLogComponent.get(getContext());
+    CallLogFramework callLogFramework = component.callLogFramework();
     callLogFramework.attachUi(this);
+
+    DialerExecutorFactory dialerExecutorFactory =
+        DialerExecutorComponent.get(getContext()).dialerExecutorFactory();
+
+    // TODO(zachh): Use support fragment manager and add support for them in executors library.
+    refreshAnnotatedCallLogTask =
+        dialerExecutorFactory
+            .createUiTaskBuilder(
+                getActivity().getFragmentManager(),
+                "NewCallLogFragment.refreshAnnotatedCallLog",
+                component.getRefreshAnnotatedCallLogWorker())
+            .build();
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+
+    LogUtil.enterBlock("NewCallLogFragment.onStart");
   }
 
   @Override
@@ -64,6 +90,9 @@
 
     CallLogFramework callLogFramework = CallLogComponent.get(getContext()).callLogFramework();
     callLogFramework.attachUi(this);
+
+    // TODO(zachh): Consider doing this when fragment becomes visible.
+    checkAnnotatedCallLogDirtyAndRefreshIfNecessary();
   }
 
   @Override
@@ -82,57 +111,48 @@
     LogUtil.enterBlock("NewCallLogFragment.onCreateView");
 
     View view = inflater.inflate(R.layout.new_call_log_fragment, container, false);
-    ListView listView = (ListView) view.findViewById(R.id.list);
+    recyclerView = view.findViewById(R.id.new_call_log_recycler_view);
 
-    this.cursorAdapter =
-        new MyCursorAdapter(
-            getContext(),
-            R.layout.new_call_log_entry,
-            null /* cursor */,
-            new String[] {Columns.TIMESTAMP, Columns.CONTACT_NAME},
-            new int[] {R.id.timestamp, R.id.contact_name},
-            0);
-    listView.setAdapter(cursorAdapter);
-
-    getLoaderManager().initLoader(0, null, this);
+    getLoaderManager().restartLoader(0, null, this);
 
     return view;
   }
 
+  private void checkAnnotatedCallLogDirtyAndRefreshIfNecessary() {
+    LogUtil.enterBlock("NewCallLogFragment.checkAnnotatedCallLogDirtyAndRefreshIfNecessary");
+    refreshAnnotatedCallLogTask.executeSerialWithWait(false /* skipDirtyCheck */, WAIT_MILLIS);
+  }
+
   @Override
   public void invalidateUi() {
     LogUtil.enterBlock("NewCallLogFragment.invalidateUi");
-    // TODO: Implementation.
+    refreshAnnotatedCallLogTask.executeSerialWithWait(true /* skipDirtyCheck */, WAIT_MILLIS);
   }
 
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    // TODO: This is sort of weird, do we need to implement a content provider?
-    return new AnnotatedCallLogCursorLoader(getContext());
+    LogUtil.enterBlock("NewCallLogFragment.onCreateLoader");
+    return new CoalescedAnnotatedCallLogCursorLoader(getContext());
   }
 
   @Override
   public void onLoadFinished(Loader<Cursor> loader, Cursor newCursor) {
-    cursorAdapter.swapCursor(newCursor);
+    LogUtil.enterBlock("NewCallLogFragment.onLoadFinished");
+
+    if (newCursor == null) {
+      // This might be possible when the annotated call log hasn't been created but we're trying
+      // to show the call log.
+      LogUtil.w("NewCallLogFragment.onLoadFinished", "null cursor");
+      return;
+    }
+    // TODO(zachh): Handle empty cursor by showing empty view.
+    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+    recyclerView.setAdapter(new NewCallLogAdapter(newCursor, System::currentTimeMillis));
   }
 
   @Override
   public void onLoaderReset(Loader<Cursor> loader) {
-    cursorAdapter.swapCursor(null);
-  }
-
-  private static class MyCursorAdapter extends SimpleCursorAdapter {
-
-    MyCursorAdapter(Context context, int layout, Cursor c, String[] from, int[] to, int flags) {
-      super(context, layout, c, from, to, flags);
-    }
-
-    @Override
-    public void setViewText(TextView view, String text) {
-      if (view.getId() == R.id.timestamp) {
-        text = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US).format(Long.valueOf(text));
-      }
-      view.setText(text);
-    }
+    LogUtil.enterBlock("NewCallLogFragment.onLoaderReset");
+    recyclerView.setAdapter(null);
   }
 }
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
new file mode 100644
index 0000000..e198a38
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
@@ -0,0 +1,175 @@
+/*
+ * 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.calllog.ui;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.CallLog.Calls;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.dialer.calllog.ui.CoalescedAnnotatedCallLogCursorLoader.Row;
+import com.android.dialer.calllogutils.CallLogDates;
+import com.android.dialer.calllogutils.CallTypeIconsView;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.time.Clock;
+import java.util.Locale;
+
+/** {@link RecyclerView.ViewHolder} for the new call log. */
+final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
+
+  private final Context context;
+  private final TextView primaryTextView;
+  private final TextView secondaryTextView;
+  private final QuickContactBadge quickContactBadge;
+  private final CallTypeIconsView primaryCallTypeIconsView; // Used for Wifi, HD icons
+  private final CallTypeIconsView secondaryCallTypeIconsView; // Used for call types
+  private final TextView phoneAccountView;
+  private final Clock clock;
+
+  NewCallLogViewHolder(View view, Clock clock) {
+    super(view);
+    this.context = view.getContext();
+    primaryTextView = view.findViewById(R.id.primary_text);
+    secondaryTextView = view.findViewById(R.id.secondary_text);
+    quickContactBadge = view.findViewById(R.id.quick_contact_photo);
+    primaryCallTypeIconsView = view.findViewById(R.id.primary_call_type_icons);
+    secondaryCallTypeIconsView = view.findViewById(R.id.secondary_call_type_icons);
+    phoneAccountView = view.findViewById(R.id.phone_account);
+    this.clock = clock;
+  }
+
+  /** @param cursor a cursor from {@link CoalescedAnnotatedCallLogCursorLoader}. */
+  void bind(Cursor cursor) {
+    CoalescedAnnotatedCallLogCursorLoader.Row row =
+        new CoalescedAnnotatedCallLogCursorLoader.Row(cursor);
+
+    // TODO(zachh): Handle RTL properly.
+    primaryTextView.setText(buildPrimaryText(row));
+    secondaryTextView.setText(buildSecondaryText(row));
+
+    if (row.isNew()) {
+      // TODO(zachh): Figure out correct styling for new/missed/unread calls.
+      primaryTextView.setTextAppearance(R.style.primary_textview_new_call);
+      // TODO(zachh): Styling for call type icons when the call is new.
+      secondaryTextView.setTextAppearance(R.style.secondary_textview_new_call);
+    }
+
+    setPhoto(row);
+    setPrimaryCallTypes(row);
+    setSecondaryCallTypes(row);
+    setPhoneAccounts(row);
+  }
+
+  private String buildPrimaryText(CoalescedAnnotatedCallLogCursorLoader.Row row) {
+    StringBuilder primaryText = new StringBuilder();
+    if (!TextUtils.isEmpty(row.name())) {
+      primaryText.append(row.name());
+    } else if (!TextUtils.isEmpty(row.formattedNumber())) {
+      primaryText.append(row.formattedNumber());
+    } else {
+      // TODO(zachh): Handle CallLog.Calls.PRESENTATION_*, including Verizon restricted numbers.
+      primaryText.append(context.getText(R.string.new_call_log_unknown));
+    }
+    if (row.numberCalls() > 1) {
+      primaryText.append(String.format(Locale.getDefault(), " (%d)", row.numberCalls()));
+    }
+    return primaryText.toString();
+  }
+
+  private String buildSecondaryText(CoalescedAnnotatedCallLogCursorLoader.Row row) {
+    /*
+     * Rules: (Duo video, )?$Label|$Location • Date
+     *
+     * Examples:
+     *   Duo Video, Mobile • Now
+     *   Duo Video • 11:45pm
+     *   Mobile • 11:45pm
+     *   Mobile • Sunday
+     *   Brooklyn, NJ • Jan 15
+     *
+     * Date rules:
+     *   if < 1 minute ago: "Now"; else if today: HH:MM(am|pm); else if < 3 days: day; else: MON D
+     */
+    StringBuilder secondaryText = new StringBuilder();
+    if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
+      // TODO(zachh): Add "Duo" prefix?
+      secondaryText.append(context.getText(R.string.new_call_log_video));
+    }
+    String numberTypeLabel = row.numberTypeLabel();
+    if (!TextUtils.isEmpty(numberTypeLabel)) {
+      if (secondaryText.length() > 0) {
+        secondaryText.append(", ");
+      }
+      secondaryText.append(numberTypeLabel);
+    } else { // If there's a number type label, don't show the location.
+      String location = row.geocodedLocation();
+      if (!TextUtils.isEmpty(location)) {
+        if (secondaryText.length() > 0) {
+          secondaryText.append(", ");
+        }
+        secondaryText.append(location);
+      }
+    }
+    if (secondaryText.length() > 0) {
+      secondaryText.append(" • ");
+    }
+    secondaryText.append(
+        CallLogDates.newCallLogTimestampLabel(context, clock.currentTimeMillis(), row.timestamp()));
+    return secondaryText.toString();
+  }
+
+  private void setPhoto(Row row) {
+    // TODO(zachh): Set the contact type.
+    ContactPhotoManager.getInstance(context)
+        .loadDialerThumbnailOrPhoto(
+            quickContactBadge,
+            row.lookupUri() == null ? null : Uri.parse(row.lookupUri()),
+            row.photoId(),
+            row.photoUri() == null ? null : Uri.parse(row.photoUri()),
+            row.name(),
+            LetterTileDrawable.TYPE_DEFAULT);
+  }
+
+  private void setPrimaryCallTypes(Row row) {
+    // Only HD and Wifi icons are shown following the primary text.
+    primaryCallTypeIconsView.setShowHd(
+        MotorolaUtils.shouldShowHdIconInCallLog(context, row.features()));
+    primaryCallTypeIconsView.setShowWifi(
+        MotorolaUtils.shouldShowWifiIconInCallLog(context, row.features()));
+  }
+
+  private void setSecondaryCallTypes(Row row) {
+    // Only call type icons are shown before the secondary text.
+    for (int callType : row.callTypes().getTypeList()) {
+      secondaryCallTypeIconsView.add(callType);
+    }
+    // TODO(zachh): Per new mocks, may need to add method to CallTypeIconsView to disable coloring.
+  }
+
+  private void setPhoneAccounts(Row row) {
+    if (row.phoneAccountLabel() != null) {
+      phoneAccountView.setText(row.phoneAccountLabel());
+      phoneAccountView.setTextColor(row.phoneAccountColor());
+      phoneAccountView.setVisibility(View.VISIBLE);
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index ee3efd0..77ba681 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -15,19 +15,97 @@
   ~ limitations under the License
   -->
 
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/call_log_entry_top_margin"
+    android:paddingTop="@dimen/call_log_entry_padding_top_start"
+    android:paddingBottom="@dimen/call_log_entry_padding_bottom_end"
+    android:paddingStart="@dimen/call_log_entry_padding_top_start"
+    android:paddingEnd="@dimen/call_log_entry_padding_bottom_end"
+    android:gravity="center_vertical">
 
-  <TextView
-      android:id="@+id/timestamp"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
+  <QuickContactBadge
+      android:id="@+id/quick_contact_photo"
+      android:layout_width="@dimen/call_log_entry_photo_size"
+      android:layout_height="@dimen/call_log_entry_photo_size"
+      android:layout_centerVertical="true"
+      android:padding="@dimen/call_log_entry_photo_padding"
+      android:focusable="true"/>
 
-  <TextView
-      android:id="@+id/contact_name"
+  <LinearLayout
       android:layout_width="wrap_content"
-      android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true"
+      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toStartOf="@+id/menu_button"
+      android:orientation="vertical">
+
+    <!-- TODO(zachh): Optimize this layout -->
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <TextView
+          android:id="@+id/primary_text"
+          style="@style/PrimaryText"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/>
+
+      <!-- HD and Wifi icons are shown adjacent to primary text. Call types are shown adjacent to
+           secondary text (below). -->
+      <com.android.dialer.calllogutils.CallTypeIconsView
+          android:id="@+id/primary_call_type_icons"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="12dp"
+          android:layout_gravity="center_vertical"/>
+
+    </LinearLayout>
+
+    <!-- TODO(zachh): Optimize this layout -->
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+      <!-- Only call types are shown adjacent to secondary text. HD and Wifi icons are shown
+           adjacent to primary text (above). -->
+      <com.android.dialer.calllogutils.CallTypeIconsView
+          android:id="@+id/secondary_call_type_icons"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="12dp"
+          android:layout_gravity="center_vertical"/>
+
+      <TextView
+          android:id="@+id/secondary_text"
+          style="@style/SecondaryText"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/phone_account"
+        style="@style/SecondaryText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"
+        android:visibility="gone"/>
+  </LinearLayout>
+
+  <ImageView
+      android:id="@+id/menu_button"
+      android:layout_width="@dimen/call_log_entry_menu_button_size"
+      android:layout_height="@dimen/call_log_entry_menu_button_size"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
+      android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:scaleType="center"
+      android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
+      android:tint="@color/dialer_secondary_text_color"/>
+</RelativeLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
index 433dbdd..e1d8410 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
@@ -15,8 +15,9 @@
   ~ limitations under the License
   -->
 
-<ListView
+<android.support.v7.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list"
+    android:id="@+id/new_call_log_recycler_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent"
+    android:background="@color/background_dialer_light"/>
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml
new file mode 100644
index 0000000..13575db
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:height="48dp">
+  <TextView
+      android:id="@+id/new_call_log_header_text"
+      style="@style/SecondaryText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/call_log_action_icon_margin_start"
+      android:layout_centerVertical="true"/>
+</RelativeLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/values-af/strings.xml b/java/com/android/dialer/calllog/ui/res/values-af/strings.xml
new file mode 100644
index 0000000..c6b69b5
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-af/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Onbekend"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Vandag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ouer"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-am/strings.xml b/java/com/android/dialer/calllog/ui/res/values-am/strings.xml
new file mode 100644
index 0000000..adde37b
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-am/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ቪዲዮ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"ያልታወቀ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ዛሬ"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"የቆዩ"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml
new file mode 100644
index 0000000..492ee42
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"فيديو"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"غير معروف"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"اليوم"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"أقدم"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-az/strings.xml b/java/com/android/dialer/calllog/ui/res/values-az/strings.xml
new file mode 100644
index 0000000..1e7e57b
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-az/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Naməlum"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bu gün"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Keçmiş"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..e60fa61
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video poziv"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznat broj"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ranije"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-be/strings.xml b/java/com/android/dialer/calllog/ui/res/values-be/strings.xml
new file mode 100644
index 0000000..c4e80c1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-be/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Відэа"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Невядома"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сёння"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Больш старыя"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml
new file mode 100644
index 0000000..8806cc1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видеообаждане"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Неизвестен"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Днес"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"По-стари"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml
new file mode 100644
index 0000000..5c374d1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ভিডিও"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"অজানা"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"আজ"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"পুরনো"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml
new file mode 100644
index 0000000..3d1b302
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Videozapis"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznato"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starije"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml
new file mode 100644
index 0000000..54d07f5
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconeguts"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Avui"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriors"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml b/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml
new file mode 100644
index 0000000..40a9cb1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznámý volající"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dnes"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starší"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-da/strings.xml b/java/com/android/dialer/calllog/ui/res/values-da/strings.xml
new file mode 100644
index 0000000..46a87a4
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-da/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukendt"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ældre"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-de/strings.xml b/java/com/android/dialer/calllog/ui/res/values-de/strings.xml
new file mode 100644
index 0000000..e587bb3
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-de/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unbekannt"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Heute"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ältere"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-el/strings.xml b/java/com/android/dialer/calllog/ui/res/values-el/strings.xml
new file mode 100644
index 0000000..9f40423
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-el/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Βίντεο"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Άγνωστος"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Σήμερα"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Παλαιότερες"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b442d5a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..b442d5a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..b442d5a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..5cfdae7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconocido"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoy"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anterior"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-es/strings.xml b/java/com/android/dialer/calllog/ui/res/values-es/strings.xml
new file mode 100644
index 0000000..c23e7cf
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-es/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconocidas"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoy"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriores"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-et/strings.xml b/java/com/android/dialer/calllog/ui/res/values-et/strings.xml
new file mode 100644
index 0000000..0199758
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-et/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tundmatu"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Täna"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vanem"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml
new file mode 100644
index 0000000..eea5b78
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Bideoa"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ezezagunak"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Gaurkoak"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Zaharragoak"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml
new file mode 100644
index 0000000..0b9b19f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ویدیو"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"نامشخص"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"امروز"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"قدیمی‌تر"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml
new file mode 100644
index 0000000..2954882
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Videopuhelu"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tuntematon"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Tänään"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vanhemmat"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..dd1a34c
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vidéo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Inconnu"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Aujourd\'hui"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Plus anciens"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml
new file mode 100644
index 0000000..ddeaf19
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vidéo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Numéro inconnu"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Aujourd\'hui"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Plus anciens"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml
new file mode 100644
index 0000000..2486119
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Descoñecidos"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoxe"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriores"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml
new file mode 100644
index 0000000..6235641
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"વીડિઓ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"અજાણ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"આજે"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"જૂનું"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml
new file mode 100644
index 0000000..3c3ccc8
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"वीडियो"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"पुराना"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml
new file mode 100644
index 0000000..614f46c
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Videopoziv"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznato"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Stariji"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml
new file mode 100644
index 0000000..0dc4e92
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Videó"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ismeretlen"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Ma"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Korábbi"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml
new file mode 100644
index 0000000..6c13619
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Տեսանյութ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Անհայտ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Այսօր"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ավելի հին"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-in/strings.xml b/java/com/android/dialer/calllog/ui/res/values-in/strings.xml
new file mode 100644
index 0000000..ee18199
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-in/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tidak diketahui"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hari ini"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Lebih lama"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-is/strings.xml b/java/com/android/dialer/calllog/ui/res/values-is/strings.xml
new file mode 100644
index 0000000..80cf17e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-is/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Myndsímtal"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Óþekkt"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Í dag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldra"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-it/strings.xml b/java/com/android/dialer/calllog/ui/res/values-it/strings.xml
new file mode 100644
index 0000000..039081e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-it/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Sconosciuto"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Oggi"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Meno recenti"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml b/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml
new file mode 100644
index 0000000..4d906ed
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"וידאו"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"לא ידוע"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"היום"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ישנות יותר"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml
new file mode 100644
index 0000000..660392d
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ビデオ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"今日"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"昨日以前"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml
new file mode 100644
index 0000000..a678783
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ვიდეო"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"უცნობი"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"დღეს"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"უფრო ძველი"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml
new file mode 100644
index 0000000..8302859
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Бейне"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Белгісіз"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Бүгін"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ескілеу"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-km/strings.xml b/java/com/android/dialer/calllog/ui/res/values-km/strings.xml
new file mode 100644
index 0000000..dfaca9a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-km/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"វីដេអូ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"មិន​ស្គាល់"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ថ្ងៃនេះ"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ចាស់ៗ"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml
new file mode 100644
index 0000000..5c764a2
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ವೀಡಿಯೊ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"ಅಪರಿಚಿತ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ಇಂದು"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ಹಳೆಯದು"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml
new file mode 100644
index 0000000..094c3d9
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"동영상"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"알 수 없음"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"오늘"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"이전"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml
new file mode 100644
index 0000000..d15a2b2
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Белгисиз"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Бүгүн"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Мурункураак"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml
new file mode 100644
index 0000000..b869bbd
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ວິດີໂອ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"ບໍ່ຮູ້ຈັກ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ມື້ນີ້"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ເກົ່າກວ່າ"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml
new file mode 100644
index 0000000..1701fa2
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vaizdo įrašas"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nežinoma"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Šiandien"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Senesni"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml
new file mode 100644
index 0000000..adce799
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Videozvans"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nezināmi"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Šodien"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vecāki zvani"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml
new file mode 100644
index 0000000..e347f1a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Непознато"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Денес"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Постари"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml
new file mode 100644
index 0000000..7d1fcd1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"വീഡിയോ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"അജ്ഞാതം"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ഇന്ന്"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"പഴയത്"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml
new file mode 100644
index 0000000..bdaf835
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Тодорхойгүй"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Өнөөдөр"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Хуучин"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml
new file mode 100644
index 0000000..5c348d1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"व्हिडिओ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"अधिक जुने"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml
new file mode 100644
index 0000000..ee18199
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tidak diketahui"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hari ini"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Lebih lama"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-my/strings.xml b/java/com/android/dialer/calllog/ui/res/values-my/strings.xml
new file mode 100644
index 0000000..f841bd5
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-my/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ဗီဒီယို"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"အမည်မသိ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ယနေ့"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ယခင်နေ့များက"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml b/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml
new file mode 100644
index 0000000..9cf3273
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukjent"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldre"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml
new file mode 100644
index 0000000..dc1c617
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"भिडियो कल"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात कल"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"अझ पुरानो"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml
new file mode 100644
index 0000000..9653187
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Onbekend"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Vandaag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ouder"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-no/strings.xml b/java/com/android/dialer/calllog/ui/res/values-no/strings.xml
new file mode 100644
index 0000000..9cf3273
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-no/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukjent"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldre"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml
new file mode 100644
index 0000000..797b55e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ਵੀਡੀਓ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"ਅਗਿਆਤ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ਅੱਜ"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"ਵਧੇਰੇ ਪੁਰਾਣਾ"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml
new file mode 100644
index 0000000..3c60028
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Rozmowa wideo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nieznany"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dzisiaj"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starsze"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..7b65f3a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Número desconhecido"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..f7491b9
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconhecido"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml
new file mode 100644
index 0000000..7b65f3a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Número desconhecido"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml
new file mode 100644
index 0000000..5446a71
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Necunoscut"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Astăzi"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mai vechi"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml
new file mode 100644
index 0000000..b8d85e9
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видеовызов"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Неизвестно"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сегодня"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Раньше"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-si/strings.xml b/java/com/android/dialer/calllog/ui/res/values-si/strings.xml
new file mode 100644
index 0000000..0aad640
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-si/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"වීඩියෝ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"නොදන්නා"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"අද"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"වඩා පරණ"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml
new file mode 100644
index 0000000..083fad4
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznáme"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dnes"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Staršie"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml
new file mode 100644
index 0000000..38b651e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznano"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danes"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starejše"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml
new file mode 100644
index 0000000..f5659af
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"I panjohur"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Sot"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Më të vjetra"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml
new file mode 100644
index 0000000..dfae733
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Видео позив"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Непознат број"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Данас"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Раније"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml
new file mode 100644
index 0000000..20c2fda
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Okänd"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Äldre"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml
new file mode 100644
index 0000000..0439061
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Haijulikani"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Leo"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Za zamani"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml
new file mode 100644
index 0000000..f883fec
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"வீடியோ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"தெரியாத எண்கள்"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"இன்று"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"பழையவை"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-te/strings.xml b/java/com/android/dialer/calllog/ui/res/values-te/strings.xml
new file mode 100644
index 0000000..6c3bd44
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-te/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"వీడియో"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"తెలియదు"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"ఈ రోజు"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"పాతది"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-th/strings.xml b/java/com/android/dialer/calllog/ui/res/values-th/strings.xml
new file mode 100644
index 0000000..8afc82a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-th/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"วิดีโอ"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"ไม่ทราบ"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"วันนี้"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"เก่ากว่า"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml
new file mode 100644
index 0000000..34d6f2c
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Hindi Alam"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Ngayong araw"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mas Luma"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml
new file mode 100644
index 0000000..e7ada3d
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Görünt. görüşme"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Bilinmiyor"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bugün"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eski"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml
new file mode 100644
index 0000000..0de770d
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Відео"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Невідомо"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сьогодні"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Старіші"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml
new file mode 100644
index 0000000..16ae08a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"ویڈیو"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"نامعلوم"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"آج"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"قدیم تر"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml b/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml
new file mode 100644
index 0000000..22e4d18
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video suhbat"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Noma’lum"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bugun"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eskiroq"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml
new file mode 100644
index 0000000..a70de21
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Không xác định"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hôm nay"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Cũ hơn"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..ae4c645
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"视频通话"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"未知"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"更早"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..4e78292
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"影片"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"較舊"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..4b6b736
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"視訊通話"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"較舊"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml
new file mode 100644
index 0000000..675e632
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_call_log_video" msgid="8414984483082880050">"Ividiyo"</string>
+    <string name="new_call_log_unknown" msgid="7873134340045098010">"Akwaziwa"</string>
+    <string name="new_call_log_header_today" msgid="3849627842127894230">"Namhlanje"</string>
+    <string name="new_call_log_header_older" msgid="5879512250610285872">"Okudala"</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values/dimens.xml b/java/com/android/dialer/calllog/ui/res/values/dimens.xml
new file mode 100644
index 0000000..bfb4c99
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values/dimens.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+
+  <!-- call log entries -->
+  <dimen name="call_log_entry_top_margin">6dp</dimen>
+  <dimen name="call_log_entry_padding_bottom_end">16dp</dimen>
+  <dimen name="call_log_entry_padding_top_start">12dp</dimen>
+  <dimen name="call_log_entry_photo_size">48dp</dimen>
+  <dimen name="call_log_entry_photo_padding">4dp</dimen>
+  <dimen name="call_log_entry_photo_text_margin">8dp</dimen>
+  <dimen name="call_log_entry_menu_button_size">48dp</dimen>
+
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values/strings.xml b/java/com/android/dialer/calllog/ui/res/values/strings.xml
new file mode 100644
index 0000000..9b044ca
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources>
+
+  <!-- Text to show in call log for a video call. [CHAR LIMIT=16] -->
+  <string name="new_call_log_video">Video</string>
+
+  <!-- String used to display calls from unknown numbers in the call log.  [CHAR LIMIT=30] -->
+  <string name="new_call_log_unknown">Unknown</string>
+
+  <!-- Header in call log to group calls from the current day.  [CHAR LIMIT=30] -->
+  <string name="new_call_log_header_today">Today</string>
+
+  <!-- Header in call log to group calls from before the current day.  [CHAR LIMIT=30] -->
+  <string name="new_call_log_header_older">Older</string>
+
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calllog/ui/res/values/styles.xml b/java/com/android/dialer/calllog/ui/res/values/styles.xml
new file mode 100644
index 0000000..23cb93e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+<resources>
+
+  <style name="primary_textview_new_call">
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+  <style name="secondary_textview_new_call">
+    <item name="android:textColor">@color/missed_call</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java
deleted file mode 100644
index 6aa93af..0000000
--- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.calllogutils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.icu.lang.UCharacter;
-import android.icu.text.BreakIterator;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.text.format.DateUtils;
-import android.text.format.Formatter;
-import com.android.dialer.util.DialerUtils;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.TimeUnit;
-
-/** Utility class for formatting data and data usage in call log entries. */
-public class CallEntryFormatter {
-
-  /**
-   * Formats the provided date into a value suitable for display in the current locale.
-   *
-   * <p>For example, returns a string like "Wednesday, May 25, 2016, 8:02PM" or "Chorshanba, 2016
-   * may 25,20:02".
-   *
-   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
-   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
-   */
-  public static CharSequence formatDate(Context context, long callDateMillis) {
-    CharSequence dateValue =
-        DateUtils.formatDateRange(
-            context,
-            callDateMillis /* startDate */,
-            callDateMillis /* endDate */,
-            DateUtils.FORMAT_SHOW_TIME
-                | DateUtils.FORMAT_SHOW_DATE
-                | DateUtils.FORMAT_SHOW_WEEKDAY
-                | DateUtils.FORMAT_SHOW_YEAR);
-
-    // We want the beginning of the date string to be capitalized, even if the word at the beginning
-    // of the string is not usually capitalized. For example, "Wednesdsay" in Uzbek is "chorshanba”
-    // (not capitalized). To handle this issue we apply title casing to the start of the sentence so
-    // that "chorshanba, 2016 may 25,20:02" becomes "Chorshanba, 2016 may 25,20:02".
-    //
-    // The ICU library was not available in Android until N, so we can only do this in N+ devices.
-    // Pre-N devices will still see incorrect capitalization in some languages.
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return dateValue;
-    }
-
-    // Using the ICU library is safer than just applying toUpperCase() on the first letter of the
-    // word because in some languages, there can be multiple starting characters which should be
-    // upper-cased together. For example in Dutch "ij" is a digraph in which both letters should be
-    // capitalized together.
-
-    // TITLECASE_NO_LOWERCASE is necessary so that things that are already capitalized like the
-    // month ("May") are not lower-cased as part of the conversion.
-    return UCharacter.toTitleCase(
-        Locale.getDefault(),
-        dateValue.toString(),
-        BreakIterator.getSentenceInstance(),
-        UCharacter.TITLECASE_NO_LOWERCASE);
-  }
-
-  private static CharSequence formatDuration(Context context, long elapsedSeconds) {
-    Resources res = context.getResources();
-    String formatPattern;
-    if (elapsedSeconds >= 60) {
-      String minutesString = res.getString(R.string.call_details_minutes_abbreviation);
-      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
-      // example output: "1m 1s"
-      formatPattern =
-          context.getString(
-              R.string.call_duration_format_pattern, "m", minutesString, "s", secondsString);
-    } else {
-      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
-      // example output: "1s"
-      formatPattern =
-          context.getString(R.string.call_duration_short_format_pattern, "s", secondsString);
-    }
-    SimpleDateFormat format = new SimpleDateFormat(formatPattern);
-    return format.format(new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds)));
-  }
-
-  private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) {
-    Resources res = context.getResources();
-    if (elapsedSeconds >= 60) {
-      int minutes = (int) (elapsedSeconds / 60);
-      int seconds = (int) elapsedSeconds - minutes * 60;
-      String minutesString = res.getQuantityString(R.plurals.a11y_minutes, minutes);
-      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, seconds);
-      // example output: "1 minute 1 second", "2 minutes 2 seconds", ect.
-      return context.getString(
-          R.string.a11y_call_duration_format, minutes, minutesString, seconds, secondsString);
-    } else {
-      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, (int) elapsedSeconds);
-      // example output: "1 second", "2 seconds"
-      return context.getString(
-          R.string.a11y_call_duration_short_format, elapsedSeconds, secondsString);
-    }
-  }
-
-  /**
-   * Formats a string containing the call duration and the data usage (if specified).
-   *
-   * @param elapsedSeconds Total elapsed seconds.
-   * @param dataUsage Data usage in bytes, or null if not specified.
-   * @return String containing call duration and data usage.
-   */
-  public static CharSequence formatDurationAndDataUsage(
-      Context context, long elapsedSeconds, long dataUsage) {
-    return formatDurationAndDataUsageInternal(
-        context, formatDuration(context, elapsedSeconds), dataUsage);
-  }
-
-  /**
-   * Formats a string containing the call duration and the data usage (if specified) for TalkBack.
-   *
-   * @param elapsedSeconds Total elapsed seconds.
-   * @param dataUsage Data usage in bytes, or null if not specified.
-   * @return String containing call duration and data usage.
-   */
-  public static CharSequence formatDurationAndDataUsageA11y(
-      Context context, long elapsedSeconds, long dataUsage) {
-    return formatDurationAndDataUsageInternal(
-        context, formatDurationA11y(context, elapsedSeconds), dataUsage);
-  }
-
-  private static CharSequence formatDurationAndDataUsageInternal(
-      Context context, CharSequence duration, long dataUsage) {
-    List<CharSequence> durationItems = new ArrayList<>();
-    if (dataUsage > 0) {
-      durationItems.add(duration);
-      durationItems.add(Formatter.formatShortFileSize(context, dataUsage));
-      return DialerUtils.join(durationItems);
-    } else {
-      return duration;
-    }
-  }
-}
diff --git a/java/com/android/dialer/calllogutils/CallLogDates.java b/java/com/android/dialer/calllogutils/CallLogDates.java
new file mode 100644
index 0000000..82e8e40
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/CallLogDates.java
@@ -0,0 +1,166 @@
+/*
+ * 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.calllogutils;
+
+import android.content.Context;
+import android.icu.lang.UCharacter;
+import android.icu.text.BreakIterator;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.text.format.DateUtils;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/** Static methods for formatting dates in the call log. */
+public final class CallLogDates {
+
+  /**
+   * Uses the new date formatting rules to format dates in the new call log.
+   *
+   * <p>Rules:
+   *
+   * <pre>
+   *   if < 1 minute ago: "Now";
+   *   else if today: "12:15 PM"
+   *   else if < 3 days ago: "Wednesday";
+   *   else: "Jan 15"
+   * </pre>
+   */
+  public static CharSequence newCallLogTimestampLabel(
+      Context context, long nowMillis, long timestampMillis) {
+    if (nowMillis - timestampMillis < TimeUnit.MINUTES.toMillis(1)) {
+      return context.getString(R.string.now);
+    }
+    if (isSameDay(nowMillis, timestampMillis)) {
+      return DateUtils.formatDateTime(
+          context, timestampMillis, DateUtils.FORMAT_SHOW_TIME); // e.g. 12:15 PM
+    }
+    if (isWithin3Days(nowMillis, timestampMillis)) {
+      return formatDayOfWeek(context, timestampMillis); // e.g. "Wednesday"
+    }
+    return formatAbbreviatedMonthAndDay(context, timestampMillis); // e.g. "Jan 15"
+  }
+
+  /**
+   * Formats the provided date into a value suitable for display in the current locale.
+   *
+   * <p>For example, returns a string like "Wednesday, May 25, 2016, 8:02PM" or "Chorshanba, 2016
+   * may 25,20:02".
+   *
+   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
+   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
+   */
+  public static CharSequence formatDate(Context context, long callDateMillis) {
+    return toTitleCase(
+        DateUtils.formatDateTime(
+            context,
+            callDateMillis,
+            DateUtils.FORMAT_SHOW_TIME
+                | DateUtils.FORMAT_SHOW_DATE
+                | DateUtils.FORMAT_SHOW_WEEKDAY
+                | DateUtils.FORMAT_SHOW_YEAR));
+  }
+
+  /**
+   * Formats the provided date into the day of week.
+   *
+   * <p>For example, returns a string like "Wednesday" or "Chorshanba".
+   *
+   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
+   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
+   */
+  private static CharSequence formatDayOfWeek(Context context, long callDateMillis) {
+    return toTitleCase(
+        DateUtils.formatDateTime(context, callDateMillis, DateUtils.FORMAT_SHOW_WEEKDAY));
+  }
+
+  /**
+   * Formats the provided date into the month abbreviation and day.
+   *
+   * <p>For example, returns a string like "Jan 15".
+   *
+   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
+   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
+   */
+  private static CharSequence formatAbbreviatedMonthAndDay(Context context, long callDateMillis) {
+    return toTitleCase(
+        DateUtils.formatDateTime(
+            context, callDateMillis, DateUtils.FORMAT_ABBREV_MONTH | DateUtils.FORMAT_NO_YEAR));
+  }
+
+  private static CharSequence toTitleCase(CharSequence value) {
+    // We want the beginning of the date string to be capitalized, even if the word at the beginning
+    // of the string is not usually capitalized. For example, "Wednesdsay" in Uzbek is "chorshanba”
+    // (not capitalized). To handle this issue we apply title casing to the start of the sentence so
+    // that "chorshanba, 2016 may 25,20:02" becomes "Chorshanba, 2016 may 25,20:02".
+    //
+    // The ICU library was not available in Android until N, so we can only do this in N+ devices.
+    // Pre-N devices will still see incorrect capitalization in some languages.
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return value;
+    }
+
+    // Using the ICU library is safer than just applying toUpperCase() on the first letter of the
+    // word because in some languages, there can be multiple starting characters which should be
+    // upper-cased together. For example in Dutch "ij" is a digraph in which both letters should be
+    // capitalized together.
+
+    // TITLECASE_NO_LOWERCASE is necessary so that things that are already capitalized are not
+    // lower-cased as part of the conversion.
+    return UCharacter.toTitleCase(
+        Locale.getDefault(),
+        value.toString(),
+        BreakIterator.getSentenceInstance(),
+        UCharacter.TITLECASE_NO_LOWERCASE);
+  }
+
+  private static boolean isWithin3Days(long nowMillis, long timestampMillis) {
+    Calendar threeDaysAgoStartOfDay = Calendar.getInstance();
+    threeDaysAgoStartOfDay.setTimeInMillis(nowMillis);
+
+    // This is attempting to find the start of the current day, but it's not quite right due to
+    // daylight savings. Unfortunately there doesn't seem to be a way to get the correct start of
+    // the day without using Joda or Java8, both of which are disallowed. This means that the wrong
+    // formatting may be applied on days with time changes (though the displayed values will be
+    // correct).
+    threeDaysAgoStartOfDay.add(
+        Calendar.HOUR_OF_DAY, -threeDaysAgoStartOfDay.get(Calendar.HOUR_OF_DAY));
+    threeDaysAgoStartOfDay.add(Calendar.MINUTE, -threeDaysAgoStartOfDay.get(Calendar.MINUTE));
+    threeDaysAgoStartOfDay.add(Calendar.SECOND, -threeDaysAgoStartOfDay.get(Calendar.SECOND));
+
+    threeDaysAgoStartOfDay.add(Calendar.DATE, -2);
+
+    Calendar then = Calendar.getInstance();
+    then.setTimeInMillis(timestampMillis);
+
+    return then.equals(threeDaysAgoStartOfDay) || then.after(threeDaysAgoStartOfDay);
+  }
+
+  /** Returns true if the provided timestamps are from the same day in the default time zone. */
+  public static boolean isSameDay(long firstMillis, long secondMillis) {
+    Calendar first = Calendar.getInstance();
+    first.setTimeInMillis(firstMillis);
+
+    Calendar second = Calendar.getInstance();
+    second.setTimeInMillis(secondMillis);
+
+    return first.get(Calendar.YEAR) == second.get(Calendar.YEAR)
+        && first.get(Calendar.MONTH) == second.get(Calendar.MONTH)
+        && first.get(Calendar.DAY_OF_MONTH) == second.get(Calendar.DAY_OF_MONTH);
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/CallLogDurations.java b/java/com/android/dialer/calllogutils/CallLogDurations.java
new file mode 100644
index 0000000..20998de
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/CallLogDurations.java
@@ -0,0 +1,127 @@
+/*
+ * 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.calllogutils;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.text.format.Formatter;
+import com.android.dialer.util.DialerUtils;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/** Utility class for formatting duration and data usage in call log entries. */
+public class CallLogDurations {
+
+  private static CharSequence formatDuration(Context context, long elapsedSeconds) {
+    Resources res = context.getResources();
+    String formatPattern;
+    if (elapsedSeconds >= 60) {
+      String minutesString = res.getString(R.string.call_details_minutes_abbreviation);
+      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
+      // example output: "1m 1s"
+      formatPattern =
+          context.getString(
+              R.string.call_duration_format_pattern, "m", minutesString, "s", secondsString);
+    } else {
+      String secondsString = res.getString(R.string.call_details_seconds_abbreviation);
+      // example output: "1s"
+      formatPattern =
+          context.getString(R.string.call_duration_short_format_pattern, "s", secondsString);
+
+      // Temporary work around for a broken Hebrew(iw) translation.
+      if (formatPattern.endsWith("\'\'")) {
+        formatPattern = formatPattern.substring(0, formatPattern.length() - 1);
+      }
+    }
+
+    // If new translation issues arise, we should catch them here to prevent crashes.
+    try {
+      Date date = new Date(TimeUnit.SECONDS.toMillis(elapsedSeconds));
+      SimpleDateFormat format = new SimpleDateFormat(formatPattern);
+      String duration = format.format(date);
+
+      // SimpleDateFormat cannot display more than 59 minutes, instead it displays MINUTES % 60.
+      // Here we check for that value and replace it with the correct value.
+      if (elapsedSeconds >= TimeUnit.MINUTES.toSeconds(60)) {
+        int minutes = (int) (elapsedSeconds / 60);
+        duration = duration.replaceFirst(Integer.toString(minutes % 60), Integer.toString(minutes));
+      }
+      return duration;
+    } catch (Exception e) {
+      return "";
+    }
+  }
+
+  private static CharSequence formatDurationA11y(Context context, long elapsedSeconds) {
+    Resources res = context.getResources();
+    if (elapsedSeconds >= 60) {
+      int minutes = (int) (elapsedSeconds / 60);
+      int seconds = (int) elapsedSeconds - minutes * 60;
+      String minutesString = res.getQuantityString(R.plurals.a11y_minutes, minutes);
+      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, seconds);
+      // example output: "1 minute 1 second", "2 minutes 2 seconds", ect.
+      return context.getString(
+          R.string.a11y_call_duration_format, minutes, minutesString, seconds, secondsString);
+    } else {
+      String secondsString = res.getQuantityString(R.plurals.a11y_seconds, (int) elapsedSeconds);
+      // example output: "1 second", "2 seconds"
+      return context.getString(
+          R.string.a11y_call_duration_short_format, elapsedSeconds, secondsString);
+    }
+  }
+
+  /**
+   * Formats a string containing the call duration and the data usage (if specified).
+   *
+   * @param elapsedSeconds Total elapsed seconds.
+   * @param dataUsage Data usage in bytes, or null if not specified.
+   * @return String containing call duration and data usage.
+   */
+  public static CharSequence formatDurationAndDataUsage(
+      Context context, long elapsedSeconds, long dataUsage) {
+    return formatDurationAndDataUsageInternal(
+        context, formatDuration(context, elapsedSeconds), dataUsage);
+  }
+
+  /**
+   * Formats a string containing the call duration and the data usage (if specified) for TalkBack.
+   *
+   * @param elapsedSeconds Total elapsed seconds.
+   * @param dataUsage Data usage in bytes, or null if not specified.
+   * @return String containing call duration and data usage.
+   */
+  public static CharSequence formatDurationAndDataUsageA11y(
+      Context context, long elapsedSeconds, long dataUsage) {
+    return formatDurationAndDataUsageInternal(
+        context, formatDurationA11y(context, elapsedSeconds), dataUsage);
+  }
+
+  private static CharSequence formatDurationAndDataUsageInternal(
+      Context context, CharSequence duration, long dataUsage) {
+    List<CharSequence> durationItems = new ArrayList<>();
+    if (dataUsage > 0) {
+      durationItems.add(duration);
+      durationItems.add(Formatter.formatShortFileSize(context, dataUsage));
+      return DialerUtils.join(durationItems);
+    } else {
+      return duration;
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/CallTypeHelper.java b/java/com/android/dialer/calllogutils/CallTypeHelper.java
index d3b5b67..783f799 100644
--- a/java/com/android/dialer/calllogutils/CallTypeHelper.java
+++ b/java/com/android/dialer/calllogutils/CallTypeHelper.java
@@ -18,6 +18,7 @@
 
 import android.content.res.Resources;
 import com.android.dialer.compat.AppCompatConstants;
+import com.android.dialer.lightbringer.Lightbringer;
 
 /** Helper class to perform operations related to call types. */
 public class CallTypeHelper {
@@ -50,8 +51,12 @@
   private final CharSequence mBlockedName;
   /** Name used to identify calls which were answered on another device. */
   private final CharSequence mAnsweredElsewhereName;
+  /** Name used to identify incoming lightbringer calls. */
+  private final CharSequence mIncomingLightbringerCall;
+  /** Name used to identify outgoing lightbringer calls. */
+  private final CharSequence mOutgoingLightbringerCall;
 
-  public CallTypeHelper(Resources resources) {
+  public CallTypeHelper(Resources resources, Lightbringer lightbringer) {
     // Cache these values so that we do not need to look them up each time.
     mIncomingName = resources.getString(R.string.type_incoming);
     mIncomingPulledName = resources.getString(R.string.type_incoming_pulled);
@@ -67,6 +72,18 @@
     mRejectedName = resources.getString(R.string.type_rejected);
     mBlockedName = resources.getString(R.string.type_blocked);
     mAnsweredElsewhereName = resources.getString(R.string.type_answered_elsewhere);
+
+    if (lightbringer.getIncomingCallTypeText() != -1) {
+      mIncomingLightbringerCall = resources.getString(lightbringer.getIncomingCallTypeText());
+    } else {
+      mIncomingLightbringerCall = mIncomingVideoName;
+    }
+
+    if (lightbringer.getOutgoingCallTypeText() != -1) {
+      mOutgoingLightbringerCall = resources.getString(lightbringer.getOutgoingCallTypeText());
+    } else {
+      mOutgoingLightbringerCall = mOutgoingVideoName;
+    }
   }
 
   public static boolean isMissedCallType(int callType) {
@@ -77,13 +94,17 @@
   }
 
   /** Returns the text used to represent the given call type. */
-  public CharSequence getCallTypeText(int callType, boolean isVideoCall, boolean isPulledCall) {
+  public CharSequence getCallTypeText(
+      int callType, boolean isVideoCall, boolean isPulledCall, boolean isLightbringerCall) {
     switch (callType) {
       case AppCompatConstants.CALLS_INCOMING_TYPE:
         if (isVideoCall) {
           if (isPulledCall) {
             return mIncomingVideoPulledName;
           } else {
+            if (isLightbringerCall) {
+              return mIncomingLightbringerCall;
+            }
             return mIncomingVideoName;
           }
         } else {
@@ -99,6 +120,9 @@
           if (isPulledCall) {
             return mOutgoingVideoPulledName;
           } else {
+            if (isLightbringerCall) {
+              return mOutgoingLightbringerCall;
+            }
             return mOutgoingVideoName;
           }
         } else {
diff --git a/java/com/android/dialer/calllogutils/PhoneCallDetails.java b/java/com/android/dialer/calllogutils/PhoneCallDetails.java
index 13c528a..869a3d0 100644
--- a/java/com/android/dialer/calllogutils/PhoneCallDetails.java
+++ b/java/com/android/dialer/calllogutils/PhoneCallDetails.java
@@ -99,6 +99,9 @@
   // Voicemail transcription
   public String transcription;
 
+  // Voicemail transcription state, ie. in-progress, failed, etc.
+  public int transcriptionState;
+
   // The display string for the number.
   public String displayNumber;
 
diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
index 0f9dd3b..557532d 100644
--- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Stemboodskap"</string>
+    <string name="now" msgid="2599778506439006806">"Nou"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
index c5da1c6..fec0691 100644
--- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ሰ"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one">ሰከንዶች</item>
       <item quantity="other">ሰከንዶች</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"በ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ላይ፣ በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"የድምፅ መልዕክት"</string>
+    <string name="now" msgid="2599778506439006806">"አሁን"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
index 39afb6d..101eb2c 100644
--- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
@@ -57,4 +57,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"من خلال <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"على <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> من خلال <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"البريد الصوتي"</string>
+    <string name="now" msgid="2599778506439006806">"الآن"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
index c280c8e..938d2d6 100644
--- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"san"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">saniyə</item>
       <item quantity="one">saniyə</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> vasitəsilə"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> vasitəsilə <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Səsli e-məktub"</string>
+    <string name="now" msgid="2599778506439006806">"İndi"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
index 74c9f78..0bf6a62 100644
--- a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
+    <string name="now" msgid="2599778506439006806">"Sada"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
index 1099e32..d7b74ab 100644
--- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"праз <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, праз <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Галасавая пошта"</string>
+    <string name="now" msgid="2599778506439006806">"Зараз"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
index 216981c..cb1dc72 100644
--- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"през <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"в/ъв <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, през <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Гласова поща"</string>
+    <string name="now" msgid="2599778506439006806">"Сега"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
index 7d51fe7..11f475f 100644
--- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> এর মাধ্যমে"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> এ, <xliff:g id="NUMBER">%2$s</xliff:g> এর মাধ্যমে"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ভয়েসমেল"</string>
+    <string name="now" msgid="2599778506439006806">"এখনই"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
index 405d9c3..7526ef4 100644
--- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
+    <string name="now" msgid="2599778506439006806">"Sada"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
index ad993e3..6441b44 100644
--- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"a <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Bústia de veu"</string>
+    <string name="now" msgid="2599778506439006806">"Ara"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
index 8889941..9e0fb0e 100644
--- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"z čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na účet <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, z čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
+    <string name="now" msgid="2599778506439006806">"Právě teď"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
index 123002a..9032f81 100644
--- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\' <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one">sekund</item>
       <item quantity="other">sekunder</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"til <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Telefonsvarer"</string>
+    <string name="now" msgid="2599778506439006806">"Nu"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
index 5867b73..7980d97 100644
--- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other"> Sekunden</item>
       <item quantity="one"> Sekunde</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"über <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"mit <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, über <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mailbox"</string>
+    <string name="now" msgid="2599778506439006806">"Jetzt"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
index 018a726..20abded 100644
--- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"μέσω <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"στον λογαριασμό <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, μέσω <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Αυτόματος τηλεφωνητής"</string>
+    <string name="now" msgid="2599778506439006806">"Τώρα"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
index d0294c6..51c5215 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
+    <string name="now" msgid="2599778506439006806">"Now"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
index d0294c6..51c5215 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
+    <string name="now" msgid="2599778506439006806">"Now"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
index d0294c6..51c5215 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
+    <string name="now" msgid="2599778506439006806">"Now"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
index 2988f91..5deb0a2 100644
--- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"por medio de <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por medio de <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Ahora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
index fb13bcc..ac8992c 100644
--- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"a través del <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través del <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Ahora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
index 3781133..e52f580 100644
--- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"numbri <xliff:g id="NUMBER">%1$s</xliff:g> kaudu"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontol <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numbri <xliff:g id="NUMBER">%2$s</xliff:g> kaudu"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Kõnepost"</string>
+    <string name="now" msgid="2599778506439006806">"Praegu"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
index a097ec8..6aa2aa6 100644
--- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
@@ -34,7 +34,7 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> eta <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' eta <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' \'eta\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">segundo</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> bidez"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> kontuan, <xliff:g id="NUMBER">%2$s</xliff:g> bidez"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Erantzungailua"</string>
+    <string name="now" msgid="2599778506439006806">"Oraintxe bertan"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
index 1a457d4..4439ca4 100644
--- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"ازطریق <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"در <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>، ازطریق <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"پست صوتی"</string>
+    <string name="now" msgid="2599778506439006806">"اکنون"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
index 70b3d53..41ff582 100644
--- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"numerosta <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"tililtä <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numerosta <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Vastaaja"</string>
+    <string name="now" msgid="2599778506439006806">"Nyt"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
index 01e2d64..0c82893 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
+    <string name="now" msgid="2599778506439006806">"Maintenant"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
index 8f8c797..c1b9ea6 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
+    <string name="now" msgid="2599778506439006806">"À l\'instant"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
index 72c0d5a..bbf75e2 100644
--- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"a través do <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través do <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correo de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Agora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
index 29c1624..37c8551 100644
--- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> મારફતે"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> પર, <xliff:g id="NUMBER">%2$s</xliff:g> મારફતે"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"વૉઇસમેઇલ"</string>
+    <string name="now" msgid="2599778506439006806">"હમણાં"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
index d20e88e..44e9b90 100644
--- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से."</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one">सेकंड</item>
       <item quantity="other">सेकंड</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> से"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> पर, <xliff:g id="NUMBER">%2$s</xliff:g> से"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"वॉइसमेल"</string>
+    <string name="now" msgid="2599778506439006806">"अभी"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
index 72281bf..560e8e5 100644
--- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"putem broja <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, putem broja <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
+    <string name="now" msgid="2599778506439006806">"Sad"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
index f85e9f1..f2bdd24 100644
--- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"szám: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"fiók: <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, szám: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hangposta"</string>
+    <string name="now" msgid="2599778506439006806">"Most"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
index db21fec..04f02d7 100644
--- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ին <xliff:g id="NUMBER">%2$s</xliff:g> համարից"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ձայնային փոստ"</string>
+    <string name="now" msgid="2599778506439006806">"Հիմա"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
index 11f407c..83367ac 100644
--- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"di <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Pesan suara"</string>
+    <string name="now" msgid="2599778506439006806">"Sekarang"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
index 1716649..639881d 100644
--- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"í gegnum <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"á <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, í gegnum <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talhólf"</string>
+    <string name="now" msgid="2599778506439006806">"Núna"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
index 2dd4dca..e40a846 100644
--- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"tramite <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"su <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, tramite <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Messaggi vocali"</string>
+    <string name="now" msgid="2599778506439006806">"Ora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
index 2f29855..82dbd85 100644
--- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
@@ -34,7 +34,7 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"שנ\'"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> ו-<xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' ו-<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="two">שניות</item>
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"דרך <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"בחשבון <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, דרך <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"דואר קולי"</string>
+    <string name="now" msgid="2599778506439006806">"עכשיו"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
index 1a4b7ee..4cfd617 100644
--- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ボイスメール"</string>
+    <string name="now" msgid="2599778506439006806">"たった今"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
index 2ce0537..62f72ad 100644
--- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-ის მეშვეობით"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ზე, <xliff:g id="NUMBER">%2$s</xliff:g>-ის მეშვეობით"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ხმოვანი ფოსტა"</string>
+    <string name="now" msgid="2599778506439006806">"ახლა"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
index b213dd5..3025979 100644
--- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> арқылы"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> арқылы"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Дауыстық хабар"</string>
+    <string name="now" msgid="2599778506439006806">"Қазір"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
index 765bb61..650d4b8 100644
--- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"នៅ​លើ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> តាមរយៈ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"សារ​ជា​សំឡេង"</string>
+    <string name="now" msgid="2599778506439006806">"ឥឡូវនេះ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
index cd6eaed..07efc0b 100644
--- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ಮೂಲಕ"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ರಲ್ಲಿ, <xliff:g id="NUMBER">%2$s</xliff:g> ಮೂಲಕ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ಧ್ವನಿಮೇಲ್"</string>
+    <string name="now" msgid="2599778506439006806">"ಈಗ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
index e1cc957..b372e23 100644
--- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 수신"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>에서 <xliff:g id="NUMBER">%2$s</xliff:g>번으로 수신"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"음성사서함"</string>
+    <string name="now" msgid="2599778506439006806">"조금 전"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
index f758dab..633bbae 100644
--- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
@@ -35,7 +35,7 @@
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">секундалар</item>
       <item quantity="one">секунда</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> аркылуу"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> боюнча <xliff:g id="NUMBER">%2$s</xliff:g> аркылуу"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Үн почтасы"</string>
+    <string name="now" msgid="2599778506439006806">"Учурда"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
index 3107b3b..7a7a869 100644
--- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"ຜ່ານ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ຢູ່ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, ຜ່ານ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ຂໍ້ຄວາມສຽງ"</string>
+    <string name="now" msgid="2599778506439006806">"ຕອນນີ້"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
index cdac535..eca5ea3 100644
--- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"numeriu <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numeriu <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Balso paštas"</string>
+    <string name="now" msgid="2599778506439006806">"Dabar"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
index c87dbb6..5b469a5 100644
--- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
@@ -35,7 +35,7 @@
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="zero">sekunžu</item>
       <item quantity="one">sekunde</item>
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"izmantojot numuru <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontā <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, izmantojot numuru <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Balss pasts"</string>
+    <string name="now" msgid="2599778506439006806">"Tikko"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
index 7c3c84e..72dfc07 100644
--- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"на <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, на <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
+    <string name="now" msgid="2599778506439006806">"Сега"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
index 0064401..7a819e9 100644
--- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
@@ -35,7 +35,7 @@
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">സെക്കൻഡ്</item>
       <item quantity="one">സെക്കൻഡ്</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പർ വഴി"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> നമ്പർ വഴി, <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> അക്കൗണ്ടിൽ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"വോയ്‌സ്‌മെയിൽ"</string>
+    <string name="now" msgid="2599778506439006806">"ഇപ്പോൾ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
index 915c1ad..77f0340 100644
--- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-р"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> дээр, <xliff:g id="NUMBER">%2$s</xliff:g>-р"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Дуут шуудан"</string>
+    <string name="now" msgid="2599778506439006806">"Одоо"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
index c01f7c1..3329b1c 100644
--- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one">सेकंद</item>
       <item quantity="other">सेकंद</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> द्वारे"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> वर, <xliff:g id="NUMBER">%2$s</xliff:g> द्वारे"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"व्हॉइसमेल"</string>
+    <string name="now" msgid="2599778506439006806">"आत्ता"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
index 441a9ab..76ada6c 100644
--- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"pada <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mel suara"</string>
+    <string name="now" msgid="2599778506439006806">"Sekarang"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
index f05d5b2..5744c2b 100644
--- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> မှတစ်ဆင့်"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> တွင်၊ <xliff:g id="NUMBER">%2$s</xliff:g> မှတစ်ဆင့်"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"အသံမေးလ်"</string>
+    <string name="now" msgid="2599778506439006806">"ယခု"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
index 2f74403..7a989d4 100644
--- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">sekunder</item>
       <item quantity="one">sekund</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
+    <string name="now" msgid="2599778506439006806">"Nå"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
index a83d6fb..bb1b25c 100644
--- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> मार्फत"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> मा, <xliff:g id="NUMBER">%2$s</xliff:g> मार्फत"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"भ्वाइस मेल"</string>
+    <string name="now" msgid="2599778506439006806">"अहिले भर्खरै"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
index d156109..9b28f6f 100644
--- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">seconden</item>
       <item quantity="one">seconde</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
+    <string name="now" msgid="2599778506439006806">"Nu"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
index 2f74403..7a989d4 100644
--- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">sekunder</item>
       <item quantity="one">sekund</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
+    <string name="now" msgid="2599778506439006806">"Nå"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
index ba77fa1..6e2c137 100644
--- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ਰਾਹੀਂ"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> \'ਤੇ, <xliff:g id="NUMBER">%2$s</xliff:g> ਰਾਹੀਂ"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ਵੌਇਸਮੇਲ"</string>
+    <string name="now" msgid="2599778506439006806">"ਹੁਣੇ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
index 3d9e9d9..b30171f 100644
--- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"przez <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"na koncie <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, przez <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Poczta głosowa"</string>
+    <string name="now" msgid="2599778506439006806">"Przed chwilą"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
index 8c13e81..4d64d22 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one"> segundo</item>
       <item quantity="other"> segundos</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Agora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
index e24d245..c10be92 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
@@ -34,14 +34,14 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"seg"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>, <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\", <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\', <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">seconds</item>
+      <item quantity="one">segundo</item>
       <item quantity="other">segundos</item>
     </plurals>
     <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minutes</item>
+      <item quantity="one">minuto</item>
       <item quantity="other">minutos</item>
     </plurals>
     <string name="type_answered_elsewhere" msgid="411958582555881640">"Chamada atendida noutro dispositivo"</string>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"através do número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, através do número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Agora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
index 8c13e81..4d64d22 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="one"> segundo</item>
       <item quantity="other"> segundos</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
+    <string name="now" msgid="2599778506439006806">"Agora"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
index 0443bda..791bf4e 100644
--- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"prin <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"pe <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prin <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Mesagerie vocală"</string>
+    <string name="now" msgid="2599778506439006806">"Acum"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
index c64d25f..378dc41 100644
--- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"Номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Голосовая почта"</string>
+    <string name="now" msgid="2599778506439006806">"Только что"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
index 36297f1..1e17d18 100644
--- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> හරහා"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> මත, <xliff:g id="NUMBER">%2$s</xliff:g> හරහා"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"හඬ තැපෑල"</string>
+    <string name="now" msgid="2599778506439006806">"දැන්"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
index 4919629..7abfafc 100644
--- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"prostredníctvom čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"v účte <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prostredníctvom čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
+    <string name="now" msgid="2599778506439006806">"Teraz"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
index 88bb0a1..21c1177 100644
--- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"prek številke <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"v računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prek številke <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Odzivnik"</string>
+    <string name="now" msgid="2599778506439006806">"Zdaj"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
index b79ad19..1124ffa 100644
--- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"nëpërmjet <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"në <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nëpërmjet <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Posta zanore"</string>
+    <string name="now" msgid="2599778506439006806">"Tani"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
index eb99186..5653dae 100644
--- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
@@ -51,4 +51,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"преко <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, преко <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
+    <string name="now" msgid="2599778506439006806">"Сада"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
index 69d97fa..1902132 100644
--- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"med <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, med <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Röstbrevlåda"</string>
+    <string name="now" msgid="2599778506439006806">"Nu"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
index 5a5a690..57eb4eb 100644
--- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\'<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">Sekunde</item>
       <item quantity="one">Sekunde</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"kupitia <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"kwenye <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, kupitia <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ujumbe wa sauti"</string>
+    <string name="now" msgid="2599778506439006806">"Sasa"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
index 34b191b..481e4a9 100644
--- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> மூலம்"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> இல் <xliff:g id="NUMBER">%2$s</xliff:g> மூலம்"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"குரலஞ்சல்"</string>
+    <string name="now" msgid="2599778506439006806">"இப்போது"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
index 17e20c1..bbea73b 100644
--- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ద్వారా"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>లో, <xliff:g id="NUMBER">%2$s</xliff:g> ద్వారా"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"వాయిస్ మెయిల్"</string>
+    <string name="now" msgid="2599778506439006806">"ఇప్పుడు"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
index 53c2e92..184cb26 100644
--- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"ผ่าน <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ใน <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ผ่าน <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"ข้อความเสียง"</string>
+    <string name="now" msgid="2599778506439006806">"ตอนนี้"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
index e88bf72..19660a6 100644
--- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"sa pamamagitan ng <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"sa <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, sa pamamagitan ng <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
+    <string name="now" msgid="2599778506439006806">"Ngayon"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
index 78e0b5b..6a6a1f7 100644
--- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sn."</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\" <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \"<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\""</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">saniye</item>
       <item quantity="one">saniye</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> kullanılarak"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> kullanılarak <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Sesli mesaj"</string>
+    <string name="now" msgid="2599778506439006806">"Şimdi"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
index d9e1556..b2026c8 100644
--- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
@@ -53,4 +53,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"на номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Голосова пошта"</string>
+    <string name="now" msgid="2599778506439006806">"Зараз"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
index 4f73a49..d110d22 100644
--- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
@@ -34,8 +34,8 @@
     <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"سیکنڈ"</string>
     <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
     <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
+    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'‎"</string>
+    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'‎"</string>
     <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
       <item quantity="other">سیکنڈز</item>
       <item quantity="one">سیکنڈ</item>
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"بذریعہ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> پر، بذریعہ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"صوتی میل"</string>
+    <string name="now" msgid="2599778506439006806">"ابھی"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
index b73ea5c..dec5060 100644
--- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ovozli pochta"</string>
+    <string name="now" msgid="2599778506439006806">"Hozir"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
index b583d40..14d9695 100644
--- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"qua <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"trên <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, qua <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Thư thoại"</string>
+    <string name="now" msgid="2599778506439006806">"Bây giờ"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
index 9484e3b..b9aca90 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"通过 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"帐号：<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，通过 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"语音邮件"</string>
+    <string name="now" msgid="2599778506439006806">"现在"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
index 131e4ed..97fc21d 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"在 <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> 上透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"留言"</string>
+    <string name="now" msgid="2599778506439006806">"現在"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
index c06e5cd..d65f3c0 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"語音留言"</string>
+    <string name="now" msgid="2599778506439006806">"剛剛"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
index f6a4739..90a80f0 100644
--- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
@@ -49,4 +49,5 @@
     <string name="description_via_number" msgid="7682575124846343076">"nge-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="description_via_number_phone_account" msgid="4345445677508018830">"ku-<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nge-<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="voicemail_string" msgid="6029775151483803006">"Ivoyisimeyili"</string>
+    <string name="now" msgid="2599778506439006806">"Manje"</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml
index 2559903..56cd94a 100644
--- a/java/com/android/dialer/calllogutils/res/values/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values/strings.xml
@@ -127,4 +127,7 @@
 
   <!-- String used for displaying calls to the voicemail number in the call log -->
   <string name="voicemail_string">Voicemail</string>
+
+  <!-- String to be displayed to indicate in the call log that a call just now occurred. -->
+  <string name="now">Now</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/common/AndroidManifest.xml b/java/com/android/dialer/common/AndroidManifest.xml
index ae43d66..8892b58 100644
--- a/java/com/android/dialer/common/AndroidManifest.xml
+++ b/java/com/android/dialer/common/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.common">
 </manifest>
diff --git a/java/com/android/dialer/common/Assert.java b/java/com/android/dialer/common/Assert.java
index 189d209..2d7f199 100644
--- a/java/com/android/dialer/common/Assert.java
+++ b/java/com/android/dialer/common/Assert.java
@@ -30,10 +30,6 @@
     Assert.areThreadAssertsEnabled = areThreadAssertsEnabled;
   }
 
-  public static boolean areThreadAssertsEnabled() {
-    return areThreadAssertsEnabled;
-  }
-
   /**
    * Called when a truly exceptional case occurs.
    *
@@ -63,6 +59,11 @@
   }
 
   @CheckReturnValue
+  public static AssertionError createAssertionFailException(String msg, Throwable reason) {
+    return new AssertionError(msg, reason);
+  }
+
+  @CheckReturnValue
   public static UnsupportedOperationException createUnsupportedOperationFailException() {
     return new UnsupportedOperationException();
   }
diff --git a/java/com/android/dialer/common/ConfigProvider.java b/java/com/android/dialer/common/ConfigProvider.java
deleted file mode 100644
index c0791e9..0000000
--- a/java/com/android/dialer/common/ConfigProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2016 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.common;
-
-/** Gets config values from the container application. */
-public interface ConfigProvider {
-
-  String getString(String key, String defaultValue);
-
-  long getLong(String key, long defaultValue);
-
-  boolean getBoolean(String key, boolean defaultValue);
-}
diff --git a/java/com/android/dialer/common/ConfigProviderBindings.java b/java/com/android/dialer/common/ConfigProviderBindings.java
deleted file mode 100644
index 9f045ad..0000000
--- a/java/com/android/dialer/common/ConfigProviderBindings.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 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.common;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.UserManagerCompat;
-
-/** Accessor for getting a {@link ConfigProvider}. */
-public class ConfigProviderBindings {
-
-  private static ConfigProvider configProvider;
-  private static ConfigProvider configProviderStub;
-
-  public static ConfigProvider get(@NonNull Context context) {
-    Assert.isNotNull(context);
-    if (configProvider != null) {
-      return configProvider;
-    }
-    if (!UserManagerCompat.isUserUnlocked(context)) {
-      if (configProviderStub == null) {
-        configProviderStub = new ConfigProviderStub();
-      }
-      return configProviderStub;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof ConfigProviderFactory) {
-      configProvider = ((ConfigProviderFactory) application).getConfigProvider();
-    }
-
-    if (configProvider == null) {
-      configProvider = new ConfigProviderStub();
-    }
-
-    return configProvider;
-  }
-
-  @VisibleForTesting
-  public static void setForTesting(@Nullable ConfigProvider configProviderForTesting) {
-    configProvider = configProviderForTesting;
-  }
-
-  private static class ConfigProviderStub implements ConfigProvider {
-    @Override
-    public String getString(String key, String defaultValue) {
-      return defaultValue;
-    }
-
-    @Override
-    public long getLong(String key, long defaultValue) {
-      return defaultValue;
-    }
-
-    @Override
-    public boolean getBoolean(String key, boolean defaultValue) {
-      return defaultValue;
-    }
-  }
-}
diff --git a/java/com/android/dialer/common/ConfigProviderFactory.java b/java/com/android/dialer/common/ConfigProviderFactory.java
deleted file mode 100644
index aeb4f30..0000000
--- a/java/com/android/dialer/common/ConfigProviderFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2016 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.common;
-
-/**
- * This interface should be implementated by the Application subclass. It allows dialer code to get
- * references to a config provider.
- */
-public interface ConfigProviderFactory {
-
-  ConfigProvider getConfigProvider();
-}
diff --git a/java/com/android/dialer/common/FragmentUtils.java b/java/com/android/dialer/common/FragmentUtils.java
index cb03695..ad7ec73 100644
--- a/java/com/android/dialer/common/FragmentUtils.java
+++ b/java/com/android/dialer/common/FragmentUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.common;
 
+import android.app.Activity;
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -62,6 +63,33 @@
     return null;
   }
 
+  /** Version of {@link #getParent(Fragment, Class)} which supports {@link android.app.Fragment}. */
+  @CheckResult(suggest = "#checkParent(Fragment, Class)}")
+  @Nullable
+  public static <T> T getParent(
+      @NonNull android.app.Fragment fragment, @NonNull Class<T> callbackInterface) {
+    if (callbackInterface.isInstance(parentForTesting)) {
+      @SuppressWarnings("unchecked") // Casts are checked using runtime methods
+      T parent = (T) parentForTesting;
+      return parent;
+    }
+
+    android.app.Fragment parentFragment = fragment.getParentFragment();
+    if (callbackInterface.isInstance(parentFragment)) {
+      @SuppressWarnings("unchecked") // Casts are checked using runtime methods
+      T parent = (T) parentFragment;
+      return parent;
+    } else {
+      Activity activity = fragment.getActivity();
+      if (callbackInterface.isInstance(activity)) {
+        @SuppressWarnings("unchecked") // Casts are checked using runtime methods
+        T parent = (T) activity;
+        return parent;
+      }
+    }
+    return null;
+  }
+
   /** Returns the parent or throws. Should perform check elsewhere(e.g. onAttach, newInstance). */
   @NonNull
   public static <T> T getParentUnsafe(
@@ -70,6 +98,16 @@
   }
 
   /**
+   * Version of {@link #getParentUnsafe(Fragment, Class)} which supports {@link
+   * android.app.Fragment}.
+   */
+  @NonNull
+  public static <T> T getParentUnsafe(
+      @NonNull android.app.Fragment fragment, @NonNull Class<T> callbackInterface) {
+    return Assert.isNotNull(getParent(fragment, callbackInterface));
+  }
+
+  /**
    * Ensures fragment has a parent that implements the corresponding interface
    *
    * @param frag The Fragment whose parents are to be checked
diff --git a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
index 4b6d81a..a87bbce 100644
--- a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
+++ b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
@@ -17,6 +17,7 @@
 package com.android.dialer.common.concurrent;
 
 import android.app.FragmentManager;
+import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
@@ -25,9 +26,13 @@
 import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 
 /** The production {@link DialerExecutorFactory}. */
@@ -62,16 +67,16 @@
         throwable -> {
           throw new RuntimeException(throwable);
         };
-    @Nullable final ExecutorService serialExecutorService;
-    @Nullable final ExecutorService parallelExecutorService;
+    @Nullable final ScheduledExecutorService serialExecutorService;
+    @Nullable final Executor parallelExecutor;
 
     BaseTaskBuilder(
         Worker<InputT, OutputT> worker,
-        @Nullable ExecutorService serialExecutorService,
-        @Nullable ExecutorService parallelExecutorService) {
+        @Nullable ScheduledExecutorService serialExecutorService,
+        @Nullable Executor parallelExecutor) {
       this.worker = worker;
       this.serialExecutorService = serialExecutorService;
-      this.parallelExecutorService = parallelExecutorService;
+      this.parallelExecutor = parallelExecutor;
     }
 
     @NonNull
@@ -91,6 +96,19 @@
 
   /** Convenience class for use by {@link DialerExecutorFactory} implementations. */
   public static class UiTaskBuilder<InputT, OutputT> extends BaseTaskBuilder<InputT, OutputT> {
+    private static final ScheduledExecutorService defaultSerialExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactory() {
+              @Override
+              public Thread newThread(Runnable runnable) {
+                LogUtil.i("UiTaskBuilder.newThread", "creating serial thread");
+                Thread thread = new Thread(runnable, "UiTaskBuilder-Serial");
+                thread.setPriority(5); // Corresponds to Process.THREAD_PRIORITY_DEFAULT
+                return thread;
+              }
+            });
+
+    private static final Executor defaultParallelExecutorService = AsyncTask.THREAD_POOL_EXECUTOR;
 
     private final FragmentManager fragmentManager;
     private final String id;
@@ -102,16 +120,16 @@
           fragmentManager,
           id,
           worker,
-          null /* serialExecutorService */,
-          null /* parallelExecutorService */);
+          defaultSerialExecutorService,
+          defaultParallelExecutorService);
     }
 
     public UiTaskBuilder(
         FragmentManager fragmentManager,
         String id,
         Worker<InputT, OutputT> worker,
-        ExecutorService serialExecutor,
-        ExecutorService parallelExecutor) {
+        ScheduledExecutorService serialExecutor,
+        Executor parallelExecutor) {
       super(worker, serialExecutor, parallelExecutor);
       this.fragmentManager = fragmentManager;
       this.id = id;
@@ -128,46 +146,36 @@
               super.successListener,
               super.failureListener,
               serialExecutorService,
-              parallelExecutorService);
+              parallelExecutor);
       return new UiDialerExecutor<>(dialerUiTaskFragment);
     }
   }
 
   /** Convenience class for use by {@link DialerExecutorFactory} implementations. */
   public static class NonUiTaskBuilder<InputT, OutputT> extends BaseTaskBuilder<InputT, OutputT> {
-    private static final ExecutorService defaultSerialExecutorService =
-        Executors.newSingleThreadExecutor(
+    private static final ScheduledExecutorService defaultSerialExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
             new ThreadFactory() {
               @Override
               public Thread newThread(Runnable runnable) {
                 LogUtil.i("NonUiTaskBuilder.newThread", "creating serial thread");
-                Thread thread = new Thread(runnable, "NonUiTaskBuilder");
+                Thread thread = new Thread(runnable, "NonUiTaskBuilder-Serial");
                 thread.setPriority(4); // Corresponds to Process.THREAD_PRIORITY_BACKGROUND
                 return thread;
               }
             });
 
-    private static final ExecutorService defaultParallelExecutorService =
-        Executors.newFixedThreadPool(
-            5,
-            new ThreadFactory() {
-              @Override
-              public Thread newThread(Runnable runnable) {
-                LogUtil.i("NonUiTaskBuilder.newThread", "creating parallel thread");
-                Thread thread = new Thread(runnable, "NonUiTaskBuilder");
-                thread.setPriority(4); // Corresponds to Process.THREAD_PRIORITY_BACKGROUND
-                return thread;
-              }
-            });
+    private static final Executor defaultParallelExecutor =
+        DialerExecutors.getLowPriorityThreadPool();
 
     NonUiTaskBuilder(Worker<InputT, OutputT> worker) {
-      this(worker, defaultSerialExecutorService, defaultParallelExecutorService);
+      this(worker, defaultSerialExecutorService, defaultParallelExecutor);
     }
 
     public NonUiTaskBuilder(
         Worker<InputT, OutputT> worker,
-        @NonNull ExecutorService serialExecutor,
-        @NonNull ExecutorService parallelExecutor) {
+        @NonNull ScheduledExecutorService serialExecutor,
+        @NonNull Executor parallelExecutor) {
       super(worker, Assert.isNotNull(serialExecutor), Assert.isNotNull(parallelExecutor));
     }
 
@@ -179,7 +187,7 @@
           super.successListener,
           super.failureListener,
           serialExecutorService,
-          parallelExecutorService);
+          parallelExecutor);
     }
   }
 
@@ -197,6 +205,11 @@
     }
 
     @Override
+    public void executeSerialWithWait(@Nullable InputT input, long waitMillis) {
+      dialerUiTaskFragment.executeSerialWithWait(input, waitMillis);
+    }
+
+    @Override
     public void executeParallel(@Nullable InputT input) {
       dialerUiTaskFragment.executeParallel(input);
     }
@@ -214,47 +227,59 @@
     private final SuccessListener<OutputT> successListener;
     private final FailureListener failureListener;
 
-    private final ExecutorService serialExecutorService;
-    private final ExecutorService parallelExecutorService;
+    private final ScheduledExecutorService serialExecutorService;
+    private final Executor parallelExecutor;
+
+    private ScheduledFuture<?> scheduledFuture;
 
     NonUiDialerExecutor(
         Worker<InputT, OutputT> worker,
         SuccessListener<OutputT> successListener,
         FailureListener failureListener,
-        ExecutorService serialExecutorService,
-        ExecutorService parallelExecutorService) {
+        ScheduledExecutorService serialExecutorService,
+        Executor parallelExecutor) {
       this.worker = worker;
       this.successListener = successListener;
       this.failureListener = failureListener;
       this.serialExecutorService = serialExecutorService;
-      this.parallelExecutorService = parallelExecutorService;
+      this.parallelExecutor = parallelExecutor;
     }
 
     @Override
     public void executeSerial(@Nullable InputT input) {
-      executeOnCustomExecutorService(serialExecutorService, input);
+      serialExecutorService.execute(() -> run(input));
+    }
+
+    @Override
+    public void executeSerialWithWait(@Nullable InputT input, long waitMillis) {
+      if (scheduledFuture != null) {
+        LogUtil.i("NonUiDialerExecutor.executeSerialWithWait", "cancelling waiting task");
+        scheduledFuture.cancel(false /* mayInterrupt */);
+      }
+      scheduledFuture =
+          serialExecutorService.schedule(() -> run(input), waitMillis, TimeUnit.MILLISECONDS);
     }
 
     @Override
     public void executeParallel(@Nullable InputT input) {
-      executeOnCustomExecutorService(parallelExecutorService, input);
+      parallelExecutor.execute(() -> run(input));
     }
 
     @Override
     public void executeOnCustomExecutorService(
         @NonNull ExecutorService executorService, @Nullable InputT input) {
-      Assert.isNotNull(executorService)
-          .execute(
-              () -> {
-                OutputT output;
-                try {
-                  output = worker.doInBackground(input);
-                } catch (Throwable throwable) {
-                  ThreadUtil.postOnUiThread(() -> failureListener.onFailure(throwable));
-                  return;
-                }
-                ThreadUtil.postOnUiThread(() -> successListener.onSuccess(output));
-              });
+      Assert.isNotNull(executorService).execute(() -> run(input));
+    }
+
+    private void run(@Nullable InputT input) {
+      OutputT output;
+      try {
+        output = worker.doInBackground(input);
+      } catch (Throwable throwable) {
+        ThreadUtil.postOnUiThread(() -> failureListener.onFailure(throwable));
+        return;
+      }
+      ThreadUtil.postOnUiThread(() -> successListener.onSuccess(output));
     }
   }
 }
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutor.java b/java/com/android/dialer/common/concurrent/DialerExecutor.java
index 0237e3a..0414581 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutor.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutor.java
@@ -84,6 +84,16 @@
   void executeSerial(@Nullable InputT input);
 
   /**
+   * Executes the task after waiting {@code waitMillis}. If called while the previous invocation is
+   * still waiting to be started, the original invocation is cancelled.
+   *
+   * <p>This is useful for tasks which might get scheduled many times in very quick succession, but
+   * it is only the last one that actually needs to be executed.
+   */
+  @MainThread
+  void executeSerialWithWait(@Nullable InputT input, long waitMillis);
+
+  /**
    * Executes the task on a thread pool shared across the application. Multiple calls using this
    * method may result in tasks being executed in parallel.
    */
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
new file mode 100644
index 0000000..2503325
--- /dev/null
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.common.concurrent;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component which provides a {@link DialerExecutorFactory}. */
+@Subcomponent
+public abstract class DialerExecutorComponent {
+
+  public abstract DialerExecutorFactory dialerExecutorFactory();
+
+  public static DialerExecutorComponent get(Context context) {
+    return ((DialerExecutorComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .dialerExecutorComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    DialerExecutorComponent dialerExecutorComponent();
+  }
+}
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorModule.java b/java/com/android/dialer/common/concurrent/DialerExecutorModule.java
new file mode 100644
index 0000000..281f88c
--- /dev/null
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorModule.java
@@ -0,0 +1,28 @@
+/*
+ * 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.common.concurrent;
+
+import dagger.Binds;
+import dagger.Module;
+
+/** Module which binds the production {@link DialerExecutorFactory}. */
+@Module
+public abstract class DialerExecutorModule {
+
+  @Binds
+  abstract DialerExecutorFactory bindDialerExecutorFactory(
+      DefaultDialerExecutorFactory defaultDialerExecutorFactory);
+}
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutors.java b/java/com/android/dialer/common/concurrent/DialerExecutors.java
index 148d866..81b3c5c 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutors.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutors.java
@@ -19,7 +19,11 @@
 import android.app.FragmentManager;
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 
 /**
  * Factory methods for creating {@link DialerExecutor} objects for doing background work.
@@ -131,4 +135,27 @@
       @NonNull Worker<InputT, OutputT> worker) {
     return new DefaultDialerExecutorFactory().createNonUiTaskBuilder(Assert.isNotNull(worker));
   }
+
+  private static final Executor lowPriorityThreadPool =
+      Executors.newFixedThreadPool(
+          5,
+          new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable runnable) {
+              LogUtil.i("DialerExecutors.newThread", "creating low priority thread");
+              Thread thread = new Thread(runnable, "DialerExecutors-LowPriority");
+              thread.setPriority(4); // Corresponds to Process.THREAD_PRIORITY_BACKGROUND
+              return thread;
+            }
+          });
+
+  /**
+   * An application-wide thread pool used for low priority (non-UI) tasks.
+   *
+   * <p>This exists to prevent each individual dialer component from having to create its own
+   * threads/pools, which would result in the application having more threads than really necessary.
+   */
+  public static Executor getLowPriorityThreadPool() {
+    return lowPriorityThreadPool;
+  }
 }
diff --git a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
index 6273368..f0b7537 100644
--- a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
+++ b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
@@ -18,17 +18,21 @@
 
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.AsyncTaskExecutors.SimpleAsyncTaskExecutor;
 import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Do not use this class directly. Instead use {@link DialerExecutors}.
@@ -38,13 +42,13 @@
  */
 public final class DialerUiTaskFragment<InputT, OutputT> extends Fragment {
 
-  private String taskId;
   private Worker<InputT, OutputT> worker;
   private SuccessListener<OutputT> successListener;
   private FailureListener failureListener;
 
-  private AsyncTaskExecutor serialExecutor = AsyncTaskExecutors.createAsyncTaskExecutor();
-  private AsyncTaskExecutor parallelExecutor = AsyncTaskExecutors.createThreadPoolExecutor();
+  private ScheduledExecutorService serialExecutor;
+  private Executor parallelExecutor;
+  private ScheduledFuture<?> scheduledFuture;
 
   /**
    * Creates a new {@link DialerUiTaskFragment} or gets an existing one in the event that a
@@ -76,28 +80,23 @@
       Worker<InputT, OutputT> worker,
       SuccessListener<OutputT> successListener,
       FailureListener failureListener,
-      @Nullable ExecutorService serialExecutorService,
-      @Nullable ExecutorService parallelExecutorService) {
+      @NonNull ScheduledExecutorService serialExecutorService,
+      @NonNull Executor parallelExecutor) {
     Assert.isMainThread();
 
     DialerUiTaskFragment<InputT, OutputT> fragment =
         (DialerUiTaskFragment<InputT, OutputT>) fragmentManager.findFragmentByTag(taskId);
 
     if (fragment == null) {
-      LogUtil.i("DialerUiTaskFragment.create", "creating new DialerUiTaskFragment");
+      LogUtil.i("DialerUiTaskFragment.create", "creating new DialerUiTaskFragment for " + taskId);
       fragment = new DialerUiTaskFragment<>();
       fragmentManager.beginTransaction().add(fragment, taskId).commit();
     }
-    fragment.taskId = taskId;
     fragment.worker = worker;
     fragment.successListener = successListener;
     fragment.failureListener = failureListener;
-    if (serialExecutorService != null) {
-      fragment.serialExecutor = new SimpleAsyncTaskExecutor(serialExecutorService);
-    }
-    if (parallelExecutorService != null) {
-      fragment.parallelExecutor = new SimpleAsyncTaskExecutor(parallelExecutorService);
-    }
+    fragment.serialExecutor = Assert.isNotNull(serialExecutorService);
+    fragment.parallelExecutor = Assert.isNotNull(parallelExecutor);
     return fragment;
   }
 
@@ -111,60 +110,75 @@
   public void onDetach() {
     super.onDetach();
     LogUtil.enterBlock("DialerUiTaskFragment.onDetach");
-    taskId = null;
     successListener = null;
     failureListener = null;
+    if (scheduledFuture != null) {
+      scheduledFuture.cancel(false /* mayInterrupt */);
+      scheduledFuture = null;
+    }
   }
 
   void executeSerial(InputT input) {
-    serialExecutor.submit(taskId, new InternalTask(), input);
+    serialExecutor.execute(() -> runTask(input));
+  }
+
+  void executeSerialWithWait(InputT input, long waitMillis) {
+    if (scheduledFuture != null) {
+      LogUtil.i("DialerUiTaskFragment.executeSerialWithWait", "cancelling waiting task");
+      scheduledFuture.cancel(false /* mayInterrupt */);
+    }
+    scheduledFuture =
+        serialExecutor.schedule(() -> runTask(input), waitMillis, TimeUnit.MILLISECONDS);
   }
 
   void executeParallel(InputT input) {
-    parallelExecutor.submit(taskId, new InternalTask(), input);
+    parallelExecutor.execute(() -> runTask(input));
   }
 
   void executeOnCustomExecutor(ExecutorService executor, InputT input) {
-    new SimpleAsyncTaskExecutor(executor).submit(taskId, new InternalTask(), input);
+    executor.execute(() -> runTask(input));
   }
 
-  private final class InternalTask extends AsyncTask<InputT, Void, InternalTaskResult<OutputT>> {
-
-    @SafeVarargs
-    @Override
-    protected final InternalTaskResult<OutputT> doInBackground(InputT... params) {
-      try {
-        return new InternalTaskResult<>(null, worker.doInBackground(params[0]));
-      } catch (Throwable throwable) {
-        LogUtil.e("InternalTask.doInBackground", "task failed", throwable);
-        return new InternalTaskResult<>(throwable, null);
-      }
-    }
-
-    @Override
-    protected void onPostExecute(InternalTaskResult<OutputT> result) {
-      if (result.throwable != null) {
-        if (failureListener == null) {
-          LogUtil.i("InternalTask.onPostExecute", "task failed but UI is dead");
-        } else {
-          failureListener.onFailure(result.throwable);
-        }
-      } else if (successListener == null) {
-        LogUtil.i("InternalTask.onPostExecute", "task succeeded but UI is dead");
+  @WorkerThread
+  private void runTask(@Nullable InputT input) {
+    try {
+      OutputT output = worker.doInBackground(input);
+      if (successListener == null) {
+        LogUtil.i("DialerUiTaskFragment.runTask", "task succeeded but UI is dead");
       } else {
-        successListener.onSuccess(result.result);
+        ThreadUtil.postOnUiThread(
+            () -> {
+              // Even though there is a null check above, it is possible for the activity/fragment
+              // to be finished between the time the runnable is posted and the time it executes. Do
+              // an additional check here.
+              if (successListener == null) {
+                LogUtil.i(
+                    "DialerUiTaskFragment.runTask",
+                    "task succeeded but UI died after success runnable posted");
+              } else {
+                successListener.onSuccess(output);
+              }
+            });
       }
-    }
-  }
-
-  private static class InternalTaskResult<OutputT> {
-
-    private final Throwable throwable;
-    private final OutputT result;
-
-    InternalTaskResult(Throwable throwable, OutputT result) {
-      this.throwable = throwable;
-      this.result = result;
+    } catch (Throwable throwable) {
+      LogUtil.e("DialerUiTaskFragment.runTask", "task failed", throwable);
+      if (failureListener == null) {
+        LogUtil.i("DialerUiTaskFragment.runTask", "task failed but UI is dead");
+      } else {
+        ThreadUtil.postOnUiThread(
+            () -> {
+              // Even though there is a null check above, it is possible for the activity/fragment
+              // to be finished between the time the runnable is posted and the time it executes. Do
+              // an additional check here.
+              if (failureListener == null) {
+                LogUtil.i(
+                    "DialerUiTaskFragment.runTask",
+                    "task failed but UI died after failure runnable posted");
+              } else {
+                failureListener.onFailure(throwable);
+              }
+            });
+      }
     }
   }
 }
diff --git a/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
index 6d02fe6..c7a7f36 100644
--- a/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
+++ b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java
@@ -30,7 +30,9 @@
  * @param <ParamsT> the type of the parameters sent to the task upon execution
  * @param <ProgressT> the type of the progress units published during the background computation
  * @param <ResultT> the type of the result of the background computation
+ * @deprecated Please use {@link DialerExecutors}.
  */
+@Deprecated
 public abstract class FallibleAsyncTask<ParamsT, ProgressT, ResultT>
     extends AsyncTask<ParamsT, ProgressT, FallibleTaskResult<ResultT>> {
 
diff --git a/java/com/android/dialer/common/concurrent/ThreadUtil.java b/java/com/android/dialer/common/concurrent/ThreadUtil.java
index 21cf463..39b6cce 100644
--- a/java/com/android/dialer/common/concurrent/ThreadUtil.java
+++ b/java/com/android/dialer/common/concurrent/ThreadUtil.java
@@ -28,6 +28,11 @@
     getUiThreadHandler().post(runnable);
   }
 
+  /** Posts a runnable to the UI thread, to be run after the specified amount of time elapses. */
+  public static void postDelayedOnUiThread(Runnable runnable, long delayMillis) {
+    getUiThreadHandler().postDelayed(runnable, delayMillis);
+  }
+
   /** Gets a handler which uses the main looper. */
   public static Handler getUiThreadHandler() {
     if (mainThreadHandler == null) {
diff --git a/java/com/android/dialer/common/database/Selection.java b/java/com/android/dialer/common/database/Selection.java
new file mode 100644
index 0000000..b61472d
--- /dev/null
+++ b/java/com/android/dialer/common/database/Selection.java
@@ -0,0 +1,260 @@
+/*
+ * 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.common.database;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.Assert;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Utility to build SQL selections. Handles string concatenation, nested statements, empty
+ * statements, and tracks the selection arguments.
+ *
+ * <p>A selection can be build from a string, factory methods like {@link #column(String)}, or use
+ * {@link Builder} to build complex nested selection with multiple operators. The Selection manages
+ * the {@code selection} and {@code selectionArgs} passed into {@link
+ * android.content.ContentResolver#query(android.net.Uri, String[], String, String[], String)}.
+ *
+ * <p>Example:
+ *
+ * <pre><code>
+ *   fromString("foo = 1")
+ * </code></pre>
+ *
+ * expands into "(foo = 1)", {}
+ *
+ * <p>
+ *
+ * <pre><code>
+ *   column("foo").is("LIKE", "bar")
+ * </code></pre>
+ *
+ * expands into "(foo LIKE ?)", {"bar"}
+ *
+ * <p>
+ *
+ * <pre><code>
+ *   builder()
+ *     .and(
+ *       fromString("foo = ?", "1").buildUpon()
+ *       .or(column("bar").is("<", 2))
+ *       .build())
+ *     .and(not(column("baz").is("!= 3")))
+ *     .build();
+ * </code></pre>
+ *
+ * expands into "(((foo = ?) OR (bar < ?)) AND (NOT (baz != 3)))", {"1", "2"}
+ */
+public final class Selection {
+
+  private final String selection;
+  private final String[] selectionArgs;
+
+  private Selection(@NonNull String selection, @NonNull String[] selectionArgs) {
+    this.selection = selection;
+    this.selectionArgs = selectionArgs;
+  }
+
+  @NonNull
+  public String getSelection() {
+    return selection;
+  }
+
+  @NonNull
+  public String[] getSelectionArgs() {
+    return selectionArgs;
+  }
+
+  public boolean isEmpty() {
+    return selection.isEmpty();
+  }
+
+  /**
+   * @return a mutable builder that appends to the selection. The selection will be parenthesized
+   *     before anything is appended to it.
+   */
+  @NonNull
+  public Builder buildUpon() {
+    return new Builder(this);
+  }
+
+  /** @return a builder that is empty. */
+  @NonNull
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  /**
+   * @return a Selection built from regular selection string/args pair. The result selection will be
+   *     enclosed in a parenthesis.
+   */
+  @NonNull
+  public static Selection fromString(@Nullable String selection, @Nullable String... args) {
+    return new Builder(selection, args).build();
+  }
+
+  /** @return a selection that is negated */
+  @NonNull
+  public static Selection not(@NonNull Selection selection) {
+    Assert.checkArgument(!selection.isEmpty());
+    return fromString("NOT " + selection.getSelection(), selection.getSelectionArgs());
+  }
+
+  /**
+   * Build a selection based on condition upon a column. is() should be called to complete the
+   * selection.
+   */
+  @NonNull
+  public static Column column(@NonNull String column) {
+    return new Column(column);
+  }
+
+  /** Helper class to build a selection based on condition upon a column. */
+  public static class Column {
+
+    @NonNull private final String column;
+
+    private Column(@NonNull String column) {
+      this.column = Assert.isNotNull(column);
+    }
+
+    /** Expands to "<column> <operator> ?" and add {@code value} to the arguments. */
+    @NonNull
+    public Selection is(@NonNull String operator, @NonNull Object value) {
+      return fromString(column + " " + Assert.isNotNull(operator) + " ?", value.toString());
+    }
+
+    /**
+     * Expands to "<column> <operator>". {@link #is(String, Object)} should be used if the condition
+     * is comparing to a string or a user input value, which must be sanitized.
+     */
+    @NonNull
+    public Selection is(@NonNull String condition) {
+      return fromString(column + " " + Assert.isNotNull(condition));
+    }
+  }
+
+  /** Builder for {@link Selection} */
+  public static final class Builder {
+
+    private final StringBuilder selection = new StringBuilder();
+    private final List<String> selectionArgs = new ArrayList<>();
+
+    private Builder() {}
+
+    private Builder(@Nullable String selection, @Nullable String... args) {
+      if (selection == null) {
+        return;
+      }
+      checkArgsCount(selection, args);
+      this.selection.append(parenthesized(selection));
+      if (args != null) {
+        Collections.addAll(selectionArgs, args);
+      }
+    }
+
+    private Builder(@NonNull Selection selection) {
+      this.selection.append(selection.getSelection());
+      Collections.addAll(selectionArgs, selection.selectionArgs);
+    }
+
+    @NonNull
+    public Selection build() {
+      if (selection.length() == 0) {
+        return new Selection("", new String[] {});
+      }
+      return new Selection(
+          parenthesized(selection.toString()),
+          selectionArgs.toArray(new String[selectionArgs.size()]));
+    }
+
+    @NonNull
+    public Builder and(@NonNull Selection selection) {
+      if (selection.isEmpty()) {
+        return this;
+      }
+
+      if (this.selection.length() > 0) {
+        this.selection.append(" AND ");
+      }
+      this.selection.append(selection.getSelection());
+      Collections.addAll(selectionArgs, selection.getSelectionArgs());
+      return this;
+    }
+
+    @NonNull
+    public Builder or(@NonNull Selection selection) {
+      if (selection.isEmpty()) {
+        return this;
+      }
+
+      if (this.selection.length() > 0) {
+        this.selection.append(" OR ");
+      }
+      this.selection.append(selection.getSelection());
+      Collections.addAll(selectionArgs, selection.getSelectionArgs());
+      return this;
+    }
+
+    private static void checkArgsCount(@NonNull String selection, @Nullable String... args) {
+      int argsInSelection = 0;
+      for (int i = 0; i < selection.length(); i++) {
+        if (selection.charAt(i) == '?') {
+          argsInSelection++;
+        }
+      }
+      Assert.checkArgument(argsInSelection == (args == null ? 0 : args.length));
+    }
+  }
+
+  /**
+   * Parenthesized the {@code string}. Will not parenthesized if {@code string} is empty or is
+   * already parenthesized (top level parenthesis encloses the whole string).
+   */
+  @NonNull
+  private static String parenthesized(@NonNull String string) {
+    if (string.isEmpty()) {
+      return "";
+    }
+    if (!string.startsWith("(")) {
+      return "(" + string + ")";
+    }
+    int depth = 1;
+    for (int i = 1; i < string.length() - 1; i++) {
+      switch (string.charAt(i)) {
+        case '(':
+          depth++;
+          break;
+        case ')':
+          depth--;
+          if (depth == 0) {
+            // First '(' closed before the string has ended,need an additional level of nesting.
+            // For example "(A) AND (B)" should become "((A) AND (B))"
+            return "(" + string + ")";
+          }
+          break;
+        default:
+          continue;
+      }
+    }
+    Assert.checkArgument(depth == 1);
+    return string;
+  }
+}
diff --git a/java/com/android/dialer/common/res/values-af/strings.xml b/java/com/android/dialer/common/res/values-af/strings.xml
index 10f1431..2ddb36c 100644
--- a/java/com/android/dialer/common/res/values-af/strings.xml
+++ b/java/com/android/dialer/common/res/values-af/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-am/strings.xml b/java/com/android/dialer/common/res/values-am/strings.xml
index 4d09ec6..57f54d3 100644
--- a/java/com/android/dialer/common/res/values-am/strings.xml
+++ b/java/com/android/dialer/common/res/values-am/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"ዋይፋይ"</string>
diff --git a/java/com/android/dialer/common/res/values-ar/strings.xml b/java/com/android/dialer/common/res/values-ar/strings.xml
index 0e837c4..8d62e39 100644
--- a/java/com/android/dialer/common/res/values-ar/strings.xml
+++ b/java/com/android/dialer/common/res/values-ar/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-az/strings.xml b/java/com/android/dialer/common/res/values-az/strings.xml
index 59ba93b..29c9cce 100644
--- a/java/com/android/dialer/common/res/values-az/strings.xml
+++ b/java/com/android/dialer/common/res/values-az/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
index 52b5f67..c2e7e6b 100644
--- a/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-be/strings.xml b/java/com/android/dialer/common/res/values-be/strings.xml
index 9bd978f..35a482f 100644
--- a/java/com/android/dialer/common/res/values-be/strings.xml
+++ b/java/com/android/dialer/common/res/values-be/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-bg/strings.xml b/java/com/android/dialer/common/res/values-bg/strings.xml
index f36aae1..b598488 100644
--- a/java/com/android/dialer/common/res/values-bg/strings.xml
+++ b/java/com/android/dialer/common/res/values-bg/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-bn/strings.xml b/java/com/android/dialer/common/res/values-bn/strings.xml
index ed55edb..a1e52ac 100644
--- a/java/com/android/dialer/common/res/values-bn/strings.xml
+++ b/java/com/android/dialer/common/res/values-bn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"ওয়াই ফাই"</string>
diff --git a/java/com/android/dialer/common/res/values-bs/strings.xml b/java/com/android/dialer/common/res/values-bs/strings.xml
index 537ccd8..85f48b8 100644
--- a/java/com/android/dialer/common/res/values-bs/strings.xml
+++ b/java/com/android/dialer/common/res/values-bs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-ca/strings.xml b/java/com/android/dialer/common/res/values-ca/strings.xml
index 8d095c7..cffdbea 100644
--- a/java/com/android/dialer/common/res/values-ca/strings.xml
+++ b/java/com/android/dialer/common/res/values-ca/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-cs/strings.xml b/java/com/android/dialer/common/res/values-cs/strings.xml
index c6a50bb..f8eeeec 100644
--- a/java/com/android/dialer/common/res/values-cs/strings.xml
+++ b/java/com/android/dialer/common/res/values-cs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-da/strings.xml b/java/com/android/dialer/common/res/values-da/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-da/strings.xml
+++ b/java/com/android/dialer/common/res/values-da/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-de/strings.xml b/java/com/android/dialer/common/res/values-de/strings.xml
index 9a54083..6761594 100644
--- a/java/com/android/dialer/common/res/values-de/strings.xml
+++ b/java/com/android/dialer/common/res/values-de/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WLAN"</string>
diff --git a/java/com/android/dialer/common/res/values-el/strings.xml b/java/com/android/dialer/common/res/values-el/strings.xml
index 43c28ca..4896004 100644
--- a/java/com/android/dialer/common/res/values-el/strings.xml
+++ b/java/com/android/dialer/common/res/values-el/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-en-rAU/strings.xml b/java/com/android/dialer/common/res/values-en-rAU/strings.xml
index dbc7a0c..29ff1e1 100644
--- a/java/com/android/dialer/common/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rAU/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-en-rGB/strings.xml b/java/com/android/dialer/common/res/values-en-rGB/strings.xml
index dbc7a0c..29ff1e1 100644
--- a/java/com/android/dialer/common/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rGB/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-en-rIN/strings.xml b/java/com/android/dialer/common/res/values-en-rIN/strings.xml
index dbc7a0c..29ff1e1 100644
--- a/java/com/android/dialer/common/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rIN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-es-rUS/strings.xml b/java/com/android/dialer/common/res/values-es-rUS/strings.xml
index 2c219a6..15bd5f6 100644
--- a/java/com/android/dialer/common/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/common/res/values-es-rUS/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-es/strings.xml b/java/com/android/dialer/common/res/values-es/strings.xml
index 2449b33..154aa13 100644
--- a/java/com/android/dialer/common/res/values-es/strings.xml
+++ b/java/com/android/dialer/common/res/values-es/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-et/strings.xml b/java/com/android/dialer/common/res/values-et/strings.xml
index 414f785..af6dd6a 100644
--- a/java/com/android/dialer/common/res/values-et/strings.xml
+++ b/java/com/android/dialer/common/res/values-et/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
diff --git a/java/com/android/dialer/common/res/values-eu/strings.xml b/java/com/android/dialer/common/res/values-eu/strings.xml
index f0f14de..d4c3cd8 100644
--- a/java/com/android/dialer/common/res/values-eu/strings.xml
+++ b/java/com/android/dialer/common/res/values-eu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-fa/strings.xml b/java/com/android/dialer/common/res/values-fa/strings.xml
index 04c6907..a9d798e 100644
--- a/java/com/android/dialer/common/res/values-fa/strings.xml
+++ b/java/com/android/dialer/common/res/values-fa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-fi/strings.xml b/java/com/android/dialer/common/res/values-fi/strings.xml
index 1671a9a..8ff088c 100644
--- a/java/com/android/dialer/common/res/values-fi/strings.xml
+++ b/java/com/android/dialer/common/res/values-fi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi‑Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-fr-rCA/strings.xml b/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
index 47828be..46172f8 100644
--- a/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-fr/strings.xml b/java/com/android/dialer/common/res/values-fr/strings.xml
index dbc7a0c..29ff1e1 100644
--- a/java/com/android/dialer/common/res/values-fr/strings.xml
+++ b/java/com/android/dialer/common/res/values-fr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-gl/strings.xml b/java/com/android/dialer/common/res/values-gl/strings.xml
index 9b5e174..6a287e5 100644
--- a/java/com/android/dialer/common/res/values-gl/strings.xml
+++ b/java/com/android/dialer/common/res/values-gl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-gu/strings.xml b/java/com/android/dialer/common/res/values-gu/strings.xml
index 0d0f4ed..9a565eb 100644
--- a/java/com/android/dialer/common/res/values-gu/strings.xml
+++ b/java/com/android/dialer/common/res/values-gu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-hi/strings.xml b/java/com/android/dialer/common/res/values-hi/strings.xml
index bb064b4..1983869 100644
--- a/java/com/android/dialer/common/res/values-hi/strings.xml
+++ b/java/com/android/dialer/common/res/values-hi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"वाई-फ़ाई"</string>
diff --git a/java/com/android/dialer/common/res/values-hr/strings.xml b/java/com/android/dialer/common/res/values-hr/strings.xml
index e2e3b71..94c2664 100644
--- a/java/com/android/dialer/common/res/values-hr/strings.xml
+++ b/java/com/android/dialer/common/res/values-hr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-hu/strings.xml b/java/com/android/dialer/common/res/values-hu/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-hu/strings.xml
+++ b/java/com/android/dialer/common/res/values-hu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-hy/strings.xml b/java/com/android/dialer/common/res/values-hy/strings.xml
index 1de9c40..6e78fe8 100644
--- a/java/com/android/dialer/common/res/values-hy/strings.xml
+++ b/java/com/android/dialer/common/res/values-hy/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-in/strings.xml b/java/com/android/dialer/common/res/values-in/strings.xml
index f531e13..85df717 100644
--- a/java/com/android/dialer/common/res/values-in/strings.xml
+++ b/java/com/android/dialer/common/res/values-in/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-is/strings.xml b/java/com/android/dialer/common/res/values-is/strings.xml
index c77dddf..987becc 100644
--- a/java/com/android/dialer/common/res/values-is/strings.xml
+++ b/java/com/android/dialer/common/res/values-is/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
diff --git a/java/com/android/dialer/common/res/values-it/strings.xml b/java/com/android/dialer/common/res/values-it/strings.xml
index 04ac198..8166c39 100644
--- a/java/com/android/dialer/common/res/values-it/strings.xml
+++ b/java/com/android/dialer/common/res/values-it/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-iw/strings.xml b/java/com/android/dialer/common/res/values-iw/strings.xml
index 2f240bb..6190045 100644
--- a/java/com/android/dialer/common/res/values-iw/strings.xml
+++ b/java/com/android/dialer/common/res/values-iw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ja/strings.xml b/java/com/android/dialer/common/res/values-ja/strings.xml
index 938f21d..3a883cc 100644
--- a/java/com/android/dialer/common/res/values-ja/strings.xml
+++ b/java/com/android/dialer/common/res/values-ja/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ka/strings.xml b/java/com/android/dialer/common/res/values-ka/strings.xml
index 224fb86..65acee5 100644
--- a/java/com/android/dialer/common/res/values-ka/strings.xml
+++ b/java/com/android/dialer/common/res/values-ka/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-kk/strings.xml b/java/com/android/dialer/common/res/values-kk/strings.xml
index 88be769..57bd245 100644
--- a/java/com/android/dialer/common/res/values-kk/strings.xml
+++ b/java/com/android/dialer/common/res/values-kk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-km/strings.xml b/java/com/android/dialer/common/res/values-km/strings.xml
index b8fe6c7..0788d94 100644
--- a/java/com/android/dialer/common/res/values-km/strings.xml
+++ b/java/com/android/dialer/common/res/values-km/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"វ៉ាយហ្វាយ"</string>
diff --git a/java/com/android/dialer/common/res/values-kn/strings.xml b/java/com/android/dialer/common/res/values-kn/strings.xml
index de4b8de..c854b0a 100644
--- a/java/com/android/dialer/common/res/values-kn/strings.xml
+++ b/java/com/android/dialer/common/res/values-kn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"ವೈಫೈ"</string>
diff --git a/java/com/android/dialer/common/res/values-ko/strings.xml b/java/com/android/dialer/common/res/values-ko/strings.xml
index 89b6c07..bbe7c8f 100644
--- a/java/com/android/dialer/common/res/values-ko/strings.xml
+++ b/java/com/android/dialer/common/res/values-ko/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ky/strings.xml b/java/com/android/dialer/common/res/values-ky/strings.xml
index 7630f31..f2f5279 100644
--- a/java/com/android/dialer/common/res/values-ky/strings.xml
+++ b/java/com/android/dialer/common/res/values-ky/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi‑Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-lo/strings.xml b/java/com/android/dialer/common/res/values-lo/strings.xml
index 9496a67..5433ce8 100644
--- a/java/com/android/dialer/common/res/values-lo/strings.xml
+++ b/java/com/android/dialer/common/res/values-lo/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-lt/strings.xml b/java/com/android/dialer/common/res/values-lt/strings.xml
index e3b0355..78e0934 100644
--- a/java/com/android/dialer/common/res/values-lt/strings.xml
+++ b/java/com/android/dialer/common/res/values-lt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-lv/strings.xml b/java/com/android/dialer/common/res/values-lv/strings.xml
index 1cece96..e857929 100644
--- a/java/com/android/dialer/common/res/values-lv/strings.xml
+++ b/java/com/android/dialer/common/res/values-lv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-mk/strings.xml b/java/com/android/dialer/common/res/values-mk/strings.xml
index 928c6d2..4ccf6bb 100644
--- a/java/com/android/dialer/common/res/values-mk/strings.xml
+++ b/java/com/android/dialer/common/res/values-mk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ml/strings.xml b/java/com/android/dialer/common/res/values-ml/strings.xml
index fe40cf5..0f10d38 100644
--- a/java/com/android/dialer/common/res/values-ml/strings.xml
+++ b/java/com/android/dialer/common/res/values-ml/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-mn/strings.xml b/java/com/android/dialer/common/res/values-mn/strings.xml
index 7f23d32..1ac0f00 100644
--- a/java/com/android/dialer/common/res/values-mn/strings.xml
+++ b/java/com/android/dialer/common/res/values-mn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
diff --git a/java/com/android/dialer/common/res/values-mr/strings.xml b/java/com/android/dialer/common/res/values-mr/strings.xml
index d860dba..491f0c0 100644
--- a/java/com/android/dialer/common/res/values-mr/strings.xml
+++ b/java/com/android/dialer/common/res/values-mr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"वायफाय"</string>
diff --git a/java/com/android/dialer/common/res/values-ms/strings.xml b/java/com/android/dialer/common/res/values-ms/strings.xml
index 2ebf4fe..3ef6055 100644
--- a/java/com/android/dialer/common/res/values-ms/strings.xml
+++ b/java/com/android/dialer/common/res/values-ms/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-my/strings.xml b/java/com/android/dialer/common/res/values-my/strings.xml
index 314613a..c211122 100644
--- a/java/com/android/dialer/common/res/values-my/strings.xml
+++ b/java/com/android/dialer/common/res/values-my/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-nb/strings.xml b/java/com/android/dialer/common/res/values-nb/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-nb/strings.xml
+++ b/java/com/android/dialer/common/res/values-nb/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ne/strings.xml b/java/com/android/dialer/common/res/values-ne/strings.xml
index 287d78d..103f81f 100644
--- a/java/com/android/dialer/common/res/values-ne/strings.xml
+++ b/java/com/android/dialer/common/res/values-ne/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-nl/strings.xml b/java/com/android/dialer/common/res/values-nl/strings.xml
index a894095..7b9745e 100644
--- a/java/com/android/dialer/common/res/values-nl/strings.xml
+++ b/java/com/android/dialer/common/res/values-nl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-no/strings.xml b/java/com/android/dialer/common/res/values-no/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-no/strings.xml
+++ b/java/com/android/dialer/common/res/values-no/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-pa/strings.xml b/java/com/android/dialer/common/res/values-pa/strings.xml
index 2dfa423..b656d19 100644
--- a/java/com/android/dialer/common/res/values-pa/strings.xml
+++ b/java/com/android/dialer/common/res/values-pa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-pl/strings.xml b/java/com/android/dialer/common/res/values-pl/strings.xml
index 6999a90..b6f4eb4 100644
--- a/java/com/android/dialer/common/res/values-pl/strings.xml
+++ b/java/com/android/dialer/common/res/values-pl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-pt-rBR/strings.xml b/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
index 77a4002..08e0644 100644
--- a/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-pt-rPT/strings.xml b/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
index 4649c42..a876565 100644
--- a/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-pt/strings.xml b/java/com/android/dialer/common/res/values-pt/strings.xml
index 77a4002..08e0644 100644
--- a/java/com/android/dialer/common/res/values-pt/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ro/strings.xml b/java/com/android/dialer/common/res/values-ro/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-ro/strings.xml
+++ b/java/com/android/dialer/common/res/values-ro/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ru/strings.xml b/java/com/android/dialer/common/res/values-ru/strings.xml
index cbc8873..2b5a0d1 100644
--- a/java/com/android/dialer/common/res/values-ru/strings.xml
+++ b/java/com/android/dialer/common/res/values-ru/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-si/strings.xml b/java/com/android/dialer/common/res/values-si/strings.xml
index b9babc6..4df629d 100644
--- a/java/com/android/dialer/common/res/values-si/strings.xml
+++ b/java/com/android/dialer/common/res/values-si/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
diff --git a/java/com/android/dialer/common/res/values-sk/strings.xml b/java/com/android/dialer/common/res/values-sk/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-sk/strings.xml
+++ b/java/com/android/dialer/common/res/values-sk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-sl/strings.xml b/java/com/android/dialer/common/res/values-sl/strings.xml
index eb4094e..5a2203a 100644
--- a/java/com/android/dialer/common/res/values-sl/strings.xml
+++ b/java/com/android/dialer/common/res/values-sl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-sq/strings.xml b/java/com/android/dialer/common/res/values-sq/strings.xml
index 9b58fbc..82ed739 100644
--- a/java/com/android/dialer/common/res/values-sq/strings.xml
+++ b/java/com/android/dialer/common/res/values-sq/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-sr/strings.xml b/java/com/android/dialer/common/res/values-sr/strings.xml
index 8b387e6..4c164f4 100644
--- a/java/com/android/dialer/common/res/values-sr/strings.xml
+++ b/java/com/android/dialer/common/res/values-sr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-sv/strings.xml b/java/com/android/dialer/common/res/values-sv/strings.xml
index 00df25a..57e6e0b 100644
--- a/java/com/android/dialer/common/res/values-sv/strings.xml
+++ b/java/com/android/dialer/common/res/values-sv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-sw/strings.xml b/java/com/android/dialer/common/res/values-sw/strings.xml
index df0b97d..48d0b35 100644
--- a/java/com/android/dialer/common/res/values-sw/strings.xml
+++ b/java/com/android/dialer/common/res/values-sw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ta/strings.xml b/java/com/android/dialer/common/res/values-ta/strings.xml
index fbce62c..b3b5e32 100644
--- a/java/com/android/dialer/common/res/values-ta/strings.xml
+++ b/java/com/android/dialer/common/res/values-ta/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"வைஃபை"</string>
diff --git a/java/com/android/dialer/common/res/values-te/strings.xml b/java/com/android/dialer/common/res/values-te/strings.xml
index af1a43c..aafec37 100644
--- a/java/com/android/dialer/common/res/values-te/strings.xml
+++ b/java/com/android/dialer/common/res/values-te/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-th/strings.xml b/java/com/android/dialer/common/res/values-th/strings.xml
index 1ea62f3..38c5f83 100644
--- a/java/com/android/dialer/common/res/values-th/strings.xml
+++ b/java/com/android/dialer/common/res/values-th/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-tl/strings.xml b/java/com/android/dialer/common/res/values-tl/strings.xml
index d9e8519..a11c8ee 100644
--- a/java/com/android/dialer/common/res/values-tl/strings.xml
+++ b/java/com/android/dialer/common/res/values-tl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-tr/strings.xml b/java/com/android/dialer/common/res/values-tr/strings.xml
index 57c66b5..14dd781 100644
--- a/java/com/android/dialer/common/res/values-tr/strings.xml
+++ b/java/com/android/dialer/common/res/values-tr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Kablosuz"</string>
diff --git a/java/com/android/dialer/common/res/values-uk/strings.xml b/java/com/android/dialer/common/res/values-uk/strings.xml
index 0d94f71..d44b19a 100644
--- a/java/com/android/dialer/common/res/values-uk/strings.xml
+++ b/java/com/android/dialer/common/res/values-uk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-ur/strings.xml b/java/com/android/dialer/common/res/values-ur/strings.xml
index f21549e..6774991 100644
--- a/java/com/android/dialer/common/res/values-ur/strings.xml
+++ b/java/com/android/dialer/common/res/values-ur/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
diff --git a/java/com/android/dialer/common/res/values-uz/strings.xml b/java/com/android/dialer/common/res/values-uz/strings.xml
index 447825a..6865409 100644
--- a/java/com/android/dialer/common/res/values-uz/strings.xml
+++ b/java/com/android/dialer/common/res/values-uz/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WI-FI"</string>
diff --git a/java/com/android/dialer/common/res/values-vi/strings.xml b/java/com/android/dialer/common/res/values-vi/strings.xml
index 574e926..469ee85 100644
--- a/java/com/android/dialer/common/res/values-vi/strings.xml
+++ b/java/com/android/dialer/common/res/values-vi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-zh-rCN/strings.xml b/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
index 202aa7f..0b7e64a 100644
--- a/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"WLAN"</string>
diff --git a/java/com/android/dialer/common/res/values-zh-rHK/strings.xml b/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
index 454b65e..789cb1c 100644
--- a/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-zh-rTW/strings.xml b/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
index 8b5f2b5..6da96b5 100644
--- a/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values-zu/strings.xml b/java/com/android/dialer/common/res/values-zu/strings.xml
index bfa458d..a953ab0 100644
--- a/java/com/android/dialer/common/res/values-zu/strings.xml
+++ b/java/com/android/dialer/common/res/values-zu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="network_name_wifi" msgid="3026388992566895417">"I-Wi-Fi"</string>
diff --git a/java/com/android/dialer/common/res/values/config.xml b/java/com/android/dialer/common/res/values/config.xml
deleted file mode 100644
index c4df279..0000000
--- a/java/com/android/dialer/common/res/values/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <bool name="spring_hd_codec">false</bool>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/common/res/values/strings.xml b/java/com/android/dialer/common/res/values/strings.xml
index 8e96161..770f42f 100644
--- a/java/com/android/dialer/common/res/values/strings.xml
+++ b/java/com/android/dialer/common/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
   <string name="network_name_wifi">Wifi</string>
   <string name="network_name_mobile">Mobile</string>
diff --git a/java/com/android/dialer/compat/CompatUtils.java b/java/com/android/dialer/compat/CompatUtils.java
index 673cb70..584f205 100644
--- a/java/com/android/dialer/compat/CompatUtils.java
+++ b/java/com/android/dialer/compat/CompatUtils.java
@@ -15,16 +15,15 @@
  */
 package com.android.dialer.compat;
 
+import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
-import java.lang.reflect.InvocationTargetException;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.LocaleList;
+import java.util.Locale;
 
 public final class CompatUtils {
 
-  private static final String TAG = CompatUtils.class.getSimpleName();
-
   /** PrioritizedMimeType is added in API level 23. */
   public static boolean hasPrioritizedMimeType() {
     return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M;
@@ -71,152 +70,16 @@
     return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M;
   }
 
-  /**
-   * Determines if this version is compatible with a default dialer. Can also force the version to
-   * be lower through {@link SdkVersionOverride}.
-   *
-   * @return {@code true} if default dialer is a feature on this device, {@code false} otherwise.
-   */
-  public static boolean isDefaultDialerCompatible() {
-    return isMarshmallowCompatible();
-  }
-
-  /**
-   * Determines if this version is compatible with Lollipop Mr1-specific APIs. Can also force the
-   * version to be lower through SdkVersionOverride.
-   *
-   * @return {@code true} if runtime sdk is compatible with Lollipop MR1, {@code false} otherwise.
-   */
-  public static boolean isLollipopMr1Compatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP_MR1)
-        >= Build.VERSION_CODES.LOLLIPOP_MR1;
-  }
-
-  /**
-   * Determines if this version is compatible with Marshmallow-specific APIs. Can also force the
-   * version to be lower through SdkVersionOverride.
-   *
-   * @return {@code true} if runtime sdk is compatible with Marshmallow, {@code false} otherwise.
-   */
-  public static boolean isMarshmallowCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M;
-  }
-
-  /**
-   * Determines if the given class is available. Can be used to check if system apis exist at
-   * runtime.
-   *
-   * @param className the name of the class to look for.
-   * @return {@code true} if the given class is available, {@code false} otherwise or if className
-   *     is empty.
-   */
-  public static boolean isClassAvailable(@Nullable String className) {
-    if (TextUtils.isEmpty(className)) {
-      return false;
+  /** Returns locale of the device. */
+  public static Locale getLocale(Context context) {
+    if (VERSION.SDK_INT >= VERSION_CODES.N) {
+      LocaleList localList = context.getResources().getConfiguration().getLocales();
+      if (!localList.isEmpty()) {
+        return localList.get(0);
+      }
+      return Locale.getDefault();
+    } else {
+      return context.getResources().getConfiguration().locale;
     }
-    try {
-      Class.forName(className);
-      return true;
-    } catch (ClassNotFoundException e) {
-      return false;
-    } catch (Throwable t) {
-      Log.e(
-          TAG,
-          "Unexpected exception when checking if class:" + className + " exists at " + "runtime",
-          t);
-      return false;
-    }
-  }
-
-  /**
-   * Determines if the given class's method is available to call. Can be used to check if system
-   * apis exist at runtime.
-   *
-   * @param className the name of the class to look for
-   * @param methodName the name of the method to look for
-   * @param parameterTypes the needed parameter types for the method to look for
-   * @return {@code true} if the given class is available, {@code false} otherwise or if className
-   *     or methodName are empty.
-   */
-  public static boolean isMethodAvailable(
-      @Nullable String className, @Nullable String methodName, Class<?>... parameterTypes) {
-    if (TextUtils.isEmpty(className) || TextUtils.isEmpty(methodName)) {
-      return false;
-    }
-
-    try {
-      Class.forName(className).getMethod(methodName, parameterTypes);
-      return true;
-    } catch (ClassNotFoundException | NoSuchMethodException e) {
-      Log.v(TAG, "Could not find method: " + className + "#" + methodName);
-      return false;
-    } catch (Throwable t) {
-      Log.e(
-          TAG,
-          "Unexpected exception when checking if method: "
-              + className
-              + "#"
-              + methodName
-              + " exists at runtime",
-          t);
-      return false;
-    }
-  }
-
-  /**
-   * Invokes a given class's method using reflection. Can be used to call system apis that exist at
-   * runtime but not in the SDK.
-   *
-   * @param instance The instance of the class to invoke the method on.
-   * @param methodName The name of the method to invoke.
-   * @param parameterTypes The needed parameter types for the method.
-   * @param parameters The parameter values to pass into the method.
-   * @return The result of the invocation or {@code null} if instance or methodName are empty, or if
-   *     the reflection fails.
-   */
-  @Nullable
-  public static Object invokeMethod(
-      @Nullable Object instance,
-      @Nullable String methodName,
-      Class<?>[] parameterTypes,
-      Object[] parameters) {
-    if (instance == null || TextUtils.isEmpty(methodName)) {
-      return null;
-    }
-
-    String className = instance.getClass().getName();
-    try {
-      return Class.forName(className)
-          .getMethod(methodName, parameterTypes)
-          .invoke(instance, parameters);
-    } catch (ClassNotFoundException
-        | NoSuchMethodException
-        | IllegalArgumentException
-        | IllegalAccessException
-        | InvocationTargetException e) {
-      Log.v(TAG, "Could not invoke method: " + className + "#" + methodName);
-      return null;
-    } catch (Throwable t) {
-      Log.e(
-          TAG,
-          "Unexpected exception when invoking method: "
-              + className
-              + "#"
-              + methodName
-              + " at runtime",
-          t);
-      return null;
-    }
-  }
-
-  /**
-   * Determines if this version is compatible with Lollipop-specific APIs. Can also force the
-   * version to be lower through SdkVersionOverride.
-   *
-   * @return {@code true} if call subject is a feature on this device, {@code false} otherwise.
-   */
-  public static boolean isLollipopCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP)
-        >= Build.VERSION_CODES.LOLLIPOP;
   }
 }
diff --git a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
new file mode 100644
index 0000000..22ec70c
--- /dev/null
+++ b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2015 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.compat.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.telecom.TelecomUtil;
+import java.lang.reflect.InvocationTargetException;
+
+public class TelephonyManagerCompat {
+
+  // TODO(maxwelb): Use public API for these constants when available
+  public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE =
+      "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE";
+  public static final String EVENT_HANDOVER_TO_WIFI_FAILED =
+      "android.telephony.event.EVENT_HANDOVER_TO_WIFI_FAILED";
+  public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";
+  public static final String EVENT_CALL_REMOTELY_UNHELD =
+      "android.telecom.event.CALL_REMOTELY_UNHELD";
+  public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START";
+  public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";
+
+  public static final String EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC =
+      "android.telephony.event.EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC";
+
+  public static final String TELEPHONY_MANAGER_CLASS = "android.telephony.TelephonyManager";
+
+  private static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";
+
+  // TODO(erfanian): b/63995261 Replace with the platform/telecom constant when available.
+  /**
+   * Indicates that the call being placed originated from a known contact.
+   *
+   * <p>This signals to the telephony platform that an outgoing call qualifies for assisted dialing.
+   */
+  public static final String ALLOW_ASSISTED_DIAL = "android.telecom.extra.ALLOW_ASSISTED_DIAL";
+
+  // TODO(erfanian): b/63995261 Replace with the platform/telecom constant when available.
+  /**
+   * Indicates that an outgoing call has undergone assisted dialing.
+   *
+   * <p>Unlike {@link ALLOW_ASSISTED_DIAL}, the presence of this key further indicates that a call
+   * has undergone Assisted Dialing -- not just that it qualified for Assisted Dialing.
+   */
+  public static final String IS_ASSISTED_DIALED = "android.telecom.extra.IS_ASSISTED_DIALED";
+
+  /**
+   * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM
+   * functionality) Returns 2 for Dual standby mode.(Dual SIM functionality)
+   *
+   * <p>Returns 1 if the method or telephonyManager is not available.
+   *
+   * @param telephonyManager The telephony manager instance to use for method calls.
+   */
+  public static int getPhoneCount(@Nullable TelephonyManager telephonyManager) {
+    if (telephonyManager == null) {
+      return 1;
+    }
+    return telephonyManager.getPhoneCount();
+  }
+
+  /**
+   * Whether the phone supports TTY mode.
+   *
+   * @param telephonyManager The telephony manager instance to use for method calls.
+   * @return {@code true} if the device supports TTY mode, and {@code false} otherwise.
+   */
+  public static boolean isTtyModeSupported(@Nullable TelephonyManager telephonyManager) {
+    return telephonyManager != null && telephonyManager.isTtyModeSupported();
+  }
+
+  /**
+   * Whether the phone supports hearing aid compatibility.
+   *
+   * @param telephonyManager The telephony manager instance to use for method calls.
+   * @return {@code true} if the device supports hearing aid compatibility, and {@code false}
+   *     otherwise.
+   */
+  public static boolean isHearingAidCompatibilitySupported(
+      @Nullable TelephonyManager telephonyManager) {
+    return telephonyManager != null && telephonyManager.isHearingAidCompatibilitySupported();
+  }
+
+  /**
+   * Returns the URI for the per-account voicemail ringtone set in Phone settings.
+   *
+   * @param telephonyManager The telephony manager instance to use for method calls.
+   * @param accountHandle The handle for the {@link android.telecom.PhoneAccount} for which to
+   *     retrieve the voicemail ringtone.
+   * @return The URI for the ringtone to play when receiving a voicemail from a specific
+   *     PhoneAccount.
+   */
+  @Nullable
+  public static Uri getVoicemailRingtoneUri(
+      TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N) {
+      return null;
+    }
+    return telephonyManager.getVoicemailRingtoneUri(accountHandle);
+  }
+
+  /**
+   * Returns whether vibration is set for voicemail notification in Phone settings.
+   *
+   * @param telephonyManager The telephony manager instance to use for method calls.
+   * @param accountHandle The handle for the {@link android.telecom.PhoneAccount} for which to
+   *     retrieve the voicemail vibration setting.
+   * @return {@code true} if the vibration is set for this PhoneAccount, {@code false} otherwise.
+   */
+  public static boolean isVoicemailVibrationEnabled(
+      TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
+    return VERSION.SDK_INT < VERSION_CODES.N
+        || telephonyManager.isVoicemailVibrationEnabled(accountHandle);
+  }
+
+  /**
+   * This method uses a new system API to enable or disable visual voicemail. TODO(twyen): restrict
+   * to N MR1, not needed in future SDK.
+   */
+  public static void setVisualVoicemailEnabled(
+      TelephonyManager telephonyManager, PhoneAccountHandle handle, boolean enabled) {
+    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
+      Assert.fail("setVisualVoicemailEnabled called on pre-NMR1");
+    }
+    try {
+      TelephonyManager.class
+          .getMethod("setVisualVoicemailEnabled", PhoneAccountHandle.class, boolean.class)
+          .invoke(telephonyManager, handle, enabled);
+    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+      LogUtil.e("TelephonyManagerCompat.setVisualVoicemailEnabled", "failed", e);
+    }
+  }
+
+  /**
+   * This method uses a new system API to check if visual voicemail is enabled TODO(twyen): restrict
+   * to N MR1, not needed in future SDK.
+   */
+  public static boolean isVisualVoicemailEnabled(
+      TelephonyManager telephonyManager, PhoneAccountHandle handle) {
+    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
+      Assert.fail("isVisualVoicemailEnabled called on pre-NMR1");
+    }
+    try {
+      return (boolean)
+          TelephonyManager.class
+              .getMethod("isVisualVoicemailEnabled", PhoneAccountHandle.class)
+              .invoke(telephonyManager, handle);
+    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+      LogUtil.e("TelephonyManagerCompat.setVisualVoicemailEnabled", "failed", e);
+    }
+    return false;
+  }
+
+  /**
+   * Handles secret codes to launch arbitrary activities.
+   *
+   * @param context the context to use
+   * @param secretCode the secret code without the "*#*#" prefix and "#*#*" suffix
+   */
+  public static void handleSecretCode(Context context, String secretCode) {
+    // Must use system service on O+ to avoid using broadcasts, which are not allowed on O+.
+    if (BuildCompat.isAtLeastO()) {
+      if (!TelecomUtil.isDefaultDialer(context)) {
+        LogUtil.e(
+            "TelephonyManagerCompat.handleSecretCode",
+            "not default dialer, cannot send special code");
+        return;
+      }
+      context.getSystemService(TelephonyManager.class).sendDialerSpecialCode(secretCode);
+    } else {
+      // System service call is not supported pre-O, so must use a broadcast for N-.
+      Intent intent =
+          new Intent(SECRET_CODE_ACTION, Uri.parse("android_secret_code://" + secretCode));
+      context.sendBroadcast(intent);
+    }
+  }
+}
diff --git a/java/com/android/dialer/configprovider/AndroidManifest.xml b/java/com/android/dialer/configprovider/AndroidManifest.xml
new file mode 100644
index 0000000..7729971
--- /dev/null
+++ b/java/com/android/dialer/configprovider/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.configprovider">
+
+  <application>
+    <service android:name=".SharedPrefConfigProvider$Service"/>
+  </application>
+
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/configprovider/ConfigProvider.java b/java/com/android/dialer/configprovider/ConfigProvider.java
new file mode 100644
index 0000000..886a69e
--- /dev/null
+++ b/java/com/android/dialer/configprovider/ConfigProvider.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 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.configprovider;
+
+/** Gets config values from the container application. */
+public interface ConfigProvider {
+
+  String getString(String key, String defaultValue);
+
+  long getLong(String key, long defaultValue);
+
+  boolean getBoolean(String key, boolean defaultValue);
+}
diff --git a/java/com/android/dialer/configprovider/ConfigProviderBindings.java b/java/com/android/dialer/configprovider/ConfigProviderBindings.java
new file mode 100644
index 0000000..0bf0e75
--- /dev/null
+++ b/java/com/android/dialer/configprovider/ConfigProviderBindings.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2016 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.configprovider;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.UserManagerCompat;
+import com.android.dialer.common.Assert;
+
+/** Accessor for getting a {@link ConfigProvider}. */
+public class ConfigProviderBindings {
+
+  private static ConfigProvider configProvider;
+  private static ConfigProvider configProviderStub;
+
+  public static ConfigProvider get(@NonNull Context context) {
+    Assert.isNotNull(context);
+    if (configProvider != null) {
+      return configProvider;
+    }
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      if (configProviderStub == null) {
+        configProviderStub = new ConfigProviderStub();
+      }
+      return configProviderStub;
+    }
+    configProvider = ConfigProviderComponent.get(context).getConfigProvider();
+    return configProvider;
+  }
+
+  @VisibleForTesting
+  public static void setForTesting(@Nullable ConfigProvider configProviderForTesting) {
+    configProvider = configProviderForTesting;
+  }
+
+  private static class ConfigProviderStub implements ConfigProvider {
+    @Override
+    public String getString(String key, String defaultValue) {
+      return defaultValue;
+    }
+
+    @Override
+    public long getLong(String key, long defaultValue) {
+      return defaultValue;
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defaultValue) {
+      return defaultValue;
+    }
+  }
+}
diff --git a/java/com/android/dialer/configprovider/ConfigProviderComponent.java b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
new file mode 100644
index 0000000..e26a5cf
--- /dev/null
+++ b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
@@ -0,0 +1,41 @@
+/*
+ * 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.configprovider;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component to provide a {@link ConfigProvider}. */
+@Subcomponent
+public abstract class ConfigProviderComponent {
+
+  @NonNull
+  public abstract ConfigProvider getConfigProvider();
+
+  public static ConfigProviderComponent get(Context context) {
+    return ((ConfigProviderComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .configProviderComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    ConfigProviderComponent configProviderComponent();
+  }
+}
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
new file mode 100644
index 0000000..6ee4695
--- /dev/null
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
@@ -0,0 +1,120 @@
+/*
+ * 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.configprovider;
+
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.dialer.util.DialerUtils;
+import javax.inject.Inject;
+
+/**
+ * {@link ConfigProvider} which uses a shared preferences file.
+ *
+ * <p>Config flags can be written using adb (with root access), for example:
+ *
+ * <pre>
+ *   adb root
+ *   adb shell am startservice -n \
+ *     'com.android.dialer/.configprovider.SharedPrefConfigProvider\$Service' \
+ *     --ez boolean_flag_name flag_value
+ * </pre>
+ *
+ * <p>(For longs use --el and for strings use --es.)
+ *
+ * <p>Flags can be viewed with:
+ *
+ * <pre>
+ *   adb shell cat \
+ *     /data/user_de/0/com.android.dialer/shared_prefs/com.android.dialer_preferences.xml
+ * </pre>
+ */
+class SharedPrefConfigProvider implements ConfigProvider {
+  private static final String PREF_PREFIX = "config_provider_prefs_";
+
+  private final Context appContext;
+
+  @Inject
+  SharedPrefConfigProvider(@ApplicationContext Context appContext) {
+    this.appContext = appContext;
+  }
+
+  /** Service to write values into {@link SharedPrefConfigProvider} using adb. */
+  public static class Service extends IntentService {
+
+    public Service() {
+      super("SharedPrefConfigProvider.Service");
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+      if (intent == null || intent.getExtras() == null || intent.getExtras().size() != 1) {
+        LogUtil.w("SharedPrefConfigProvider.Service.onHandleIntent", "must set exactly one extra");
+        return;
+      }
+      String key = intent.getExtras().keySet().iterator().next();
+      Object value = intent.getExtras().get(key);
+      put(key, value);
+    }
+
+    private void put(String key, Object value) {
+      Editor editor = getSharedPrefs(getApplicationContext()).edit();
+      String prefixedKey = PREF_PREFIX + key;
+      if (value instanceof Boolean) {
+        editor.putBoolean(prefixedKey, (Boolean) value);
+      } else if (value instanceof Long) {
+        editor.putLong(prefixedKey, (Long) value);
+      } else if (value instanceof String) {
+        editor.putString(prefixedKey, (String) value);
+      } else {
+        throw Assert.createAssertionFailException("unsupported extra type: " + value.getClass());
+      }
+      editor.apply();
+    }
+  }
+
+  @Override
+  public String getString(String key, String defaultValue) {
+    // Reading shared prefs on the main thread is generally safe since a single instance is cached.
+    return DialerStrictMode.bypass(
+        () -> getSharedPrefs(appContext).getString(PREF_PREFIX + key, defaultValue));
+  }
+
+  @Override
+  public long getLong(String key, long defaultValue) {
+    // Reading shared prefs on the main thread is generally safe since a single instance is cached.
+    return DialerStrictMode.bypass(
+        () -> getSharedPrefs(appContext).getLong(PREF_PREFIX + key, defaultValue));
+  }
+
+  @Override
+  public boolean getBoolean(String key, boolean defaultValue) {
+    // Reading shared prefs on the main thread is generally safe since a single instance is cached.
+    return DialerStrictMode.bypass(
+        () -> getSharedPrefs(appContext).getBoolean(PREF_PREFIX + key, defaultValue));
+  }
+
+  private static SharedPreferences getSharedPrefs(Context appContext) {
+    return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(appContext);
+  }
+}
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
new file mode 100644
index 0000000..fe1c908
--- /dev/null
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
@@ -0,0 +1,30 @@
+/*
+ * 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.configprovider;
+
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+/** Dagger module providing {@link ConfigProvider} based on shared preferences. */
+@Module
+public abstract class SharedPrefConfigProviderModule {
+
+  @Binds
+  @Singleton
+  abstract ConfigProvider to(SharedPrefConfigProvider impl);
+}
diff --git a/java/com/android/dialer/constants/ActivityRequestCodes.java b/java/com/android/dialer/constants/ActivityRequestCodes.java
new file mode 100644
index 0000000..da05eb7
--- /dev/null
+++ b/java/com/android/dialer/constants/ActivityRequestCodes.java
@@ -0,0 +1,41 @@
+/*
+ * 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.constants;
+
+/**
+ * Class containing {@link android.app.Activity#onActivityResult(int, int, android.content.Intent)}
+ * request codes.
+ */
+public final class ActivityRequestCodes {
+
+  private ActivityRequestCodes() {}
+
+  /** Request code for {@link android.speech.RecognizerIntent#ACTION_RECOGNIZE_SPEECH} intent. */
+  public static final int DIALTACTS_VOICE_SEARCH = 1;
+
+  /** Request code for {@link com.android.dialer.callcomposer.CallComposerActivity} intent. */
+  public static final int DIALTACTS_CALL_COMPOSER = 2;
+
+  /**
+   * Request code for {@link
+   * com.android.dialer.lightbringer.Lightbringer#getIntent(android.content.Context, String)}.
+   */
+  public static final int DIALTACTS_LIGHTBRINGER = 3;
+
+  /** Request code for {@link com.android.dialer.calldetails.CallDetailsActivity} intent. */
+  public static final int DIALTACTS_CALL_DETAILS = 4;
+}
diff --git a/java/com/android/dialer/constants/Constants.java b/java/com/android/dialer/constants/Constants.java
index d92c0bc..f9d07e3 100644
--- a/java/com/android/dialer/constants/Constants.java
+++ b/java/com/android/dialer/constants/Constants.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.constants;
 
+import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
 import com.android.dialer.proguard.UsedByReflection;
@@ -53,5 +54,10 @@
   @NonNull
   public abstract String getFileProviderAuthority();
 
+  @NonNull
+  public abstract String getAnnotatedCallLogProviderAuthority();
+
+  public abstract String getUserAgent(Context context);
+
   protected Constants() {}
 }
diff --git a/java/com/android/dialer/constants/ScheduledJobIds.java b/java/com/android/dialer/constants/ScheduledJobIds.java
index 2fed4ef..cf93a46 100644
--- a/java/com/android/dialer/constants/ScheduledJobIds.java
+++ b/java/com/android/dialer/constants/ScheduledJobIds.java
@@ -32,6 +32,8 @@
   public static final int VVM_TASK_SCHEDULER_JOB = 200;
   public static final int VVM_STATUS_CHECK_JOB = 201;
   public static final int VVM_DEVICE_PROVISIONED_JOB = 202;
+  public static final int VVM_TRANSCRIPTION_JOB = 203;
+  public static final int VVM_TRANSCRIPTION_BACKFILL_JOB = 204;
 
   public static final int VOIP_REGISTRATION = 300;
 
diff --git a/java/com/android/dialer/constants/TrafficStatsTags.java b/java/com/android/dialer/constants/TrafficStatsTags.java
new file mode 100644
index 0000000..1eca784
--- /dev/null
+++ b/java/com/android/dialer/constants/TrafficStatsTags.java
@@ -0,0 +1,33 @@
+/*
+ * 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.constants;
+
+/** Registry of tags for {@link android.net.TrafficStats#setThreadStatsTag(int)} */
+public class TrafficStatsTags {
+  public static final int CONTACT_PHOTO_DOWNLOAD_TAG = 0x00000001;
+  public static final int NEARBY_PLACES_TAG = 0x00000002;
+  public static final int REVERSE_LOOKUP_CONTACT_TAG = 0x00000003;
+  public static final int REVERSE_LOOKUP_IMAGE_TAG = 0x00000004;
+  public static final int DOWNLOAD_LOCATION_MAP_TAG = 0x00000005;
+  public static final int REVERSE_GEOCODE_TAG = 0x00000006;
+  public static final int VISUAL_VOICEMAIL_TAG = 0x00000007;
+
+  // 0xfffffe00 to 0xffffff00 reserved for proprietary extensions to the dialer app.
+
+  // 0xffffff00 to 0xffffffff reserved by the system (see TrafficStats#getAndSetThreadStatsTag)
+
+}
diff --git a/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java b/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
index 6b78b98..38fd24b 100644
--- a/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
+++ b/java/com/android/dialer/constants/aospdialer/ConstantsImpl.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.constants;
 
+import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.proguard.UsedByReflection;
 
@@ -34,4 +35,15 @@
   public String getFileProviderAuthority() {
     return "com.android.dialer.files";
   }
+
+  @NonNull
+  @Override
+  public String getAnnotatedCallLogProviderAuthority() {
+    return "com.android.dialer.annotatedcalllog";
+  }
+
+  @Override
+  public String getUserAgent(Context context) {
+    return null;
+  }
 }
diff --git a/java/com/android/dialer/constants/googledialer/ConstantsImpl.java b/java/com/android/dialer/constants/googledialer/ConstantsImpl.java
new file mode 100644
index 0000000..e151344
--- /dev/null
+++ b/java/com/android/dialer/constants/googledialer/ConstantsImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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.constants;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import com.android.dialer.proguard.UsedByReflection;
+
+/** Provider config values for Google Dialer. */
+@UsedByReflection(value = "Constants.java")
+public class ConstantsImpl extends Constants {
+
+  @Override
+  @NonNull
+  public String getFilteredNumberProviderAuthority() {
+    return "com.google.android.dialer.blocking.filterednumberprovider";
+  }
+
+  @Override
+  @NonNull
+  public String getFileProviderAuthority() {
+    return "com.google.android.dialer.files";
+  }
+
+  @NonNull
+  @Override
+  public String getAnnotatedCallLogProviderAuthority() {
+    return "com.google.android.dialer.annotatedcalllog";
+  }
+
+  @Override
+  public String getUserAgent(Context context) {
+    StringBuilder userAgent = new StringBuilder("GoogleDialer ");
+    try {
+      String versionName =
+          context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+      userAgent.append(versionName).append(" ");
+    } catch (PackageManager.NameNotFoundException e) {
+      // ignore
+    }
+    userAgent.append(Build.FINGERPRINT);
+
+    return userAgent.toString();
+  }
+}
diff --git a/java/com/android/dialer/contactactions/AndroidManifest.xml b/java/com/android/dialer/contactactions/AndroidManifest.xml
new file mode 100644
index 0000000..a64066e
--- /dev/null
+++ b/java/com/android/dialer/contactactions/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.contactactions"/>
diff --git a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java
new file mode 100644
index 0000000..9bf7ca0
--- /dev/null
+++ b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java
@@ -0,0 +1,136 @@
+/*
+ * 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.contactactions;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.design.widget.BottomSheetDialog;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.dialer.common.Assert;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.dialercontact.DialerContact;
+import java.util.List;
+
+/**
+ * {@link BottomSheetDialog} used for building a list of contact actions in a bottom sheet menu.
+ *
+ * <p>{@link #show(Context, DialerContact, List)} should be used to create and display the menu.
+ * Modules are built using {@link ContactActionModule} and some defaults are provided by {@link
+ * IntentModule} and {@link DividerModule}.
+ */
+public class ContactActionBottomSheet extends BottomSheetDialog implements OnClickListener {
+
+  private final List<ContactActionModule> modules;
+  private final DialerContact contact;
+
+  private ContactActionBottomSheet(
+      Context context, DialerContact contact, List<ContactActionModule> modules) {
+    super(context);
+    this.modules = modules;
+    this.contact = contact;
+    setContentView(LayoutInflater.from(context).inflate(R.layout.sheet_layout, null));
+  }
+
+  public static ContactActionBottomSheet show(
+      Context context, DialerContact contact, List<ContactActionModule> modules) {
+    ContactActionBottomSheet sheet = new ContactActionBottomSheet(context, contact, modules);
+    sheet.show();
+    return sheet;
+  }
+
+  @Override
+  protected void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    LinearLayout container = Assert.isNotNull(findViewById(R.id.action_container));
+    container.addView(getContactView(container));
+
+    for (ContactActionModule module : modules) {
+      if (module instanceof DividerModule) {
+        container.addView(getDividerView(container));
+      } else {
+        container.addView(getModuleView(container, module));
+      }
+    }
+  }
+
+  // TODO(calderwoodra): add on click action to contact.
+  private View getContactView(ViewGroup container) {
+    LayoutInflater inflater = LayoutInflater.from(getContext());
+    View contactView = inflater.inflate(R.layout.contact_layout, container, false);
+
+    ContactPhotoManager.getInstance(getContext())
+        .loadDialerThumbnailOrPhoto(
+            contactView.findViewById(R.id.quick_contact_photo),
+            contact.hasContactUri() ? Uri.parse(contact.getContactUri()) : null,
+            contact.getPhotoId(),
+            contact.hasPhotoUri() ? Uri.parse(contact.getPhotoUri()) : null,
+            contact.getNameOrNumber(),
+            contact.getContactType());
+
+    TextView nameView = contactView.findViewById(R.id.contact_name);
+    TextView numberView = contactView.findViewById(R.id.phone_number);
+
+    nameView.setText(contact.getNameOrNumber());
+    if (!TextUtils.isEmpty(contact.getDisplayNumber())) {
+      numberView.setVisibility(View.VISIBLE);
+      String secondaryInfo =
+          TextUtils.isEmpty(contact.getNumberLabel())
+              ? contact.getDisplayNumber()
+              : getContext()
+                  .getString(
+                      com.android.contacts.common.R.string.call_subject_type_and_number,
+                      contact.getNumberLabel(),
+                      contact.getDisplayNumber());
+      numberView.setText(secondaryInfo);
+    } else {
+      numberView.setVisibility(View.GONE);
+      numberView.setText(null);
+    }
+    return contactView;
+  }
+
+  private View getDividerView(ViewGroup container) {
+    LayoutInflater inflater = LayoutInflater.from(getContext());
+    return inflater.inflate(R.layout.divider_layout, container, false);
+  }
+
+  private View getModuleView(ViewGroup container, ContactActionModule module) {
+    LayoutInflater inflater = LayoutInflater.from(getContext());
+    View moduleView = inflater.inflate(R.layout.module_layout, container, false);
+    ((TextView) moduleView.findViewById(R.id.module_text)).setText(module.getStringId());
+    ((ImageView) moduleView.findViewById(R.id.module_image))
+        .setImageResource(module.getDrawableId());
+    moduleView.setOnClickListener(this);
+    moduleView.setTag(module);
+    return moduleView;
+  }
+
+  @Override
+  public void onClick(View view) {
+    if (((ContactActionModule) view.getTag()).onClick()) {
+      dismiss();
+    }
+  }
+}
diff --git a/java/com/android/dialer/contactactions/ContactActionModule.java b/java/com/android/dialer/contactactions/ContactActionModule.java
new file mode 100644
index 0000000..8089edc
--- /dev/null
+++ b/java/com/android/dialer/contactactions/ContactActionModule.java
@@ -0,0 +1,38 @@
+/*
+ * 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.contactactions;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
+
+/**
+ * Modules used to build {@link ContactActionBottomSheet}.
+ *
+ * <p>Contacts as they relate to this class should be thought of as any entity that an action can be
+ * performed on like unknown/restricted contacts, along with saved and non-saved contacts.
+ */
+public interface ContactActionModule {
+
+  @StringRes
+  int getStringId();
+
+  @DrawableRes
+  int getDrawableId();
+
+  /** @return true if the bottom sheet should close, false otherwise */
+  boolean onClick();
+}
diff --git a/java/com/android/dialer/contactactions/DividerModule.java b/java/com/android/dialer/contactactions/DividerModule.java
new file mode 100644
index 0000000..aabd160
--- /dev/null
+++ b/java/com/android/dialer/contactactions/DividerModule.java
@@ -0,0 +1,41 @@
+/*
+ * 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.contactactions;
+
+import com.android.dialer.common.Assert;
+
+/**
+ * A module that inserts a grey line divider into {@link ContactActionModule}. Layout it provided in
+ * R.layout.divider_layout.xml
+ */
+public final class DividerModule implements ContactActionModule {
+
+  @Override
+  public int getStringId() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public int getDrawableId() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+
+  @Override
+  public boolean onClick() {
+    throw Assert.createUnsupportedOperationFailException();
+  }
+}
diff --git a/java/com/android/dialer/contactactions/IntentModule.java b/java/com/android/dialer/contactactions/IntentModule.java
new file mode 100644
index 0000000..201f521
--- /dev/null
+++ b/java/com/android/dialer/contactactions/IntentModule.java
@@ -0,0 +1,75 @@
+/*
+ * 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.contactactions;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
+import com.android.dialer.callintent.CallInitiationType.Type;
+import com.android.dialer.callintent.CallIntentBuilder;
+
+/**
+ * {@link ContactActionModule} useful for making easy to build modules based on starting an intent.
+ */
+public class IntentModule implements ContactActionModule {
+
+  private final Context context;
+  private final Intent intent;
+  private final @StringRes int text;
+  private final @DrawableRes int image;
+
+  public IntentModule(Context context, Intent intent, @StringRes int text, @DrawableRes int image) {
+    this.context = context;
+    this.intent = intent;
+    this.text = text;
+    this.image = image;
+  }
+
+  @Override
+  public int getStringId() {
+    return text;
+  }
+
+  @Override
+  public int getDrawableId() {
+    return image;
+  }
+
+  @Override
+  public boolean onClick() {
+    context.startActivity(intent);
+    return true;
+  }
+
+  public static IntentModule newCallModule(Context context, String number, Type initiationType) {
+    return new IntentModule(
+        context,
+        new CallIntentBuilder(number, initiationType).build(),
+        R.string.call,
+        R.drawable.quantum_ic_call_white_24);
+  }
+
+  public static IntentModule newVideoCallModule(
+      Context context, String number, Type initiationType) {
+    return new IntentModule(
+        context,
+        new CallIntentBuilder(number, initiationType).setIsVideoCall(true).build(),
+        R.string.video_call,
+        R.drawable.quantum_ic_videocam_white_24);
+  }
+}
diff --git a/java/com/android/dialer/contactactions/res/layout/contact_layout.xml b/java/com/android/dialer/contactactions/res/layout/contact_layout.xml
new file mode 100644
index 0000000..bf32971
--- /dev/null
+++ b/java/com/android/dialer/contactactions/res/layout/contact_layout.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="12dp"
+    android:layout_marginEnd="8dp">
+
+  <QuickContactBadge
+      android:id="@+id/quick_contact_photo"
+      android:layout_width="@dimen/contact_actions_image_size"
+      android:layout_height="@dimen/contact_actions_image_size"
+      android:layout_marginStart="@dimen/contact_actions_image_margin"
+      android:layout_marginEnd="@dimen/contact_actions_image_margin"
+      android:padding="4dp"
+      android:focusable="true"/>
+
+  <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_vertical">
+
+    <TextView
+        android:id="@+id/contact_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/PrimaryText"/>
+
+    <TextView
+        android:id="@+id/phone_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        style="@style/SecondaryText"/>
+  </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactactions/res/layout/divider_layout.xml b/java/com/android/dialer/contactactions/res/layout/divider_layout.xml
new file mode 100644
index 0000000..fdee50e
--- /dev/null
+++ b/java/com/android/dialer/contactactions/res/layout/divider_layout.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:background="#12000000"/>
diff --git a/java/com/android/dialer/contactactions/res/layout/module_layout.xml b/java/com/android/dialer/contactactions/res/layout/module_layout.xml
new file mode 100644
index 0000000..9aee679
--- /dev/null
+++ b/java/com/android/dialer/contactactions/res/layout/module_layout.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/module_container"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground">
+
+  <ImageView
+      android:id="@+id/module_image"
+      android:layout_width="@dimen/contact_actions_image_size"
+      android:layout_height="@dimen/contact_actions_image_size"
+      android:layout_marginStart="@dimen/contact_actions_image_margin"
+      android:layout_marginEnd="@dimen/contact_actions_image_margin"
+      android:tint="@color/dialer_secondary_text_color"
+      android:scaleType="center"/>
+
+  <TextView
+      android:id="@+id/module_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_vertical"
+      style="@style/PrimaryText"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactactions/res/layout/sheet_layout.xml b/java/com/android/dialer/contactactions/res/layout/sheet_layout.xml
new file mode 100644
index 0000000..6984367
--- /dev/null
+++ b/java/com/android/dialer/contactactions/res/layout/sheet_layout.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/action_container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="4dp"
+    android:paddingBottom="8dp"/>
diff --git a/java/com/android/dialer/contactactions/res/values/dimens.xml b/java/com/android/dialer/contactactions/res/values/dimens.xml
new file mode 100644
index 0000000..47bf804
--- /dev/null
+++ b/java/com/android/dialer/contactactions/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <dimen name="contact_actions_image_size">48dp</dimen>
+  <dimen name="contact_actions_image_margin">12dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactphoto/AndroidManifest.xml b/java/com/android/dialer/contactphoto/AndroidManifest.xml
new file mode 100644
index 0000000..d852d40
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/AndroidManifest.xml
@@ -0,0 +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.contactphoto">
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactphoto/BitmapUtil.java b/java/com/android/dialer/contactphoto/BitmapUtil.java
new file mode 100644
index 0000000..36055e2
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/BitmapUtil.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2012 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.contactphoto;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+
+/** Provides static functions to decode bitmaps at the optimal size */
+public class BitmapUtil {
+
+  private BitmapUtil() {}
+
+  /**
+   * Returns Width or Height of the picture, depending on which size is smaller. Doesn't actually
+   * decode the picture, so it is pretty efficient to run.
+   */
+  public static int getSmallerExtentFromBytes(byte[] bytes) {
+    final BitmapFactory.Options options = new BitmapFactory.Options();
+
+    // don't actually decode the picture, just return its bounds
+    options.inJustDecodeBounds = true;
+    BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
+
+    // test what the best sample size is
+    return Math.min(options.outWidth, options.outHeight);
+  }
+
+  /**
+   * Finds the optimal sampleSize for loading the picture
+   *
+   * @param originalSmallerExtent Width or height of the picture, whichever is smaller
+   * @param targetExtent Width or height of the target view, whichever is bigger.
+   *     <p>If either one of the parameters is 0 or smaller, no sampling is applied
+   */
+  public static int findOptimalSampleSize(int originalSmallerExtent, int targetExtent) {
+    // If we don't know sizes, we can't do sampling.
+    if (targetExtent < 1) {
+      return 1;
+    }
+    if (originalSmallerExtent < 1) {
+      return 1;
+    }
+
+    // Test what the best sample size is. To do that, we find the sample size that gives us
+    // the best trade-off between resulting image size and memory requirement. We allow
+    // the down-sampled image to be 20% smaller than the target size. That way we can get around
+    // unfortunate cases where e.g. a 720 picture is requested for 362 and not down-sampled at
+    // all. Why 20%? Why not. Prove me wrong.
+    int extent = originalSmallerExtent;
+    int sampleSize = 1;
+    while ((extent >> 1) >= targetExtent * 0.8f) {
+      sampleSize <<= 1;
+      extent >>= 1;
+    }
+
+    return sampleSize;
+  }
+
+  /** Decodes the bitmap with the given sample size */
+  public static Bitmap decodeBitmapFromBytes(byte[] bytes, int sampleSize) {
+    final BitmapFactory.Options options;
+    if (sampleSize <= 1) {
+      options = null;
+    } else {
+      options = new BitmapFactory.Options();
+      options.inSampleSize = sampleSize;
+    }
+    return BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
+  }
+
+  /**
+   * Given an input bitmap, scales it to the given width/height and makes it round.
+   *
+   * @param input {@link Bitmap} to scale and crop
+   * @param targetWidth desired output width
+   * @param targetHeight desired output height
+   * @return output bitmap scaled to the target width/height and cropped to an oval. The cropping
+   *     algorithm will try to fit as much of the input into the output as possible, while
+   *     preserving the target width/height ratio.
+   */
+  public static Bitmap getRoundedBitmap(Bitmap input, int targetWidth, int targetHeight) {
+    if (input == null) {
+      return null;
+    }
+    final Bitmap.Config inputConfig = input.getConfig();
+    final Bitmap result =
+        Bitmap.createBitmap(
+            targetWidth, targetHeight, inputConfig != null ? inputConfig : Bitmap.Config.ARGB_8888);
+    final Canvas canvas = new Canvas(result);
+    final Paint paint = new Paint();
+    canvas.drawARGB(0, 0, 0, 0);
+    paint.setAntiAlias(true);
+    final RectF dst = new RectF(0, 0, targetWidth, targetHeight);
+    canvas.drawOval(dst, paint);
+
+    // Specifies that only pixels present in the destination (i.e. the drawn oval) should
+    // be overwritten with pixels from the input bitmap.
+    paint.setXfermode(new PorterDuffXfermode(Mode.SRC_IN));
+
+    final int inputWidth = input.getWidth();
+    final int inputHeight = input.getHeight();
+
+    // Choose the largest scale factor that will fit inside the dimensions of the
+    // input bitmap.
+    final float scaleBy =
+        Math.min((float) inputWidth / targetWidth, (float) inputHeight / targetHeight);
+
+    final int xCropAmountHalved = (int) (scaleBy * targetWidth / 2);
+    final int yCropAmountHalved = (int) (scaleBy * targetHeight / 2);
+
+    final Rect src =
+        new Rect(
+            inputWidth / 2 - xCropAmountHalved,
+            inputHeight / 2 - yCropAmountHalved,
+            inputWidth / 2 + xCropAmountHalved,
+            inputHeight / 2 + yCropAmountHalved);
+
+    canvas.drawBitmap(input, src, dst, paint);
+    return result;
+  }
+}
diff --git a/java/com/android/dialer/contactphoto/ContactPhotoManager.java b/java/com/android/dialer/contactphoto/ContactPhotoManager.java
new file mode 100644
index 0000000..4598379
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/ContactPhotoManager.java
@@ -0,0 +1,511 @@
+/*
+ * Copyright (C) 2010 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.contactphoto;
+
+import android.content.ComponentCallbacks2;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.net.Uri.Builder;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.QuickContactBadge;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.UriUtils;
+
+/** Asynchronously loads contact photos and maintains a cache of photos. */
+public abstract class ContactPhotoManager implements ComponentCallbacks2 {
+
+  /** Scale and offset default constants used for default letter images */
+  public static final float SCALE_DEFAULT = 1.0f;
+
+  public static final float OFFSET_DEFAULT = 0.0f;
+  public static final boolean IS_CIRCULAR_DEFAULT = false;
+  // TODO: Use LogUtil.isVerboseEnabled for DEBUG branches instead of a lint check.
+  // LINT.DoNotSubmitIf(true)
+  static final boolean DEBUG = false;
+  // LINT.DoNotSubmitIf(true)
+  static final boolean DEBUG_SIZES = false;
+  /** Uri-related constants used for default letter images */
+  private static final String DISPLAY_NAME_PARAM_KEY = "display_name";
+
+  private static final String IDENTIFIER_PARAM_KEY = "identifier";
+  private static final String CONTACT_TYPE_PARAM_KEY = "contact_type";
+  private static final String SCALE_PARAM_KEY = "scale";
+  private static final String OFFSET_PARAM_KEY = "offset";
+  private static final String IS_CIRCULAR_PARAM_KEY = "is_circular";
+  private static final String DEFAULT_IMAGE_URI_SCHEME = "defaultimage";
+  private static final Uri DEFAULT_IMAGE_URI = Uri.parse(DEFAULT_IMAGE_URI_SCHEME + "://");
+  public static final DefaultImageProvider DEFAULT_AVATAR = new LetterTileDefaultImageProvider();
+  private static ContactPhotoManager sInstance;
+
+  /**
+   * Given a {@link DefaultImageRequest}, returns an Uri that can be used to request a letter tile
+   * avatar when passed to the {@link ContactPhotoManager}. The internal implementation of this uri
+   * is not guaranteed to remain the same across application versions, so the actual uri should
+   * never be persisted in long-term storage and reused.
+   *
+   * @param request A {@link DefaultImageRequest} object with the fields configured to return a
+   * @return A Uri that when later passed to the {@link ContactPhotoManager} via {@link
+   *     #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest)}, can be used to
+   *     request a default contact image, drawn as a letter tile using the parameters as configured
+   *     in the provided {@link DefaultImageRequest}
+   */
+  public static Uri getDefaultAvatarUriForContact(DefaultImageRequest request) {
+    final Builder builder = DEFAULT_IMAGE_URI.buildUpon();
+    if (request != null) {
+      if (!TextUtils.isEmpty(request.displayName)) {
+        builder.appendQueryParameter(DISPLAY_NAME_PARAM_KEY, request.displayName);
+      }
+      if (!TextUtils.isEmpty(request.identifier)) {
+        builder.appendQueryParameter(IDENTIFIER_PARAM_KEY, request.identifier);
+      }
+      if (request.contactType != LetterTileDrawable.TYPE_DEFAULT) {
+        builder.appendQueryParameter(CONTACT_TYPE_PARAM_KEY, String.valueOf(request.contactType));
+      }
+      if (request.scale != SCALE_DEFAULT) {
+        builder.appendQueryParameter(SCALE_PARAM_KEY, String.valueOf(request.scale));
+      }
+      if (request.offset != OFFSET_DEFAULT) {
+        builder.appendQueryParameter(OFFSET_PARAM_KEY, String.valueOf(request.offset));
+      }
+      if (request.isCircular != IS_CIRCULAR_DEFAULT) {
+        builder.appendQueryParameter(IS_CIRCULAR_PARAM_KEY, String.valueOf(request.isCircular));
+      }
+    }
+    return builder.build();
+  }
+
+  /**
+   * Adds a business contact type encoded fragment to the URL. Used to ensure photo URLS from Nearby
+   * Places can be identified as business photo URLs rather than URLs for personal contact photos.
+   *
+   * @param photoUrl The photo URL to modify.
+   * @return URL with the contact type parameter added and set to TYPE_BUSINESS.
+   */
+  public static String appendBusinessContactType(String photoUrl) {
+    Uri uri = Uri.parse(photoUrl);
+    Builder builder = uri.buildUpon();
+    builder.encodedFragment(String.valueOf(LetterTileDrawable.TYPE_BUSINESS));
+    return builder.build().toString();
+  }
+
+  /**
+   * Removes the contact type information stored in the photo URI encoded fragment.
+   *
+   * @param photoUri The photo URI to remove the contact type from.
+   * @return The photo URI with contact type removed.
+   */
+  public static Uri removeContactType(Uri photoUri) {
+    String encodedFragment = photoUri.getEncodedFragment();
+    if (!TextUtils.isEmpty(encodedFragment)) {
+      Builder builder = photoUri.buildUpon();
+      builder.encodedFragment(null);
+      return builder.build();
+    }
+    return photoUri;
+  }
+
+  /**
+   * Inspects a photo URI to determine if the photo URI represents a business.
+   *
+   * @param photoUri The URI to inspect.
+   * @return Whether the URI represents a business photo or not.
+   */
+  public static boolean isBusinessContactUri(Uri photoUri) {
+    if (photoUri == null) {
+      return false;
+    }
+
+    String encodedFragment = photoUri.getEncodedFragment();
+    return !TextUtils.isEmpty(encodedFragment)
+        && encodedFragment.equals(String.valueOf(LetterTileDrawable.TYPE_BUSINESS));
+  }
+
+  protected static DefaultImageRequest getDefaultImageRequestFromUri(Uri uri) {
+    final DefaultImageRequest request =
+        new DefaultImageRequest(
+            uri.getQueryParameter(DISPLAY_NAME_PARAM_KEY),
+            uri.getQueryParameter(IDENTIFIER_PARAM_KEY),
+            false);
+    try {
+      String contactType = uri.getQueryParameter(CONTACT_TYPE_PARAM_KEY);
+      if (!TextUtils.isEmpty(contactType)) {
+        request.contactType = Integer.valueOf(contactType);
+      }
+
+      String scale = uri.getQueryParameter(SCALE_PARAM_KEY);
+      if (!TextUtils.isEmpty(scale)) {
+        request.scale = Float.valueOf(scale);
+      }
+
+      String offset = uri.getQueryParameter(OFFSET_PARAM_KEY);
+      if (!TextUtils.isEmpty(offset)) {
+        request.offset = Float.valueOf(offset);
+      }
+
+      String isCircular = uri.getQueryParameter(IS_CIRCULAR_PARAM_KEY);
+      if (!TextUtils.isEmpty(isCircular)) {
+        request.isCircular = Boolean.valueOf(isCircular);
+      }
+    } catch (NumberFormatException e) {
+      LogUtil.w(
+          "ContactPhotoManager.getDefaultImageRequestFromUri",
+          "Invalid DefaultImageRequest image parameters provided, ignoring and using "
+              + "defaults.");
+    }
+
+    return request;
+  }
+
+  public static ContactPhotoManager getInstance(Context context) {
+    if (sInstance == null) {
+      Context applicationContext = context.getApplicationContext();
+      sInstance = createContactPhotoManager(applicationContext);
+      applicationContext.registerComponentCallbacks(sInstance);
+      if (PermissionsUtil.hasContactsReadPermissions(context)) {
+        sInstance.preloadPhotosInBackground();
+      }
+    }
+    return sInstance;
+  }
+
+  public static synchronized ContactPhotoManager createContactPhotoManager(Context context) {
+    return new ContactPhotoManagerImpl(context);
+  }
+
+  @VisibleForTesting
+  public static void injectContactPhotoManagerForTesting(ContactPhotoManager photoManager) {
+    sInstance = photoManager;
+  }
+
+  protected boolean isDefaultImageUri(Uri uri) {
+    return DEFAULT_IMAGE_URI_SCHEME.equals(uri.getScheme());
+  }
+
+  /**
+   * Load thumbnail image into the supplied image view. If the photo is already cached, it is
+   * displayed immediately. Otherwise a request is sent to load the photo from the database.
+   */
+  public abstract void loadThumbnail(
+      ImageView view,
+      long photoId,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest,
+      DefaultImageProvider defaultProvider);
+
+  /**
+   * Calls {@link #loadThumbnail(ImageView, long, boolean, boolean, DefaultImageRequest,
+   * DefaultImageProvider)} using the {@link DefaultImageProvider} {@link #DEFAULT_AVATAR}.
+   */
+  public final void loadThumbnail(
+      ImageView view,
+      long photoId,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest) {
+    loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
+  }
+
+  public final void loadDialerThumbnailOrPhoto(
+      QuickContactBadge badge,
+      Uri contactUri,
+      long photoId,
+      Uri photoUri,
+      String displayName,
+      int contactType) {
+    badge.assignContactUri(contactUri);
+    badge.setOverlay(null);
+
+    badge.setContentDescription(
+        badge.getContext().getString(R.string.description_quick_contact_for, displayName));
+
+    String lookupKey = contactUri == null ? null : UriUtils.getLookupKeyFromUri(contactUri);
+    ContactPhotoManager.DefaultImageRequest request =
+        new ContactPhotoManager.DefaultImageRequest(
+            displayName, lookupKey, contactType, true /* isCircular */);
+    if (photoId == 0 && photoUri != null) {
+      loadDirectoryPhoto(badge, photoUri, false /* darkTheme */, true /* isCircular */, request);
+    } else {
+      loadThumbnail(badge, photoId, false /* darkTheme */, true /* isCircular */, request);
+    }
+  }
+
+  /**
+   * Load photo into the supplied image view. If the photo is already cached, it is displayed
+   * immediately. Otherwise a request is sent to load the photo from the location specified by the
+   * URI.
+   *
+   * @param view The target view
+   * @param photoUri The uri of the photo to load
+   * @param requestedExtent Specifies an approximate Max(width, height) of the targetView. This is
+   *     useful if the source image can be a lot bigger that the target, so that the decoding is
+   *     done using efficient sampling. If requestedExtent is specified, no sampling of the image is
+   *     performed
+   * @param darkTheme Whether the background is dark. This is used for default avatars
+   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
+   *     letter tile avatar should be drawn.
+   * @param defaultProvider The provider of default avatars (this is used if photoUri doesn't refer
+   *     to an existing image)
+   */
+  public abstract void loadPhoto(
+      ImageView view,
+      Uri photoUri,
+      int requestedExtent,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest,
+      DefaultImageProvider defaultProvider);
+
+  /**
+   * Calls {@link #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest,
+   * DefaultImageProvider)} with {@link #DEFAULT_AVATAR} and {@code null} display names and lookup
+   * keys.
+   *
+   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
+   *     letter tile avatar should be drawn.
+   */
+  public final void loadPhoto(
+      ImageView view,
+      Uri photoUri,
+      int requestedExtent,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest) {
+    loadPhoto(
+        view,
+        photoUri,
+        requestedExtent,
+        darkTheme,
+        isCircular,
+        defaultImageRequest,
+        DEFAULT_AVATAR);
+  }
+
+  /**
+   * Calls {@link #loadPhoto(ImageView, Uri, int, boolean, boolean, DefaultImageRequest,
+   * DefaultImageProvider)} with {@link #DEFAULT_AVATAR} and with the assumption, that the image is
+   * a thumbnail.
+   *
+   * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
+   *     letter tile avatar should be drawn.
+   */
+  public final void loadDirectoryPhoto(
+      ImageView view,
+      Uri photoUri,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest) {
+    loadPhoto(view, photoUri, -1, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
+  }
+
+  /**
+   * Remove photo from the supplied image view. This also cancels current pending load request
+   * inside this photo manager.
+   */
+  public abstract void removePhoto(ImageView view);
+
+  /** Cancels all pending requests to load photos asynchronously. */
+  public abstract void cancelPendingRequests(View fragmentRootView);
+
+  /** Temporarily stops loading photos from the database. */
+  public abstract void pause();
+
+  /** Resumes loading photos from the database. */
+  public abstract void resume();
+
+  /**
+   * Marks all cached photos for reloading. We can continue using cache but should also make sure
+   * the photos haven't changed in the background and notify the views if so.
+   */
+  public abstract void refreshCache();
+
+  /** Initiates a background process that over time will fill up cache with preload photos. */
+  public abstract void preloadPhotosInBackground();
+
+  // ComponentCallbacks2
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {}
+
+  // ComponentCallbacks2
+  @Override
+  public void onLowMemory() {}
+
+  // ComponentCallbacks2
+  @Override
+  public void onTrimMemory(int level) {}
+
+  /**
+   * Contains fields used to contain contact details and other user-defined settings that might be
+   * used by the ContactPhotoManager to generate a default contact image. This contact image takes
+   * the form of a letter or bitmap drawn on top of a colored tile.
+   */
+  public static class DefaultImageRequest {
+
+    /**
+     * Used to indicate that a drawable that represents a contact without any contact details should
+     * be returned.
+     */
+    public static final DefaultImageRequest EMPTY_DEFAULT_IMAGE_REQUEST = new DefaultImageRequest();
+    /**
+     * Used to indicate that a drawable that represents a business without a business photo should
+     * be returned.
+     */
+    public static final DefaultImageRequest EMPTY_DEFAULT_BUSINESS_IMAGE_REQUEST =
+        new DefaultImageRequest(null, null, LetterTileDrawable.TYPE_BUSINESS, false);
+    /**
+     * Used to indicate that a circular drawable that represents a contact without any contact
+     * details should be returned.
+     */
+    public static final DefaultImageRequest EMPTY_CIRCULAR_DEFAULT_IMAGE_REQUEST =
+        new DefaultImageRequest(null, null, true);
+    /**
+     * Used to indicate that a circular drawable that represents a business without a business photo
+     * should be returned.
+     */
+    public static final DefaultImageRequest EMPTY_CIRCULAR_BUSINESS_IMAGE_REQUEST =
+        new DefaultImageRequest(null, null, LetterTileDrawable.TYPE_BUSINESS, true);
+    /** The contact's display name. The display name is used to */
+    public String displayName;
+    /**
+     * A unique and deterministic string that can be used to identify this contact. This is usually
+     * the contact's lookup key, but other contact details can be used as well, especially for
+     * non-local or temporary contacts that might not have a lookup key. This is used to determine
+     * the color of the tile.
+     */
+    public String identifier;
+    /**
+     * The type of this contact. This contact type may be used to decide the kind of image to use in
+     * the case where a unique letter cannot be generated from the contact's display name and
+     * identifier.
+     */
+    public @LetterTileDrawable.ContactType int contactType = LetterTileDrawable.TYPE_DEFAULT;
+    /**
+     * The amount to scale the letter or bitmap to, as a ratio of its default size (from a range of
+     * 0.0f to 2.0f). The default value is 1.0f.
+     */
+    public float scale = SCALE_DEFAULT;
+    /**
+     * The amount to vertically offset the letter or image to within the tile. The provided offset
+     * must be within the range of -0.5f to 0.5f. If set to -0.5f, the letter will be shifted
+     * upwards by 0.5 times the height of the canvas it is being drawn on, which means it will be
+     * drawn with the center of the letter starting at the top edge of the canvas. If set to 0.5f,
+     * the letter will be shifted downwards by 0.5 times the height of the canvas it is being drawn
+     * on, which means it will be drawn with the center of the letter starting at the bottom edge of
+     * the canvas. The default is 0.0f, which means the letter is drawn in the exact vertical center
+     * of the tile.
+     */
+    public float offset = OFFSET_DEFAULT;
+    /** Whether or not to draw the default image as a circle, instead of as a square/rectangle. */
+    public boolean isCircular = false;
+
+    public DefaultImageRequest() {}
+
+    public DefaultImageRequest(String displayName, String identifier, boolean isCircular) {
+      this(
+          displayName,
+          identifier,
+          LetterTileDrawable.TYPE_DEFAULT,
+          SCALE_DEFAULT,
+          OFFSET_DEFAULT,
+          isCircular);
+    }
+
+    public DefaultImageRequest(
+        String displayName, String identifier, int contactType, boolean isCircular) {
+      this(displayName, identifier, contactType, SCALE_DEFAULT, OFFSET_DEFAULT, isCircular);
+    }
+
+    public DefaultImageRequest(
+        String displayName,
+        String identifier,
+        int contactType,
+        float scale,
+        float offset,
+        boolean isCircular) {
+      this.displayName = displayName;
+      this.identifier = identifier;
+      this.contactType = contactType;
+      this.scale = scale;
+      this.offset = offset;
+      this.isCircular = isCircular;
+    }
+  }
+
+  public abstract static class DefaultImageProvider {
+
+    /**
+     * Applies the default avatar to the ImageView. Extent is an indicator for the size (width or
+     * height). If darkTheme is set, the avatar is one that looks better on dark background
+     *
+     * @param defaultImageRequest {@link DefaultImageRequest} object that specifies how a default
+     *     letter tile avatar should be drawn.
+     */
+    public abstract void applyDefaultImage(
+        ImageView view, int extent, boolean darkTheme, DefaultImageRequest defaultImageRequest);
+  }
+
+  /**
+   * A default image provider that applies a letter tile consisting of a colored background and a
+   * letter in the foreground as the default image for a contact. The color of the background and
+   * the type of letter is decided based on the contact's details.
+   */
+  private static class LetterTileDefaultImageProvider extends DefaultImageProvider {
+
+    public static Drawable getDefaultImageForContact(
+        Resources resources, DefaultImageRequest defaultImageRequest) {
+      final LetterTileDrawable drawable = new LetterTileDrawable(resources);
+      final int tileShape =
+          defaultImageRequest.isCircular
+              ? LetterTileDrawable.SHAPE_CIRCLE
+              : LetterTileDrawable.SHAPE_RECTANGLE;
+      if (defaultImageRequest != null) {
+        // If the contact identifier is null or empty, fallback to the
+        // displayName. In that case, use {@code null} for the contact's
+        // display name so that a default bitmap will be used instead of a
+        // letter
+        if (TextUtils.isEmpty(defaultImageRequest.identifier)) {
+          drawable.setCanonicalDialerLetterTileDetails(
+              null, defaultImageRequest.displayName, tileShape, defaultImageRequest.contactType);
+        } else {
+          drawable.setCanonicalDialerLetterTileDetails(
+              defaultImageRequest.displayName,
+              defaultImageRequest.identifier,
+              tileShape,
+              defaultImageRequest.contactType);
+        }
+        drawable.setScale(defaultImageRequest.scale);
+        drawable.setOffset(defaultImageRequest.offset);
+      }
+      return drawable;
+    }
+
+    @Override
+    public void applyDefaultImage(
+        ImageView view, int extent, boolean darkTheme, DefaultImageRequest defaultImageRequest) {
+      final Drawable drawable = getDefaultImageForContact(view.getResources(), defaultImageRequest);
+      view.setImageDrawable(drawable);
+    }
+  }
+}
diff --git a/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
new file mode 100644
index 0000000..5dbdf5e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java
@@ -0,0 +1,1266 @@
+/*
+ * Copyright (C) 2016 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.contactphoto;
+
+import android.app.ActivityManager;
+import android.content.ComponentCallbacks2;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.TransitionDrawable;
+import android.media.ThumbnailUtils;
+import android.net.TrafficStats;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Handler.Callback;
+import android.os.HandlerThread;
+import android.os.Message;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Contacts.Photo;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Directory;
+import android.support.annotation.UiThread;
+import android.support.annotation.WorkerThread;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
+import android.text.TextUtils;
+import android.util.LruCache;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.Constants;
+import com.android.dialer.constants.TrafficStatsTags;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.UriUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
+
+  private static final String LOADER_THREAD_NAME = "ContactPhotoLoader";
+
+  private static final int FADE_TRANSITION_DURATION = 200;
+
+  /**
+   * Type of message sent by the UI thread to itself to indicate that some photos need to be loaded.
+   */
+  private static final int MESSAGE_REQUEST_LOADING = 1;
+
+  /** Type of message sent by the loader thread to indicate that some photos have been loaded. */
+  private static final int MESSAGE_PHOTOS_LOADED = 2;
+
+  private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+  private static final String[] COLUMNS = new String[] {Photo._ID, Photo.PHOTO};
+
+  /**
+   * Dummy object used to indicate that a bitmap for a given key could not be stored in the cache.
+   */
+  private static final BitmapHolder BITMAP_UNAVAILABLE;
+  /** Cache size for {@link #mBitmapHolderCache} for devices with "large" RAM. */
+  private static final int HOLDER_CACHE_SIZE = 2000000;
+  /** Cache size for {@link #mBitmapCache} for devices with "large" RAM. */
+  private static final int BITMAP_CACHE_SIZE = 36864 * 48; // 1728K
+  /** Height/width of a thumbnail image */
+  private static int mThumbnailSize;
+
+  static {
+    BITMAP_UNAVAILABLE = new BitmapHolder(new byte[0], 0);
+    BITMAP_UNAVAILABLE.bitmapRef = new SoftReference<Bitmap>(null);
+  }
+
+  private final Context mContext;
+  /**
+   * An LRU cache for bitmap holders. The cache contains bytes for photos just as they come from the
+   * database. Each holder has a soft reference to the actual bitmap.
+   */
+  private final LruCache<Object, BitmapHolder> mBitmapHolderCache;
+  /** Cache size threshold at which bitmaps will not be preloaded. */
+  private final int mBitmapHolderCacheRedZoneBytes;
+  /**
+   * Level 2 LRU cache for bitmaps. This is a smaller cache that holds the most recently used
+   * bitmaps to save time on decoding them from bytes (the bytes are stored in {@link
+   * #mBitmapHolderCache}.
+   */
+  private final LruCache<Object, Bitmap> mBitmapCache;
+  /**
+   * A map from ImageView to the corresponding photo ID or uri, encapsulated in a request. The
+   * request may swapped out before the photo loading request is started.
+   */
+  private final ConcurrentHashMap<ImageView, Request> mPendingRequests =
+      new ConcurrentHashMap<ImageView, Request>();
+  /** Handler for messages sent to the UI thread. */
+  private final Handler mMainThreadHandler = new Handler(this);
+  /** For debug: How many times we had to reload cached photo for a stale entry */
+  private final AtomicInteger mStaleCacheOverwrite = new AtomicInteger();
+  /** For debug: How many times we had to reload cached photo for a fresh entry. Should be 0. */
+  private final AtomicInteger mFreshCacheOverwrite = new AtomicInteger();
+  /** {@code true} if ALL entries in {@link #mBitmapHolderCache} are NOT fresh. */
+  private volatile boolean mBitmapHolderCacheAllUnfresh = true;
+  /** Thread responsible for loading photos from the database. Created upon the first request. */
+  private LoaderThread mLoaderThread;
+  /** A gate to make sure we only send one instance of MESSAGE_PHOTOS_NEEDED at a time. */
+  private boolean mLoadingRequested;
+  /** Flag indicating if the image loading is paused. */
+  private boolean mPaused;
+  /** The user agent string to use when loading URI based photos. */
+  private String mUserAgent;
+
+  public ContactPhotoManagerImpl(Context context) {
+    mContext = context;
+
+    final ActivityManager am =
+        ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE));
+
+    final float cacheSizeAdjustment = (am.isLowRamDevice()) ? 0.5f : 1.0f;
+
+    final int bitmapCacheSize = (int) (cacheSizeAdjustment * BITMAP_CACHE_SIZE);
+    mBitmapCache =
+        new LruCache<Object, Bitmap>(bitmapCacheSize) {
+          @Override
+          protected int sizeOf(Object key, Bitmap value) {
+            return value.getByteCount();
+          }
+
+          @Override
+          protected void entryRemoved(
+              boolean evicted, Object key, Bitmap oldValue, Bitmap newValue) {
+            if (DEBUG) {
+              dumpStats();
+            }
+          }
+        };
+    final int holderCacheSize = (int) (cacheSizeAdjustment * HOLDER_CACHE_SIZE);
+    mBitmapHolderCache =
+        new LruCache<Object, BitmapHolder>(holderCacheSize) {
+          @Override
+          protected int sizeOf(Object key, BitmapHolder value) {
+            return value.bytes != null ? value.bytes.length : 0;
+          }
+
+          @Override
+          protected void entryRemoved(
+              boolean evicted, Object key, BitmapHolder oldValue, BitmapHolder newValue) {
+            if (DEBUG) {
+              dumpStats();
+            }
+          }
+        };
+    mBitmapHolderCacheRedZoneBytes = (int) (holderCacheSize * 0.75);
+    LogUtil.i(
+        "ContactPhotoManagerImpl.ContactPhotoManagerImpl", "cache adj: " + cacheSizeAdjustment);
+    if (DEBUG) {
+      LogUtil.d(
+          "ContactPhotoManagerImpl.ContactPhotoManagerImpl",
+          "Cache size: " + btk(mBitmapHolderCache.maxSize()) + " + " + btk(mBitmapCache.maxSize()));
+    }
+
+    mThumbnailSize =
+        context.getResources().getDimensionPixelSize(R.dimen.contact_browser_list_item_photo_size);
+
+    // Get a user agent string to use for URI photo requests.
+    mUserAgent = Constants.get().getUserAgent(context);
+    if (mUserAgent == null) {
+      mUserAgent = "";
+    }
+  }
+
+  /** Converts bytes to K bytes, rounding up. Used only for debug log. */
+  private static String btk(int bytes) {
+    return ((bytes + 1023) / 1024) + "K";
+  }
+
+  private static final int safeDiv(int dividend, int divisor) {
+    return (divisor == 0) ? 0 : (dividend / divisor);
+  }
+
+  private static boolean isChildView(View parent, View potentialChild) {
+    return potentialChild.getParent() != null
+        && (potentialChild.getParent() == parent
+            || (potentialChild.getParent() instanceof ViewGroup
+                && isChildView(parent, (ViewGroup) potentialChild.getParent())));
+  }
+
+  /**
+   * If necessary, decodes bytes stored in the holder to Bitmap. As long as the bitmap is held
+   * either by {@link #mBitmapCache} or by a soft reference in the holder, it will not be necessary
+   * to decode the bitmap.
+   */
+  private static void inflateBitmap(BitmapHolder holder, int requestedExtent) {
+    final int sampleSize =
+        BitmapUtil.findOptimalSampleSize(holder.originalSmallerExtent, requestedExtent);
+    byte[] bytes = holder.bytes;
+    if (bytes == null || bytes.length == 0) {
+      return;
+    }
+
+    if (sampleSize == holder.decodedSampleSize) {
+      // Check the soft reference.  If will be retained if the bitmap is also
+      // in the LRU cache, so we don't need to check the LRU cache explicitly.
+      if (holder.bitmapRef != null) {
+        holder.bitmap = holder.bitmapRef.get();
+        if (holder.bitmap != null) {
+          return;
+        }
+      }
+    }
+
+    try {
+      Bitmap bitmap = BitmapUtil.decodeBitmapFromBytes(bytes, sampleSize);
+
+      // TODO: As a temporary workaround while framework support is being added to
+      // clip non-square bitmaps into a perfect circle, manually crop the bitmap into
+      // into a square if it will be displayed as a thumbnail so that it can be cropped
+      // into a circle.
+      final int height = bitmap.getHeight();
+      final int width = bitmap.getWidth();
+
+      // The smaller dimension of a scaled bitmap can range from anywhere from 0 to just
+      // below twice the length of a thumbnail image due to the way we calculate the optimal
+      // sample size.
+      if (height != width && Math.min(height, width) <= mThumbnailSize * 2) {
+        final int dimension = Math.min(height, width);
+        bitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension);
+      }
+      // make bitmap mutable and draw size onto it
+      if (DEBUG_SIZES) {
+        Bitmap original = bitmap;
+        bitmap = bitmap.copy(bitmap.getConfig(), true);
+        original.recycle();
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        paint.setTextSize(16);
+        paint.setColor(Color.BLUE);
+        paint.setStyle(Style.FILL);
+        canvas.drawRect(0.0f, 0.0f, 50.0f, 20.0f, paint);
+        paint.setColor(Color.WHITE);
+        paint.setAntiAlias(true);
+        canvas.drawText(bitmap.getWidth() + "/" + sampleSize, 0, 15, paint);
+      }
+
+      holder.decodedSampleSize = sampleSize;
+      holder.bitmap = bitmap;
+      holder.bitmapRef = new SoftReference<Bitmap>(bitmap);
+      if (DEBUG) {
+        LogUtil.d(
+            "ContactPhotoManagerImpl.inflateBitmap",
+            "inflateBitmap "
+                + btk(bytes.length)
+                + " -> "
+                + bitmap.getWidth()
+                + "x"
+                + bitmap.getHeight()
+                + ", "
+                + btk(bitmap.getByteCount()));
+      }
+    } catch (OutOfMemoryError e) {
+      // Do nothing - the photo will appear to be missing
+    }
+  }
+
+  /** Dump cache stats on logcat. */
+  private void dumpStats() {
+    if (!DEBUG) {
+      return;
+    }
+    {
+      int numHolders = 0;
+      int rawBytes = 0;
+      int bitmapBytes = 0;
+      int numBitmaps = 0;
+      for (BitmapHolder h : mBitmapHolderCache.snapshot().values()) {
+        numHolders++;
+        if (h.bytes != null) {
+          rawBytes += h.bytes.length;
+        }
+        Bitmap b = h.bitmapRef != null ? h.bitmapRef.get() : null;
+        if (b != null) {
+          numBitmaps++;
+          bitmapBytes += b.getByteCount();
+        }
+      }
+      LogUtil.d(
+          "ContactPhotoManagerImpl.dumpStats",
+          "L1: "
+              + btk(rawBytes)
+              + " + "
+              + btk(bitmapBytes)
+              + " = "
+              + btk(rawBytes + bitmapBytes)
+              + ", "
+              + numHolders
+              + " holders, "
+              + numBitmaps
+              + " bitmaps, avg: "
+              + btk(safeDiv(rawBytes, numHolders))
+              + ","
+              + btk(safeDiv(bitmapBytes, numBitmaps)));
+      LogUtil.d(
+          "ContactPhotoManagerImpl.dumpStats",
+          "L1 Stats: "
+              + mBitmapHolderCache.toString()
+              + ", overwrite: fresh="
+              + mFreshCacheOverwrite.get()
+              + " stale="
+              + mStaleCacheOverwrite.get());
+    }
+
+    {
+      int numBitmaps = 0;
+      int bitmapBytes = 0;
+      for (Bitmap b : mBitmapCache.snapshot().values()) {
+        numBitmaps++;
+        bitmapBytes += b.getByteCount();
+      }
+      LogUtil.d(
+          "ContactPhotoManagerImpl.dumpStats",
+          "L2: "
+              + btk(bitmapBytes)
+              + ", "
+              + numBitmaps
+              + " bitmaps"
+              + ", avg: "
+              + btk(safeDiv(bitmapBytes, numBitmaps)));
+      // We don't get from L2 cache, so L2 stats is meaningless.
+    }
+  }
+
+  @Override
+  public void onTrimMemory(int level) {
+    if (DEBUG) {
+      LogUtil.d("ContactPhotoManagerImpl.onTrimMemory", "onTrimMemory: " + level);
+    }
+    if (level >= ComponentCallbacks2.TRIM_MEMORY_MODERATE) {
+      // Clear the caches.  Note all pending requests will be removed too.
+      clear();
+    }
+  }
+
+  @Override
+  public void preloadPhotosInBackground() {
+    ensureLoaderThread();
+    mLoaderThread.requestPreloading();
+  }
+
+  @Override
+  public void loadThumbnail(
+      ImageView view,
+      long photoId,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest,
+      DefaultImageProvider defaultProvider) {
+    if (photoId == 0) {
+      // No photo is needed
+      defaultProvider.applyDefaultImage(view, -1, darkTheme, defaultImageRequest);
+      mPendingRequests.remove(view);
+    } else {
+      if (DEBUG) {
+        LogUtil.d("ContactPhotoManagerImpl.loadThumbnail", "loadPhoto request: " + photoId);
+      }
+      loadPhotoByIdOrUri(
+          view, Request.createFromThumbnailId(photoId, darkTheme, isCircular, defaultProvider));
+    }
+  }
+
+  @Override
+  public void loadPhoto(
+      ImageView view,
+      Uri photoUri,
+      int requestedExtent,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageRequest defaultImageRequest,
+      DefaultImageProvider defaultProvider) {
+    if (photoUri == null) {
+      // No photo is needed
+      defaultProvider.applyDefaultImage(view, requestedExtent, darkTheme, defaultImageRequest);
+      mPendingRequests.remove(view);
+    } else {
+      if (DEBUG) {
+        LogUtil.d("ContactPhotoManagerImpl.loadPhoto", "loadPhoto request: " + photoUri);
+      }
+      if (isDefaultImageUri(photoUri)) {
+        createAndApplyDefaultImageForUri(
+            view, photoUri, requestedExtent, darkTheme, isCircular, defaultProvider);
+      } else {
+        loadPhotoByIdOrUri(
+            view,
+            Request.createFromUri(
+                photoUri, requestedExtent, darkTheme, isCircular, defaultProvider));
+      }
+    }
+  }
+
+  private void createAndApplyDefaultImageForUri(
+      ImageView view,
+      Uri uri,
+      int requestedExtent,
+      boolean darkTheme,
+      boolean isCircular,
+      DefaultImageProvider defaultProvider) {
+    DefaultImageRequest request = getDefaultImageRequestFromUri(uri);
+    request.isCircular = isCircular;
+    defaultProvider.applyDefaultImage(view, requestedExtent, darkTheme, request);
+  }
+
+  private void loadPhotoByIdOrUri(ImageView view, Request request) {
+    boolean loaded = loadCachedPhoto(view, request, false);
+    if (loaded) {
+      mPendingRequests.remove(view);
+    } else {
+      mPendingRequests.put(view, request);
+      if (!mPaused) {
+        // Send a request to start loading photos
+        requestLoading();
+      }
+    }
+  }
+
+  @Override
+  public void removePhoto(ImageView view) {
+    view.setImageDrawable(null);
+    mPendingRequests.remove(view);
+  }
+
+  /**
+   * Cancels pending requests to load photos asynchronously for views inside {@param
+   * fragmentRootView}. If {@param fragmentRootView} is null, cancels all requests.
+   */
+  @Override
+  public void cancelPendingRequests(View fragmentRootView) {
+    if (fragmentRootView == null) {
+      mPendingRequests.clear();
+      return;
+    }
+    final Iterator<Entry<ImageView, Request>> iterator = mPendingRequests.entrySet().iterator();
+    while (iterator.hasNext()) {
+      final ImageView imageView = iterator.next().getKey();
+      // If an ImageView is orphaned (currently scrap) or a child of fragmentRootView, then
+      // we can safely remove its request.
+      if (imageView.getParent() == null || isChildView(fragmentRootView, imageView)) {
+        iterator.remove();
+      }
+    }
+  }
+
+  @Override
+  public void refreshCache() {
+    if (mBitmapHolderCacheAllUnfresh) {
+      if (DEBUG) {
+        LogUtil.d("ContactPhotoManagerImpl.refreshCache", "refreshCache -- no fresh entries.");
+      }
+      return;
+    }
+    if (DEBUG) {
+      LogUtil.d("ContactPhotoManagerImpl.refreshCache", "refreshCache");
+    }
+    mBitmapHolderCacheAllUnfresh = true;
+    for (BitmapHolder holder : mBitmapHolderCache.snapshot().values()) {
+      if (holder != BITMAP_UNAVAILABLE) {
+        holder.fresh = false;
+      }
+    }
+  }
+
+  /**
+   * Checks if the photo is present in cache. If so, sets the photo on the view.
+   *
+   * @return false if the photo needs to be (re)loaded from the provider.
+   */
+  @UiThread
+  private boolean loadCachedPhoto(ImageView view, Request request, boolean fadeIn) {
+    BitmapHolder holder = mBitmapHolderCache.get(request.getKey());
+    if (holder == null) {
+      // The bitmap has not been loaded ==> show default avatar
+      request.applyDefaultImage(view, request.mIsCircular);
+      return false;
+    }
+
+    if (holder.bytes == null) {
+      request.applyDefaultImage(view, request.mIsCircular);
+      return holder.fresh;
+    }
+
+    Bitmap cachedBitmap = holder.bitmapRef == null ? null : holder.bitmapRef.get();
+    if (cachedBitmap == null) {
+      request.applyDefaultImage(view, request.mIsCircular);
+      return false;
+    }
+
+    final Drawable previousDrawable = view.getDrawable();
+    if (fadeIn && previousDrawable != null) {
+      final Drawable[] layers = new Drawable[2];
+      // Prevent cascade of TransitionDrawables.
+      if (previousDrawable instanceof TransitionDrawable) {
+        final TransitionDrawable previousTransitionDrawable = (TransitionDrawable) previousDrawable;
+        layers[0] =
+            previousTransitionDrawable.getDrawable(
+                previousTransitionDrawable.getNumberOfLayers() - 1);
+      } else {
+        layers[0] = previousDrawable;
+      }
+      layers[1] = getDrawableForBitmap(mContext.getResources(), cachedBitmap, request);
+      TransitionDrawable drawable = new TransitionDrawable(layers);
+      view.setImageDrawable(drawable);
+      drawable.startTransition(FADE_TRANSITION_DURATION);
+    } else {
+      view.setImageDrawable(getDrawableForBitmap(mContext.getResources(), cachedBitmap, request));
+    }
+
+    // Put the bitmap in the LRU cache. But only do this for images that are small enough
+    // (we require that at least six of those can be cached at the same time)
+    if (cachedBitmap.getByteCount() < mBitmapCache.maxSize() / 6) {
+      mBitmapCache.put(request.getKey(), cachedBitmap);
+    }
+
+    // Soften the reference
+    holder.bitmap = null;
+
+    return holder.fresh;
+  }
+
+  /**
+   * Given a bitmap, returns a drawable that is configured to display the bitmap based on the
+   * specified request.
+   */
+  private Drawable getDrawableForBitmap(Resources resources, Bitmap bitmap, Request request) {
+    if (request.mIsCircular) {
+      final RoundedBitmapDrawable drawable = RoundedBitmapDrawableFactory.create(resources, bitmap);
+      drawable.setAntiAlias(true);
+      drawable.setCornerRadius(drawable.getIntrinsicHeight() / 2);
+      return drawable;
+    } else {
+      return new BitmapDrawable(resources, bitmap);
+    }
+  }
+
+  public void clear() {
+    if (DEBUG) {
+      LogUtil.d("ContactPhotoManagerImpl.clear", "clear");
+    }
+    mPendingRequests.clear();
+    mBitmapHolderCache.evictAll();
+    mBitmapCache.evictAll();
+  }
+
+  @Override
+  public void pause() {
+    mPaused = true;
+  }
+
+  @Override
+  public void resume() {
+    mPaused = false;
+    if (DEBUG) {
+      dumpStats();
+    }
+    if (!mPendingRequests.isEmpty()) {
+      requestLoading();
+    }
+  }
+
+  /**
+   * Sends a message to this thread itself to start loading images. If the current view contains
+   * multiple image views, all of those image views will get a chance to request their respective
+   * photos before any of those requests are executed. This allows us to load images in bulk.
+   */
+  private void requestLoading() {
+    if (!mLoadingRequested) {
+      mLoadingRequested = true;
+      mMainThreadHandler.sendEmptyMessage(MESSAGE_REQUEST_LOADING);
+    }
+  }
+
+  /** Processes requests on the main thread. */
+  @Override
+  public boolean handleMessage(Message msg) {
+    switch (msg.what) {
+      case MESSAGE_REQUEST_LOADING:
+        {
+          mLoadingRequested = false;
+          if (!mPaused) {
+            ensureLoaderThread();
+            mLoaderThread.requestLoading();
+          }
+          return true;
+        }
+
+      case MESSAGE_PHOTOS_LOADED:
+        {
+          if (!mPaused) {
+            processLoadedImages();
+          }
+          if (DEBUG) {
+            dumpStats();
+          }
+          return true;
+        }
+      default:
+        return false;
+    }
+  }
+
+  public void ensureLoaderThread() {
+    if (mLoaderThread == null) {
+      mLoaderThread = new LoaderThread(mContext.getContentResolver());
+      mLoaderThread.start();
+    }
+  }
+
+  /**
+   * Goes over pending loading requests and displays loaded photos. If some of the photos still
+   * haven't been loaded, sends another request for image loading.
+   */
+  private void processLoadedImages() {
+    final Iterator<Entry<ImageView, Request>> iterator = mPendingRequests.entrySet().iterator();
+    while (iterator.hasNext()) {
+      final Entry<ImageView, Request> entry = iterator.next();
+      // TODO: Temporarily disable contact photo fading in, until issues with
+      // RoundedBitmapDrawables overlapping the default image drawables are resolved.
+      final boolean loaded = loadCachedPhoto(entry.getKey(), entry.getValue(), false);
+      if (loaded) {
+        iterator.remove();
+      }
+    }
+
+    softenCache();
+
+    if (!mPendingRequests.isEmpty()) {
+      requestLoading();
+    }
+  }
+
+  /**
+   * Removes strong references to loaded bitmaps to allow them to be garbage collected if needed.
+   * Some of the bitmaps will still be retained by {@link #mBitmapCache}.
+   */
+  private void softenCache() {
+    for (BitmapHolder holder : mBitmapHolderCache.snapshot().values()) {
+      holder.bitmap = null;
+    }
+  }
+
+  /** Stores the supplied bitmap in cache. */
+  private void cacheBitmap(Object key, byte[] bytes, boolean preloading, int requestedExtent) {
+    if (DEBUG) {
+      BitmapHolder prev = mBitmapHolderCache.get(key);
+      if (prev != null && prev.bytes != null) {
+        LogUtil.d(
+            "ContactPhotoManagerImpl.cacheBitmap",
+            "overwriting cache: key=" + key + (prev.fresh ? " FRESH" : " stale"));
+        if (prev.fresh) {
+          mFreshCacheOverwrite.incrementAndGet();
+        } else {
+          mStaleCacheOverwrite.incrementAndGet();
+        }
+      }
+      LogUtil.d(
+          "ContactPhotoManagerImpl.cacheBitmap",
+          "caching data: key=" + key + ", " + (bytes == null ? "<null>" : btk(bytes.length)));
+    }
+    BitmapHolder holder =
+        new BitmapHolder(bytes, bytes == null ? -1 : BitmapUtil.getSmallerExtentFromBytes(bytes));
+
+    // Unless this image is being preloaded, decode it right away while
+    // we are still on the background thread.
+    if (!preloading) {
+      inflateBitmap(holder, requestedExtent);
+    }
+
+    if (bytes != null) {
+      mBitmapHolderCache.put(key, holder);
+      if (mBitmapHolderCache.get(key) != holder) {
+        LogUtil.w("ContactPhotoManagerImpl.cacheBitmap", "bitmap too big to fit in cache.");
+        mBitmapHolderCache.put(key, BITMAP_UNAVAILABLE);
+      }
+    } else {
+      mBitmapHolderCache.put(key, BITMAP_UNAVAILABLE);
+    }
+
+    mBitmapHolderCacheAllUnfresh = false;
+  }
+
+  /**
+   * Populates an array of photo IDs that need to be loaded. Also decodes bitmaps that we have
+   * already loaded
+   */
+  private void obtainPhotoIdsAndUrisToLoad(
+      Set<Long> photoIds, Set<String> photoIdsAsStrings, Set<Request> uris) {
+    photoIds.clear();
+    photoIdsAsStrings.clear();
+    uris.clear();
+
+    boolean jpegsDecoded = false;
+
+    /*
+     * Since the call is made from the loader thread, the map could be
+     * changing during the iteration. That's not really a problem:
+     * ConcurrentHashMap will allow those changes to happen without throwing
+     * exceptions. Since we may miss some requests in the situation of
+     * concurrent change, we will need to check the map again once loading
+     * is complete.
+     */
+    Iterator<Request> iterator = mPendingRequests.values().iterator();
+    while (iterator.hasNext()) {
+      Request request = iterator.next();
+      final BitmapHolder holder = mBitmapHolderCache.get(request.getKey());
+      if (holder == BITMAP_UNAVAILABLE) {
+        continue;
+      }
+      if (holder != null
+          && holder.bytes != null
+          && holder.fresh
+          && (holder.bitmapRef == null || holder.bitmapRef.get() == null)) {
+        // This was previously loaded but we don't currently have the inflated Bitmap
+        inflateBitmap(holder, request.getRequestedExtent());
+        jpegsDecoded = true;
+      } else {
+        if (holder == null || !holder.fresh) {
+          if (request.isUriRequest()) {
+            uris.add(request);
+          } else {
+            photoIds.add(request.getId());
+            photoIdsAsStrings.add(String.valueOf(request.mId));
+          }
+        }
+      }
+    }
+
+    if (jpegsDecoded) {
+      mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
+    }
+  }
+
+  /** Maintains the state of a particular photo. */
+  private static class BitmapHolder {
+
+    final byte[] bytes;
+    final int originalSmallerExtent;
+
+    volatile boolean fresh;
+    Bitmap bitmap;
+    Reference<Bitmap> bitmapRef;
+    int decodedSampleSize;
+
+    public BitmapHolder(byte[] bytes, int originalSmallerExtent) {
+      this.bytes = bytes;
+      this.fresh = true;
+      this.originalSmallerExtent = originalSmallerExtent;
+    }
+  }
+
+  /**
+   * A holder for either a Uri or an id and a flag whether this was requested for the dark or light
+   * theme
+   */
+  private static final class Request {
+
+    private final long mId;
+    private final Uri mUri;
+    private final boolean mDarkTheme;
+    private final int mRequestedExtent;
+    private final DefaultImageProvider mDefaultProvider;
+    /** Whether or not the contact photo is to be displayed as a circle */
+    private final boolean mIsCircular;
+
+    private Request(
+        long id,
+        Uri uri,
+        int requestedExtent,
+        boolean darkTheme,
+        boolean isCircular,
+        DefaultImageProvider defaultProvider) {
+      mId = id;
+      mUri = uri;
+      mDarkTheme = darkTheme;
+      mIsCircular = isCircular;
+      mRequestedExtent = requestedExtent;
+      mDefaultProvider = defaultProvider;
+    }
+
+    public static Request createFromThumbnailId(
+        long id, boolean darkTheme, boolean isCircular, DefaultImageProvider defaultProvider) {
+      return new Request(id, null /* no URI */, -1, darkTheme, isCircular, defaultProvider);
+    }
+
+    public static Request createFromUri(
+        Uri uri,
+        int requestedExtent,
+        boolean darkTheme,
+        boolean isCircular,
+        DefaultImageProvider defaultProvider) {
+      return new Request(
+          0 /* no ID */, uri, requestedExtent, darkTheme, isCircular, defaultProvider);
+    }
+
+    public boolean isUriRequest() {
+      return mUri != null;
+    }
+
+    public Uri getUri() {
+      return mUri;
+    }
+
+    public long getId() {
+      return mId;
+    }
+
+    public int getRequestedExtent() {
+      return mRequestedExtent;
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + (int) (mId ^ (mId >>> 32));
+      result = prime * result + mRequestedExtent;
+      result = prime * result + ((mUri == null) ? 0 : mUri.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (obj == null) {
+        return false;
+      }
+      if (getClass() != obj.getClass()) {
+        return false;
+      }
+      final Request that = (Request) obj;
+      if (mId != that.mId) {
+        return false;
+      }
+      if (mRequestedExtent != that.mRequestedExtent) {
+        return false;
+      }
+      if (!UriUtils.areEqual(mUri, that.mUri)) {
+        return false;
+      }
+      // Don't compare equality of mDarkTheme because it is only used in the default contact
+      // photo case. When the contact does have a photo, the contact photo is the same
+      // regardless of mDarkTheme, so we shouldn't need to put the photo request on the queue
+      // twice.
+      return true;
+    }
+
+    public Object getKey() {
+      return mUri == null ? mId : mUri;
+    }
+
+    /**
+     * Applies the default image to the current view. If the request is URI-based, looks for the
+     * contact type encoded fragment to determine if this is a request for a business photo, in
+     * which case we will load the default business photo.
+     *
+     * @param view The current image view to apply the image to.
+     * @param isCircular Whether the image is circular or not.
+     */
+    public void applyDefaultImage(ImageView view, boolean isCircular) {
+      final DefaultImageRequest request;
+
+      if (isCircular) {
+        request =
+            ContactPhotoManager.isBusinessContactUri(mUri)
+                ? DefaultImageRequest.EMPTY_CIRCULAR_BUSINESS_IMAGE_REQUEST
+                : DefaultImageRequest.EMPTY_CIRCULAR_DEFAULT_IMAGE_REQUEST;
+      } else {
+        request =
+            ContactPhotoManager.isBusinessContactUri(mUri)
+                ? DefaultImageRequest.EMPTY_DEFAULT_BUSINESS_IMAGE_REQUEST
+                : DefaultImageRequest.EMPTY_DEFAULT_IMAGE_REQUEST;
+      }
+      mDefaultProvider.applyDefaultImage(view, mRequestedExtent, mDarkTheme, request);
+    }
+  }
+
+  /** The thread that performs loading of photos from the database. */
+  private class LoaderThread extends HandlerThread implements Callback {
+
+    private static final int BUFFER_SIZE = 1024 * 16;
+    private static final int MESSAGE_PRELOAD_PHOTOS = 0;
+    private static final int MESSAGE_LOAD_PHOTOS = 1;
+
+    /** A pause between preload batches that yields to the UI thread. */
+    private static final int PHOTO_PRELOAD_DELAY = 1000;
+
+    /** Number of photos to preload per batch. */
+    private static final int PRELOAD_BATCH = 25;
+
+    /**
+     * Maximum number of photos to preload. If the cache size is 2Mb and the expected average size
+     * of a photo is 4kb, then this number should be 2Mb/4kb = 500.
+     */
+    private static final int MAX_PHOTOS_TO_PRELOAD = 100;
+
+    private static final int PRELOAD_STATUS_NOT_STARTED = 0;
+    private static final int PRELOAD_STATUS_IN_PROGRESS = 1;
+    private static final int PRELOAD_STATUS_DONE = 2;
+    private final ContentResolver mResolver;
+    private final StringBuilder mStringBuilder = new StringBuilder();
+    private final Set<Long> mPhotoIds = new HashSet<>();
+    private final Set<String> mPhotoIdsAsStrings = new HashSet<>();
+    private final Set<Request> mPhotoUris = new HashSet<>();
+    private final List<Long> mPreloadPhotoIds = new ArrayList<>();
+    private Handler mLoaderThreadHandler;
+    private byte[] mBuffer;
+    private int mPreloadStatus = PRELOAD_STATUS_NOT_STARTED;
+
+    public LoaderThread(ContentResolver resolver) {
+      super(LOADER_THREAD_NAME);
+      mResolver = resolver;
+    }
+
+    public void ensureHandler() {
+      if (mLoaderThreadHandler == null) {
+        mLoaderThreadHandler = new Handler(getLooper(), this);
+      }
+    }
+
+    /**
+     * Kicks off preloading of the next batch of photos on the background thread. Preloading will
+     * happen after a delay: we want to yield to the UI thread as much as possible.
+     *
+     * <p>If preloading is already complete, does nothing.
+     */
+    public void requestPreloading() {
+      if (mPreloadStatus == PRELOAD_STATUS_DONE) {
+        return;
+      }
+
+      ensureHandler();
+      if (mLoaderThreadHandler.hasMessages(MESSAGE_LOAD_PHOTOS)) {
+        return;
+      }
+
+      mLoaderThreadHandler.sendEmptyMessageDelayed(MESSAGE_PRELOAD_PHOTOS, PHOTO_PRELOAD_DELAY);
+    }
+
+    /**
+     * Sends a message to this thread to load requested photos. Cancels a preloading request, if
+     * any: we don't want preloading to impede loading of the photos we need to display now.
+     */
+    public void requestLoading() {
+      ensureHandler();
+      mLoaderThreadHandler.removeMessages(MESSAGE_PRELOAD_PHOTOS);
+      mLoaderThreadHandler.sendEmptyMessage(MESSAGE_LOAD_PHOTOS);
+    }
+
+    /**
+     * Receives the above message, loads photos and then sends a message to the main thread to
+     * process them.
+     */
+    @Override
+    public boolean handleMessage(Message msg) {
+      switch (msg.what) {
+        case MESSAGE_PRELOAD_PHOTOS:
+          preloadPhotosInBackground();
+          break;
+        case MESSAGE_LOAD_PHOTOS:
+          loadPhotosInBackground();
+          break;
+      }
+      return true;
+    }
+
+    /**
+     * The first time it is called, figures out which photos need to be preloaded. Each subsequent
+     * call preloads the next batch of photos and requests another cycle of preloading after a
+     * delay. The whole process ends when we either run out of photos to preload or fill up cache.
+     */
+    @WorkerThread
+    private void preloadPhotosInBackground() {
+      if (!PermissionsUtil.hasPermission(mContext, android.Manifest.permission.READ_CONTACTS)) {
+        return;
+      }
+
+      if (mPreloadStatus == PRELOAD_STATUS_DONE) {
+        return;
+      }
+
+      if (mPreloadStatus == PRELOAD_STATUS_NOT_STARTED) {
+        queryPhotosForPreload();
+        if (mPreloadPhotoIds.isEmpty()) {
+          mPreloadStatus = PRELOAD_STATUS_DONE;
+        } else {
+          mPreloadStatus = PRELOAD_STATUS_IN_PROGRESS;
+        }
+        requestPreloading();
+        return;
+      }
+
+      if (mBitmapHolderCache.size() > mBitmapHolderCacheRedZoneBytes) {
+        mPreloadStatus = PRELOAD_STATUS_DONE;
+        return;
+      }
+
+      mPhotoIds.clear();
+      mPhotoIdsAsStrings.clear();
+
+      int count = 0;
+      int preloadSize = mPreloadPhotoIds.size();
+      while (preloadSize > 0 && mPhotoIds.size() < PRELOAD_BATCH) {
+        preloadSize--;
+        count++;
+        Long photoId = mPreloadPhotoIds.get(preloadSize);
+        mPhotoIds.add(photoId);
+        mPhotoIdsAsStrings.add(photoId.toString());
+        mPreloadPhotoIds.remove(preloadSize);
+      }
+
+      loadThumbnails(true);
+
+      if (preloadSize == 0) {
+        mPreloadStatus = PRELOAD_STATUS_DONE;
+      }
+
+      LogUtil.v(
+          "ContactPhotoManagerImpl.preloadPhotosInBackground",
+          "preloaded " + count + " photos.  cached bytes: " + mBitmapHolderCache.size());
+
+      requestPreloading();
+    }
+
+    @WorkerThread
+    private void queryPhotosForPreload() {
+      Cursor cursor = null;
+      try {
+        Uri uri =
+            Contacts.CONTENT_URI
+                .buildUpon()
+                .appendQueryParameter(
+                    ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
+                .appendQueryParameter(
+                    ContactsContract.LIMIT_PARAM_KEY, String.valueOf(MAX_PHOTOS_TO_PRELOAD))
+                .build();
+        cursor =
+            mResolver.query(
+                uri,
+                new String[] {Contacts.PHOTO_ID},
+                Contacts.PHOTO_ID + " NOT NULL AND " + Contacts.PHOTO_ID + "!=0",
+                null,
+                Contacts.STARRED + " DESC, " + Contacts.LAST_TIME_CONTACTED + " DESC");
+
+        if (cursor != null) {
+          while (cursor.moveToNext()) {
+            // Insert them in reverse order, because we will be taking
+            // them from the end of the list for loading.
+            mPreloadPhotoIds.add(0, cursor.getLong(0));
+          }
+        }
+      } finally {
+        if (cursor != null) {
+          cursor.close();
+        }
+      }
+    }
+
+    @WorkerThread
+    private void loadPhotosInBackground() {
+      if (!PermissionsUtil.hasPermission(mContext, android.Manifest.permission.READ_CONTACTS)) {
+        return;
+      }
+      obtainPhotoIdsAndUrisToLoad(mPhotoIds, mPhotoIdsAsStrings, mPhotoUris);
+      loadThumbnails(false);
+      loadUriBasedPhotos();
+      requestPreloading();
+    }
+
+    /** Loads thumbnail photos with ids */
+    @WorkerThread
+    private void loadThumbnails(boolean preloading) {
+      if (mPhotoIds.isEmpty()) {
+        return;
+      }
+
+      // Remove loaded photos from the preload queue: we don't want
+      // the preloading process to load them again.
+      if (!preloading && mPreloadStatus == PRELOAD_STATUS_IN_PROGRESS) {
+        for (Long id : mPhotoIds) {
+          mPreloadPhotoIds.remove(id);
+        }
+        if (mPreloadPhotoIds.isEmpty()) {
+          mPreloadStatus = PRELOAD_STATUS_DONE;
+        }
+      }
+
+      mStringBuilder.setLength(0);
+      mStringBuilder.append(Photo._ID + " IN(");
+      for (int i = 0; i < mPhotoIds.size(); i++) {
+        if (i != 0) {
+          mStringBuilder.append(',');
+        }
+        mStringBuilder.append('?');
+      }
+      mStringBuilder.append(')');
+
+      Cursor cursor = null;
+      try {
+        if (DEBUG) {
+          LogUtil.d(
+              "ContactPhotoManagerImpl.loadThumbnails",
+              "loading " + TextUtils.join(",", mPhotoIdsAsStrings));
+        }
+        cursor =
+            mResolver.query(
+                Data.CONTENT_URI,
+                COLUMNS,
+                mStringBuilder.toString(),
+                mPhotoIdsAsStrings.toArray(EMPTY_STRING_ARRAY),
+                null);
+
+        if (cursor != null) {
+          while (cursor.moveToNext()) {
+            Long id = cursor.getLong(0);
+            byte[] bytes = cursor.getBlob(1);
+            cacheBitmap(id, bytes, preloading, -1);
+            mPhotoIds.remove(id);
+          }
+        }
+      } finally {
+        if (cursor != null) {
+          cursor.close();
+        }
+      }
+
+      // Remaining photos were not found in the contacts database (but might be in profile).
+      for (Long id : mPhotoIds) {
+        if (ContactsContract.isProfileId(id)) {
+          Cursor profileCursor = null;
+          try {
+            profileCursor =
+                mResolver.query(
+                    ContentUris.withAppendedId(Data.CONTENT_URI, id), COLUMNS, null, null, null);
+            if (profileCursor != null && profileCursor.moveToFirst()) {
+              cacheBitmap(profileCursor.getLong(0), profileCursor.getBlob(1), preloading, -1);
+            } else {
+              // Couldn't load a photo this way either.
+              cacheBitmap(id, null, preloading, -1);
+            }
+          } finally {
+            if (profileCursor != null) {
+              profileCursor.close();
+            }
+          }
+        } else {
+          // Not a profile photo and not found - mark the cache accordingly
+          cacheBitmap(id, null, preloading, -1);
+        }
+      }
+
+      mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
+    }
+
+    /**
+     * Loads photos referenced with Uris. Those can be remote thumbnails (from directory searches),
+     * display photos etc
+     */
+    @WorkerThread
+    private void loadUriBasedPhotos() {
+      for (Request uriRequest : mPhotoUris) {
+        // Keep the original URI and use this to key into the cache.  Failure to do so will
+        // result in an image being continually reloaded into cache if the original URI
+        // has a contact type encodedFragment (eg nearby places business photo URLs).
+        Uri originalUri = uriRequest.getUri();
+
+        // Strip off the "contact type" we added to the URI to ensure it was identifiable as
+        // a business photo -- there is no need to pass this on to the server.
+        Uri uri = ContactPhotoManager.removeContactType(originalUri);
+
+        if (mBuffer == null) {
+          mBuffer = new byte[BUFFER_SIZE];
+        }
+        try {
+          if (DEBUG) {
+            LogUtil.d("ContactPhotoManagerImpl.loadUriBasedPhotos", "loading " + uri);
+          }
+          final String scheme = uri.getScheme();
+          InputStream is = null;
+          if (scheme.equals("http") || scheme.equals("https")) {
+            TrafficStats.setThreadStatsTag(TrafficStatsTags.CONTACT_PHOTO_DOWNLOAD_TAG);
+            try {
+              final HttpURLConnection connection =
+                  (HttpURLConnection) new URL(uri.toString()).openConnection();
+
+              // Include the user agent if it is specified.
+              if (!TextUtils.isEmpty(mUserAgent)) {
+                connection.setRequestProperty("User-Agent", mUserAgent);
+              }
+              try {
+                is = connection.getInputStream();
+              } catch (IOException e) {
+                connection.disconnect();
+                is = null;
+              }
+            } finally {
+              TrafficStats.clearThreadStatsTag();
+            }
+          } else {
+            is = mResolver.openInputStream(uri);
+          }
+          if (is != null) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+              int size;
+              while ((size = is.read(mBuffer)) != -1) {
+                baos.write(mBuffer, 0, size);
+              }
+            } finally {
+              is.close();
+            }
+            cacheBitmap(originalUri, baos.toByteArray(), false, uriRequest.getRequestedExtent());
+            mMainThreadHandler.sendEmptyMessage(MESSAGE_PHOTOS_LOADED);
+          } else {
+            LogUtil.v("ContactPhotoManagerImpl.loadUriBasedPhotos", "cannot load photo " + uri);
+            cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
+          }
+        } catch (final Exception | OutOfMemoryError ex) {
+          LogUtil.v("ContactPhotoManagerImpl.loadUriBasedPhotos", "cannot load photo " + uri, ex);
+          cacheBitmap(originalUri, null, false, uriRequest.getRequestedExtent());
+        }
+      }
+    }
+  }
+}
diff --git a/java/com/android/dialer/contactphoto/res/values-af/strings.xml b/java/com/android/dialer/contactphoto/res/values-af/strings.xml
new file mode 100644
index 0000000..c3d5f78
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Vinnige kontak vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-am/strings.xml b/java/com/android/dialer/contactphoto/res/values-am/strings.xml
new file mode 100644
index 0000000..949a018
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"ለ<xliff:g id="NAME">%1$s</xliff:g> ፈጣን ዕውቂያ"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ar/strings.xml b/java/com/android/dialer/contactphoto/res/values-ar/strings.xml
new file mode 100644
index 0000000..a11eeea
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"اتصال سريع لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-az/strings.xml b/java/com/android/dialer/contactphoto/res/values-az/strings.xml
new file mode 100644
index 0000000..3559951
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> üçün cəld kontakt"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..8932e55
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-be/strings.xml b/java/com/android/dialer/contactphoto/res/values-be/strings.xml
new file mode 100644
index 0000000..70eb91b
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Хуткі кантакт для карыстальніка <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bg/strings.xml b/java/com/android/dialer/contactphoto/res/values-bg/strings.xml
new file mode 100644
index 0000000..4c15cec
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Бърз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bn/strings.xml b/java/com/android/dialer/contactphoto/res/values-bn/strings.xml
new file mode 100644
index 0000000..62a7ddb
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> এর জন্য দ্রুত পরিচিতি"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bs/strings.xml b/java/com/android/dialer/contactphoto/res/values-bs/strings.xml
new file mode 100644
index 0000000..de9e970
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ca/strings.xml b/java/com/android/dialer/contactphoto/res/values-ca/strings.xml
new file mode 100644
index 0000000..c6276fb
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacte ràpid per a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-cs/strings.xml b/java/com/android/dialer/contactphoto/res/values-cs/strings.xml
new file mode 100644
index 0000000..2a37e59
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Rychlý kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-da/strings.xml b/java/com/android/dialer/contactphoto/res/values-da/strings.xml
new file mode 100644
index 0000000..3df1386
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-de/strings.xml b/java/com/android/dialer/contactphoto/res/values-de/strings.xml
new file mode 100644
index 0000000..e182ea5
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Schnellkontakt für <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-el/strings.xml b/java/com/android/dialer/contactphoto/res/values-el/strings.xml
new file mode 100644
index 0000000..537f41e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Γρήγορη επαφή για <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..9ce88e7
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..9ce88e7
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..9ce88e7
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml b/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..315978e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-es/strings.xml b/java/com/android/dialer/contactphoto/res/values-es/strings.xml
new file mode 100644
index 0000000..315978e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-et/strings.xml b/java/com/android/dialer/contactphoto/res/values-et/strings.xml
new file mode 100644
index 0000000..1db8d75
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kiirkontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-eu/strings.xml b/java/com/android/dialer/contactphoto/res/values-eu/strings.xml
new file mode 100644
index 0000000..4be6d83
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen kontaktu bizkorra"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fa/strings.xml b/java/com/android/dialer/contactphoto/res/values-fa/strings.xml
new file mode 100644
index 0000000..63fc2cb
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"تماس سریع برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fi/strings.xml b/java/com/android/dialer/contactphoto/res/values-fi/strings.xml
new file mode 100644
index 0000000..6109e86
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Pikayhteys henkilöön <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml b/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..353920e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fr/strings.xml b/java/com/android/dialer/contactphoto/res/values-fr/strings.xml
new file mode 100644
index 0000000..353920e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-gl/strings.xml b/java/com/android/dialer/contactphoto/res/values-gl/strings.xml
new file mode 100644
index 0000000..f65800d
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-gu/strings.xml b/java/com/android/dialer/contactphoto/res/values-gu/strings.xml
new file mode 100644
index 0000000..323b74f
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> માટે ઝડપી સંપર્ક"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hi/strings.xml b/java/com/android/dialer/contactphoto/res/values-hi/strings.xml
new file mode 100644
index 0000000..08b2322
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> के लिए झटपट संपर्क"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hr/strings.xml b/java/com/android/dialer/contactphoto/res/values-hr/strings.xml
new file mode 100644
index 0000000..36b97f5
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hu/strings.xml b/java/com/android/dialer/contactphoto/res/values-hu/strings.xml
new file mode 100644
index 0000000..70223a3
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> gyors elérése"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hy/strings.xml b/java/com/android/dialer/contactphoto/res/values-hy/strings.xml
new file mode 100644
index 0000000..af84ef3
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Արագ հաղորդակցում <xliff:g id="NAME">%1$s</xliff:g>-ի հետ"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-in/strings.xml b/java/com/android/dialer/contactphoto/res/values-in/strings.xml
new file mode 100644
index 0000000..0295a30
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kontak kilat untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-is/strings.xml b/java/com/android/dialer/contactphoto/res/values-is/strings.xml
new file mode 100644
index 0000000..8b6a988
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Flýtitengiliður fyrir <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-it/strings.xml b/java/com/android/dialer/contactphoto/res/values-it/strings.xml
new file mode 100644
index 0000000..4abc81e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contatto rapido per <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-iw/strings.xml b/java/com/android/dialer/contactphoto/res/values-iw/strings.xml
new file mode 100644
index 0000000..bae1c28
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"קשר מהיר עבור <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ja/strings.xml b/java/com/android/dialer/contactphoto/res/values-ja/strings.xml
new file mode 100644
index 0000000..f1aae7e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> さんのクイックコンタクト"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ka/strings.xml b/java/com/android/dialer/contactphoto/res/values-ka/strings.xml
new file mode 100644
index 0000000..48c5203
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"სწრაფი კონტაქტი <xliff:g id="NAME">%1$s</xliff:g>-თან"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-kk/strings.xml b/java/com/android/dialer/contactphoto/res/values-kk/strings.xml
new file mode 100644
index 0000000..1253006
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> үшін жылдам байланыс"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-km/strings.xml b/java/com/android/dialer/contactphoto/res/values-km/strings.xml
new file mode 100644
index 0000000..16c71bd
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"ទំនាក់ទំនង​រហ័ស​សម្រាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-kn/strings.xml b/java/com/android/dialer/contactphoto/res/values-kn/strings.xml
new file mode 100644
index 0000000..3ed2bd0
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರಿಗೆ ತ್ವರಿತ ಸಂಪರ್ಕ"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ko/strings.xml b/java/com/android/dialer/contactphoto/res/values-ko/strings.xml
new file mode 100644
index 0000000..512c2d8
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>님의 빠른 주소록"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ky/strings.xml b/java/com/android/dialer/contactphoto/res/values-ky/strings.xml
new file mode 100644
index 0000000..7ea4196
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> үчүн тез байланышуу"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lo/strings.xml b/java/com/android/dialer/contactphoto/res/values-lo/strings.xml
new file mode 100644
index 0000000..0b9d624
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"ຂໍ້ມູນຕິດຕໍ່ດ່ວນສຳລັບ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lt/strings.xml b/java/com/android/dialer/contactphoto/res/values-lt/strings.xml
new file mode 100644
index 0000000..4d5d86e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Spartusis <xliff:g id="NAME">%1$s</xliff:g> kontaktas"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lv/strings.xml b/java/com/android/dialer/contactphoto/res/values-lv/strings.xml
new file mode 100644
index 0000000..1fc1457
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Ātrā saziņa ar kontaktpersonu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mk/strings.xml b/java/com/android/dialer/contactphoto/res/values-mk/strings.xml
new file mode 100644
index 0000000..0d84df8
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Брз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ml/strings.xml b/java/com/android/dialer/contactphoto/res/values-ml/strings.xml
new file mode 100644
index 0000000..695917b
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mn/strings.xml b/java/com/android/dialer/contactphoto/res/values-mn/strings.xml
new file mode 100644
index 0000000..bf28c8b
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>-н Шуурхай хаяг"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mr/strings.xml b/java/com/android/dialer/contactphoto/res/values-mr/strings.xml
new file mode 100644
index 0000000..a7cba8d
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> साठी जलद संपर्क"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ms/strings.xml b/java/com/android/dialer/contactphoto/res/values-ms/strings.xml
new file mode 100644
index 0000000..e6b74d2
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kenalan cepat untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-my/strings.xml b/java/com/android/dialer/contactphoto/res/values-my/strings.xml
new file mode 100644
index 0000000..05965d1
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> အတွက် အမြန်အဆက်အသွယ်"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-nb/strings.xml b/java/com/android/dialer/contactphoto/res/values-nb/strings.xml
new file mode 100644
index 0000000..3df1386
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ne/strings.xml b/java/com/android/dialer/contactphoto/res/values-ne/strings.xml
new file mode 100644
index 0000000..906dffe
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>को छिटो सम्पर्क"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-nl/strings.xml b/java/com/android/dialer/contactphoto/res/values-nl/strings.xml
new file mode 100644
index 0000000..a7046e5
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Snelcontact voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-no/strings.xml b/java/com/android/dialer/contactphoto/res/values-no/strings.xml
new file mode 100644
index 0000000..3df1386
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-no/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pa/strings.xml b/java/com/android/dialer/contactphoto/res/values-pa/strings.xml
new file mode 100644
index 0000000..b94a4d5
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> ਲਈ ਤਤਕਾਲ ਸੰਪਰਕ"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pl/strings.xml b/java/com/android/dialer/contactphoto/res/values-pl/strings.xml
new file mode 100644
index 0000000..91a4c22
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Szybki kontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..8cd0996
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..fdb5cf7
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contactos rápidos para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt/strings.xml
new file mode 100644
index 0000000..8cd0996
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ro/strings.xml b/java/com/android/dialer/contactphoto/res/values-ro/strings.xml
new file mode 100644
index 0000000..5872c36
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contact rapid pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ru/strings.xml b/java/com/android/dialer/contactphoto/res/values-ru/strings.xml
new file mode 100644
index 0000000..efb1cc4
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Быстрый вызов, контакт: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-si/strings.xml b/java/com/android/dialer/contactphoto/res/values-si/strings.xml
new file mode 100644
index 0000000..7abbdbe
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> සඳහා ඉක්මන් සම්බන්ධතාව"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sk/strings.xml b/java/com/android/dialer/contactphoto/res/values-sk/strings.xml
new file mode 100644
index 0000000..2abf26a
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Rýchly kontakt pre osobu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sl/strings.xml b/java/com/android/dialer/contactphoto/res/values-sl/strings.xml
new file mode 100644
index 0000000..c3f1207
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hitri stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sq/strings.xml b/java/com/android/dialer/contactphoto/res/values-sq/strings.xml
new file mode 100644
index 0000000..96a83e7
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kontakti i shpejtë për <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sr/strings.xml b/java/com/android/dialer/contactphoto/res/values-sr/strings.xml
new file mode 100644
index 0000000..16df264
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Брзи контакт за: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sv/strings.xml b/java/com/android/dialer/contactphoto/res/values-sv/strings.xml
new file mode 100644
index 0000000..217230f
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Snabbkontakt för <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sw/strings.xml b/java/com/android/dialer/contactphoto/res/values-sw/strings.xml
new file mode 100644
index 0000000..8127e25
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ta/strings.xml b/java/com/android/dialer/contactphoto/res/values-ta/strings.xml
new file mode 100644
index 0000000..4e488fd
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>க்கான விரைவுத் தொடர்பு"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-te/strings.xml b/java/com/android/dialer/contactphoto/res/values-te/strings.xml
new file mode 100644
index 0000000..0bcf37a
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> కోసం త్వరిత సంప్రదింపు"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-th/strings.xml b/java/com/android/dialer/contactphoto/res/values-th/strings.xml
new file mode 100644
index 0000000..02470c4
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"สมุดโทรศัพท์ด่วนสำหรับ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-tl/strings.xml b/java/com/android/dialer/contactphoto/res/values-tl/strings.xml
new file mode 100644
index 0000000..9a1de36
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Mabilisan na contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-tr/strings.xml b/java/com/android/dialer/contactphoto/res/values-tr/strings.xml
new file mode 100644
index 0000000..310233f
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> için hızlı iletişim"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-uk/strings.xml b/java/com/android/dialer/contactphoto/res/values-uk/strings.xml
new file mode 100644
index 0000000..5eceb6f
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Швидкий контакт із користувачем <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ur/strings.xml b/java/com/android/dialer/contactphoto/res/values-ur/strings.xml
new file mode 100644
index 0000000..fa7221c
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> کیلئے فوری رابطہ"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-uz/strings.xml b/java/com/android/dialer/contactphoto/res/values-uz/strings.xml
new file mode 100644
index 0000000..6eb28ee
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Tezkor chaqiruv, kontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-vi/strings.xml b/java/com/android/dialer/contactphoto/res/values-vi/strings.xml
new file mode 100644
index 0000000..f10ea2f
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Liên hệ nhanh cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..1739077
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>的快捷联系方式"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..53f6fdd
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"快速聯絡<xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..a4eca1e
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>的快速聯絡人相片"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zu/strings.xml b/java/com/android/dialer/contactphoto/res/values-zu/strings.xml
new file mode 100644
index 0000000..f8cf074
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="description_quick_contact_for" msgid="6701611505635096879">"Oxhumene naye ngokushesha ku <xliff:g id="NAME">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/contactphoto/res/values/dimens.xml b/java/com/android/dialer/contactphoto/res/values/dimens.xml
new file mode 100644
index 0000000..7c3361a
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <dimen name="contact_browser_list_item_photo_size">40dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactphoto/res/values/strings.xml b/java/com/android/dialer/contactphoto/res/values/strings.xml
new file mode 100644
index 0000000..5b050d8
--- /dev/null
+++ b/java/com/android/dialer/contactphoto/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 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
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- String describing the text for photo of a contact in a contacts list.
+
+      Note: AccessibilityServices use this attribute to announce what the view represents.
+            This is especially valuable for views without textual representation like ImageView.
+  -->
+  <string name="description_quick_contact_for">Quick contact for <xliff:g id="name">%1$s</xliff:g></string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactsfragment/AddContactViewHolder.java b/java/com/android/dialer/contactsfragment/AddContactViewHolder.java
new file mode 100644
index 0000000..09c222e
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/AddContactViewHolder.java
@@ -0,0 +1,42 @@
+/*
+ * 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.contactsfragment;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.View;
+import android.view.View.OnClickListener;
+import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.IntentUtil;
+
+/** ViewHolder for {@link ContactsFragment} to display add contact row. */
+final class AddContactViewHolder extends ViewHolder implements OnClickListener {
+
+  private final Context context;
+
+  AddContactViewHolder(View view) {
+    super(view);
+    view.setOnClickListener(this);
+    context = view.getContext();
+  }
+
+  @Override
+  public void onClick(View v) {
+    DialerUtils.startActivityWithErrorToast(
+        context, IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
+  }
+}
diff --git a/java/com/android/dialer/contactsfragment/ContactViewHolder.java b/java/com/android/dialer/contactsfragment/ContactViewHolder.java
index 5df106d..0597c2a 100644
--- a/java/com/android/dialer/contactsfragment/ContactViewHolder.java
+++ b/java/com/android/dialer/contactsfragment/ContactViewHolder.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.contactsfragment;
 
+import android.content.Context;
 import android.net.Uri;
 import android.provider.ContactsContract.QuickContact;
 import android.support.v7.widget.RecyclerView;
@@ -25,6 +26,9 @@
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
+import com.android.dialer.contactsfragment.ContactsFragment.ClickAction;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 
 /** View holder for a contact. */
 final class ContactViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
@@ -32,16 +36,21 @@
   private final TextView header;
   private final TextView name;
   private final QuickContactBadge photo;
+  private final Context context;
+  private final @ClickAction int clickAction;
 
   private String headerText;
   private Uri contactUri;
 
-  public ContactViewHolder(View itemView) {
+  ContactViewHolder(View itemView, @ClickAction int clickAction) {
     super(itemView);
+    Assert.checkArgument(clickAction != ClickAction.INVALID, "Invalid click action.");
+    context = itemView.getContext();
     itemView.findViewById(R.id.click_target).setOnClickListener(this);
-    header = (TextView) itemView.findViewById(R.id.header);
-    name = (TextView) itemView.findViewById(R.id.contact_name);
-    photo = (QuickContactBadge) itemView.findViewById(R.id.photo);
+    header = itemView.findViewById(R.id.header);
+    name = itemView.findViewById(R.id.contact_name);
+    photo = itemView.findViewById(R.id.photo);
+    this.clickAction = clickAction;
   }
 
   /**
@@ -60,6 +69,10 @@
     name.setText(displayName);
     header.setText(headerText);
     header.setVisibility(showHeader ? View.VISIBLE : View.INVISIBLE);
+
+    Logger.get(context)
+        .logQuickContactOnTouch(
+            photo, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CONTACTS_FRAGMENT_BADGE, true);
   }
 
   public QuickContactBadge getPhoto() {
@@ -76,7 +89,20 @@
 
   @Override
   public void onClick(View v) {
-    QuickContact.showQuickContact(
-        photo.getContext(), photo, contactUri, QuickContact.MODE_LARGE, null /* excludeMimes */);
+    switch (clickAction) {
+      case ClickAction.OPEN_CONTACT_CARD:
+        Logger.get(context)
+            .logInteraction(InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CONTACTS_FRAGMENT_ITEM);
+        QuickContact.showQuickContact(
+            photo.getContext(),
+            photo,
+            contactUri,
+            QuickContact.MODE_LARGE,
+            null /* excludeMimes */);
+        break;
+      case ClickAction.INVALID:
+      default:
+        throw Assert.createIllegalStateFailException("Invalid click action.");
+    }
   }
 }
diff --git a/java/com/android/dialer/contactsfragment/ContactsAdapter.java b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
index 4692eff..1389531 100644
--- a/java/com/android/dialer/contactsfragment/ContactsAdapter.java
+++ b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
@@ -20,20 +20,37 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
+import android.support.annotation.IntDef;
 import android.support.v4.util.ArrayMap;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.dialer.common.Assert;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contactsfragment.ContactsFragment.ClickAction;
+import com.android.dialer.contactsfragment.ContactsFragment.Header;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /** List adapter for the union of all contacts associated with every account on the device. */
-final class ContactsAdapter extends RecyclerView.Adapter<ContactViewHolder> {
+final class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+  private static final int UNKNOWN_VIEW_TYPE = 0;
+  private static final int ADD_CONTACT_VIEW_TYPE = 1;
+  private static final int CONTACT_VIEW_TYPE = 2;
+
+  /** An Enum for the different row view types shown by this adapter. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({UNKNOWN_VIEW_TYPE, ADD_CONTACT_VIEW_TYPE, CONTACT_VIEW_TYPE})
+  @interface ContactsViewType {}
 
   private final ArrayMap<ContactViewHolder, Integer> holderMap = new ArrayMap<>();
   private final Context context;
   private final Cursor cursor;
+  private final @Header int header;
+  private final @ClickAction int clickAction;
 
   // List of contact sublist headers
   private final String[] headers;
@@ -41,23 +58,44 @@
   // Number of contacts that correspond to each header in {@code headers}.
   private final int[] counts;
 
-  public ContactsAdapter(Context context, Cursor cursor) {
+  ContactsAdapter(
+      Context context, Cursor cursor, @Header int header, @ClickAction int clickAction) {
     this.context = context;
     this.cursor = cursor;
+    this.header = header;
+    this.clickAction = clickAction;
     headers = cursor.getExtras().getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
     counts = cursor.getExtras().getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
   }
 
   @Override
-  public ContactViewHolder onCreateViewHolder(ViewGroup parent, int position) {
-    return new ContactViewHolder(
-        LayoutInflater.from(context).inflate(R.layout.contact_row, parent, false));
+  public RecyclerView.ViewHolder onCreateViewHolder(
+      ViewGroup parent, @ContactsViewType int viewType) {
+    switch (viewType) {
+      case ADD_CONTACT_VIEW_TYPE:
+        return new AddContactViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.add_contact_row, parent, false));
+      case CONTACT_VIEW_TYPE:
+        return new ContactViewHolder(
+            LayoutInflater.from(context).inflate(R.layout.contact_row, parent, false), clickAction);
+      case UNKNOWN_VIEW_TYPE:
+      default:
+        throw Assert.createIllegalStateFailException("Invalid view type: " + viewType);
+    }
   }
 
   @Override
-  public void onBindViewHolder(ContactViewHolder contactViewHolder, int position) {
+  public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
+    if (viewHolder instanceof AddContactViewHolder) {
+      return;
+    }
+
+    ContactViewHolder contactViewHolder = (ContactViewHolder) viewHolder;
     holderMap.put(contactViewHolder, position);
     cursor.moveToPosition(position);
+    if (header != Header.NONE) {
+      cursor.moveToPrevious();
+    }
 
     String name = getDisplayName(cursor);
     String header = getHeaderString(position);
@@ -70,7 +108,7 @@
             getPhotoId(cursor),
             getPhotoUri(cursor),
             name,
-            0);
+            LetterTileDrawable.TYPE_DEFAULT);
 
     String photoDescription =
         context.getString(com.android.contacts.common.R.string.description_quick_contact_for, name);
@@ -79,44 +117,48 @@
     // Always show the view holder's header if it's the first item in the list. Otherwise, compare
     // it to the previous element and only show the anchored header if the row elements fall into
     // the same sublists.
-    if (position == 0) {
-      contactViewHolder.bind(header, name, contactUri, true);
-    } else {
-      boolean showHeader = !header.equals(getHeaderString(position - 1));
-      contactViewHolder.bind(header, name, contactUri, showHeader);
+    boolean showHeader = position == 0 || !header.equals(getHeaderString(position - 1));
+    contactViewHolder.bind(header, name, contactUri, showHeader);
+  }
+
+  /**
+   * Returns {@link #ADD_CONTACT_VIEW_TYPE} if the adapter was initialized with {@link
+   * Header#ADD_CONTACT} and the position is 0. Otherwise, {@link #CONTACT_VIEW_TYPE}.
+   */
+  @Override
+  public @ContactsViewType int getItemViewType(int position) {
+    if (header != Header.NONE && position == 0) {
+      return ADD_CONTACT_VIEW_TYPE;
+    }
+    return CONTACT_VIEW_TYPE;
+  }
+
+  @Override
+  public void onViewRecycled(RecyclerView.ViewHolder contactViewHolder) {
+    super.onViewRecycled(contactViewHolder);
+    if (contactViewHolder instanceof ContactViewHolder) {
+      holderMap.remove(contactViewHolder);
     }
   }
 
-  public void refreshHeaders() {
+  void refreshHeaders() {
     for (ContactViewHolder holder : holderMap.keySet()) {
-      onBindViewHolder(holder, holderMap.get(holder));
+      int position = holderMap.get(holder);
+      boolean showHeader =
+          position == 0 || !getHeaderString(position).equals(getHeaderString(position - 1));
+      int visibility = showHeader ? View.VISIBLE : View.INVISIBLE;
+      holder.getHeaderView().setVisibility(visibility);
     }
   }
 
   @Override
   public int getItemCount() {
-    return cursor == null ? 0 : cursor.getCount();
-  }
-
-  public String getHeader(int position) {
-    return getHolderAt(position).getHeader();
-  }
-
-  public TextView getHeaderView(int position) {
-    return getHolderAt(position).getHeaderView();
-  }
-
-  public void setHeaderVisibility(int position, int visibility) {
-    getHolderAt(position).getHeaderView().setVisibility(visibility);
-  }
-
-  private ContactViewHolder getHolderAt(int position) {
-    for (ContactViewHolder holder : holderMap.keySet()) {
-      if (holderMap.get(holder) == position) {
-        return holder;
-      }
+    int count = cursor == null || cursor.isClosed() ? 0 : cursor.getCount();
+    // Manually insert the header if one exists.
+    if (header != Header.NONE) {
+      count++;
     }
-    throw Assert.createIllegalStateFailException("No holder for position: " + position);
+    return count;
   }
 
   private static String getDisplayName(Cursor cursor) {
@@ -138,7 +180,14 @@
     return Contacts.getLookupUri(contactId, lookupKey);
   }
 
-  private String getHeaderString(int position) {
+  String getHeaderString(int position) {
+    if (header != Header.NONE) {
+      if (position == 0) {
+        return "+";
+      }
+      position--;
+    }
+
     int index = -1;
     int sum = 0;
     while (sum <= position) {
diff --git a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
index 6d4d210..a22f7eb 100644
--- a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
+++ b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
@@ -29,7 +29,7 @@
   public static final int CONTACT_PHOTO_URI = 3;
   public static final int CONTACT_LOOKUP_KEY = 4;
 
-  public static final String[] CONTACTS_PROJECTION =
+  public static final String[] CONTACTS_PROJECTION_DISPLAY_NAME_PRIMARY =
       new String[] {
         Contacts._ID, // 0
         Contacts.DISPLAY_NAME_PRIMARY, // 1
@@ -38,16 +38,35 @@
         Contacts.LOOKUP_KEY, // 4
       };
 
-  public ContactsCursorLoader(Context context) {
+  public static final String[] CONTACTS_PROJECTION_DISPLAY_NAME_ALTERNATIVE =
+      new String[] {
+        Contacts._ID, // 0
+        Contacts.DISPLAY_NAME_ALTERNATIVE, // 1
+        Contacts.PHOTO_ID, // 2
+        Contacts.PHOTO_THUMBNAIL_URI, // 3
+        Contacts.LOOKUP_KEY, // 4
+      };
+
+  private ContactsCursorLoader(Context context, String[] contactProjection, String sortKey) {
     super(
         context,
         Contacts.CONTENT_URI
             .buildUpon()
             .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
             .build(),
-        CONTACTS_PROJECTION,
+        contactProjection,
+        contactProjection[CONTACT_DISPLAY_NAME] + " IS NOT NULL",
         null,
-        null,
-        Contacts.SORT_KEY_PRIMARY + " ASC");
+        sortKey + " ASC");
+  }
+
+  public static ContactsCursorLoader createInstanceDisplayNamePrimary(
+      Context context, String sortKey) {
+    return new ContactsCursorLoader(context, CONTACTS_PROJECTION_DISPLAY_NAME_PRIMARY, sortKey);
+  }
+
+  public static ContactsCursorLoader createInstanceDisplayNameAlternative(
+      Context context, String sortKey) {
+    return new ContactsCursorLoader(context, CONTACTS_PROJECTION_DISPLAY_NAME_ALTERNATIVE, sortKey);
   }
 }
diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java
index ea662fc..ddf00b3 100644
--- a/java/com/android/dialer/contactsfragment/ContactsFragment.java
+++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java
@@ -19,60 +19,194 @@
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Loader;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.provider.ContactsContract.Contacts;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import android.support.v13.app.FragmentCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.Recycler;
+import android.support.v7.widget.RecyclerView.State;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnScrollChangeListener;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.common.preference.ContactsPreferences.ChangeListener;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.IntentUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
 
 /** Fragment containing a list of all contacts. */
 public class ContactsFragment extends Fragment
-    implements LoaderCallbacks<Cursor>, OnScrollChangeListener {
+    implements LoaderCallbacks<Cursor>,
+        OnScrollChangeListener,
+        OnEmptyViewActionButtonClickedListener,
+        ChangeListener {
 
+  /** IntDef to define the OnClick action for contact rows. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ClickAction.INVALID, ClickAction.OPEN_CONTACT_CARD})
+  public @interface ClickAction {
+    int INVALID = 0;
+    /** Open contact card on click. */
+    int OPEN_CONTACT_CARD = 1;
+  }
+
+  /** An enum for the different types of headers that be inserted at position 0 in the list. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({Header.NONE, Header.ADD_CONTACT})
+  public @interface Header {
+    int NONE = 0;
+    /** Header that allows the user to add a new contact. */
+    int ADD_CONTACT = 1;
+  }
+
+  public static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
+
+  private static final String EXTRA_HEADER = "extra_header";
+  private static final String EXTRA_CLICK_ACTION = "extra_click_action";
+
+  private FastScroller fastScroller;
   private TextView anchoredHeader;
   private RecyclerView recyclerView;
   private LinearLayoutManager manager;
   private ContactsAdapter adapter;
+  private EmptyContentView emptyContentView;
+
+  private ContactsPreferences contactsPrefs;
+  private @Header int header;
+  private @ClickAction int clickAction;
+
+  /**
+   * Used to get a configured instance of ContactsFragment.
+   *
+   * <p>Current example of this fragment are the contacts tab and in creating a new favorite
+   * contact. For example, the contacts tab we use:
+   *
+   * <ul>
+   *   <li>{@link Header#ADD_CONTACT} to insert a header that allows users to add a contact
+   *   <li>{@link ClickAction#OPEN_CONTACT_CARD} to open contact cards on click
+   * </ul>
+   *
+   * And for the add favorite contact screen we might use:
+   *
+   * <ul>
+   *   <li>{@link Header#NONE} so that all rows are contacts (i.e. no header inserted)
+   *   <li>{@link ClickAction#SET_RESULT_AND_FINISH} to send a selected contact to the previous
+   *       activity.
+   * </ul>
+   *
+   * @param header determines the type of header inserted at position 0 in the contacts list
+   * @param clickAction defines the on click actions on rows that represent contacts
+   */
+  public static ContactsFragment newInstance(@Header int header, @ClickAction int clickAction) {
+    Assert.checkArgument(clickAction != ClickAction.INVALID, "Invalid click action");
+    ContactsFragment fragment = new ContactsFragment();
+    Bundle args = new Bundle();
+    args.putInt(EXTRA_HEADER, header);
+    args.putInt(EXTRA_CLICK_ACTION, clickAction);
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  @SuppressWarnings("WrongConstant")
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    contactsPrefs = new ContactsPreferences(getContext());
+    contactsPrefs.registerChangeListener(this);
+    header = getArguments().getInt(EXTRA_HEADER);
+    clickAction = getArguments().getInt(EXTRA_CLICK_ACTION);
+  }
 
   @Nullable
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.fragment_contacts, container, false);
-    anchoredHeader = (TextView) view.findViewById(R.id.header);
-    manager = new LinearLayoutManager(getContext());
+    fastScroller = view.findViewById(R.id.fast_scroller);
+    anchoredHeader = view.findViewById(R.id.header);
+    recyclerView = view.findViewById(R.id.recycler_view);
 
-    // TODO: Handle contacts permission denied view
-    // TODO: Handle 0 contacts layout
-    recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
-    recyclerView.setLayoutManager(manager);
-    getLoaderManager().initLoader(0, null, this);
+    emptyContentView = view.findViewById(R.id.empty_list_view);
+    emptyContentView.setImage(R.drawable.empty_contacts);
+    emptyContentView.setActionClickedListener(this);
 
     if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
       getLoaderManager().initLoader(0, null, this);
+    } else {
+      emptyContentView.setDescription(R.string.permission_no_contacts);
+      emptyContentView.setActionLabel(R.string.permission_single_turn_on);
+      emptyContentView.setVisibility(View.VISIBLE);
     }
 
     return view;
   }
 
   @Override
+  public void onChange() {
+    if (getActivity() != null && isAdded()) {
+      getLoaderManager().restartLoader(0, null, this);
+    }
+  }
+
+  /** @return a loader according to sort order and display order. */
+  @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new ContactsCursorLoader(getContext());
+    boolean sortOrderPrimary =
+        (contactsPrefs.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY);
+    boolean displayOrderPrimary =
+        (contactsPrefs.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY);
+
+    String sortKey = sortOrderPrimary ? Contacts.SORT_KEY_PRIMARY : Contacts.SORT_KEY_ALTERNATIVE;
+    return displayOrderPrimary
+        ? ContactsCursorLoader.createInstanceDisplayNamePrimary(getContext(), sortKey)
+        : ContactsCursorLoader.createInstanceDisplayNameAlternative(getContext(), sortKey);
   }
 
   @Override
   public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
-    // TODO setup fast scroller.
-    adapter = new ContactsAdapter(getContext(), cursor);
-    recyclerView.setAdapter(adapter);
-    if (adapter.getItemCount() > 1) {
-      recyclerView.setOnScrollChangeListener(this);
+    if (cursor.getCount() == 0) {
+      emptyContentView.setDescription(R.string.all_contacts_empty);
+      emptyContentView.setActionLabel(R.string.all_contacts_empty_add_contact_action);
+      emptyContentView.setVisibility(View.VISIBLE);
+      recyclerView.setVisibility(View.GONE);
+    } else {
+      emptyContentView.setVisibility(View.GONE);
+      recyclerView.setVisibility(View.VISIBLE);
+      adapter = new ContactsAdapter(getContext(), cursor, header, clickAction);
+      manager =
+          new LinearLayoutManager(getContext()) {
+            @Override
+            public void onLayoutChildren(Recycler recycler, State state) {
+              super.onLayoutChildren(recycler, state);
+              int itemsShown = findLastVisibleItemPosition() - findFirstVisibleItemPosition() + 1;
+              if (adapter.getItemCount() > itemsShown) {
+                fastScroller.setVisibility(View.VISIBLE);
+                recyclerView.setOnScrollChangeListener(ContactsFragment.this);
+              } else {
+                fastScroller.setVisibility(View.GONE);
+              }
+            }
+          };
+
+      recyclerView.setLayoutManager(manager);
+      recyclerView.setAdapter(adapter);
+      PerformanceReport.logOnScrollStateChange(recyclerView);
+      fastScroller.setup(adapter, manager);
     }
   }
 
@@ -81,6 +215,7 @@
     recyclerView.setAdapter(null);
     recyclerView.setOnScrollChangeListener(null);
     adapter = null;
+    contactsPrefs.unregisterChangeListener();
   }
 
   /*
@@ -95,8 +230,14 @@
    */
   @Override
   public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
+    fastScroller.updateContainerAndScrollBarPosition(recyclerView);
     int firstVisibleItem = manager.findFirstVisibleItemPosition();
     int firstCompletelyVisible = manager.findFirstCompletelyVisibleItemPosition();
+    if (firstCompletelyVisible == RecyclerView.NO_POSITION) {
+      // No items are visible, so there are no headers to update.
+      return;
+    }
+    String anchoredHeaderString = adapter.getHeaderString(firstCompletelyVisible);
 
     // If the user swipes to the top of the list very quickly, there is some strange behavior
     // between this method updating headers and adapter#onBindViewHolder updating headers.
@@ -104,15 +245,57 @@
     if (firstVisibleItem == firstCompletelyVisible && firstVisibleItem == 0) {
       adapter.refreshHeaders();
       anchoredHeader.setVisibility(View.INVISIBLE);
-    } else {
-      boolean showAnchor =
-          adapter.getHeader(firstVisibleItem).equals(adapter.getHeader(firstCompletelyVisible));
-      anchoredHeader.setText(adapter.getHeader(firstCompletelyVisible));
-      anchoredHeader.setVisibility(showAnchor ? View.VISIBLE : View.INVISIBLE);
+    } else if (firstVisibleItem != 0) { // skip the add contact row
+      if (adapter.getHeaderString(firstVisibleItem).equals(anchoredHeaderString)) {
+        anchoredHeader.setText(anchoredHeaderString);
+        anchoredHeader.setVisibility(View.VISIBLE);
+        getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.INVISIBLE);
+        getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.INVISIBLE);
+      } else {
+        anchoredHeader.setVisibility(View.INVISIBLE);
+        getContactHolder(firstVisibleItem).getHeaderView().setVisibility(View.VISIBLE);
+        getContactHolder(firstCompletelyVisible).getHeaderView().setVisibility(View.VISIBLE);
+      }
+    }
+  }
 
-      int rowHeaderVisibility = showAnchor ? View.INVISIBLE : View.VISIBLE;
-      adapter.setHeaderVisibility(firstVisibleItem, rowHeaderVisibility);
-      adapter.setHeaderVisibility(firstCompletelyVisible, rowHeaderVisibility);
+  private ContactViewHolder getContactHolder(int position) {
+    return ((ContactViewHolder) recyclerView.findViewHolderForAdapterPosition(position));
+  }
+
+  @Override
+  public void onEmptyViewActionButtonClicked() {
+    if (emptyContentView.getActionLabel() == R.string.permission_single_turn_on) {
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+      if (deniedPermissions.length > 0) {
+        LogUtil.i(
+            "ContactsFragment.onEmptyViewActionButtonClicked",
+            "Requesting permissions: " + Arrays.toString(deniedPermissions));
+        FragmentCompat.requestPermissions(
+            this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+      }
+
+    } else if (emptyContentView.getActionLabel()
+        == R.string.all_contacts_empty_add_contact_action) {
+      // Add new contact
+      DialerUtils.startActivityWithErrorToast(
+          getContext(), IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
+    } else {
+      throw Assert.createIllegalStateFailException("Invalid empty content view action label.");
+    }
+  }
+
+  @Override
+  public void onRequestPermissionsResult(
+      int requestCode, String[] permissions, int[] grantResults) {
+    if (requestCode == READ_CONTACTS_PERMISSION_REQUEST_CODE) {
+      if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
+        // Force a refresh of the data since we were missing the permission before this.
+        emptyContentView.setVisibility(View.GONE);
+        getLoaderManager().initLoader(0, null, this);
+      }
     }
   }
 }
diff --git a/java/com/android/dialer/contactsfragment/FastScroller.java b/java/com/android/dialer/contactsfragment/FastScroller.java
new file mode 100644
index 0000000..2a86a3b
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/FastScroller.java
@@ -0,0 +1,131 @@
+/*
+ * 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.contactsfragment;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+/** Widget to add fast scrolling to {@link ContactsFragment}. */
+public class FastScroller extends RelativeLayout {
+
+  private final int touchTargetWidth;
+
+  private ContactsAdapter adapter;
+  private LinearLayoutManager layoutManager;
+
+  private TextView container;
+  private View scrollBar;
+
+  private boolean dragStarted;
+
+  public FastScroller(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    touchTargetWidth =
+        context.getResources().getDimensionPixelSize(R.dimen.fast_scroller_touch_target_width);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+    container = findViewById(R.id.fast_scroller_container);
+    scrollBar = findViewById(R.id.fast_scroller_scroll_bar);
+  }
+
+  void setup(ContactsAdapter adapter, LinearLayoutManager layoutManager) {
+    this.adapter = adapter;
+    this.layoutManager = layoutManager;
+    setVisibility(VISIBLE);
+  }
+
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent event) {
+    // Don't override if touch event isn't within desired touch target and dragging hasn't started.
+    if (!dragStarted && getWidth() - touchTargetWidth - event.getX() > 0) {
+      return super.onTouchEvent(event);
+    }
+
+    switch (event.getAction()) {
+      case MotionEvent.ACTION_DOWN:
+        dragStarted = true;
+        container.setVisibility(VISIBLE);
+        scrollBar.setSelected(true);
+        // fall through
+      case MotionEvent.ACTION_MOVE:
+        setContainerAndScrollBarPosition(event.getY());
+        setRecyclerViewPosition(event.getY());
+        return true;
+      case MotionEvent.ACTION_UP:
+      case MotionEvent.ACTION_CANCEL:
+        dragStarted = false;
+        container.setVisibility(INVISIBLE);
+        scrollBar.setSelected(false);
+        return true;
+    }
+    return super.onTouchEvent(event);
+  }
+
+  private void setRecyclerViewPosition(float y) {
+    final int itemCount = adapter.getItemCount();
+    float scrolledPosition = getScrolledPercentage(y) * (float) itemCount;
+    int targetPos = getValueInRange(0, itemCount - 1, (int) scrolledPosition);
+    layoutManager.scrollToPositionWithOffset(targetPos, 0);
+    container.setText(adapter.getHeaderString(targetPos));
+    adapter.refreshHeaders();
+  }
+
+  // Returns a float in range [0, 1] which represents the position of the scroller.
+  private float getScrolledPercentage(float y) {
+    if (scrollBar.getY() == 0) {
+      return 0f;
+    } else if (scrollBar.getY() + scrollBar.getHeight() >= getHeight()) {
+      return 1f;
+    } else {
+      return y / (float) getHeight();
+    }
+  }
+
+  private int getValueInRange(int min, int max, int value) {
+    int minimum = Math.max(min, value);
+    return Math.min(minimum, max);
+  }
+
+  void updateContainerAndScrollBarPosition(RecyclerView recyclerView) {
+    if (!scrollBar.isSelected()) {
+      int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
+      int verticalScrollRange = recyclerView.computeVerticalScrollRange();
+      float proportion = (float) verticalScrollOffset / ((float) verticalScrollRange - getHeight());
+      setContainerAndScrollBarPosition(getHeight() * proportion);
+    }
+  }
+
+  private void setContainerAndScrollBarPosition(float y) {
+    int scrollBarHeight = scrollBar.getHeight();
+    int containerHeight = container.getHeight();
+    scrollBar.setY(
+        getValueInRange(0, getHeight() - scrollBarHeight, (int) (y - scrollBarHeight / 2)));
+    container.setY(
+        getValueInRange(
+            0, getHeight() - containerHeight - scrollBarHeight / 2, (int) (y - containerHeight)));
+  }
+}
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
new file mode 100644
index 0000000..a7b2277
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="@color/dialer_theme_color"/>
+  <size
+      android:height="@dimen/fast_scroller_container_size"
+      android:width="@dimen/fast_scroller_container_size"/>
+  <corners
+      android:topLeftRadius="@dimen/fast_scroller_container_corner_radius"
+      android:topRightRadius="@dimen/fast_scroller_container_corner_radius"
+      android:bottomLeftRadius="@dimen/fast_scroller_bottom_left_corner_radius"
+      android:bottomRightRadius="@dimen/fast_scroller_bottom_right_corner_radius"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
new file mode 100644
index 0000000..a3e0c25
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_selected="true">
+    <shape android:shape="rectangle">
+      <solid android:color="@color/dialer_theme_color"/>
+      <size android:height="32dp" android:width="4dp"/>
+      <corners android:radius="2dp"/>
+    </shape>
+  </item>
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@color/dialer_secondary_text_color"/>
+      <size android:height="32dp" android:width="4dp"/>
+      <corners android:radius="2dp"/>
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
new file mode 100644
index 0000000..dbc7caf
--- /dev/null
+++ b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/click_target"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/row_height"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="@dimen/header_width"
+    android:layout_marginEnd="@dimen/row_end_margin"
+    android:paddingTop="@dimen/row_top_bottom_padding"
+    android:paddingBottom="@dimen/row_top_bottom_padding"
+    android:paddingStart="@dimen/row_start_padding"
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground">
+
+  <ImageView
+      android:id="@+id/photo"
+      android:layout_width="@dimen/photo_size"
+      android:layout_height="@dimen/photo_size"
+      android:src="@drawable/quantum_ic_person_add_white_24"
+      android:tint="@color/dialer_theme_color"
+      android:scaleType="center"/>
+
+  <TextView
+      android:id="@+id/contact_name"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:paddingStart="@dimen/text_padding_start"
+      android:paddingEnd="@dimen/text_padding_end"
+      android:gravity="center_vertical"
+      android:fontFamily="sans-serif"
+      android:text="@string/all_contacts_empty_add_contact_action"
+      style="@style/PrimaryText"/>
+</LinearLayout>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
index af87c7f..9e829fe 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
@@ -43,11 +43,13 @@
 
     <TextView
         android:id="@+id/contact_name"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:paddingStart="@dimen/text_padding_start"
         android:paddingEnd="@dimen/text_padding_end"
-        android:gravity="center_vertical|start"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
         android:textSize="@dimen/text_size"
         android:textColor="@color/dialer_primary_text_color"
         android:fontFamily="sans-serif"/>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
index 67b490f..3d58aad 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
@@ -23,8 +23,47 @@
       android:id="@+id/recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/background_dialer_white"/>
+      android:background="@color/background_dialer_light"/>
+
+  <!-- Scrollbars are always on the right side of the screen. Layouts should use Rights/Left instead
+       of Start/End -->
+  <com.android.dialer.contactsfragment.FastScroller
+      android:id="@+id/fast_scroller"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="8dp"
+      android:layout_marginBottom="8dp"
+      android:clipChildren="false"
+      android:visibility="gone">
+
+    <TextView
+        android:id="@+id/fast_scroller_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/fast_scroller_scroll_bar"
+        android:gravity="center"
+        android:textSize="48sp"
+        android:textColor="@color/background_dialer_white"
+        android:visibility="gone"
+        android:background="@drawable/fast_scroller_container_background"/>
+
+    <ImageView
+        android:id="@+id/fast_scroller_scroll_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_alignParentRight="true"
+        android:paddingRight="16dp"
+        android:src="@drawable/fast_scroller_scroll_bar" />
+  </com.android.dialer.contactsfragment.FastScroller>
 
   <!-- Anchored header view -->
   <include layout="@layout/header"/>
+
+  <com.android.dialer.widget.EmptyContentView
+      android:id="@+id/empty_list_view"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:visibility="gone"/>
 </FrameLayout>
diff --git a/java/com/android/dialer/contactsfragment/res/values/dimens.xml b/java/com/android/dialer/contactsfragment/res/values/dimens.xml
index 00d7c6d..f120014 100644
--- a/java/com/android/dialer/contactsfragment/res/values/dimens.xml
+++ b/java/com/android/dialer/contactsfragment/res/values/dimens.xml
@@ -25,4 +25,11 @@
   <dimen name="text_padding_start">16dp</dimen>
   <dimen name="text_padding_end">8dp</dimen>
   <dimen name="text_size">16sp</dimen>
-</resources>
+
+  <dimen name="fast_scroller_touch_target_width">20dp</dimen>
+
+  <dimen name="fast_scroller_container_size">88dp</dimen>
+  <dimen name="fast_scroller_container_corner_radius">44dp</dimen>
+  <dimen name="fast_scroller_bottom_right_corner_radius">0px</dimen>
+  <dimen name="fast_scroller_bottom_left_corner_radius">44dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java
index 35f7854..4867d9d 100644
--- a/java/com/android/dialer/database/CallLogQueryHandler.java
+++ b/java/com/android/dialer/database/CallLogQueryHandler.java
@@ -188,6 +188,20 @@
       VoicemailComponent.get(mContext)
           .getVoicemailClient()
           .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
+    } else {
+      // Filter out all Duo entries other than video calls
+      where
+          .append(" AND (")
+          .append(Calls.PHONE_ACCOUNT_COMPONENT_NAME)
+          .append(" IS NULL OR ")
+          .append(Calls.PHONE_ACCOUNT_COMPONENT_NAME)
+          .append(" NOT LIKE 'com.google.android.apps.tachyon%' OR ")
+          .append(Calls.FEATURES)
+          .append(" & ")
+          .append(Calls.FEATURES_VIDEO)
+          .append(" == ")
+          .append(Calls.FEATURES_VIDEO)
+          .append(")");
     }
 
     final int limit = (mLogLimit == -1) ? NUM_LOGS_TO_DISPLAY : mLogLimit;
diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java
index 3488142..6dd7cf4 100644
--- a/java/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/java/com/android/dialer/database/DialerDatabaseHelper.java
@@ -34,6 +34,7 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Directory;
 import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 import com.android.contacts.common.R;
 import com.android.contacts.common.util.StopWatch;
@@ -46,7 +47,6 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Database helper for smart dial. Designed as a singleton to make sure there is only one access
@@ -77,8 +77,6 @@
   private static final int MAX_ENTRIES = 20;
 
   private final Context mContext;
-  private final Object mLock = new Object();
-  private final AtomicBoolean mInUpdate = new AtomicBoolean(false);
   private boolean mIsTestInstance = false;
 
   protected DialerDatabaseHelper(Context context, String databaseName, int dbVersion) {
@@ -596,218 +594,212 @@
    * accordingly. It also queries the deleted contact database to remove newly deleted contacts
    * since last update.
    */
-  public void updateSmartDialDatabase() {
+  @WorkerThread
+  public synchronized void updateSmartDialDatabase() {
     LogUtil.enterBlock("DialerDatabaseHelper.updateSmartDialDatabase");
 
     final SQLiteDatabase db = getWritableDatabase();
 
-    synchronized (mLock) {
-      LogUtil.v("DialerDatabaseHelper.updateSmartDialDatabase", "starting to update database");
-      final StopWatch stopWatch = DEBUG ? StopWatch.start("Updating databases") : null;
+    LogUtil.v("DialerDatabaseHelper.updateSmartDialDatabase", "starting to update database");
+    final StopWatch stopWatch = DEBUG ? StopWatch.start("Updating databases") : null;
 
-      /** Gets the last update time on the database. */
-      final SharedPreferences databaseLastUpdateSharedPref =
-          mContext.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
-      final String lastUpdateMillis =
-          String.valueOf(databaseLastUpdateSharedPref.getLong(LAST_UPDATED_MILLIS, 0));
+    /** Gets the last update time on the database. */
+    final SharedPreferences databaseLastUpdateSharedPref =
+        mContext.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
+    final String lastUpdateMillis =
+        String.valueOf(databaseLastUpdateSharedPref.getLong(LAST_UPDATED_MILLIS, 0));
 
-      LogUtil.v(
-          "DialerDatabaseHelper.updateSmartDialDatabase", "last updated at " + lastUpdateMillis);
+    LogUtil.v(
+        "DialerDatabaseHelper.updateSmartDialDatabase", "last updated at " + lastUpdateMillis);
 
-      /** Sets the time after querying the database as the current update time. */
-      final Long currentMillis = System.currentTimeMillis();
+    /** Sets the time after querying the database as the current update time. */
+    final Long currentMillis = System.currentTimeMillis();
 
-      if (DEBUG) {
-        stopWatch.lap("Queried the Contacts database");
-      }
+    if (DEBUG) {
+      stopWatch.lap("Queried the Contacts database");
+    }
 
-      /** Prevents the app from reading the dialer database when updating. */
-      mInUpdate.getAndSet(true);
+    /** Removes contacts that have been deleted. */
+    removeDeletedContacts(db, getDeletedContactCursor(lastUpdateMillis));
+    removePotentiallyCorruptedContacts(db, lastUpdateMillis);
 
-      /** Removes contacts that have been deleted. */
-      removeDeletedContacts(db, getDeletedContactCursor(lastUpdateMillis));
-      removePotentiallyCorruptedContacts(db, lastUpdateMillis);
+    if (DEBUG) {
+      stopWatch.lap("Finished deleting deleted entries");
+    }
 
-      if (DEBUG) {
-        stopWatch.lap("Finished deleting deleted entries");
-      }
-
+    /**
+     * If the database did not exist before, jump through deletion as there is nothing to delete.
+     */
+    if (!lastUpdateMillis.equals("0")) {
       /**
-       * If the database did not exist before, jump through deletion as there is nothing to delete.
+       * Removes contacts that have been updated. Updated contact information will be inserted
+       * later. Note that this has to use a separate result set from updatePhoneCursor, since it is
+       * possible for a contact to be updated (e.g. phone number deleted), but have no results show
+       * up in updatedPhoneCursor (since all of its phone numbers have been deleted).
        */
-      if (!lastUpdateMillis.equals("0")) {
-        /**
-         * Removes contacts that have been updated. Updated contact information will be inserted
-         * later. Note that this has to use a separate result set from updatePhoneCursor, since it
-         * is possible for a contact to be updated (e.g. phone number deleted), but have no results
-         * show up in updatedPhoneCursor (since all of its phone numbers have been deleted).
-         */
-        final Cursor updatedContactCursor =
-            mContext
-                .getContentResolver()
-                .query(
-                    UpdatedContactQuery.URI,
-                    UpdatedContactQuery.PROJECTION,
-                    UpdatedContactQuery.SELECT_UPDATED_CLAUSE,
-                    new String[] {lastUpdateMillis},
-                    null);
-        if (updatedContactCursor == null) {
-          LogUtil.e(
-              "DialerDatabaseHelper.updateSmartDialDatabase",
-              "smartDial query received null for cursor");
-          return;
-        }
-        try {
-          removeUpdatedContacts(db, updatedContactCursor);
-        } finally {
-          updatedContactCursor.close();
-        }
-        if (DEBUG) {
-          stopWatch.lap("Finished deleting entries belonging to updated contacts");
-        }
-      }
-
-      /**
-       * Queries the contact database to get all phone numbers that have been updated since the last
-       * update time.
-       */
-      final Cursor updatedPhoneCursor =
+      final Cursor updatedContactCursor =
           mContext
               .getContentResolver()
               .query(
-                  PhoneQuery.URI,
-                  PhoneQuery.PROJECTION,
-                  PhoneQuery.SELECTION,
+                  UpdatedContactQuery.URI,
+                  UpdatedContactQuery.PROJECTION,
+                  UpdatedContactQuery.SELECT_UPDATED_CLAUSE,
                   new String[] {lastUpdateMillis},
                   null);
-      if (updatedPhoneCursor == null) {
+      if (updatedContactCursor == null) {
         LogUtil.e(
             "DialerDatabaseHelper.updateSmartDialDatabase",
             "smartDial query received null for cursor");
         return;
       }
-
       try {
-        /** Inserts recently updated phone numbers to the smartdial database. */
-        insertUpdatedContactsAndNumberPrefix(db, updatedPhoneCursor, currentMillis);
+        removeUpdatedContacts(db, updatedContactCursor);
+      } finally {
+        updatedContactCursor.close();
+      }
+      if (DEBUG) {
+        stopWatch.lap("Finished deleting entries belonging to updated contacts");
+      }
+    }
+
+    /**
+     * Queries the contact database to get all phone numbers that have been updated since the last
+     * update time.
+     */
+    final Cursor updatedPhoneCursor =
+        mContext
+            .getContentResolver()
+            .query(
+                PhoneQuery.URI,
+                PhoneQuery.PROJECTION,
+                PhoneQuery.SELECTION,
+                new String[] {lastUpdateMillis},
+                null);
+    if (updatedPhoneCursor == null) {
+      LogUtil.e(
+          "DialerDatabaseHelper.updateSmartDialDatabase",
+          "smartDial query received null for cursor");
+      return;
+    }
+
+    try {
+      /** Inserts recently updated phone numbers to the smartdial database. */
+      insertUpdatedContactsAndNumberPrefix(db, updatedPhoneCursor, currentMillis);
+      if (DEBUG) {
+        stopWatch.lap("Finished building the smart dial table");
+      }
+    } finally {
+      updatedPhoneCursor.close();
+    }
+
+    /**
+     * Gets a list of distinct contacts which have been updated, and adds the name prefixes of these
+     * contacts to the prefix table.
+     */
+    final Cursor nameCursor =
+        db.rawQuery(
+            "SELECT DISTINCT "
+                + SmartDialDbColumns.DISPLAY_NAME_PRIMARY
+                + ", "
+                + SmartDialDbColumns.CONTACT_ID
+                + " FROM "
+                + Tables.SMARTDIAL_TABLE
+                + " WHERE "
+                + SmartDialDbColumns.LAST_SMARTDIAL_UPDATE_TIME
+                + " = "
+                + currentMillis,
+            new String[] {});
+    if (nameCursor != null) {
+      try {
         if (DEBUG) {
-          stopWatch.lap("Finished building the smart dial table");
+          stopWatch.lap("Queried the smart dial table for contact names");
+        }
+
+        /** Inserts prefixes of names into the prefix table. */
+        insertNamePrefixes(db, nameCursor);
+        if (DEBUG) {
+          stopWatch.lap("Finished building the name prefix table");
         }
       } finally {
-        updatedPhoneCursor.close();
+        nameCursor.close();
       }
-
-      /**
-       * Gets a list of distinct contacts which have been updated, and adds the name prefixes of
-       * these contacts to the prefix table.
-       */
-      final Cursor nameCursor =
-          db.rawQuery(
-              "SELECT DISTINCT "
-                  + SmartDialDbColumns.DISPLAY_NAME_PRIMARY
-                  + ", "
-                  + SmartDialDbColumns.CONTACT_ID
-                  + " FROM "
-                  + Tables.SMARTDIAL_TABLE
-                  + " WHERE "
-                  + SmartDialDbColumns.LAST_SMARTDIAL_UPDATE_TIME
-                  + " = "
-                  + Long.toString(currentMillis),
-              new String[] {});
-      if (nameCursor != null) {
-        try {
-          if (DEBUG) {
-            stopWatch.lap("Queried the smart dial table for contact names");
-          }
-
-          /** Inserts prefixes of names into the prefix table. */
-          insertNamePrefixes(db, nameCursor);
-          if (DEBUG) {
-            stopWatch.lap("Finished building the name prefix table");
-          }
-        } finally {
-          nameCursor.close();
-        }
-      }
-
-      /** Creates index on contact_id for fast JOIN operation. */
-      db.execSQL(
-          "CREATE INDEX IF NOT EXISTS smartdial_contact_id_index ON "
-              + Tables.SMARTDIAL_TABLE
-              + " ("
-              + SmartDialDbColumns.CONTACT_ID
-              + ");");
-      /** Creates index on last_smartdial_update_time for fast SELECT operation. */
-      db.execSQL(
-          "CREATE INDEX IF NOT EXISTS smartdial_last_update_index ON "
-              + Tables.SMARTDIAL_TABLE
-              + " ("
-              + SmartDialDbColumns.LAST_SMARTDIAL_UPDATE_TIME
-              + ");");
-      /** Creates index on sorting fields for fast sort operation. */
-      db.execSQL(
-          "CREATE INDEX IF NOT EXISTS smartdial_sort_index ON "
-              + Tables.SMARTDIAL_TABLE
-              + " ("
-              + SmartDialDbColumns.STARRED
-              + ", "
-              + SmartDialDbColumns.IS_SUPER_PRIMARY
-              + ", "
-              + SmartDialDbColumns.LAST_TIME_USED
-              + ", "
-              + SmartDialDbColumns.TIMES_USED
-              + ", "
-              + SmartDialDbColumns.IN_VISIBLE_GROUP
-              + ", "
-              + SmartDialDbColumns.DISPLAY_NAME_PRIMARY
-              + ", "
-              + SmartDialDbColumns.CONTACT_ID
-              + ", "
-              + SmartDialDbColumns.IS_PRIMARY
-              + ");");
-      /** Creates index on prefix for fast SELECT operation. */
-      db.execSQL(
-          "CREATE INDEX IF NOT EXISTS nameprefix_index ON "
-              + Tables.PREFIX_TABLE
-              + " ("
-              + PrefixColumns.PREFIX
-              + ");");
-      /** Creates index on contact_id for fast JOIN operation. */
-      db.execSQL(
-          "CREATE INDEX IF NOT EXISTS nameprefix_contact_id_index ON "
-              + Tables.PREFIX_TABLE
-              + " ("
-              + PrefixColumns.CONTACT_ID
-              + ");");
-
-      if (DEBUG) {
-        stopWatch.lap(TAG + "Finished recreating index");
-      }
-
-      /** Updates the database index statistics. */
-      db.execSQL("ANALYZE " + Tables.SMARTDIAL_TABLE);
-      db.execSQL("ANALYZE " + Tables.PREFIX_TABLE);
-      db.execSQL("ANALYZE smartdial_contact_id_index");
-      db.execSQL("ANALYZE smartdial_last_update_index");
-      db.execSQL("ANALYZE nameprefix_index");
-      db.execSQL("ANALYZE nameprefix_contact_id_index");
-      if (DEBUG) {
-        stopWatch.stopAndLog(TAG + "Finished updating index stats", 0);
-      }
-
-      mInUpdate.getAndSet(false);
-
-      final SharedPreferences.Editor editor = databaseLastUpdateSharedPref.edit();
-      editor.putLong(LAST_UPDATED_MILLIS, currentMillis);
-      editor.apply();
-
-      LogUtil.i("DialerDatabaseHelper.updateSmartDialDatabase", "broadcasting smart dial update");
-
-      // Notify content observers that smart dial database has been updated.
-      Intent intent = new Intent(ACTION_SMART_DIAL_UPDATED);
-      intent.setPackage(mContext.getPackageName());
-      mContext.sendBroadcast(intent);
     }
+
+    /** Creates index on contact_id for fast JOIN operation. */
+    db.execSQL(
+        "CREATE INDEX IF NOT EXISTS smartdial_contact_id_index ON "
+            + Tables.SMARTDIAL_TABLE
+            + " ("
+            + SmartDialDbColumns.CONTACT_ID
+            + ");");
+    /** Creates index on last_smartdial_update_time for fast SELECT operation. */
+    db.execSQL(
+        "CREATE INDEX IF NOT EXISTS smartdial_last_update_index ON "
+            + Tables.SMARTDIAL_TABLE
+            + " ("
+            + SmartDialDbColumns.LAST_SMARTDIAL_UPDATE_TIME
+            + ");");
+    /** Creates index on sorting fields for fast sort operation. */
+    db.execSQL(
+        "CREATE INDEX IF NOT EXISTS smartdial_sort_index ON "
+            + Tables.SMARTDIAL_TABLE
+            + " ("
+            + SmartDialDbColumns.STARRED
+            + ", "
+            + SmartDialDbColumns.IS_SUPER_PRIMARY
+            + ", "
+            + SmartDialDbColumns.LAST_TIME_USED
+            + ", "
+            + SmartDialDbColumns.TIMES_USED
+            + ", "
+            + SmartDialDbColumns.IN_VISIBLE_GROUP
+            + ", "
+            + SmartDialDbColumns.DISPLAY_NAME_PRIMARY
+            + ", "
+            + SmartDialDbColumns.CONTACT_ID
+            + ", "
+            + SmartDialDbColumns.IS_PRIMARY
+            + ");");
+    /** Creates index on prefix for fast SELECT operation. */
+    db.execSQL(
+        "CREATE INDEX IF NOT EXISTS nameprefix_index ON "
+            + Tables.PREFIX_TABLE
+            + " ("
+            + PrefixColumns.PREFIX
+            + ");");
+    /** Creates index on contact_id for fast JOIN operation. */
+    db.execSQL(
+        "CREATE INDEX IF NOT EXISTS nameprefix_contact_id_index ON "
+            + Tables.PREFIX_TABLE
+            + " ("
+            + PrefixColumns.CONTACT_ID
+            + ");");
+
+    if (DEBUG) {
+      stopWatch.lap(TAG + "Finished recreating index");
+    }
+
+    /** Updates the database index statistics. */
+    db.execSQL("ANALYZE " + Tables.SMARTDIAL_TABLE);
+    db.execSQL("ANALYZE " + Tables.PREFIX_TABLE);
+    db.execSQL("ANALYZE smartdial_contact_id_index");
+    db.execSQL("ANALYZE smartdial_last_update_index");
+    db.execSQL("ANALYZE nameprefix_index");
+    db.execSQL("ANALYZE nameprefix_contact_id_index");
+    if (DEBUG) {
+      stopWatch.stopAndLog(TAG + "Finished updating index stats", 0);
+    }
+
+    final SharedPreferences.Editor editor = databaseLastUpdateSharedPref.edit();
+    editor.putLong(LAST_UPDATED_MILLIS, currentMillis);
+    editor.apply();
+
+    LogUtil.i("DialerDatabaseHelper.updateSmartDialDatabase", "broadcasting smart dial update");
+
+    // Notify content observers that smart dial database has been updated.
+    Intent intent = new Intent(ACTION_SMART_DIAL_UPDATED);
+    intent.setPackage(mContext.getPackageName());
+    mContext.sendBroadcast(intent);
   }
 
   /**
@@ -817,12 +809,9 @@
    * @param query The prefix of a contact's dialpad index.
    * @return A list of top candidate contacts that will be suggested to user to match their input.
    */
-  public ArrayList<ContactNumber> getLooseMatches(String query, SmartDialNameMatcher nameMatcher) {
-    final boolean inUpdate = mInUpdate.get();
-    if (inUpdate) {
-      return new ArrayList<>();
-    }
-
+  @WorkerThread
+  public synchronized ArrayList<ContactNumber> getLooseMatches(
+      String query, SmartDialNameMatcher nameMatcher) {
     final SQLiteDatabase db = getReadableDatabase();
 
     /** Uses SQL query wildcard '%' to represent prefix matching. */
diff --git a/java/com/android/dialer/database/VoicemailStatusQuery.java b/java/com/android/dialer/database/VoicemailStatusQuery.java
index d9e1b72..dbd88be 100644
--- a/java/com/android/dialer/database/VoicemailStatusQuery.java
+++ b/java/com/android/dialer/database/VoicemailStatusQuery.java
@@ -27,7 +27,7 @@
 /** The query for the call voicemail status table. */
 public class VoicemailStatusQuery {
 
-  // TODO: Column indices should be removed in favor of Cursor#getColumnIndex
+  // TODO(maxwelb): Column indices should be removed in favor of Cursor#getColumnIndex
   public static final int SOURCE_PACKAGE_INDEX = 0;
   public static final int SETTINGS_URI_INDEX = 1;
   public static final int VOICEMAIL_ACCESS_URI_INDEX = 2;
diff --git a/java/com/android/dialer/databasepopulator/AndroidManifest.xml b/java/com/android/dialer/databasepopulator/AndroidManifest.xml
new file mode 100644
index 0000000..0a37285
--- /dev/null
+++ b/java/com/android/dialer/databasepopulator/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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.databasepopulator">
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/databasepopulator/CallLogPopulator.java b/java/com/android/dialer/databasepopulator/CallLogPopulator.java
new file mode 100644
index 0000000..7c387ec
--- /dev/null
+++ b/java/com/android/dialer/databasepopulator/CallLogPopulator.java
@@ -0,0 +1,168 @@
+/*
+ * 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.databasepopulator;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.common.Assert;
+import com.google.auto.value.AutoValue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+/** Populates the device database with call log entries. */
+public final class CallLogPopulator {
+  // Phone numbers from https://www.google.com/about/company/facts/locations/
+  private static final CallEntry.Builder[] SIMPLE_CALL_LOG = {
+    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+1-302-6365454"),
+    CallEntry.builder()
+        .setType(Calls.MISSED_TYPE)
+        .setNumber("")
+        .setPresentation(Calls.PRESENTATION_UNKNOWN),
+    CallEntry.builder().setType(Calls.REJECTED_TYPE).setNumber("+1-302-6365454"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+1-302-6365454"),
+    CallEntry.builder()
+        .setType(Calls.MISSED_TYPE)
+        .setNumber("1234")
+        .setPresentation(Calls.PRESENTATION_RESTRICTED),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1-302-6365454"),
+    CallEntry.builder().setType(Calls.BLOCKED_TYPE).setNumber("+1-302-6365454"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("(425) 739-5600"),
+    CallEntry.builder().setType(Calls.ANSWERED_EXTERNALLY_TYPE).setNumber("(425) 739-5600"),
+    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+1 (425) 739-5600"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("739-5600"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("711"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("711"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("(425) 739-5600"),
+    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+44 (0) 20 7031 3000"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1-650-2530000"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 303-245-0086;123,456"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 303-245-0086"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+1-650-2530000"),
+    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("650-2530000"),
+    CallEntry.builder().setType(Calls.REJECTED_TYPE).setNumber("2530000"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 404-487-9000"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+61 2 9374 4001"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+33 (0)1 42 68 53 00"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("972-74-746-6245"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+971 4 4509500"),
+    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+971 4 4509500"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("55-31-2128-6800"),
+    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("611"),
+    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("*86 512-343-5283"),
+  };
+
+  @WorkerThread
+  public static void populateCallLog(@NonNull Context context) {
+    populateCallLog(context, false);
+  }
+
+  @WorkerThread
+  public static void populateCallLogWithoutMissed(@NonNull Context context) {
+    populateCallLog(context, true);
+  }
+
+  @WorkerThread
+  public static void populateCallLog(@NonNull Context context, boolean isWithoutMissedCalls) {
+    Assert.isWorkerThread();
+    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+    // Do this 4 times to make the call log 4 times bigger.
+    long timeMillis = System.currentTimeMillis();
+    for (int i = 0; i < 4; i++) {
+      for (CallEntry.Builder builder : SIMPLE_CALL_LOG) {
+        CallEntry callEntry = builder.setTimeMillis(timeMillis).build();
+        if (isWithoutMissedCalls && builder.build().getType() == Calls.MISSED_TYPE) {
+          continue;
+        }
+        operations.add(
+            ContentProviderOperation.newInsert(Calls.CONTENT_URI)
+                .withValues(callEntry.getAsContentValues())
+                .withYieldAllowed(true)
+                .build());
+        timeMillis -= TimeUnit.HOURS.toMillis(1);
+      }
+    }
+    try {
+      context.getContentResolver().applyBatch(CallLog.AUTHORITY, operations);
+    } catch (RemoteException | OperationApplicationException e) {
+      Assert.fail("error adding call entries: " + e);
+    }
+  }
+
+  @WorkerThread
+  public static void deleteAllCallLog(@NonNull Context context) {
+    Assert.isWorkerThread();
+    try {
+      context
+          .getContentResolver()
+          .applyBatch(
+              CallLog.AUTHORITY,
+              new ArrayList<>(
+                  Arrays.asList(ContentProviderOperation.newDelete(Calls.CONTENT_URI).build())));
+    } catch (RemoteException | OperationApplicationException e) {
+      Assert.fail("failed to delete call log: " + e);
+    }
+  }
+
+  @AutoValue
+  abstract static class CallEntry {
+    @NonNull
+    abstract String getNumber();
+
+    abstract int getType();
+
+    abstract int getPresentation();
+
+    abstract long getTimeMillis();
+
+    static Builder builder() {
+      return new AutoValue_CallLogPopulator_CallEntry.Builder()
+          .setPresentation(Calls.PRESENTATION_ALLOWED);
+    }
+
+    ContentValues getAsContentValues() {
+      ContentValues values = new ContentValues();
+      values.put(Calls.TYPE, getType());
+      values.put(Calls.NUMBER, getNumber());
+      values.put(Calls.NUMBER_PRESENTATION, getPresentation());
+      values.put(Calls.DATE, getTimeMillis());
+      return values;
+    }
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder setNumber(@NonNull String number);
+
+      abstract Builder setType(int type);
+
+      abstract Builder setPresentation(int presentation);
+
+      abstract Builder setTimeMillis(long timeMillis);
+
+      abstract CallEntry build();
+    }
+  }
+
+  private CallLogPopulator() {}
+}
diff --git a/java/com/android/dialer/databasepopulator/ContactsPopulator.java b/java/com/android/dialer/databasepopulator/ContactsPopulator.java
new file mode 100644
index 0000000..e93c569
--- /dev/null
+++ b/java/com/android/dialer/databasepopulator/ContactsPopulator.java
@@ -0,0 +1,356 @@
+/*
+ * 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.databasepopulator;
+
+import android.content.ContentProviderOperation;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.RemoteException;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.RawContacts;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.google.auto.value.AutoValue;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/** Populates the device database with contacts. */
+public final class ContactsPopulator {
+  // Phone numbers from https://www.google.com/about/company/facts/locations/
+  private static final Contact[] SIMPLE_CONTACTS = {
+    // US, contact with e164 number.
+    Contact.builder()
+        .setName("Michelangelo")
+        .addPhoneNumber(new PhoneNumber("+1-302-6365454", Phone.TYPE_MOBILE))
+        .addEmail(new Email("m@example.com"))
+        .setIsStarred(true)
+        .setPinned(1)
+        .setOrangePhoto()
+        .build(),
+    // US, contact with a non-e164 number.
+    Contact.builder()
+        .setName("Leonardo da Vinci")
+        .addPhoneNumber(new PhoneNumber("(425) 739-5600", Phone.TYPE_MOBILE))
+        .addEmail(new Email("l@example.com"))
+        .setIsStarred(true)
+        .setPinned(2)
+        .setBluePhoto()
+        .build(),
+    // UK, number where the (0) should be dropped.
+    Contact.builder()
+        .setName("Raphael")
+        .addPhoneNumber(new PhoneNumber("+44 (0) 20 7031 3000", Phone.TYPE_MOBILE))
+        .addEmail(new Email("r@example.com"))
+        .setIsStarred(true)
+        .setPinned(3)
+        .setRedPhoto()
+        .build(),
+    // US and Australia, contact with a long name and multiple phone numbers.
+    Contact.builder()
+        .setName("Donatello di Niccolò di Betto Bardi")
+        .addPhoneNumber(new PhoneNumber("+1-650-2530000", Phone.TYPE_HOME))
+        .addPhoneNumber(new PhoneNumber("+1 404-487-9000", Phone.TYPE_WORK))
+        .addPhoneNumber(new PhoneNumber("+61 2 9374 4001", Phone.TYPE_FAX_HOME))
+        .setIsStarred(true)
+        .setPinned(4)
+        .setPurplePhoto()
+        .build(),
+    // US, phone number shared with another contact and 2nd phone number with wait and pause.
+    Contact.builder()
+        .setName("Splinter")
+        .addPhoneNumber(new PhoneNumber("+1-650-2530000", Phone.TYPE_HOME))
+        .addPhoneNumber(new PhoneNumber("+1 303-245-0086;123,456", Phone.TYPE_WORK))
+        .setBluePhoto()
+        .build(),
+    // France, number with Japanese name.
+    Contact.builder()
+        .setName("スパイク・スピーゲル")
+        .addPhoneNumber(new PhoneNumber("+33 (0)1 42 68 53 00", Phone.TYPE_MOBILE))
+        .setBluePhoto()
+        .build(),
+    // Israel, RTL name and non-e164 number.
+    Contact.builder()
+        .setName("עקב אריה טברסק")
+        .addPhoneNumber(new PhoneNumber("+33 (0)1 42 68 53 00", Phone.TYPE_MOBILE))
+        .setBluePhoto()
+        .build(),
+    // UAE, RTL name.
+    Contact.builder()
+        .setName("سلام دنیا")
+        .addPhoneNumber(new PhoneNumber("+971 4 4509500", Phone.TYPE_MOBILE))
+        .setBluePhoto()
+        .build(),
+    // Brazil, contact with no name.
+    Contact.builder()
+        .addPhoneNumber(new PhoneNumber("+55-31-2128-6800", Phone.TYPE_MOBILE))
+        .setBluePhoto()
+        .build(),
+    // Short number, contact with no name.
+    Contact.builder().addPhoneNumber(new PhoneNumber("611", Phone.TYPE_MOBILE)).build(),
+    // US, number with an anonymous prefix.
+    Contact.builder()
+        .setName("Anonymous")
+        .addPhoneNumber(new PhoneNumber("*86 512-343-5283", Phone.TYPE_MOBILE))
+        .setBluePhoto()
+        .build(),
+    // None, contact with no phone number.
+    Contact.builder()
+        .setName("No Phone Number")
+        .addEmail(new Email("no@example.com"))
+        .setIsStarred(true)
+        .setBluePhoto()
+        .build(),
+  };
+
+  @WorkerThread
+  public static void populateContacts(@NonNull Context context) {
+    Assert.isWorkerThread();
+    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+    for (Contact contact : SIMPLE_CONTACTS) {
+      addContact(contact, operations);
+    }
+    try {
+      context.getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations);
+    } catch (RemoteException | OperationApplicationException e) {
+      Assert.fail("error adding contacts: " + e);
+    }
+  }
+
+  @WorkerThread
+  public static void deleteAllContacts(@NonNull Context context) {
+    Assert.isWorkerThread();
+    try {
+      context
+          .getContentResolver()
+          .applyBatch(
+              ContactsContract.AUTHORITY,
+              new ArrayList<>(
+                  Arrays.asList(
+                      ContentProviderOperation.newDelete(RawContacts.CONTENT_URI).build())));
+    } catch (RemoteException | OperationApplicationException e) {
+      Assert.fail("failed to delete contacts: " + e);
+    }
+  }
+
+  private static void addContact(Contact contact, List<ContentProviderOperation> operations) {
+    int index = operations.size();
+
+    operations.add(
+        ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
+            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, contact.getAccountType())
+            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, contact.getAccountName())
+            .withValue(ContactsContract.RawContacts.STARRED, contact.getIsStarred() ? 1 : 0)
+            .withValue(
+                ContactsContract.RawContacts.PINNED,
+                contact.getIsStarred() ? contact.getPinned() : 0)
+            .withYieldAllowed(true)
+            .build());
+
+    if (!TextUtils.isEmpty(contact.getName())) {
+      operations.add(
+          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
+              .withValue(
+                  ContactsContract.Data.MIMETYPE,
+                  ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+              .withValue(
+                  ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, contact.getName())
+              .build());
+    }
+
+    if (contact.getPhotoStream() != null) {
+      operations.add(
+          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
+              .withValue(
+                  ContactsContract.Data.MIMETYPE,
+                  ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
+              .withValue(
+                  ContactsContract.CommonDataKinds.Photo.PHOTO,
+                  contact.getPhotoStream().toByteArray())
+              .build());
+    }
+
+    for (PhoneNumber phoneNumber : contact.getPhoneNumbers()) {
+      operations.add(
+          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
+              .withValue(
+                  ContactsContract.Data.MIMETYPE,
+                  ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
+              .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber.value)
+              .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, phoneNumber.type)
+              .withValue(ContactsContract.CommonDataKinds.Phone.LABEL, phoneNumber.label)
+              .build());
+    }
+
+    for (Email email : contact.getEmails()) {
+      operations.add(
+          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
+              .withValue(
+                  ContactsContract.Data.MIMETYPE,
+                  ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
+              .withValue(ContactsContract.CommonDataKinds.Email.DATA, email.value)
+              .withValue(ContactsContract.CommonDataKinds.Email.TYPE, email.type)
+              .withValue(ContactsContract.CommonDataKinds.Email.LABEL, email.label)
+              .build());
+    }
+  }
+
+  @AutoValue
+  abstract static class Contact {
+    @NonNull
+    abstract String getAccountType();
+
+    @NonNull
+    abstract String getAccountName();
+
+    @Nullable
+    abstract String getName();
+
+    abstract boolean getIsStarred();
+
+    abstract int getPinned();
+
+    @Nullable
+    abstract ByteArrayOutputStream getPhotoStream();
+
+    @NonNull
+    abstract List<PhoneNumber> getPhoneNumbers();
+
+    @NonNull
+    abstract List<Email> getEmails();
+
+    static Builder builder() {
+      return new AutoValue_ContactsPopulator_Contact.Builder()
+          .setAccountType("com.google")
+          .setAccountName("foo@example")
+          .setPinned(0)
+          .setIsStarred(false)
+          .setPhoneNumbers(new ArrayList<>())
+          .setEmails(new ArrayList<>());
+    }
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      @NonNull private final List<PhoneNumber> phoneNumbers = new ArrayList<>();
+      @NonNull private final List<Email> emails = new ArrayList<>();
+
+      abstract Builder setAccountType(@NonNull String accountType);
+
+      abstract Builder setAccountName(@NonNull String accountName);
+
+      abstract Builder setName(@NonNull String name);
+
+      abstract Builder setIsStarred(boolean isStarred);
+
+      abstract Builder setPinned(int position);
+
+      abstract Builder setPhotoStream(ByteArrayOutputStream photoStream);
+
+      abstract Builder setPhoneNumbers(@NonNull List<PhoneNumber> phoneNumbers);
+
+      abstract Builder setEmails(@NonNull List<Email> emails);
+
+      abstract Contact build();
+
+      Builder addPhoneNumber(PhoneNumber phoneNumber) {
+        phoneNumbers.add(phoneNumber);
+        return setPhoneNumbers(phoneNumbers);
+      }
+
+      Builder addEmail(Email email) {
+        emails.add(email);
+        return setEmails(emails);
+      }
+
+      Builder setRedPhoto() {
+        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0xe3, 0x33, 0x1c)));
+        return this;
+      }
+
+      Builder setBluePhoto() {
+        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0x00, 0xaa, 0xe6)));
+        return this;
+      }
+
+      Builder setOrangePhoto() {
+        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0xea, 0x95, 0x00)));
+        return this;
+      }
+
+      Builder setPurplePhoto() {
+        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0x99, 0x5a, 0xa0)));
+        return this;
+      }
+
+      /** Creates a contact photo with a green background and a circle of the given color. */
+      private static ByteArrayOutputStream getPhotoStreamWithColor(int color) {
+        int width = 300;
+        int height = 300;
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawColor(Color.argb(0xff, 0x4c, 0x9c, 0x23));
+        Paint paint = new Paint();
+        paint.setColor(color);
+        paint.setStyle(Paint.Style.FILL);
+        canvas.drawCircle(width / 2, height / 2, width / 3, paint);
+
+        ByteArrayOutputStream photoStream = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 75, photoStream);
+        return photoStream;
+      }
+    }
+  }
+
+  static class PhoneNumber {
+    public final String value;
+    public final int type;
+    public final String label;
+
+    PhoneNumber(String value, int type) {
+      this.value = value;
+      this.type = type;
+      label = "simulator phone number";
+    }
+  }
+
+  static class Email {
+    public final String value;
+    public final int type;
+    public final String label;
+
+    Email(String simpleEmail) {
+      value = simpleEmail;
+      type = ContactsContract.CommonDataKinds.Email.TYPE_WORK;
+      label = "simulator email";
+    }
+  }
+
+  private ContactsPopulator() {}
+}
diff --git a/java/com/android/dialer/databasepopulator/VoicemailPopulator.java b/java/com/android/dialer/databasepopulator/VoicemailPopulator.java
new file mode 100644
index 0000000..e99f7c7
--- /dev/null
+++ b/java/com/android/dialer/databasepopulator/VoicemailPopulator.java
@@ -0,0 +1,164 @@
+/*
+ * 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.databasepopulator;
+
+import android.content.ComponentName;
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.VoicemailContract.Status;
+import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.TelephonyManager;
+import com.android.dialer.common.Assert;
+import com.google.auto.value.AutoValue;
+import java.util.concurrent.TimeUnit;
+
+/** Populates the device database with voicemail entries. */
+public final class VoicemailPopulator {
+  private static final String ACCOUNT_ID = "ACCOUNT_ID";
+
+  private static final Voicemail.Builder[] SIMPLE_VOICEMAILS = {
+    // Long transcription with an embedded phone number.
+    Voicemail.builder()
+        .setPhoneNumber("+1-302-6365454")
+        .setTranscription(
+            "Hi, this is a very long voicemail. Please call me back at 650 253 0000. "
+                + "I hope you listen to all of it. This is very important. "
+                + "Hi, this is a very long voicemail. "
+                + "I hope you listen to all of it. It's very important.")
+        .setDurationSeconds(10)
+        .setIsRead(false),
+    // RTL transcription.
+    Voicemail.builder()
+        .setPhoneNumber("+1-302-6365454")
+        .setTranscription("هزاران دوست کم اند و یک دشمن زیاد")
+        .setDurationSeconds(60)
+        .setIsRead(true),
+    // Empty number.
+    Voicemail.builder()
+        .setPhoneNumber("")
+        .setTranscription("")
+        .setDurationSeconds(60)
+        .setIsRead(true),
+    // No duration.
+    Voicemail.builder()
+        .setPhoneNumber("+1-302-6365454")
+        .setTranscription("")
+        .setDurationSeconds(0)
+        .setIsRead(true),
+    // Short number.
+    Voicemail.builder()
+        .setPhoneNumber("711")
+        .setTranscription("This is a short voicemail.")
+        .setDurationSeconds(12)
+        .setIsRead(true),
+  };
+
+  @WorkerThread
+  public static void populateVoicemail(@NonNull Context context) {
+    Assert.isWorkerThread();
+    enableVoicemail(context);
+
+    // Do this 4 times to make the voicemail database 4 times bigger.
+    long timeMillis = System.currentTimeMillis();
+    for (int i = 0; i < 4; i++) {
+      for (Voicemail.Builder builder : SIMPLE_VOICEMAILS) {
+        Voicemail voicemail = builder.setTimeMillis(timeMillis).build();
+        context
+            .getContentResolver()
+            .insert(
+                Voicemails.buildSourceUri(context.getPackageName()),
+                voicemail.getAsContentValues(context));
+        timeMillis -= TimeUnit.HOURS.toMillis(2);
+      }
+    }
+  }
+
+  @WorkerThread
+  public static void deleteAllVoicemail(@NonNull Context context) {
+    Assert.isWorkerThread();
+    context
+        .getContentResolver()
+        .delete(Voicemails.buildSourceUri(context.getPackageName()), "", new String[] {});
+  }
+
+  private static void enableVoicemail(@NonNull Context context) {
+    PhoneAccountHandle handle =
+        new PhoneAccountHandle(new ComponentName(context, VoicemailPopulator.class), ACCOUNT_ID);
+
+    ContentValues values = new ContentValues();
+    values.put(Status.SOURCE_PACKAGE, handle.getComponentName().getPackageName());
+    values.put(Status.SOURCE_TYPE, TelephonyManager.VVM_TYPE_OMTP);
+    values.put(Status.PHONE_ACCOUNT_COMPONENT_NAME, handle.getComponentName().flattenToString());
+    values.put(Status.PHONE_ACCOUNT_ID, handle.getId());
+    values.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
+    values.put(Status.DATA_CHANNEL_STATE, Status.DATA_CHANNEL_STATE_OK);
+    values.put(Status.NOTIFICATION_CHANNEL_STATE, Status.NOTIFICATION_CHANNEL_STATE_OK);
+    context.getContentResolver().insert(Status.buildSourceUri(context.getPackageName()), values);
+  }
+
+  /** Data for a single voicemail entry. */
+  @AutoValue
+  public abstract static class Voicemail {
+    @NonNull
+    public abstract String getPhoneNumber();
+
+    @NonNull
+    public abstract String getTranscription();
+
+    public abstract long getDurationSeconds();
+
+    public abstract long getTimeMillis();
+
+    public abstract boolean getIsRead();
+
+    public static Builder builder() {
+      return new AutoValue_VoicemailPopulator_Voicemail.Builder();
+    }
+
+    public ContentValues getAsContentValues(Context context) {
+      ContentValues values = new ContentValues();
+      values.put(Voicemails.DATE, getTimeMillis());
+      values.put(Voicemails.NUMBER, getPhoneNumber());
+      values.put(Voicemails.DURATION, getDurationSeconds());
+      values.put(Voicemails.SOURCE_PACKAGE, context.getPackageName());
+      values.put(Voicemails.IS_READ, getIsRead() ? 1 : 0);
+      values.put(Voicemails.TRANSCRIPTION, getTranscription());
+      return values;
+    }
+
+    /** Builder for a single voicemail entry. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+      public abstract Builder setPhoneNumber(@NonNull String phoneNumber);
+
+      public abstract Builder setTranscription(@NonNull String transcription);
+
+      public abstract Builder setDurationSeconds(long durationSeconds);
+
+      public abstract Builder setTimeMillis(long timeMillis);
+
+      public abstract Builder setIsRead(boolean isRead);
+
+      public abstract Voicemail build();
+    }
+  }
+
+  private VoicemailPopulator() {}
+}
diff --git a/java/com/android/dialer/dialercontact/dialer_contact.proto b/java/com/android/dialer/dialercontact/dialer_contact.proto
new file mode 100644
index 0000000..d63295b
--- /dev/null
+++ b/java/com/android/dialer/dialercontact/dialer_contact.proto
@@ -0,0 +1,27 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.dialercontact";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.callcomposer;
+
+message DialerContact {
+  optional fixed64 photo_id = 1;
+  optional string photo_uri = 2;
+  optional string contact_uri = 3;
+  optional string name_or_number = 4;
+  optional string number = 6;
+  optional string display_number = 7;
+  optional string number_label = 8;
+  optional int32 contact_type = 9;
+  optional SimDetails sim_details = 10;
+}
+
+message SimDetails {
+  // Human readable netwrork name displayed to user where relevant
+  optional string network = 1;
+  // This value represents a hex representation of a color (i.e. #ffffff)
+  optional int32 color = 2;
+}
diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java
new file mode 100644
index 0000000..c15014f
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/DialpadFragment.java
@@ -0,0 +1,1720 @@
+/*
+ * Copyright (C) 2011 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.dialpadview;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.AudioManager;
+import android.media.ToneGenerator;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Trace;
+import android.provider.Contacts.People;
+import android.provider.Contacts.Phones;
+import android.provider.Contacts.PhonesColumns;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.design.widget.FloatingActionButton;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.PhoneNumberFormattingTextWatcher;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.HapticFeedbackConstants;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.PopupMenu;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import com.android.contacts.common.dialog.CallSubjectDialog;
+import com.android.contacts.common.util.StopWatch;
+import com.android.contacts.common.widget.FloatingActionButtonController;
+import com.android.dialer.animation.AnimUtils;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.common.FragmentUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.location.GeoUtil;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.proguard.UsedByReflection;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.util.CallUtil;
+import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.PermissionsUtil;
+import java.util.HashSet;
+import java.util.List;
+
+/** Fragment that displays a twelve-key phone dialpad. */
+public class DialpadFragment extends Fragment
+    implements View.OnClickListener,
+        View.OnLongClickListener,
+        View.OnKeyListener,
+        AdapterView.OnItemClickListener,
+        TextWatcher,
+        PopupMenu.OnMenuItemClickListener,
+        DialpadKeyButton.OnPressedListener {
+
+  private static final String TAG = "DialpadFragment";
+  private static final String EMPTY_NUMBER = "";
+  private static final char PAUSE = ',';
+  private static final char WAIT = ';';
+  /** The length of DTMF tones in milliseconds */
+  private static final int TONE_LENGTH_MS = 150;
+
+  private static final int TONE_LENGTH_INFINITE = -1;
+  /** The DTMF tone volume relative to other sounds in the stream */
+  private static final int TONE_RELATIVE_VOLUME = 80;
+  /** Stream type used to play the DTMF tones off call, and mapped to the volume control keys */
+  private static final int DIAL_TONE_STREAM_TYPE = AudioManager.STREAM_DTMF;
+  /** Identifier for the "Add Call" intent extra. */
+  private static final String ADD_CALL_MODE_KEY = "add_call_mode";
+  /**
+   * Identifier for intent extra for sending an empty Flash message for CDMA networks. This message
+   * is used by the network to simulate a press/depress of the "hookswitch" of a landline phone. Aka
+   * "empty flash".
+   *
+   * <p>TODO: Using an intent extra to tell the phone to send this flash is a temporary measure. To
+   * be replaced with an Telephony/TelecomManager call in the future. TODO: Keep in sync with the
+   * string defined in OutgoingCallBroadcaster.java in Phone app until this is replaced with the
+   * Telephony/Telecom API.
+   */
+  private static final String EXTRA_SEND_EMPTY_FLASH = "com.android.phone.extra.SEND_EMPTY_FLASH";
+
+  private static final String PREF_DIGITS_FILLED_BY_INTENT = "pref_digits_filled_by_intent";
+  private final Object mToneGeneratorLock = new Object();
+  /** Set of dialpad keys that are currently being pressed */
+  private final HashSet<View> mPressedDialpadKeys = new HashSet<>(12);
+
+  private OnDialpadQueryChangedListener mDialpadQueryListener;
+  private DialpadView mDialpadView;
+  private EditText mDigits;
+  private int mDialpadSlideInDuration;
+  /** Remembers if we need to clear digits field when the screen is completely gone. */
+  private boolean mClearDigitsOnStop;
+
+  private View mOverflowMenuButton;
+  private PopupMenu mOverflowPopupMenu;
+  private View mDelete;
+  private ToneGenerator mToneGenerator;
+  private FloatingActionButtonController mFloatingActionButtonController;
+  private FloatingActionButton mFloatingActionButton;
+  private ListView mDialpadChooser;
+  private DialpadChooserAdapter mDialpadChooserAdapter;
+  /** Regular expression prohibiting manual phone call. Can be empty, which means "no rule". */
+  private String mProhibitedPhoneNumberRegexp;
+
+  private PseudoEmergencyAnimator mPseudoEmergencyAnimator;
+  private String mLastNumberDialed = EMPTY_NUMBER;
+
+  // determines if we want to playback local DTMF tones.
+  private boolean mDTMFToneEnabled;
+  private String mCurrentCountryIso;
+  private CallStateReceiver mCallStateReceiver;
+  private boolean mWasEmptyBeforeTextChange;
+  /**
+   * This field is set to true while processing an incoming DIAL intent, in order to make sure that
+   * SpecialCharSequenceMgr actions can be triggered by user input but *not* by a tel: URI passed by
+   * some other app. It will be set to false when all digits are cleared.
+   */
+  private boolean mDigitsFilledByIntent;
+
+  private boolean mStartedFromNewIntent = false;
+  private boolean mFirstLaunch = false;
+  private boolean mAnimate = false;
+
+  private DialerExecutor<String> initPhoneNumberFormattingTextWatcherExecutor;
+
+  /**
+   * Determines whether an add call operation is requested.
+   *
+   * @param intent The intent.
+   * @return {@literal true} if add call operation was requested. {@literal false} otherwise.
+   */
+  public static boolean isAddCallMode(Intent intent) {
+    if (intent == null) {
+      return false;
+    }
+    final String action = intent.getAction();
+    if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
+      // see if we are "adding a call" from the InCallScreen; false by default.
+      return intent.getBooleanExtra(ADD_CALL_MODE_KEY, false);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Format the provided string of digits into one that represents a properly formatted phone
+   * number.
+   *
+   * @param dialString String of characters to format
+   * @param normalizedNumber the E164 format number whose country code is used if the given
+   *     phoneNumber doesn't have the country code.
+   * @param countryIso The country code representing the format to use if the provided normalized
+   *     number is null or invalid.
+   * @return the provided string of digits as a formatted phone number, retaining any post-dial
+   *     portion of the string.
+   */
+  @VisibleForTesting
+  static String getFormattedDigits(String dialString, String normalizedNumber, String countryIso) {
+    String number = PhoneNumberUtils.extractNetworkPortion(dialString);
+    // Also retrieve the post dial portion of the provided data, so that the entire dial
+    // string can be reconstituted later.
+    final String postDial = PhoneNumberUtils.extractPostDialPortion(dialString);
+
+    if (TextUtils.isEmpty(number)) {
+      return postDial;
+    }
+
+    number = PhoneNumberUtils.formatNumber(number, normalizedNumber, countryIso);
+
+    if (TextUtils.isEmpty(postDial)) {
+      return number;
+    }
+
+    return number.concat(postDial);
+  }
+
+  /**
+   * Returns true of the newDigit parameter can be added at the current selection point, otherwise
+   * returns false. Only prevents input of WAIT and PAUSE digits at an unsupported position. Fails
+   * early if start == -1 or start is larger than end.
+   */
+  @VisibleForTesting
+  /* package */ static boolean canAddDigit(CharSequence digits, int start, int end, char newDigit) {
+    if (newDigit != WAIT && newDigit != PAUSE) {
+      throw new IllegalArgumentException(
+          "Should not be called for anything other than PAUSE & WAIT");
+    }
+
+    // False if no selection, or selection is reversed (end < start)
+    if (start == -1 || end < start) {
+      return false;
+    }
+
+    // unsupported selection-out-of-bounds state
+    if (start > digits.length() || end > digits.length()) {
+      return false;
+    }
+
+    // Special digit cannot be the first digit
+    if (start == 0) {
+      return false;
+    }
+
+    if (newDigit == WAIT) {
+      // preceding char is ';' (WAIT)
+      if (digits.charAt(start - 1) == WAIT) {
+        return false;
+      }
+
+      // next char is ';' (WAIT)
+      if ((digits.length() > end) && (digits.charAt(end) == WAIT)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  private TelephonyManager getTelephonyManager() {
+    return (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+  }
+
+  @Override
+  public Context getContext() {
+    return getActivity();
+  }
+
+  @Override
+  public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    mWasEmptyBeforeTextChange = TextUtils.isEmpty(s);
+  }
+
+  @Override
+  public void onTextChanged(CharSequence input, int start, int before, int changeCount) {
+    if (mWasEmptyBeforeTextChange != TextUtils.isEmpty(input)) {
+      final Activity activity = getActivity();
+      if (activity != null) {
+        activity.invalidateOptionsMenu();
+        updateMenuOverflowButton(mWasEmptyBeforeTextChange);
+      }
+    }
+
+    // DTMF Tones do not need to be played here any longer -
+    // the DTMF dialer handles that functionality now.
+  }
+
+  @Override
+  public void afterTextChanged(Editable input) {
+    // When DTMF dialpad buttons are being pressed, we delay SpecialCharSequenceMgr sequence,
+    // since some of SpecialCharSequenceMgr's behavior is too abrupt for the "touch-down"
+    // behavior.
+    if (!mDigitsFilledByIntent
+        && SpecialCharSequenceMgr.handleChars(getActivity(), input.toString(), mDigits)) {
+      // A special sequence was entered, clear the digits
+      mDigits.getText().clear();
+    }
+
+    if (isDigitsEmpty()) {
+      mDigitsFilledByIntent = false;
+      mDigits.setCursorVisible(false);
+    }
+
+    if (mDialpadQueryListener != null) {
+      mDialpadQueryListener.onDialpadQueryChanged(mDigits.getText().toString());
+    }
+
+    updateDeleteButtonEnabledState();
+  }
+
+  @Override
+  public void onCreate(Bundle state) {
+    Trace.beginSection(TAG + " onCreate");
+    super.onCreate(state);
+
+    mFirstLaunch = state == null;
+
+    mCurrentCountryIso = GeoUtil.getCurrentCountryIso(getActivity());
+
+    mProhibitedPhoneNumberRegexp =
+        getResources().getString(R.string.config_prohibited_phone_number_regexp);
+
+    if (state != null) {
+      mDigitsFilledByIntent = state.getBoolean(PREF_DIGITS_FILLED_BY_INTENT);
+    }
+
+    mDialpadSlideInDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration);
+
+    if (mCallStateReceiver == null) {
+      IntentFilter callStateIntentFilter =
+          new IntentFilter(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
+      mCallStateReceiver = new CallStateReceiver();
+      getActivity().registerReceiver(mCallStateReceiver, callStateIntentFilter);
+    }
+
+    initPhoneNumberFormattingTextWatcherExecutor =
+        DialerExecutors.createUiTaskBuilder(
+                getFragmentManager(),
+                "DialpadFragment.initPhoneNumberFormattingTextWatcher",
+                new InitPhoneNumberFormattingTextWatcherWorker())
+            .onSuccess(watcher -> mDialpadView.getDigits().addTextChangedListener(watcher))
+            .build();
+    Trace.endSection();
+  }
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+    Trace.beginSection(TAG + " onCreateView");
+    Trace.beginSection(TAG + " inflate view");
+    View fragmentView = inflater.inflate(R.layout.dialpad_fragment, container, false);
+    Trace.endSection();
+    Trace.beginSection(TAG + " buildLayer");
+    fragmentView.buildLayer();
+    Trace.endSection();
+
+    Trace.beginSection(TAG + " setup views");
+
+    mDialpadView = fragmentView.findViewById(R.id.dialpad_view);
+    mDialpadView.setCanDigitsBeEdited(true);
+    mDigits = mDialpadView.getDigits();
+    mDigits.setKeyListener(UnicodeDialerKeyListener.INSTANCE);
+    mDigits.setOnClickListener(this);
+    mDigits.setOnKeyListener(this);
+    mDigits.setOnLongClickListener(this);
+    mDigits.addTextChangedListener(this);
+    mDigits.setElegantTextHeight(false);
+
+    initPhoneNumberFormattingTextWatcherExecutor.executeSerial(
+        GeoUtil.getCurrentCountryIso(getActivity()));
+
+    // Check for the presence of the keypad
+    View oneButton = fragmentView.findViewById(R.id.one);
+    if (oneButton != null) {
+      configureKeypadListeners(fragmentView);
+    }
+
+    mDelete = mDialpadView.getDeleteButton();
+
+    if (mDelete != null) {
+      mDelete.setOnClickListener(this);
+      mDelete.setOnLongClickListener(this);
+    }
+
+    fragmentView
+        .findViewById(R.id.spacer)
+        .setOnTouchListener(
+            (v, event) -> {
+              if (isDigitsEmpty()) {
+                if (getActivity() != null) {
+                  return ((HostInterface) getActivity()).onDialpadSpacerTouchWithEmptyQuery();
+                }
+                return true;
+              }
+              return false;
+            });
+
+    mDigits.setCursorVisible(false);
+
+    // Set up the "dialpad chooser" UI; see showDialpadChooser().
+    mDialpadChooser = fragmentView.findViewById(R.id.dialpadChooser);
+    mDialpadChooser.setOnItemClickListener(this);
+
+    mFloatingActionButton = fragmentView.findViewById(R.id.dialpad_floating_action_button);
+    mFloatingActionButton.setOnClickListener(this);
+    mFloatingActionButtonController =
+        new FloatingActionButtonController(getActivity(), mFloatingActionButton);
+    Trace.endSection();
+    Trace.endSection();
+    return fragmentView;
+  }
+
+  private boolean isLayoutReady() {
+    return mDigits != null;
+  }
+
+  public EditText getDigitsWidget() {
+    return mDigits;
+  }
+
+  /** @return true when {@link #mDigits} is actually filled by the Intent. */
+  private boolean fillDigitsIfNecessary(Intent intent) {
+    // Only fills digits from an intent if it is a new intent.
+    // Otherwise falls back to the previously used number.
+    if (!mFirstLaunch && !mStartedFromNewIntent) {
+      return false;
+    }
+
+    final String action = intent.getAction();
+    if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
+      Uri uri = intent.getData();
+      if (uri != null) {
+        if (PhoneAccount.SCHEME_TEL.equals(uri.getScheme())) {
+          // Put the requested number into the input area
+          String data = uri.getSchemeSpecificPart();
+          // Remember it is filled via Intent.
+          mDigitsFilledByIntent = true;
+          final String converted =
+              PhoneNumberUtils.convertKeypadLettersToDigits(
+                  PhoneNumberUtils.replaceUnicodeDigits(data));
+          setFormattedDigits(converted, null);
+          return true;
+        } else {
+          if (!PermissionsUtil.hasContactsReadPermissions(getActivity())) {
+            return false;
+          }
+          String type = intent.getType();
+          if (People.CONTENT_ITEM_TYPE.equals(type) || Phones.CONTENT_ITEM_TYPE.equals(type)) {
+            // Query the phone number
+            Cursor c =
+                getActivity()
+                    .getContentResolver()
+                    .query(
+                        intent.getData(),
+                        new String[] {PhonesColumns.NUMBER, PhonesColumns.NUMBER_KEY},
+                        null,
+                        null,
+                        null);
+            if (c != null) {
+              try {
+                if (c.moveToFirst()) {
+                  // Remember it is filled via Intent.
+                  mDigitsFilledByIntent = true;
+                  // Put the number into the input area
+                  setFormattedDigits(c.getString(0), c.getString(1));
+                  return true;
+                }
+              } finally {
+                c.close();
+              }
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Checks the given Intent and changes dialpad's UI state. For example, if the Intent requires the
+   * screen to enter "Add Call" mode, this method will show correct UI for the mode.
+   */
+  private void configureScreenFromIntent(Activity parent) {
+    // If we were not invoked with a DIAL intent
+    if (!Intent.ACTION_DIAL.equals(parent.getIntent().getAction())) {
+      setStartedFromNewIntent(false);
+      return;
+    }
+
+    // See if we were invoked with a DIAL intent. If we were, fill in the appropriate
+    // digits in the dialer field.
+    Intent intent = parent.getIntent();
+
+    if (!isLayoutReady()) {
+      // This happens typically when parent's Activity#onNewIntent() is called while
+      // Fragment#onCreateView() isn't called yet, and thus we cannot configure Views at
+      // this point. onViewCreate() should call this method after preparing layouts, so
+      // just ignore this call now.
+      LogUtil.i(
+          "DialpadFragment.configureScreenFromIntent",
+          "Screen configuration is requested before onCreateView() is called. Ignored");
+      return;
+    }
+
+    boolean needToShowDialpadChooser = false;
+
+    // Be sure *not* to show the dialpad chooser if this is an
+    // explicit "Add call" action, though.
+    final boolean isAddCallMode = isAddCallMode(intent);
+    if (!isAddCallMode) {
+
+      // Don't show the chooser when called via onNewIntent() and phone number is present.
+      // i.e. User clicks a telephone link from gmail for example.
+      // In this case, we want to show the dialpad with the phone number.
+      final boolean digitsFilled = fillDigitsIfNecessary(intent);
+      if (!(mStartedFromNewIntent && digitsFilled)) {
+
+        final String action = intent.getAction();
+        if (Intent.ACTION_DIAL.equals(action)
+            || Intent.ACTION_VIEW.equals(action)
+            || Intent.ACTION_MAIN.equals(action)) {
+          // If there's already an active call, bring up an intermediate UI to
+          // make the user confirm what they really want to do.
+          if (isPhoneInUse()) {
+            needToShowDialpadChooser = true;
+          }
+        }
+      }
+    }
+    showDialpadChooser(needToShowDialpadChooser);
+    setStartedFromNewIntent(false);
+  }
+
+  public void setStartedFromNewIntent(boolean value) {
+    mStartedFromNewIntent = value;
+  }
+
+  public void clearCallRateInformation() {
+    setCallRateInformation(null, null);
+  }
+
+  public void setCallRateInformation(String countryName, String displayRate) {
+    mDialpadView.setCallRateInformation(countryName, displayRate);
+  }
+
+  /** Sets formatted digits to digits field. */
+  private void setFormattedDigits(String data, String normalizedNumber) {
+    final String formatted = getFormattedDigits(data, normalizedNumber, mCurrentCountryIso);
+    if (!TextUtils.isEmpty(formatted)) {
+      Editable digits = mDigits.getText();
+      digits.replace(0, digits.length(), formatted);
+      // for some reason this isn't getting called in the digits.replace call above..
+      // but in any case, this will make sure the background drawable looks right
+      afterTextChanged(digits);
+    }
+  }
+
+  private void configureKeypadListeners(View fragmentView) {
+    final int[] buttonIds =
+        new int[] {
+          R.id.one,
+          R.id.two,
+          R.id.three,
+          R.id.four,
+          R.id.five,
+          R.id.six,
+          R.id.seven,
+          R.id.eight,
+          R.id.nine,
+          R.id.star,
+          R.id.zero,
+          R.id.pound
+        };
+
+    DialpadKeyButton dialpadKey;
+
+    for (int buttonId : buttonIds) {
+      dialpadKey = fragmentView.findViewById(buttonId);
+      dialpadKey.setOnPressedListener(this);
+    }
+
+    // Long-pressing one button will initiate Voicemail.
+    final DialpadKeyButton one = fragmentView.findViewById(R.id.one);
+    one.setOnLongClickListener(this);
+
+    // Long-pressing zero button will enter '+' instead.
+    final DialpadKeyButton zero = fragmentView.findViewById(R.id.zero);
+    zero.setOnLongClickListener(this);
+  }
+
+  @Override
+  public void onStart() {
+    LogUtil.d("DialpadFragment.onStart", "first launch: %b", mFirstLaunch);
+    Trace.beginSection(TAG + " onStart");
+    super.onStart();
+    // if the mToneGenerator creation fails, just continue without it.  It is
+    // a local audio signal, and is not as important as the dtmf tone itself.
+    final long start = System.currentTimeMillis();
+    synchronized (mToneGeneratorLock) {
+      if (mToneGenerator == null) {
+        try {
+          mToneGenerator = new ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME);
+        } catch (RuntimeException e) {
+          LogUtil.e(
+              "DialpadFragment.onStart",
+              "Exception caught while creating local tone generator: " + e);
+          mToneGenerator = null;
+        }
+      }
+    }
+    final long total = System.currentTimeMillis() - start;
+    if (total > 50) {
+      LogUtil.i("DialpadFragment.onStart", "Time for ToneGenerator creation: " + total);
+    }
+    Trace.endSection();
+  }
+
+  @Override
+  public void onResume() {
+    LogUtil.d("DialpadFragment.onResume", "");
+    Trace.beginSection(TAG + " onResume");
+    super.onResume();
+
+    Resources res = getResources();
+    int iconId = R.drawable.quantum_ic_call_vd_theme_24;
+    if (MotorolaUtils.isWifiCallingAvailable(getContext())) {
+      iconId = R.drawable.ic_wifi_calling;
+    }
+    mFloatingActionButtonController.changeIcon(
+        res.getDrawable(iconId, null), res.getString(R.string.description_dial_button));
+
+    mDialpadQueryListener =
+        FragmentUtils.getParentUnsafe(this, OnDialpadQueryChangedListener.class);
+
+    final StopWatch stopWatch = StopWatch.start("Dialpad.onResume");
+
+    // Query the last dialed number. Do it first because hitting
+    // the DB is 'slow'. This call is asynchronous.
+    queryLastOutgoingCall();
+
+    stopWatch.lap("qloc");
+
+    final ContentResolver contentResolver = getActivity().getContentResolver();
+
+    // retrieve the DTMF tone play back setting.
+    mDTMFToneEnabled =
+        Settings.System.getInt(contentResolver, Settings.System.DTMF_TONE_WHEN_DIALING, 1) == 1;
+
+    stopWatch.lap("dtwd");
+
+    stopWatch.lap("hptc");
+
+    mPressedDialpadKeys.clear();
+
+    configureScreenFromIntent(getActivity());
+
+    stopWatch.lap("fdin");
+
+    if (!isPhoneInUse()) {
+      // A sanity-check: the "dialpad chooser" UI should not be visible if the phone is idle.
+      showDialpadChooser(false);
+    }
+
+    stopWatch.lap("hnt");
+
+    updateDeleteButtonEnabledState();
+
+    stopWatch.lap("bes");
+
+    stopWatch.stopAndLog(TAG, 50);
+
+    // Populate the overflow menu in onResume instead of onCreate, so that if the SMS activity
+    // is disabled while Dialer is paused, the "Send a text message" option can be correctly
+    // removed when resumed.
+    mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
+    mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
+    mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
+    mOverflowMenuButton.setOnClickListener(this);
+    mOverflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
+
+    if (mFirstLaunch) {
+      // The onHiddenChanged callback does not get called the first time the fragment is
+      // attached, so call it ourselves here.
+      onHiddenChanged(false);
+    }
+
+    mFirstLaunch = false;
+    Trace.endSection();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+
+    // Make sure we don't leave this activity with a tone still playing.
+    stopTone();
+    mPressedDialpadKeys.clear();
+
+    // TODO: I wonder if we should not check if the AsyncTask that
+    // lookup the last dialed number has completed.
+    mLastNumberDialed = EMPTY_NUMBER; // Since we are going to query again, free stale number.
+
+    SpecialCharSequenceMgr.cleanup();
+    mOverflowPopupMenu.dismiss();
+  }
+
+  @Override
+  public void onStop() {
+    super.onStop();
+
+    synchronized (mToneGeneratorLock) {
+      if (mToneGenerator != null) {
+        mToneGenerator.release();
+        mToneGenerator = null;
+      }
+    }
+
+    if (mClearDigitsOnStop) {
+      mClearDigitsOnStop = false;
+      clearDialpad();
+    }
+  }
+
+  @Override
+  public void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    outState.putBoolean(PREF_DIGITS_FILLED_BY_INTENT, mDigitsFilledByIntent);
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    if (mPseudoEmergencyAnimator != null) {
+      mPseudoEmergencyAnimator.destroy();
+      mPseudoEmergencyAnimator = null;
+    }
+    getActivity().unregisterReceiver(mCallStateReceiver);
+  }
+
+  private void keyPressed(int keyCode) {
+    if (getView() == null || getView().getTranslationY() != 0) {
+      return;
+    }
+    switch (keyCode) {
+      case KeyEvent.KEYCODE_1:
+        playTone(ToneGenerator.TONE_DTMF_1, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_2:
+        playTone(ToneGenerator.TONE_DTMF_2, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_3:
+        playTone(ToneGenerator.TONE_DTMF_3, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_4:
+        playTone(ToneGenerator.TONE_DTMF_4, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_5:
+        playTone(ToneGenerator.TONE_DTMF_5, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_6:
+        playTone(ToneGenerator.TONE_DTMF_6, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_7:
+        playTone(ToneGenerator.TONE_DTMF_7, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_8:
+        playTone(ToneGenerator.TONE_DTMF_8, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_9:
+        playTone(ToneGenerator.TONE_DTMF_9, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_0:
+        playTone(ToneGenerator.TONE_DTMF_0, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_POUND:
+        playTone(ToneGenerator.TONE_DTMF_P, TONE_LENGTH_INFINITE);
+        break;
+      case KeyEvent.KEYCODE_STAR:
+        playTone(ToneGenerator.TONE_DTMF_S, TONE_LENGTH_INFINITE);
+        break;
+      default:
+        break;
+    }
+
+    getView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+    KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
+    mDigits.onKeyDown(keyCode, event);
+
+    // If the cursor is at the end of the text we hide it.
+    final int length = mDigits.length();
+    if (length == mDigits.getSelectionStart() && length == mDigits.getSelectionEnd()) {
+      mDigits.setCursorVisible(false);
+    }
+  }
+
+  @Override
+  public boolean onKey(View view, int keyCode, KeyEvent event) {
+    if (view.getId() == R.id.digits) {
+      if (keyCode == KeyEvent.KEYCODE_ENTER) {
+        handleDialButtonPressed();
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * When a key is pressed, we start playing DTMF tone, do vibration, and enter the digit
+   * immediately. When a key is released, we stop the tone. Note that the "key press" event will be
+   * delivered by the system with certain amount of delay, it won't be synced with user's actual
+   * "touch-down" behavior.
+   */
+  @Override
+  public void onPressed(View view, boolean pressed) {
+    if (pressed) {
+      int resId = view.getId();
+      if (resId == R.id.one) {
+        keyPressed(KeyEvent.KEYCODE_1);
+      } else if (resId == R.id.two) {
+        keyPressed(KeyEvent.KEYCODE_2);
+      } else if (resId == R.id.three) {
+        keyPressed(KeyEvent.KEYCODE_3);
+      } else if (resId == R.id.four) {
+        keyPressed(KeyEvent.KEYCODE_4);
+      } else if (resId == R.id.five) {
+        keyPressed(KeyEvent.KEYCODE_5);
+      } else if (resId == R.id.six) {
+        keyPressed(KeyEvent.KEYCODE_6);
+      } else if (resId == R.id.seven) {
+        keyPressed(KeyEvent.KEYCODE_7);
+      } else if (resId == R.id.eight) {
+        keyPressed(KeyEvent.KEYCODE_8);
+      } else if (resId == R.id.nine) {
+        keyPressed(KeyEvent.KEYCODE_9);
+      } else if (resId == R.id.zero) {
+        keyPressed(KeyEvent.KEYCODE_0);
+      } else if (resId == R.id.pound) {
+        keyPressed(KeyEvent.KEYCODE_POUND);
+      } else if (resId == R.id.star) {
+        keyPressed(KeyEvent.KEYCODE_STAR);
+      } else {
+        LogUtil.e(
+            "DialpadFragment.onPressed", "Unexpected onTouch(ACTION_DOWN) event from: " + view);
+      }
+      mPressedDialpadKeys.add(view);
+    } else {
+      mPressedDialpadKeys.remove(view);
+      if (mPressedDialpadKeys.isEmpty()) {
+        stopTone();
+      }
+    }
+  }
+
+  /**
+   * Called by the containing Activity to tell this Fragment to build an overflow options menu for
+   * display by the container when appropriate.
+   *
+   * @param invoker the View that invoked the options menu, to act as an anchor location.
+   */
+  private PopupMenu buildOptionsMenu(View invoker) {
+    final PopupMenu popupMenu =
+        new PopupMenu(getActivity(), invoker) {
+          @Override
+          public void show() {
+            final Menu menu = getMenu();
+
+            boolean enable = !isDigitsEmpty();
+            for (int i = 0; i < menu.size(); i++) {
+              MenuItem item = menu.getItem(i);
+              item.setEnabled(enable);
+              if (item.getItemId() == R.id.menu_call_with_note) {
+                item.setVisible(CallUtil.isCallWithSubjectSupported(getContext()));
+              }
+            }
+            super.show();
+          }
+        };
+    popupMenu.inflate(R.menu.dialpad_options);
+    popupMenu.setOnMenuItemClickListener(this);
+    return popupMenu;
+  }
+
+  @Override
+  public void onClick(View view) {
+    int resId = view.getId();
+    if (resId == R.id.dialpad_floating_action_button) {
+      view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+      handleDialButtonPressed();
+    } else if (resId == R.id.deleteButton) {
+      keyPressed(KeyEvent.KEYCODE_DEL);
+    } else if (resId == R.id.digits) {
+      if (!isDigitsEmpty()) {
+        mDigits.setCursorVisible(true);
+      }
+    } else if (resId == R.id.dialpad_overflow) {
+      mOverflowPopupMenu.show();
+    } else {
+      LogUtil.w("DialpadFragment.onClick", "Unexpected event from: " + view);
+    }
+  }
+
+  @Override
+  public boolean onLongClick(View view) {
+    final Editable digits = mDigits.getText();
+    final int id = view.getId();
+    if (id == R.id.deleteButton) {
+      digits.clear();
+      return true;
+    } else if (id == R.id.one) {
+      if (isDigitsEmpty() || TextUtils.equals(mDigits.getText(), "1")) {
+        // We'll try to initiate voicemail and thus we want to remove irrelevant string.
+        removePreviousDigitIfPossible('1');
+
+        List<PhoneAccountHandle> subscriptionAccountHandles =
+            PhoneAccountUtils.getSubscriptionPhoneAccounts(getActivity());
+        boolean hasUserSelectedDefault =
+            subscriptionAccountHandles.contains(
+                TelecomUtil.getDefaultOutgoingPhoneAccount(
+                    getActivity(), PhoneAccount.SCHEME_VOICEMAIL));
+        boolean needsAccountDisambiguation =
+            subscriptionAccountHandles.size() > 1 && !hasUserSelectedDefault;
+
+        if (needsAccountDisambiguation || isVoicemailAvailable()) {
+          // On a multi-SIM phone, if the user has not selected a default
+          // subscription, initiate a call to voicemail so they can select an account
+          // from the "Call with" dialog.
+          callVoicemail();
+        } else if (getActivity() != null) {
+          // Voicemail is unavailable maybe because Airplane mode is turned on.
+          // Check the current status and show the most appropriate error message.
+          final boolean isAirplaneModeOn =
+              Settings.System.getInt(
+                      getActivity().getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0)
+                  != 0;
+          if (isAirplaneModeOn) {
+            DialogFragment dialogFragment =
+                ErrorDialogFragment.newInstance(R.string.dialog_voicemail_airplane_mode_message);
+            dialogFragment.show(getFragmentManager(), "voicemail_request_during_airplane_mode");
+          } else {
+            DialogFragment dialogFragment =
+                ErrorDialogFragment.newInstance(R.string.dialog_voicemail_not_ready_message);
+            dialogFragment.show(getFragmentManager(), "voicemail_not_ready");
+          }
+        }
+        return true;
+      }
+      return false;
+    } else if (id == R.id.zero) {
+      if (mPressedDialpadKeys.contains(view)) {
+        // If the zero key is currently pressed, then the long press occurred by touch
+        // (and not via other means like certain accessibility input methods).
+        // Remove the '0' that was input when the key was first pressed.
+        removePreviousDigitIfPossible('0');
+      }
+      keyPressed(KeyEvent.KEYCODE_PLUS);
+      stopTone();
+      mPressedDialpadKeys.remove(view);
+      return true;
+    } else if (id == R.id.digits) {
+      mDigits.setCursorVisible(true);
+      return false;
+    }
+    return false;
+  }
+
+  /**
+   * Remove the digit just before the current position of the cursor, iff the following conditions
+   * are true: 1) The cursor is not positioned at index 0. 2) The digit before the current cursor
+   * position matches the current digit.
+   *
+   * @param digit to remove from the digits view.
+   */
+  private void removePreviousDigitIfPossible(char digit) {
+    final int currentPosition = mDigits.getSelectionStart();
+    if (currentPosition > 0 && digit == mDigits.getText().charAt(currentPosition - 1)) {
+      mDigits.setSelection(currentPosition);
+      mDigits.getText().delete(currentPosition - 1, currentPosition);
+    }
+  }
+
+  public void callVoicemail() {
+    DialerUtils.startActivityWithErrorToast(
+        getActivity(),
+        new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.DIALPAD).build());
+    hideAndClearDialpad(false);
+  }
+
+  private void hideAndClearDialpad(boolean animate) {
+    FragmentUtils.getParentUnsafe(this, DialpadListener.class).hideDialpadFragment(animate, true);
+  }
+
+  /**
+   * In most cases, when the dial button is pressed, there is a number in digits area. Pack it in
+   * the intent, start the outgoing call broadcast as a separate task and finish this activity.
+   *
+   * <p>When there is no digit and the phone is CDMA and off hook, we're sending a blank flash for
+   * CDMA. CDMA networks use Flash messages when special processing needs to be done, mainly for
+   * 3-way or call waiting scenarios. Presumably, here we're in a special 3-way scenario where the
+   * network needs a blank flash before being able to add the new participant. (This is not the case
+   * with all 3-way calls, just certain CDMA infrastructures.)
+   *
+   * <p>Otherwise, there is no digit, display the last dialed number. Don't finish since the user
+   * may want to edit it. The user needs to press the dial button again, to dial it (general case
+   * described above).
+   */
+  private void handleDialButtonPressed() {
+    if (isDigitsEmpty()) { // No number entered.
+      // No real call made, so treat it as a click
+      PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
+      handleDialButtonClickWithEmptyDigits();
+    } else {
+      final String number = mDigits.getText().toString();
+
+      // "persist.radio.otaspdial" is a temporary hack needed for one carrier's automated
+      // test equipment.
+      // TODO: clean it up.
+      if (number != null
+          && !TextUtils.isEmpty(mProhibitedPhoneNumberRegexp)
+          && number.matches(mProhibitedPhoneNumberRegexp)) {
+        PerformanceReport.recordClick(UiAction.Type.PRESS_CALL_BUTTON_WITHOUT_CALLING);
+        LogUtil.i(
+            "DialpadFragment.handleDialButtonPressed",
+            "The phone number is prohibited explicitly by a rule.");
+        if (getActivity() != null) {
+          DialogFragment dialogFragment =
+              ErrorDialogFragment.newInstance(R.string.dialog_phone_call_prohibited_message);
+          dialogFragment.show(getFragmentManager(), "phone_prohibited_dialog");
+        }
+
+        // Clear the digits just in case.
+        clearDialpad();
+      } else {
+        final Intent intent =
+            new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD).build();
+        DialerUtils.startActivityWithErrorToast(getActivity(), intent);
+        hideAndClearDialpad(false);
+      }
+    }
+  }
+
+  public void clearDialpad() {
+    if (mDigits != null) {
+      mDigits.getText().clear();
+    }
+  }
+
+  private void handleDialButtonClickWithEmptyDigits() {
+    if (phoneIsCdma() && isPhoneInUse()) {
+      // TODO: Move this logic into services/Telephony
+      //
+      // This is really CDMA specific. On GSM is it possible
+      // to be off hook and wanted to add a 3rd party using
+      // the redial feature.
+      startActivity(newFlashIntent());
+    } else {
+      if (!TextUtils.isEmpty(mLastNumberDialed)) {
+        // Dialpad will be filled with last called number,
+        // but we don't want to record it as user action
+        PerformanceReport.setIgnoreActionOnce(UiAction.Type.TEXT_CHANGE_WITH_INPUT);
+
+        // Recall the last number dialed.
+        mDigits.setText(mLastNumberDialed);
+
+        // ...and move the cursor to the end of the digits string,
+        // so you'll be able to delete digits using the Delete
+        // button (just as if you had typed the number manually.)
+        //
+        // Note we use mDigits.getText().length() here, not
+        // mLastNumberDialed.length(), since the EditText widget now
+        // contains a *formatted* version of mLastNumberDialed (due to
+        // mTextWatcher) and its length may have changed.
+        mDigits.setSelection(mDigits.getText().length());
+      } else {
+        // There's no "last number dialed" or the
+        // background query is still running. There's
+        // nothing useful for the Dial button to do in
+        // this case.  Note: with a soft dial button, this
+        // can never happens since the dial button is
+        // disabled under these conditons.
+        playTone(ToneGenerator.TONE_PROP_NACK);
+      }
+    }
+  }
+
+  /** Plays the specified tone for TONE_LENGTH_MS milliseconds. */
+  private void playTone(int tone) {
+    playTone(tone, TONE_LENGTH_MS);
+  }
+
+  /**
+   * Play the specified tone for the specified milliseconds
+   *
+   * <p>The tone is played locally, using the audio stream for phone calls. Tones are played only if
+   * the "Audible touch tones" user preference is checked, and are NOT played if the device is in
+   * silent mode.
+   *
+   * <p>The tone length can be -1, meaning "keep playing the tone." If the caller does so, it should
+   * call stopTone() afterward.
+   *
+   * @param tone a tone code from {@link ToneGenerator}
+   * @param durationMs tone length.
+   */
+  private void playTone(int tone, int durationMs) {
+    // if local tone playback is disabled, just return.
+    if (!mDTMFToneEnabled) {
+      return;
+    }
+
+    // Also do nothing if the phone is in silent mode.
+    // We need to re-check the ringer mode for *every* playTone()
+    // call, rather than keeping a local flag that's updated in
+    // onResume(), since it's possible to toggle silent mode without
+    // leaving the current activity (via the ENDCALL-longpress menu.)
+    AudioManager audioManager =
+        (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
+    int ringerMode = audioManager.getRingerMode();
+    if ((ringerMode == AudioManager.RINGER_MODE_SILENT)
+        || (ringerMode == AudioManager.RINGER_MODE_VIBRATE)) {
+      return;
+    }
+
+    synchronized (mToneGeneratorLock) {
+      if (mToneGenerator == null) {
+        LogUtil.w("DialpadFragment.playTone", "mToneGenerator == null, tone: " + tone);
+        return;
+      }
+
+      // Start the new tone (will stop any playing tone)
+      mToneGenerator.startTone(tone, durationMs);
+    }
+  }
+
+  /** Stop the tone if it is played. */
+  private void stopTone() {
+    // if local tone playback is disabled, just return.
+    if (!mDTMFToneEnabled) {
+      return;
+    }
+    synchronized (mToneGeneratorLock) {
+      if (mToneGenerator == null) {
+        LogUtil.w("DialpadFragment.stopTone", "mToneGenerator == null");
+        return;
+      }
+      mToneGenerator.stopTone();
+    }
+  }
+
+  /**
+   * Brings up the "dialpad chooser" UI in place of the usual Dialer elements (the textfield/button
+   * and the dialpad underneath).
+   *
+   * <p>We show this UI if the user brings up the Dialer while a call is already in progress, since
+   * there's a good chance we got here accidentally (and the user really wanted the in-call dialpad
+   * instead). So in this situation we display an intermediate UI that lets the user explicitly
+   * choose between the in-call dialpad ("Use touch tone keypad") and the regular Dialer ("Add
+   * call"). (Or, the option "Return to call in progress" just goes back to the in-call UI with no
+   * dialpad at all.)
+   *
+   * @param enabled If true, show the "dialpad chooser" instead of the regular Dialer UI
+   */
+  private void showDialpadChooser(boolean enabled) {
+    if (getActivity() == null) {
+      return;
+    }
+    // Check if onCreateView() is already called by checking one of View objects.
+    if (!isLayoutReady()) {
+      return;
+    }
+
+    if (enabled) {
+      LogUtil.i("DialpadFragment.showDialpadChooser", "Showing dialpad chooser!");
+      if (mDialpadView != null) {
+        mDialpadView.setVisibility(View.GONE);
+      }
+
+      if (mOverflowPopupMenu != null) {
+        mOverflowPopupMenu.dismiss();
+      }
+
+      mFloatingActionButtonController.setVisible(false);
+      mDialpadChooser.setVisibility(View.VISIBLE);
+
+      // Instantiate the DialpadChooserAdapter and hook it up to the
+      // ListView.  We do this only once.
+      if (mDialpadChooserAdapter == null) {
+        mDialpadChooserAdapter = new DialpadChooserAdapter(getActivity());
+      }
+      mDialpadChooser.setAdapter(mDialpadChooserAdapter);
+    } else {
+      LogUtil.i("DialpadFragment.showDialpadChooser", "Displaying normal Dialer UI.");
+      if (mDialpadView != null) {
+        mDialpadView.setVisibility(View.VISIBLE);
+      } else {
+        mDigits.setVisibility(View.VISIBLE);
+      }
+
+      // mFloatingActionButtonController must also be 'scaled in', in order to be visible after
+      // 'scaleOut()' hidden method.
+      if (!mFloatingActionButtonController.isVisible()) {
+        // Just call 'scaleIn()' method if the mFloatingActionButtonController was not already
+        // previously visible.
+        mFloatingActionButtonController.scaleIn(0);
+      }
+      mDialpadChooser.setVisibility(View.GONE);
+    }
+  }
+
+  /** @return true if we're currently showing the "dialpad chooser" UI. */
+  private boolean isDialpadChooserVisible() {
+    return mDialpadChooser.getVisibility() == View.VISIBLE;
+  }
+
+  /** Handle clicks from the dialpad chooser. */
+  @Override
+  public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+    DialpadChooserAdapter.ChoiceItem item =
+        (DialpadChooserAdapter.ChoiceItem) parent.getItemAtPosition(position);
+    int itemId = item.id;
+    if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_USE_DTMF_DIALPAD) {
+      // Fire off an intent to go back to the in-call UI
+      // with the dialpad visible.
+      returnToInCallScreen(true);
+    } else if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_RETURN_TO_CALL) {
+      // Fire off an intent to go back to the in-call UI
+      // (with the dialpad hidden).
+      returnToInCallScreen(false);
+    } else if (itemId == DialpadChooserAdapter.DIALPAD_CHOICE_ADD_NEW_CALL) {
+      // Ok, guess the user really did want to be here (in the
+      // regular Dialer) after all.  Bring back the normal Dialer UI.
+      showDialpadChooser(false);
+    } else {
+      LogUtil.w("DialpadFragment.onItemClick", "Unexpected itemId: " + itemId);
+    }
+  }
+
+  /**
+   * Returns to the in-call UI (where there's presumably a call in progress) in response to the user
+   * selecting "use touch tone keypad" or "return to call" from the dialpad chooser.
+   */
+  private void returnToInCallScreen(boolean showDialpad) {
+    TelecomUtil.showInCallScreen(getActivity(), showDialpad);
+
+    // Finally, finish() ourselves so that we don't stay on the
+    // activity stack.
+    // Note that we do this whether or not the showCallScreenWithDialpad()
+    // call above had any effect or not!  (That call is a no-op if the
+    // phone is idle, which can happen if the current call ends while
+    // the dialpad chooser is up.  In this case we can't show the
+    // InCallScreen, and there's no point staying here in the Dialer,
+    // so we just take the user back where he came from...)
+    getActivity().finish();
+  }
+
+  /**
+   * @return true if the phone is "in use", meaning that at least one line is active (ie. off hook
+   *     or ringing or dialing, or on hold).
+   */
+  private boolean isPhoneInUse() {
+    return getContext() != null && TelecomUtil.isInCall(getContext());
+  }
+
+  /** @return true if the phone is a CDMA phone type */
+  private boolean phoneIsCdma() {
+    return getTelephonyManager().getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA;
+  }
+
+  @Override
+  public boolean onMenuItemClick(MenuItem item) {
+    int resId = item.getItemId();
+    if (resId == R.id.menu_2s_pause) {
+      updateDialString(PAUSE);
+      return true;
+    } else if (resId == R.id.menu_add_wait) {
+      updateDialString(WAIT);
+      return true;
+    } else if (resId == R.id.menu_call_with_note) {
+      CallSubjectDialog.start(getActivity(), mDigits.getText().toString());
+      hideAndClearDialpad(false);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Updates the dial string (mDigits) after inserting a Pause character (,) or Wait character (;).
+   */
+  private void updateDialString(char newDigit) {
+    if (newDigit != WAIT && newDigit != PAUSE) {
+      throw new IllegalArgumentException("Not expected for anything other than PAUSE & WAIT");
+    }
+
+    int selectionStart;
+    int selectionEnd;
+
+    // SpannableStringBuilder editable_text = new SpannableStringBuilder(mDigits.getText());
+    int anchor = mDigits.getSelectionStart();
+    int point = mDigits.getSelectionEnd();
+
+    selectionStart = Math.min(anchor, point);
+    selectionEnd = Math.max(anchor, point);
+
+    if (selectionStart == -1) {
+      selectionStart = selectionEnd = mDigits.length();
+    }
+
+    Editable digits = mDigits.getText();
+
+    if (canAddDigit(digits, selectionStart, selectionEnd, newDigit)) {
+      digits.replace(selectionStart, selectionEnd, Character.toString(newDigit));
+
+      if (selectionStart != selectionEnd) {
+        // Unselect: back to a regular cursor, just pass the character inserted.
+        mDigits.setSelection(selectionStart + 1);
+      }
+    }
+  }
+
+  /** Update the enabledness of the "Dial" and "Backspace" buttons if applicable. */
+  private void updateDeleteButtonEnabledState() {
+    if (getActivity() == null) {
+      return;
+    }
+    final boolean digitsNotEmpty = !isDigitsEmpty();
+    mDelete.setEnabled(digitsNotEmpty);
+  }
+
+  /**
+   * Handle transitions for the menu button depending on the state of the digits edit text.
+   * Transition out when going from digits to no digits and transition in when the first digit is
+   * pressed.
+   *
+   * @param transitionIn True if transitioning in, False if transitioning out
+   */
+  private void updateMenuOverflowButton(boolean transitionIn) {
+    mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
+    if (transitionIn) {
+      AnimUtils.fadeIn(mOverflowMenuButton, AnimUtils.DEFAULT_DURATION);
+    } else {
+      AnimUtils.fadeOut(mOverflowMenuButton, AnimUtils.DEFAULT_DURATION);
+    }
+  }
+
+  /**
+   * Check if voicemail is enabled/accessible.
+   *
+   * @return true if voicemail is enabled and accessible. Note that this can be false "temporarily"
+   *     after the app boot.
+   */
+  private boolean isVoicemailAvailable() {
+    try {
+      PhoneAccountHandle defaultUserSelectedAccount =
+          TelecomUtil.getDefaultOutgoingPhoneAccount(getActivity(), PhoneAccount.SCHEME_VOICEMAIL);
+      if (defaultUserSelectedAccount == null) {
+        // In a single-SIM phone, there is no default outgoing phone account selected by
+        // the user, so just call TelephonyManager#getVoicemailNumber directly.
+        return !TextUtils.isEmpty(getTelephonyManager().getVoiceMailNumber());
+      } else {
+        return !TextUtils.isEmpty(
+            TelecomUtil.getVoicemailNumber(getActivity(), defaultUserSelectedAccount));
+      }
+    } catch (SecurityException se) {
+      // Possibly no READ_PHONE_STATE privilege.
+      LogUtil.w(
+          "DialpadFragment.isVoicemailAvailable",
+          "SecurityException is thrown. Maybe privilege isn't sufficient.");
+    }
+    return false;
+  }
+
+  /** @return true if the widget with the phone number digits is empty. */
+  private boolean isDigitsEmpty() {
+    return mDigits.length() == 0;
+  }
+
+  /**
+   * Starts the asyn query to get the last dialed/outgoing number. When the background query
+   * finishes, mLastNumberDialed is set to the last dialed number or an empty string if none exists
+   * yet.
+   */
+  private void queryLastOutgoingCall() {
+    mLastNumberDialed = EMPTY_NUMBER;
+    if (!PermissionsUtil.hasCallLogReadPermissions(getContext())) {
+      return;
+    }
+    FragmentUtils.getParentUnsafe(this, DialpadListener.class)
+        .getLastOutgoingCall(
+            number -> {
+              // TODO: Filter out emergency numbers if the carrier does not want redial for these.
+
+              // If the fragment has already been detached since the last time we called
+              // queryLastOutgoingCall in onResume there is no point doing anything here.
+              if (getActivity() == null) {
+                return;
+              }
+              mLastNumberDialed = number;
+              updateDeleteButtonEnabledState();
+            });
+  }
+
+  private Intent newFlashIntent() {
+    Intent intent = new CallIntentBuilder(EMPTY_NUMBER, CallInitiationType.Type.DIALPAD).build();
+    intent.putExtra(EXTRA_SEND_EMPTY_FLASH, true);
+    return intent;
+  }
+
+  @Override
+  public void onHiddenChanged(boolean hidden) {
+    super.onHiddenChanged(hidden);
+    if (getActivity() == null || getView() == null) {
+      return;
+    }
+    final DialpadView dialpadView = getView().findViewById(R.id.dialpad_view);
+    if (!hidden && !isDialpadChooserVisible()) {
+      if (mAnimate) {
+        dialpadView.animateShow();
+      }
+      mFloatingActionButtonController.setVisible(false);
+      mFloatingActionButtonController.scaleIn(mAnimate ? mDialpadSlideInDuration : 0);
+      FragmentUtils.getParentUnsafe(this, DialpadListener.class).onDialpadShown();
+      mDigits.requestFocus();
+    }
+    if (hidden) {
+      if (mAnimate) {
+        mFloatingActionButtonController.scaleOut();
+      } else {
+        mFloatingActionButtonController.setVisible(false);
+      }
+    }
+  }
+
+  public boolean getAnimate() {
+    return mAnimate;
+  }
+
+  public void setAnimate(boolean value) {
+    mAnimate = value;
+  }
+
+  public void setYFraction(float yFraction) {
+    ((DialpadSlidingRelativeLayout) getView()).setYFraction(yFraction);
+  }
+
+  public int getDialpadHeight() {
+    if (mDialpadView == null) {
+      return 0;
+    }
+    return mDialpadView.getHeight();
+  }
+
+  public void process_quote_emergency_unquote(String query) {
+    if (PseudoEmergencyAnimator.PSEUDO_EMERGENCY_NUMBER.equals(query)) {
+      if (mPseudoEmergencyAnimator == null) {
+        mPseudoEmergencyAnimator =
+            new PseudoEmergencyAnimator(
+                new PseudoEmergencyAnimator.ViewProvider() {
+                  @Override
+                  public View getFab() {
+                    return mFloatingActionButton;
+                  }
+
+                  @Override
+                  public Context getContext() {
+                    return DialpadFragment.this.getContext();
+                  }
+                });
+      }
+      mPseudoEmergencyAnimator.start();
+    } else {
+      if (mPseudoEmergencyAnimator != null) {
+        mPseudoEmergencyAnimator.end();
+      }
+    }
+  }
+
+  public interface OnDialpadQueryChangedListener {
+
+    void onDialpadQueryChanged(String query);
+  }
+
+  public interface HostInterface {
+
+    /**
+     * Notifies the parent activity that the space above the dialpad has been tapped with no query
+     * in the dialpad present. In most situations this will cause the dialpad to be dismissed,
+     * unless there happens to be content showing.
+     */
+    boolean onDialpadSpacerTouchWithEmptyQuery();
+  }
+
+  /**
+   * LinearLayout with getter and setter methods for the translationY property using floats, for
+   * animation purposes.
+   */
+  public static class DialpadSlidingRelativeLayout extends RelativeLayout {
+
+    public DialpadSlidingRelativeLayout(Context context) {
+      super(context);
+    }
+
+    public DialpadSlidingRelativeLayout(Context context, AttributeSet attrs) {
+      super(context, attrs);
+    }
+
+    public DialpadSlidingRelativeLayout(Context context, AttributeSet attrs, int defStyle) {
+      super(context, attrs, defStyle);
+    }
+
+    @UsedByReflection(value = "dialpad_fragment.xml")
+    public float getYFraction() {
+      final int height = getHeight();
+      if (height == 0) {
+        return 0;
+      }
+      return getTranslationY() / height;
+    }
+
+    @UsedByReflection(value = "dialpad_fragment.xml")
+    public void setYFraction(float yFraction) {
+      setTranslationY(yFraction * getHeight());
+    }
+  }
+
+  public static class ErrorDialogFragment extends DialogFragment {
+
+    private static final String ARG_TITLE_RES_ID = "argTitleResId";
+    private static final String ARG_MESSAGE_RES_ID = "argMessageResId";
+    private int mTitleResId;
+    private int mMessageResId;
+
+    public static ErrorDialogFragment newInstance(int messageResId) {
+      return newInstance(0, messageResId);
+    }
+
+    public static ErrorDialogFragment newInstance(int titleResId, int messageResId) {
+      final ErrorDialogFragment fragment = new ErrorDialogFragment();
+      final Bundle args = new Bundle();
+      args.putInt(ARG_TITLE_RES_ID, titleResId);
+      args.putInt(ARG_MESSAGE_RES_ID, messageResId);
+      fragment.setArguments(args);
+      return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+      super.onCreate(savedInstanceState);
+      mTitleResId = getArguments().getInt(ARG_TITLE_RES_ID);
+      mMessageResId = getArguments().getInt(ARG_MESSAGE_RES_ID);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+      AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+      if (mTitleResId != 0) {
+        builder.setTitle(mTitleResId);
+      }
+      if (mMessageResId != 0) {
+        builder.setMessage(mMessageResId);
+      }
+      builder.setPositiveButton(android.R.string.ok, (dialog, which) -> dismiss());
+      return builder.create();
+    }
+  }
+
+  /**
+   * Simple list adapter, binding to an icon + text label for each item in the "dialpad chooser"
+   * list.
+   */
+  private static class DialpadChooserAdapter extends BaseAdapter {
+
+    // IDs for the possible "choices":
+    static final int DIALPAD_CHOICE_USE_DTMF_DIALPAD = 101;
+    static final int DIALPAD_CHOICE_RETURN_TO_CALL = 102;
+    static final int DIALPAD_CHOICE_ADD_NEW_CALL = 103;
+    private static final int NUM_ITEMS = 3;
+    private LayoutInflater mInflater;
+    private ChoiceItem[] mChoiceItems = new ChoiceItem[NUM_ITEMS];
+
+    DialpadChooserAdapter(Context context) {
+      // Cache the LayoutInflate to avoid asking for a new one each time.
+      mInflater = LayoutInflater.from(context);
+
+      // Initialize the possible choices.
+      // TODO: could this be specified entirely in XML?
+
+      // - "Use touch tone keypad"
+      mChoiceItems[0] =
+          new ChoiceItem(
+              context.getString(R.string.dialer_useDtmfDialpad),
+              BitmapFactory.decodeResource(
+                  context.getResources(), R.drawable.ic_dialer_fork_tt_keypad),
+              DIALPAD_CHOICE_USE_DTMF_DIALPAD);
+
+      // - "Return to call in progress"
+      mChoiceItems[1] =
+          new ChoiceItem(
+              context.getString(R.string.dialer_returnToInCallScreen),
+              BitmapFactory.decodeResource(
+                  context.getResources(), R.drawable.ic_dialer_fork_current_call),
+              DIALPAD_CHOICE_RETURN_TO_CALL);
+
+      // - "Add call"
+      mChoiceItems[2] =
+          new ChoiceItem(
+              context.getString(R.string.dialer_addAnotherCall),
+              BitmapFactory.decodeResource(
+                  context.getResources(), R.drawable.ic_dialer_fork_add_call),
+              DIALPAD_CHOICE_ADD_NEW_CALL);
+    }
+
+    @Override
+    public int getCount() {
+      return NUM_ITEMS;
+    }
+
+    /** Return the ChoiceItem for a given position. */
+    @Override
+    public Object getItem(int position) {
+      return mChoiceItems[position];
+    }
+
+    /** Return a unique ID for each possible choice. */
+    @Override
+    public long getItemId(int position) {
+      return position;
+    }
+
+    /** Make a view for each row. */
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+      // When convertView is non-null, we can reuse it (there's no need
+      // to reinflate it.)
+      if (convertView == null) {
+        convertView = mInflater.inflate(R.layout.dialpad_chooser_list_item, null);
+      }
+
+      TextView text = convertView.findViewById(R.id.text);
+      text.setText(mChoiceItems[position].text);
+
+      ImageView icon = convertView.findViewById(R.id.icon);
+      icon.setImageBitmap(mChoiceItems[position].icon);
+
+      return convertView;
+    }
+
+    // Simple struct for a single "choice" item.
+    static class ChoiceItem {
+
+      String text;
+      Bitmap icon;
+      int id;
+
+      ChoiceItem(String s, Bitmap b, int i) {
+        text = s;
+        icon = b;
+        id = i;
+      }
+    }
+  }
+
+  private class CallStateReceiver extends BroadcastReceiver {
+
+    /**
+     * Receive call state changes so that we can take down the "dialpad chooser" if the phone
+     * becomes idle while the chooser UI is visible.
+     */
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      String state = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
+      if ((TextUtils.equals(state, TelephonyManager.EXTRA_STATE_IDLE)
+              || TextUtils.equals(state, TelephonyManager.EXTRA_STATE_OFFHOOK))
+          && isDialpadChooserVisible()) {
+        // Note there's a race condition in the UI here: the
+        // dialpad chooser could conceivably disappear (on its
+        // own) at the exact moment the user was trying to select
+        // one of the choices, which would be confusing.  (But at
+        // least that's better than leaving the dialpad chooser
+        // onscreen, but useless...)
+        showDialpadChooser(false);
+      }
+    }
+  }
+
+  /** Listener for dialpad's parent. */
+  public interface DialpadListener {
+    void getLastOutgoingCall(LastOutgoingCallCallback callback);
+
+    void onDialpadShown();
+
+    void hideDialpadFragment(boolean animate, boolean value);
+  }
+
+  /** Callback for async lookup of the last number dialed. */
+  public interface LastOutgoingCallCallback {
+
+    void lastOutgoingCall(String number);
+  }
+
+  /**
+   * Input: the ISO 3166-1 two letters country code of the country the user is in
+   *
+   * <p>Output: PhoneNumberFormattingTextWatcher. Note: It is unusual to return a non-data value
+   * from a worker, but it is a limitation in libphonenumber API that the watcher cannot be
+   * initialized on the main thread.
+   */
+  private static class InitPhoneNumberFormattingTextWatcherWorker
+      implements Worker<String, PhoneNumberFormattingTextWatcher> {
+
+    @Nullable
+    @Override
+    public PhoneNumberFormattingTextWatcher doInBackground(@Nullable String countryCode) {
+      return new PhoneNumberFormattingTextWatcher(countryCode);
+    }
+  }
+}
diff --git a/java/com/android/dialer/dialpadview/DialpadView.java b/java/com/android/dialer/dialpadview/DialpadView.java
index 4a9b500..0c53273 100644
--- a/java/com/android/dialer/dialpadview/DialpadView.java
+++ b/java/com/android/dialer/dialpadview/DialpadView.java
@@ -29,7 +29,6 @@
 import android.text.TextUtils;
 import android.text.style.TtsSpan;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,6 +39,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.android.dialer.animation.AnimUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.CompatUtils;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Locale;
@@ -153,7 +154,7 @@
     // We translate dialpad numbers only for "fa" and not any other locale
     // ("ar" anybody ?).
     if ("fa".equals(currentLocale.getLanguage())) {
-      nf = DecimalFormat.getInstance(resources.getConfiguration().locale);
+      nf = DecimalFormat.getInstance(CompatUtils.getLocale(getContext()));
     } else {
       nf = DecimalFormat.getInstance(Locale.ENGLISH);
     }
@@ -395,7 +396,7 @@
       }
     }
 
-    Log.wtf(TAG, "Attempted to get animation delay for invalid key button id.");
+    LogUtil.e(TAG, "Attempted to get animation delay for invalid key button id.");
     return 0;
   }
 
@@ -458,7 +459,7 @@
       }
     }
 
-    Log.wtf(TAG, "Attempted to get animation duration for invalid key button id.");
+    LogUtil.e(TAG, "Attempted to get animation duration for invalid key button id.");
     return 0;
   }
 }
diff --git a/java/com/android/dialer/dialpadview/PseudoEmergencyAnimator.java b/java/com/android/dialer/dialpadview/PseudoEmergencyAnimator.java
new file mode 100644
index 0000000..16bdd24
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/PseudoEmergencyAnimator.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2015 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.dialpadview;
+
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.LightingColorFilter;
+import android.os.Handler;
+import android.os.Vibrator;
+import android.view.View;
+
+/** Animates the dial button on "emergency" phone numbers. */
+public class PseudoEmergencyAnimator {
+
+  static final String PSEUDO_EMERGENCY_NUMBER = "01189998819991197253";
+  private static final int VIBRATE_LENGTH_MILLIS = 200;
+  private static final int ITERATION_LENGTH_MILLIS = 1000;
+  private static final int ANIMATION_ITERATION_COUNT = 6;
+  private ViewProvider mViewProvider;
+  private ValueAnimator mPseudoEmergencyColorAnimator;
+
+  PseudoEmergencyAnimator(ViewProvider viewProvider) {
+    mViewProvider = viewProvider;
+  }
+
+  public void destroy() {
+    end();
+    mViewProvider = null;
+  }
+
+  public void start() {
+    if (mPseudoEmergencyColorAnimator == null) {
+      Integer colorFrom = Color.BLUE;
+      Integer colorTo = Color.RED;
+      mPseudoEmergencyColorAnimator =
+          ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
+
+      mPseudoEmergencyColorAnimator.addUpdateListener(
+          animator -> {
+            try {
+              int color = (int) animator.getAnimatedValue();
+              ColorFilter colorFilter = new LightingColorFilter(Color.BLACK, color);
+
+              if (mViewProvider.getFab() != null) {
+                mViewProvider.getFab().getBackground().setColorFilter(colorFilter);
+              }
+            } catch (Exception e) {
+              animator.cancel();
+            }
+          });
+
+      mPseudoEmergencyColorAnimator.addListener(
+          new AnimatorListener() {
+            @Override
+            public void onAnimationCancel(Animator animation) {}
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+              try {
+                vibrate(VIBRATE_LENGTH_MILLIS);
+              } catch (Exception e) {
+                animation.cancel();
+              }
+            }
+
+            @Override
+            public void onAnimationStart(Animator animation) {}
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+              try {
+                if (mViewProvider.getFab() != null) {
+                  mViewProvider.getFab().getBackground().clearColorFilter();
+                }
+
+                new Handler()
+                    .postDelayed(
+                        () -> {
+                          try {
+                            vibrate(VIBRATE_LENGTH_MILLIS);
+                          } catch (Exception e) {
+                            // ignored
+                          }
+                        },
+                        ITERATION_LENGTH_MILLIS);
+              } catch (Exception e) {
+                animation.cancel();
+              }
+            }
+          });
+
+      mPseudoEmergencyColorAnimator.setDuration(VIBRATE_LENGTH_MILLIS);
+      mPseudoEmergencyColorAnimator.setRepeatMode(ValueAnimator.REVERSE);
+      mPseudoEmergencyColorAnimator.setRepeatCount(ANIMATION_ITERATION_COUNT);
+    }
+    if (!mPseudoEmergencyColorAnimator.isStarted()) {
+      mPseudoEmergencyColorAnimator.start();
+    }
+  }
+
+  public void end() {
+    if (mPseudoEmergencyColorAnimator != null && mPseudoEmergencyColorAnimator.isStarted()) {
+      mPseudoEmergencyColorAnimator.end();
+    }
+  }
+
+  private void vibrate(long milliseconds) {
+    Context context = mViewProvider.getContext();
+    if (context != null) {
+      Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+      if (vibrator != null) {
+        vibrator.vibrate(milliseconds);
+      }
+    }
+  }
+
+  interface ViewProvider {
+
+    View getFab();
+
+    Context getContext();
+  }
+}
diff --git a/java/com/android/dialer/dialpadview/SmartDialCursorLoader.java b/java/com/android/dialer/dialpadview/SmartDialCursorLoader.java
new file mode 100644
index 0000000..271535f
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/SmartDialCursorLoader.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2013 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.dialpadview;
+
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.database.Database;
+import com.android.dialer.database.DialerDatabaseHelper;
+import com.android.dialer.database.DialerDatabaseHelper.ContactNumber;
+import com.android.dialer.smartdial.SmartDialNameMatcher;
+import com.android.dialer.smartdial.SmartDialPrefix;
+import com.android.dialer.util.PermissionsUtil;
+import java.util.ArrayList;
+
+/** Implements a Loader<Cursor> class to asynchronously load SmartDial search results. */
+public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
+
+  private static final String TAG = "SmartDialCursorLoader";
+  private static final boolean DEBUG = false;
+
+  private final Context mContext;
+
+  private Cursor mCursor;
+
+  private String mQuery;
+  private SmartDialNameMatcher mNameMatcher;
+
+  private boolean mShowEmptyListForNullQuery = true;
+
+  public SmartDialCursorLoader(Context context) {
+    super(context);
+    mContext = context;
+  }
+
+  /**
+   * Configures the query string to be used to find SmartDial matches.
+   *
+   * @param query The query string user typed.
+   */
+  public void configureQuery(String query) {
+    if (DEBUG) {
+      LogUtil.v(TAG, "Configure new query to be " + query);
+    }
+    mQuery = SmartDialNameMatcher.normalizeNumber(query, SmartDialPrefix.getMap());
+
+    /** Constructs a name matcher object for matching names. */
+    mNameMatcher = new SmartDialNameMatcher(mQuery, SmartDialPrefix.getMap());
+    mNameMatcher.setShouldMatchEmptyQuery(!mShowEmptyListForNullQuery);
+  }
+
+  /**
+   * Queries the SmartDial database and loads results in background.
+   *
+   * @return Cursor of contacts that matches the SmartDial query.
+   */
+  @Override
+  public Cursor loadInBackground() {
+    if (DEBUG) {
+      LogUtil.v(TAG, "Load in background " + mQuery);
+    }
+
+    if (!PermissionsUtil.hasContactsReadPermissions(mContext)) {
+      return new MatrixCursor(PhoneQuery.PROJECTION_PRIMARY);
+    }
+
+    /** Loads results from the database helper. */
+    final DialerDatabaseHelper dialerDatabaseHelper =
+        Database.get(mContext).getDatabaseHelper(mContext);
+    final ArrayList<ContactNumber> allMatches =
+        dialerDatabaseHelper.getLooseMatches(mQuery, mNameMatcher);
+
+    if (DEBUG) {
+      LogUtil.v(TAG, "Loaded matches " + allMatches.size());
+    }
+
+    /** Constructs a cursor for the returned array of results. */
+    final MatrixCursor cursor = new MatrixCursor(PhoneQuery.PROJECTION_PRIMARY);
+    Object[] row = new Object[PhoneQuery.PROJECTION_PRIMARY.length];
+    for (ContactNumber contact : allMatches) {
+      row[PhoneQuery.PHONE_ID] = contact.dataId;
+      row[PhoneQuery.PHONE_NUMBER] = contact.phoneNumber;
+      row[PhoneQuery.CONTACT_ID] = contact.id;
+      row[PhoneQuery.LOOKUP_KEY] = contact.lookupKey;
+      row[PhoneQuery.PHOTO_ID] = contact.photoId;
+      row[PhoneQuery.DISPLAY_NAME] = contact.displayName;
+      row[PhoneQuery.CARRIER_PRESENCE] = contact.carrierPresence;
+      cursor.addRow(row);
+    }
+    return cursor;
+  }
+
+  @Override
+  public void deliverResult(Cursor cursor) {
+    if (isReset()) {
+      /** The Loader has been reset; ignore the result and invalidate the data. */
+      releaseResources(cursor);
+      return;
+    }
+
+    /** Hold a reference to the old data so it doesn't get garbage collected. */
+    Cursor oldCursor = mCursor;
+    mCursor = cursor;
+
+    if (isStarted()) {
+      /** If the Loader is in a started state, deliver the results to the client. */
+      super.deliverResult(cursor);
+    }
+
+    /** Invalidate the old data as we don't need it any more. */
+    if (oldCursor != null && oldCursor != cursor) {
+      releaseResources(oldCursor);
+    }
+  }
+
+  @Override
+  protected void onStartLoading() {
+    if (mCursor != null) {
+      /** Deliver any previously loaded data immediately. */
+      deliverResult(mCursor);
+    }
+    if (mCursor == null) {
+      /** Force loads every time as our results change with queries. */
+      forceLoad();
+    }
+  }
+
+  @Override
+  protected void onStopLoading() {
+    /** The Loader is in a stopped state, so we should attempt to cancel the current load. */
+    cancelLoad();
+  }
+
+  @Override
+  protected void onReset() {
+    /** Ensure the loader has been stopped. */
+    onStopLoading();
+
+    /** Release all previously saved query results. */
+    if (mCursor != null) {
+      releaseResources(mCursor);
+      mCursor = null;
+    }
+  }
+
+  @Override
+  public void onCanceled(Cursor cursor) {
+    super.onCanceled(cursor);
+
+    /** The load has been canceled, so we should release the resources associated with 'data'. */
+    releaseResources(cursor);
+  }
+
+  private void releaseResources(Cursor cursor) {
+    if (cursor != null) {
+      cursor.close();
+    }
+  }
+
+  public void setShowEmptyListForNullQuery(boolean show) {
+    mShowEmptyListForNullQuery = show;
+    if (mNameMatcher != null) {
+      mNameMatcher.setShouldMatchEmptyQuery(!show);
+    }
+  }
+}
diff --git a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
new file mode 100644
index 0000000..7ff0d08
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright (C) 2006 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.dialpadview;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.DialogFragment;
+import android.app.KeyguardManager;
+import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.Toast;
+import com.android.common.io.MoreCloseables;
+import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
+import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.util.PermissionsUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper class to listen for some magic character sequences that are handled specially by the
+ * dialer.
+ *
+ * <p>Note the Phone app also handles these sequences too (in a couple of relatively obscure places
+ * in the UI), so there's a separate version of this class under apps/Phone.
+ *
+ * <p>TODO: there's lots of duplicated code between this class and the corresponding class under
+ * apps/Phone. Let's figure out a way to unify these two classes (in the framework? in a common
+ * shared library?)
+ */
+public class SpecialCharSequenceMgr {
+
+  private static final String TAG = "SpecialCharSequenceMgr";
+
+  private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment";
+
+  private static final String MMI_IMEI_DISPLAY = "*#06#";
+  private static final String MMI_REGULATORY_INFO_DISPLAY = "*#07#";
+  /** ***** This code is used to handle SIM Contact queries ***** */
+  private static final String ADN_PHONE_NUMBER_COLUMN_NAME = "number";
+
+  private static final String ADN_NAME_COLUMN_NAME = "name";
+  private static final int ADN_QUERY_TOKEN = -1;
+  /**
+   * Remembers the previous {@link QueryHandler} and cancel the operation when needed, to prevent
+   * possible crash.
+   *
+   * <p>QueryHandler may call {@link ProgressDialog#dismiss()} when the screen is already gone,
+   * which will cause the app crash. This variable enables the class to prevent the crash on {@link
+   * #cleanup()}.
+   *
+   * <p>TODO: Remove this and replace it (and {@link #cleanup()}) with better implementation. One
+   * complication is that we have SpecialCharSequenceMgr in Phone package too, which has *slightly*
+   * different implementation. Note that Phone package doesn't have this problem, so the class on
+   * Phone side doesn't have this functionality. Fundamental fix would be to have one shared
+   * implementation and resolve this corner case more gracefully.
+   */
+  private static QueryHandler sPreviousAdnQueryHandler;
+
+  /** This class is never instantiated. */
+  private SpecialCharSequenceMgr() {}
+
+  public static boolean handleChars(Context context, String input, EditText textField) {
+    // get rid of the separators so that the string gets parsed correctly
+    String dialString = PhoneNumberUtils.stripSeparators(input);
+
+    if (handleDeviceIdDisplay(context, dialString)
+        || handleRegulatoryInfoDisplay(context, dialString)
+        || handlePinEntry(context, dialString)
+        || handleAdnEntry(context, dialString, textField)
+        || handleSecretCode(context, dialString)) {
+      return true;
+    }
+
+    if (MotorolaUtils.handleSpecialCharSequence(context, input)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Cleanup everything around this class. Must be run inside the main thread.
+   *
+   * <p>This should be called when the screen becomes background.
+   */
+  public static void cleanup() {
+    Assert.isMainThread();
+
+    if (sPreviousAdnQueryHandler != null) {
+      sPreviousAdnQueryHandler.cancel();
+      sPreviousAdnQueryHandler = null;
+    }
+  }
+
+  /**
+   * Handles secret codes to launch arbitrary activities in the form of *#*#<code>#*#*.
+   *
+   * @param context the context to use
+   * @param input the text to check for a secret code in
+   * @return true if a secret code was encountered and handled
+   */
+  static boolean handleSecretCode(Context context, String input) {
+    // Secret codes are accessed by dialing *#*#<code>#*#*
+
+    int len = input.length();
+    if (len <= 8 || !input.startsWith("*#*#") || !input.endsWith("#*#*")) {
+      return false;
+    }
+    String secretCode = input.substring(4, len - 4);
+    TelephonyManagerCompat.handleSecretCode(context, secretCode);
+    return true;
+  }
+
+  /**
+   * Handle ADN requests by filling in the SIM contact number into the requested EditText.
+   *
+   * <p>This code works alongside the Asynchronous query handler {@link QueryHandler} and query
+   * cancel handler implemented in {@link SimContactQueryCookie}.
+   */
+  static boolean handleAdnEntry(Context context, String input, EditText textField) {
+    /* ADN entries are of the form "N(N)(N)#" */
+    TelephonyManager telephonyManager =
+        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+    if (telephonyManager == null
+        || telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) {
+      return false;
+    }
+
+    // if the phone is keyguard-restricted, then just ignore this
+    // input.  We want to make sure that sim card contacts are NOT
+    // exposed unless the phone is unlocked, and this code can be
+    // accessed from the emergency dialer.
+    KeyguardManager keyguardManager =
+        (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+    if (keyguardManager.inKeyguardRestrictedInputMode()) {
+      return false;
+    }
+
+    int len = input.length();
+    if ((len > 1) && (len < 5) && (input.endsWith("#"))) {
+      try {
+        // get the ordinal number of the sim contact
+        final int index = Integer.parseInt(input.substring(0, len - 1));
+
+        // The original code that navigated to a SIM Contacts list view did not
+        // highlight the requested contact correctly, a requirement for PTCRB
+        // certification.  This behaviour is consistent with the UI paradigm
+        // for touch-enabled lists, so it does not make sense to try to work
+        // around it.  Instead we fill in the the requested phone number into
+        // the dialer text field.
+
+        // create the async query handler
+        final QueryHandler handler = new QueryHandler(context.getContentResolver());
+
+        // create the cookie object
+        final SimContactQueryCookie sc =
+            new SimContactQueryCookie(index - 1, handler, ADN_QUERY_TOKEN);
+
+        // setup the cookie fields
+        sc.contactNum = index - 1;
+        sc.setTextField(textField);
+
+        // create the progress dialog
+        sc.progressDialog = new ProgressDialog(context);
+        sc.progressDialog.setTitle(R.string.simContacts_title);
+        sc.progressDialog.setMessage(context.getText(R.string.simContacts_emptyLoading));
+        sc.progressDialog.setIndeterminate(true);
+        sc.progressDialog.setCancelable(true);
+        sc.progressDialog.setOnCancelListener(sc);
+        sc.progressDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+
+        List<PhoneAccountHandle> subscriptionAccountHandles =
+            PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
+        Context applicationContext = context.getApplicationContext();
+        boolean hasUserSelectedDefault =
+            subscriptionAccountHandles.contains(
+                TelecomUtil.getDefaultOutgoingPhoneAccount(
+                    applicationContext, PhoneAccount.SCHEME_TEL));
+
+        if (subscriptionAccountHandles.size() <= 1 || hasUserSelectedDefault) {
+          Uri uri = TelecomUtil.getAdnUriForPhoneAccount(applicationContext, null);
+          handleAdnQuery(handler, sc, uri);
+        } else {
+          SelectPhoneAccountListener callback =
+              new HandleAdnEntryAccountSelectedCallback(applicationContext, handler, sc);
+
+          DialogFragment dialogFragment =
+              SelectPhoneAccountDialogFragment.newInstance(
+                  subscriptionAccountHandles, callback, null);
+          dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
+        }
+
+        return true;
+      } catch (NumberFormatException ex) {
+        // Ignore
+      }
+    }
+    return false;
+  }
+
+  private static void handleAdnQuery(QueryHandler handler, SimContactQueryCookie cookie, Uri uri) {
+    if (handler == null || cookie == null || uri == null) {
+      LogUtil.w("SpecialCharSequenceMgr.handleAdnQuery", "queryAdn parameters incorrect");
+      return;
+    }
+
+    // display the progress dialog
+    cookie.progressDialog.show();
+
+    // run the query.
+    handler.startQuery(
+        ADN_QUERY_TOKEN,
+        cookie,
+        uri,
+        new String[] {ADN_PHONE_NUMBER_COLUMN_NAME},
+        null,
+        null,
+        null);
+
+    if (sPreviousAdnQueryHandler != null) {
+      // It is harmless to call cancel() even after the handler's gone.
+      sPreviousAdnQueryHandler.cancel();
+    }
+    sPreviousAdnQueryHandler = handler;
+  }
+
+  static boolean handlePinEntry(final Context context, final String input) {
+    if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {
+      List<PhoneAccountHandle> subscriptionAccountHandles =
+          PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
+      boolean hasUserSelectedDefault =
+          subscriptionAccountHandles.contains(
+              TelecomUtil.getDefaultOutgoingPhoneAccount(context, PhoneAccount.SCHEME_TEL));
+
+      if (subscriptionAccountHandles.size() <= 1 || hasUserSelectedDefault) {
+        // Don't bring up the dialog for single-SIM or if the default outgoing account is
+        // a subscription account.
+        return TelecomUtil.handleMmi(context, input, null);
+      } else {
+        SelectPhoneAccountListener listener = new HandleMmiAccountSelectedCallback(context, input);
+
+        DialogFragment dialogFragment =
+            SelectPhoneAccountDialogFragment.newInstance(
+                subscriptionAccountHandles, listener, null);
+        dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
+      }
+      return true;
+    }
+    return false;
+  }
+
+  // TODO: Use TelephonyCapabilities.getDeviceIdLabel() to get the device id label instead of a
+  // hard-coded string.
+  static boolean handleDeviceIdDisplay(Context context, String input) {
+    if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_PHONE_STATE)) {
+      return false;
+    }
+    TelephonyManager telephonyManager =
+        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+
+    if (telephonyManager != null && input.equals(MMI_IMEI_DISPLAY)) {
+      int labelResId =
+          (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM)
+              ? R.string.imei
+              : R.string.meid;
+
+      List<String> deviceIds = new ArrayList<String>();
+      if (TelephonyManagerCompat.getPhoneCount(telephonyManager) > 1) {
+        for (int slot = 0; slot < telephonyManager.getPhoneCount(); slot++) {
+          String deviceId = telephonyManager.getDeviceId(slot);
+          if (!TextUtils.isEmpty(deviceId)) {
+            deviceIds.add(deviceId);
+          }
+        }
+      } else {
+        deviceIds.add(telephonyManager.getDeviceId());
+      }
+
+      new AlertDialog.Builder(context)
+          .setTitle(labelResId)
+          .setItems(deviceIds.toArray(new String[deviceIds.size()]), null)
+          .setPositiveButton(android.R.string.ok, null)
+          .setCancelable(false)
+          .show();
+      return true;
+    }
+    return false;
+  }
+
+  private static boolean handleRegulatoryInfoDisplay(Context context, String input) {
+    if (input.equals(MMI_REGULATORY_INFO_DISPLAY)) {
+      LogUtil.i(
+          "SpecialCharSequenceMgr.handleRegulatoryInfoDisplay", "sending intent to settings app");
+      Intent showRegInfoIntent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
+      try {
+        context.startActivity(showRegInfoIntent);
+      } catch (ActivityNotFoundException e) {
+        LogUtil.e(
+            "SpecialCharSequenceMgr.handleRegulatoryInfoDisplay", "startActivity() failed: ", e);
+      }
+      return true;
+    }
+    return false;
+  }
+
+  public static class HandleAdnEntryAccountSelectedCallback extends SelectPhoneAccountListener {
+
+    private final Context mContext;
+    private final QueryHandler mQueryHandler;
+    private final SimContactQueryCookie mCookie;
+
+    public HandleAdnEntryAccountSelectedCallback(
+        Context context, QueryHandler queryHandler, SimContactQueryCookie cookie) {
+      mContext = context;
+      mQueryHandler = queryHandler;
+      mCookie = cookie;
+    }
+
+    @Override
+    public void onPhoneAccountSelected(
+        PhoneAccountHandle selectedAccountHandle, boolean setDefault, @Nullable String callId) {
+      Uri uri = TelecomUtil.getAdnUriForPhoneAccount(mContext, selectedAccountHandle);
+      handleAdnQuery(mQueryHandler, mCookie, uri);
+      // TODO: Show error dialog if result isn't valid.
+    }
+  }
+
+  public static class HandleMmiAccountSelectedCallback extends SelectPhoneAccountListener {
+
+    private final Context mContext;
+    private final String mInput;
+
+    public HandleMmiAccountSelectedCallback(Context context, String input) {
+      mContext = context.getApplicationContext();
+      mInput = input;
+    }
+
+    @Override
+    public void onPhoneAccountSelected(
+        PhoneAccountHandle selectedAccountHandle, boolean setDefault, @Nullable String callId) {
+      TelecomUtil.handleMmi(mContext, mInput, selectedAccountHandle);
+    }
+  }
+
+  /**
+   * Cookie object that contains everything we need to communicate to the handler's onQuery
+   * Complete, as well as what we need in order to cancel the query (if requested).
+   *
+   * <p>Note, access to the textField field is going to be synchronized, because the user can
+   * request a cancel at any time through the UI.
+   */
+  private static class SimContactQueryCookie implements DialogInterface.OnCancelListener {
+
+    public ProgressDialog progressDialog;
+    public int contactNum;
+
+    // Used to identify the query request.
+    private int mToken;
+    private QueryHandler mHandler;
+
+    // The text field we're going to update
+    private EditText textField;
+
+    public SimContactQueryCookie(int number, QueryHandler handler, int token) {
+      contactNum = number;
+      mHandler = handler;
+      mToken = token;
+    }
+
+    /** Synchronized getter for the EditText. */
+    public synchronized EditText getTextField() {
+      return textField;
+    }
+
+    /** Synchronized setter for the EditText. */
+    public synchronized void setTextField(EditText text) {
+      textField = text;
+    }
+
+    /**
+     * Cancel the ADN query by stopping the operation and signaling the cookie that a cancel request
+     * is made.
+     */
+    @Override
+    public synchronized void onCancel(DialogInterface dialog) {
+      // close the progress dialog
+      if (progressDialog != null) {
+        progressDialog.dismiss();
+      }
+
+      // setting the textfield to null ensures that the UI does NOT get
+      // updated.
+      textField = null;
+
+      // Cancel the operation if possible.
+      mHandler.cancelOperation(mToken);
+    }
+  }
+
+  /**
+   * Asynchronous query handler that services requests to look up ADNs
+   *
+   * <p>Queries originate from {@link #handleAdnEntry}.
+   */
+  private static class QueryHandler extends NoNullCursorAsyncQueryHandler {
+
+    private boolean mCanceled;
+
+    public QueryHandler(ContentResolver cr) {
+      super(cr);
+    }
+
+    /** Override basic onQueryComplete to fill in the textfield when we're handed the ADN cursor. */
+    @Override
+    protected void onNotNullableQueryComplete(int token, Object cookie, Cursor c) {
+      try {
+        sPreviousAdnQueryHandler = null;
+        if (mCanceled) {
+          return;
+        }
+
+        SimContactQueryCookie sc = (SimContactQueryCookie) cookie;
+
+        // close the progress dialog.
+        sc.progressDialog.dismiss();
+
+        // get the EditText to update or see if the request was cancelled.
+        EditText text = sc.getTextField();
+
+        // if the TextView is valid, and the cursor is valid and positionable on the
+        // Nth number, then we update the text field and display a toast indicating the
+        // caller name.
+        if ((c != null) && (text != null) && (c.moveToPosition(sc.contactNum))) {
+          String name = c.getString(c.getColumnIndexOrThrow(ADN_NAME_COLUMN_NAME));
+          String number = c.getString(c.getColumnIndexOrThrow(ADN_PHONE_NUMBER_COLUMN_NAME));
+
+          // fill the text in.
+          text.getText().replace(0, 0, number);
+
+          // display the name as a toast
+          Context context = sc.progressDialog.getContext();
+          CharSequence msg =
+              ContactDisplayUtils.getTtsSpannedPhoneNumber(
+                  context.getResources(), R.string.menu_callNumber, name);
+          Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+        }
+      } finally {
+        MoreCloseables.closeQuietly(c);
+      }
+    }
+
+    public void cancel() {
+      mCanceled = true;
+      // Ask AsyncQueryHandler to cancel the whole request. This will fail when the query is
+      // already started.
+      cancelOperation(ADN_QUERY_TOKEN);
+    }
+  }
+}
diff --git a/java/com/android/dialer/dialpadview/UnicodeDialerKeyListener.java b/java/com/android/dialer/dialpadview/UnicodeDialerKeyListener.java
new file mode 100644
index 0000000..e9201c0
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/UnicodeDialerKeyListener.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 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.dialpadview;
+
+import android.telephony.PhoneNumberUtils;
+import android.text.Spanned;
+import android.text.method.DialerKeyListener;
+
+/**
+ * {@link DialerKeyListener} with Unicode support. Converts any Unicode(e.g. Arabic) characters that
+ * represent digits into digits before filtering the results so that we can support pasted digits
+ * from Unicode languages.
+ */
+public class UnicodeDialerKeyListener extends DialerKeyListener {
+
+  public static final UnicodeDialerKeyListener INSTANCE = new UnicodeDialerKeyListener();
+
+  @Override
+  public CharSequence filter(
+      CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+    final String converted =
+        PhoneNumberUtils.convertKeypadLettersToDigits(
+            PhoneNumberUtils.replaceUnicodeDigits(source.toString()));
+    // PhoneNumberUtils.replaceUnicodeDigits performs a character for character replacement,
+    // so we can assume that start and end positions should remain unchanged.
+    CharSequence result = super.filter(converted, start, end, dest, dstart, dend);
+    if (result == null) {
+      if (source.equals(converted)) {
+        // There was no conversion or filtering performed. Just return null according to
+        // the behavior of DialerKeyListener.
+        return null;
+      } else {
+        // filter returns null if the charsequence is to be returned unchanged/unfiltered.
+        // But in this case we do want to return a modified character string (even if
+        // none of the characters in the modified string are filtered). So if
+        // result == null we return the unfiltered but converted numeric string instead.
+        return converted.subSequence(start, end);
+      }
+    }
+    return result;
+  }
+}
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png
deleted file mode 100644
index 1a9cd75..0000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_close_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png
old mode 100644
new mode 100755
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_add_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png
old mode 100644
new mode 100755
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_current_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
old mode 100644
new mode 100755
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
rename to java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png
deleted file mode 100644
index e588d90..0000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_delete.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png
deleted file mode 100644
index 4706112..0000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialpad_voicemail.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png
deleted file mode 100644
index 262e9df..0000000
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_overflow_menu.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_add_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_current_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
rename to java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_add_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_current_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
rename to java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
rename to java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
rename to java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable/dialpad_scrim.xml b/java/com/android/dialer/dialpadview/res/drawable/dialpad_scrim.xml
deleted file mode 100644
index ee0f40a..0000000
--- a/java/com/android/dialer/dialpadview/res/drawable/dialpad_scrim.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <gradient
-    android:angle="270"
-    android:endColor="@android:color/darker_gray"
-    android:startColor="@android:color/transparent"/>
-</shape>
diff --git a/java/com/android/dialer/dialpadview/res/drawable/ic_wifi_calling.xml b/java/com/android/dialer/dialpadview/res/drawable/ic_wifi_calling.xml
new file mode 100644
index 0000000..9687133
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/res/drawable/ic_wifi_calling.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="30"
+    android:viewportWidth="30"
+    android:width="24dp">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.88,16.3h0L25,3.66a16.51,16.51 0,0 0,-20.3 0L14.88,16.3Z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M26.42,18.88a1.25,1.25 0,0 0,-0.89 -0.36,1.28 1.28,0 0,0 -0.87,0.35 14.26,14.26 0,0 1,-3.32 2.31,1.24 1.24,0 0,0 -0.7,1.12v3.87a18.27,18.27 0,0 1,-5.75 0.91,18.63 18.63,0 0,1 -5.75,-0.9v-3.87a1.26,1.26 0,0 0,-0.7 -1.12,14.73 14.73,0 0,1 -3.34,-2.31 1.23,1.23 0,0 0,-0.87 -0.35,1.25 1.25,0 0,0 -0.89,0.36L0.24,22a1.24,1.24 0,0 0,-0.36 0.89,1.23 1.23,0 0,0 0.37,0.87 21.26,21.26 0,0 0,29.26 0,1.27 1.27,0 0,0 0,-1.77Z"/>
+</vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/shadow_fade_left.xml b/java/com/android/dialer/dialpadview/res/drawable/shadow_fade_left.xml
similarity index 100%
rename from java/com/android/dialer/app/res/drawable/shadow_fade_left.xml
rename to java/com/android/dialer/dialpadview/res/drawable/shadow_fade_left.xml
diff --git a/java/com/android/dialer/app/res/drawable/shadow_fade_up.xml b/java/com/android/dialer/dialpadview/res/drawable/shadow_fade_up.xml
similarity index 100%
rename from java/com/android/dialer/app/res/drawable/shadow_fade_up.xml
rename to java/com/android/dialer/dialpadview/res/drawable/shadow_fade_up.xml
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
new file mode 100644
index 0000000..6389853
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    class="com.android.dialer.dialpadview.DialpadFragment$DialpadSlidingRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <!-- spacer view -->
+    <View
+      android:id="@+id/spacer"
+      android:layout_width="0dp"
+      android:layout_height="match_parent"
+      android:layout_weight="4"
+      android:background="#00000000"/>
+
+    <!-- Dialpad shadow -->
+    <View
+      android:layout_width="@dimen/shadow_length"
+      android:layout_height="match_parent"
+      android:background="@drawable/shadow_fade_left"/>
+
+    <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="match_parent"
+      android:layout_weight="6">
+
+      <include
+        layout="@layout/dialpad_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+      <!-- "Dialpad chooser" UI, shown only when the user brings up the
+               Dialer while a call is already in progress.
+               When this UI is visible, the other Dialer elements
+               (the textfield/button and the dialpad) are hidden. -->
+
+      <ListView
+        android:id="@+id/dialpadChooser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/background_dialer_light"
+        android:visibility="gone"/>
+
+      <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
+      <Space
+        android:id="@+id/dialpad_floating_action_button_margin_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/floating_action_button_margin_bottom"
+        android:layout_alignParentBottom="true"/>
+
+      <android.support.design.widget.FloatingActionButton
+          android:id="@+id/dialpad_floating_action_button"
+          android:layout_width="@dimen/floating_action_button_width"
+          android:layout_height="@dimen/floating_action_button_height"
+          android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
+          android:layout_centerHorizontal="true"
+          android:src="@drawable/quantum_ic_call_white_24"
+          android:contentDescription="@string/description_dial_button"
+          app:elevation="@dimen/floating_action_button_translation_z"
+          app:backgroundTint="@color/dialpad_fab_green"/>
+    </RelativeLayout>
+  </LinearLayout>
+</view>
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
index 6f178f0..1356246 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
@@ -35,7 +35,7 @@
       <ImageView
         android:id="@+id/dialpad_key_voicemail"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dialpad_voicemail_icon_size"
         android:scaleType="fitCenter"
         android:src="@drawable/quantum_ic_voicemail_white_24"
         android:tint="@color/dialpad_voicemail_tint"/>
diff --git a/java/com/android/dialer/app/res/layout/dialpad_chooser_list_item.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
similarity index 100%
rename from java/com/android/dialer/app/res/layout/dialpad_chooser_list_item.xml
rename to java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
new file mode 100644
index 0000000..2f62e14
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    class="com.android.dialer.dialpadview.DialpadFragment$DialpadSlidingRelativeLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+
+    <!-- spacer view -->
+    <View
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="#00000000"/>
+    <!-- Dialpad shadow -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/shadow_length"
+        android:background="@drawable/shadow_fade_up"/>
+    <include layout="@layout/dialpad_view"/>
+    <!-- "Dialpad chooser" UI, shown only when the user brings up the
+             Dialer while a call is already in progress.
+             When this UI is visible, the other Dialer elements
+             (the textfield/button and the dialpad) are hidden. -->
+    <ListView
+        android:id="@+id/dialpadChooser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/background_dialer_light"
+        android:visibility="gone"/>
+
+  </LinearLayout>
+
+  <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
+  <Space
+      android:id="@+id/dialpad_floating_action_button_margin_bottom"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/floating_action_button_margin_bottom"
+      android:layout_alignParentBottom="true"/>
+
+  <android.support.design.widget.FloatingActionButton
+      android:id="@+id/dialpad_floating_action_button"
+      android:layout_width="@dimen/floating_action_button_width"
+      android:layout_height="@dimen/floating_action_button_height"
+      android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
+      android:layout_centerHorizontal="true"
+      android:contentDescription="@string/description_dial_button"
+      android:src="@drawable/quantum_ic_call_vd_theme_24"
+      app:backgroundTint="@color/dialpad_fab_green"
+      app:colorControlNormal="#ffffff"
+      app:elevation="@dimen/floating_action_button_translation_z"/>
+</view>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
index 8859440..4401c5b 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
@@ -18,7 +18,8 @@
   android:id="@+id/one"
   style="@style/DialpadKeyButtonStyle">
   <LinearLayout
-    style="@style/DialpadKeyInternalLayoutStyle">
+      android:layout_marginTop="1dp"
+      style="@style/DialpadKeyInternalLayoutStyle">
     <com.android.dialer.dialpadview.DialpadTextView
       android:id="@+id/dialpad_key_number"
       style="@style/DialpadKeyNumberStyle"/>
@@ -28,9 +29,8 @@
       <ImageView
         android:id="@+id/dialpad_key_voicemail"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dialpad_voicemail_icon_size"
         android:layout_centerInParent="true"
-        android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
         android:scaleType="fitCenter"
         android:src="@drawable/quantum_ic_voicemail_white_24"
         android:tint="?attr/dialpad_voicemail_tint"/>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
index 838f1ec..13c11f1 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
@@ -14,141 +14,142 @@
      limitations under the License.
 -->
 <view xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/dialpad_view"
-  class="com.android.dialer.dialpadview.DialpadView"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:layout_gravity="bottom"
-  android:background="?attr/dialpad_background"
-  android:clickable="true"
-  android:elevation="?attr/dialpad_elevation"
-  android:layoutDirection="ltr"
-  android:orientation="vertical">
+    android:id="@+id/dialpad_view"
+    class="com.android.dialer.dialpadview.DialpadView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="bottom"
+    android:background="?attr/dialpad_background"
+    android:clickable="true"
+    android:elevation="?attr/dialpad_elevation"
+    android:layoutDirection="ltr"
+    android:orientation="vertical">
 
   <!-- Text field where call rate is displayed for ILD calls. -->
   <LinearLayout
-    android:id="@+id/rate_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:visibility="gone">
+      android:id="@+id/rate_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:visibility="gone">
 
     <LinearLayout
-      android:id="@+id/ild_container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/ild_margin_height"
-      android:layout_marginBottom="@dimen/ild_margin_height"
-      android:layout_gravity="center_horizontal"
-      android:orientation="horizontal">
-
-      <TextView
-        android:id="@+id/ild_country"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-      <TextView
-        android:id="@+id/ild_rate"
-        android:textStyle="bold"
+        android:id="@+id/ild_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"/>
+        android:layout_marginTop="@dimen/ild_margin_height"
+        android:layout_marginBottom="@dimen/ild_margin_height"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal">
+
+      <TextView
+          android:id="@+id/ild_country"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+
+      <TextView
+          android:id="@+id/ild_rate"
+          android:textStyle="bold"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="4dp"/>
 
     </LinearLayout>
 
     <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="#e3e3e3"/>
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#e3e3e3"/>
 
   </LinearLayout>
 
   <!-- Text field and possibly soft menu button above the keypad where
    the digits are displayed. -->
   <LinearLayout
-    android:id="@+id/digits_container"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/dialpad_digits_adjustable_height"
-    android:orientation="horizontal">
+      android:id="@+id/digits_container"
+      android:layout_width="match_parent"
+      android:layout_height="?attr/dialpad_digits_adjustable_height"
+      android:orientation="horizontal">
 
     <ImageButton
-      android:id="@+id/dialpad_back"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:layout_margin="@dimen/dialpad_overflow_margin"
-      android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
-      android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
-      android:background="@drawable/btn_dialpad_key"
-      android:contentDescription="@string/description_dialpad_back"
-      android:gravity="center"
-      android:src="@drawable/quantum_ic_close_white_24"
-      android:tint="?attr/dialpad_icon_tint"
-      android:tintMode="src_in"
-      android:visibility="gone"/>
+        android:id="@+id/dialpad_back"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/dialpad_overflow_margin"
+        android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
+        android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
+        android:background="@drawable/btn_dialpad_key"
+        android:contentDescription="@string/description_dialpad_back"
+        android:gravity="center"
+        android:src="@drawable/quantum_ic_close_white_24"
+        android:tint="?attr/dialpad_icon_tint"
+        android:tintMode="src_in"
+        android:visibility="gone"/>
 
     <ImageButton
-      android:id="@+id/dialpad_overflow"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:layout_margin="@dimen/dialpad_overflow_margin"
-      android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
-      android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
-      android:background="@drawable/btn_dialpad_key"
-      android:contentDescription="@string/description_dialpad_overflow"
-      android:gravity="center"
-      android:src="@drawable/quantum_ic_more_vert_white_24"
-      android:tint="?attr/dialpad_icon_tint"
-      android:tintMode="src_in"
-      android:visibility="gone"/>
+        android:id="@+id/dialpad_overflow"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/dialpad_overflow_margin"
+        android:paddingLeft="@dimen/dialpad_digits_menu_left_padding"
+        android:paddingRight="@dimen/dialpad_digits_menu_right_padding"
+        android:background="@drawable/btn_dialpad_key"
+        android:contentDescription="@string/description_dialpad_overflow"
+        android:gravity="center"
+        android:src="@drawable/quantum_ic_more_vert_white_24"
+        android:tint="?attr/dialpad_icon_tint"
+        android:tintMode="src_in"
+        android:visibility="gone"/>
 
     <view xmlns:ex="http://schemas.android.com/apk/res-auto"
-      android:id="@+id/digits"
-      class="com.android.dialer.dialpadview.DigitsEditText"
-      android:textStyle="normal"
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:background="@android:color/transparent"
-      android:cursorVisible="false"
-      android:focusableInTouchMode="true"
-      android:fontFamily="sans-serif"
-      android:freezesText="true"
-      android:gravity="center"
-      android:maxLines="1"
-      android:scrollHorizontally="true"
-      android:singleLine="true"
-      android:textColor="?attr/dialpad_text_color"
-      android:textCursorDrawable="@null"
-      android:textSize="?attr/dialpad_digits_adjustable_text_size"
-      ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size"/>
+        android:id="@+id/digits"
+        class="com.android.dialer.dialpadview.DigitsEditText"
+        android:textStyle="normal"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="@android:color/transparent"
+        android:cursorVisible="false"
+        android:focusableInTouchMode="true"
+        android:fontFamily="sans-serif"
+        android:freezesText="true"
+        android:gravity="center"
+        android:importantForAutofill="no"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="?attr/dialpad_text_color"
+        android:textCursorDrawable="@null"
+        android:textSize="?attr/dialpad_digits_adjustable_text_size"
+        ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size"/>
 
     <ImageButton
-      android:id="@+id/deleteButton"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:paddingLeft="@dimen/dialpad_digits_padding"
-      android:paddingRight="@dimen/dialpad_digits_padding"
-      android:background="@drawable/btn_dialpad_key"
-      android:contentDescription="@string/description_delete_button"
-      android:src="@drawable/quantum_ic_backspace_white_24"
-      android:state_enabled="false"
-      android:tint="?attr/dialpad_icon_tint"
-      android:tintMode="src_in"/>
+        android:id="@+id/deleteButton"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/dialpad_digits_padding"
+        android:paddingRight="@dimen/dialpad_digits_padding"
+        android:background="@drawable/btn_dialpad_key"
+        android:contentDescription="@string/description_delete_button"
+        android:src="@drawable/quantum_ic_backspace_white_24"
+        android:state_enabled="false"
+        android:tint="?attr/dialpad_icon_tint"
+        android:tintMode="src_in"/>
   </LinearLayout>
 
   <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="#e3e3e3"/>
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="#e3e3e3"/>
 
   <Space
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dialpad_space_above_keys"/>
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/dialpad_space_above_keys"/>
 
   <include layout="@layout/dialpad"/>
 
   <Space
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dialpad_space_below_keys"/>
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/dialpad_space_below_keys"/>
 
 </view>
diff --git a/java/com/android/dialer/app/res/menu/dialpad_options.xml b/java/com/android/dialer/dialpadview/res/menu/dialpad_options.xml
similarity index 100%
rename from java/com/android/dialer/app/res/menu/dialpad_options.xml
rename to java/com/android/dialer/dialpadview/res/menu/dialpad_options.xml
diff --git a/java/com/android/dialer/dialpadview/res/values-af/strings.xml b/java/com/android/dialer/dialpadview/res/values-af/strings.xml
index b2d03a0..c5c72e0 100644
--- a/java/com/android/dialer/dialpadview/res/values-af/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-af/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"stemboodskap"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"bel"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Om stemboodskapdiens te bel, skakel eers vliegtuigmodus af."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Om stemboodskapdiens op te stel, gaan na Kieslys &gt; Instellings."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Voeg 2-sek.-pouse by"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Voeg wagtyd by"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gebruik raak-nommerbord"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Keer terug na oproep wat besig is"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Voeg oproep by"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laai tans van SIM-kaart af …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kaartkontakte"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan nie hierdie nommer bel nie"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-am/strings.xml b/java/com/android/dialer/dialpadview/res/values-am/strings.xml
index 04f6022..efbdb1d 100644
--- a/java/com/android/dialer/dialpadview/res/values-am/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-am/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"የኋሊት ደምሳሽ"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"የመደመር ምልክት"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"የድምፅ መልዕክት"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ይደውሉ"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"የድምጽ መልዕክት ጥሪ ለማድረግ፣ በመጀመሪያ የአውሮፕላን ሁነታን ያጥፉ።"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"የድምጽ መልዕክትን ለማዘጋጀት፣ ወደ ምናሌ &gt; ቅንብሮች ይሂዱ።"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 ሴኮንድ ፋታ አክል"</string>
+    <string name="add_wait" msgid="2278146476349811062">"ቆይታ አክል"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ባለድምጽ የንኪ ቁልፍ ሰሌዳን ይጠቀሙ"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"በመካሄድ ላይ ወዳለው ጥሪ ተመለስ"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ጥሪ አክል"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ከSIM ካርድ ላይ በመጫን ላይ…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"የSIM ካርድ ዕውቂያዎች"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"ወደ <xliff:g id="NUMBER">%s</xliff:g> ደውል"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ይህን ቁጥር መደወል አልተቻለም"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ar/strings.xml b/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
index 9caea15..649280a 100644
--- a/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"مسافة للخلف"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"علامة الجمع"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"بريد صوتي"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"طلب"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"للاتصال بالبريد الصوتي، يجب أولاً إيقاف وضع الطائرة."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"لإعداد البريد الصوتي، انتقل إلى القائمة &gt; الإعدادات."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"إضافة ثانيتين إيقاف مؤقت"</string>
+    <string name="add_wait" msgid="2278146476349811062">"إضافة انتظار"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"استخدام لوحة مفاتيح نغمات باللمس"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"عودة إلى المكالمة الجارية"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"إضافة مكالمة"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏جارٍ التحميل من شريحة SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"‏شريحة SIM وجهات الاتصال"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"لا يمكن الاتصال بهذا الرقم"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-az/strings.xml b/java/com/android/dialer/dialpadview/res/values-az/strings.xml
index 46f218e..8de688d 100644
--- a/java/com/android/dialer/dialpadview/res/values-az/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-az/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"geri düyməsi"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"səsli məktub"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"nömrə yığın"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Səsli e-poçta zəng etmək üçün Təyyarə rejimini deaktiv edin."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Səsli e-poçtu ayarlamaq üçün Menyu &gt; Ayarlar bölməsinə daxil olun."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 saniyəlik pauza əlavə edin"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Gözləmə əlavə edin"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Toxunuş ton klaviaturasından istifadə edin"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Davam edən zəngə qayıdın"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Zəng əlavə edin"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM kartdan yüklənir..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM kart kontaktları"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> nömrəsinə zəng edin"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu nömrəyə zəng etmək mümkün deyil"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
index 24ea308..c15aee4 100644
--- a/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"birajte broj"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da biste pozvali govornu poštu, prvo isključite režim rada u avionu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da biste podesili govornu poštu, idite u Meni &gt; Podešavanja."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj pauzu od 2 sekunde"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Dodaj čekanje"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Koristi tastaturu za tonsko biranje"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Nazad u poziv koji je u toku"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj poziv"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitava se sa SIM kartice…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti na SIM kartici"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće pozvati ovaj broj"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-be/strings.xml b/java/com/android/dialer/dialpadview/res/values-be/strings.xml
index db50455..cbe85f5 100644
--- a/java/com/android/dialer/dialpadview/res/values-be/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-be/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"галасавая пошта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"набор"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Каб пазваніць на галасавую пошту, спачатку адключыце Рэжым палёту."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Каб наладзіць галасавую пошту, перайдзіце ў раздзел \"Меню &gt; Налады\"."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Дадаць 2-секундную паўзу"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Дадаць чаканне"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Выкарыстанне тонавай клавіятуры"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вярнуцца да бягучага выкліку"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Дадаць выклік"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Загрузка з SIM-карты..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Кантакты SIM-карты"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Выклікаць <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Немагчыма выклікаць гэты нумар"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bg/strings.xml b/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
index 7a3073d..1188d79 100644
--- a/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"гласова поща"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"набиране"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"За да чуете гласовата си поща, първо изключете самолетния режим."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"За да настроите гласовата поща, отворете „Меню“ &gt; „Настройки“."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Добавяне на пауза от 2 сек"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Добавяне на изчакване"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Използване на тонова клавиатура"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Назад към текущото обаждане"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Добавяне на обаждане"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Зарежда се от SIM картата…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Контакти от SIM картата"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Не можете да се обадите на този номер"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bn/strings.xml b/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
index 98171cf..9f3713f 100644
--- a/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ব্যাক-স্পেস"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"যোগ চিহ্ন"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ভয়েসমেল"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ডায়াল করুন"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ভয়েসমেলে কল করতে, সবার আগে বিমানমোড বন্ধ করুন৷"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ভয়েসমেল সেট-আপ করতে, মেনু &gt; সেটিংসে যান৷"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"২-সেকেন্ড বিরতি যোগ করুন"</string>
+    <string name="add_wait" msgid="2278146476349811062">"অপেক্ষা যোগ করুন"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"টাচ-টোন কীপ্যাড ব্যবহার করুন"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"আগের কলে ফিরে যান"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"কল যোগ করুন"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"সিম কার্ড থেকে লোড করা হচ্ছে…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"সিম কার্ডের পরিচিতিগুলি"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> নম্বরে কল করুন"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"এই নম্বরে কল করা যাবে না"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bs/strings.xml b/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
index 9768662..4c0527b 100644
--- a/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tipka za brisanje"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"biranje"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da pozovete govornu poštu, isključite Način rada u avionu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da postavite govornu poštu, idite na Meni &gt; Postavke."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Dodajte pauzu od 2 sekunde"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Dodajte čekanje"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Korištenje tastature za tonsko biranje"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Povratak na poziv"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodajte poziv"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitavanje sa SIM kartice…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti sa SIM kartice"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Pozivanje broja <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće pozvati ovaj broj"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ca/strings.xml b/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
index 2bd6c71..eda95b4 100644
--- a/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retrocés"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"més"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"missatge de veu"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"marca"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Per configurar la bústia de veu, ves a Menú &gt; Configuració."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Afegeix una pausa de 2 segons"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Afegeix una espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utilitza el teclat de tons"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Torna a la trucada en curs"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Afegeix una trucada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"S\'està carregant des de la targeta SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contactes de la targeta SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No es pot trucar a aquest número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-cs/strings.xml b/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
index 6c13e1c..a97d213 100644
--- a/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"hlasová zpráva"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"vytočit"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pokud chcete volat do hlasové schránky, vypněte nejdříve režim letadla."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pokud chcete nastavit hlasovou schránku, přejděte na nabídku &gt; Nastavení."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Přidat pauzu 2 s"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Přidat čekání"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Použít dotykovou tónovou klávesnici"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vrátit se k probíhajícímu hovoru"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Přidat hovor"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Načítání ze SIM karty…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty na SIM kartě"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Zavolat <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Na toto číslo není možné zavolat"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-da/strings.xml b/java/com/android/dialer/dialpadview/res/values-da/strings.xml
index 1df7348..45eb872 100644
--- a/java/com/android/dialer/dialpadview/res/values-da/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-da/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tilbagetast"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"telefonsvarer"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ring op"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Hvis du vil ringe til telefonsvareren, skal du først slå Flytilstand fra."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Gå til Menu &gt; Indstillinger for at konfigurere telefonsvareren."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Tilføj pause på 2 sek."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Tilføj ventetid"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Brug trykknaptastatur"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vend tilbage til igangværende opkald"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tilføj opkald"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI-nummer"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID-nummer"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Der indlæses fra SIM-kortet…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontaktpersoner på SIM-kortet"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Det er ikke muligt at ringe til dette nummer"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-de/strings.xml b/java/com/android/dialer/dialpadview/res/values-de/strings.xml
index c93ce4d..c350c94 100644
--- a/java/com/android/dialer/dialpadview/res/values-de/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-de/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Rücktaste"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"Plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"Mailboxnachricht"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"Wählen"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Deaktiviere zunächst den Flugmodus, um die Mailbox anzurufen."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Konfiguriere deine Mailbox unter \"Menü\" &gt; \"Einstellungen\"."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 Sekunden Pause hinzufügen"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Warten hinzufügen"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tonwahltasten verwenden"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Zurück zum aktuellen Anruf"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Anruf hinzufügen"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ladevorgang von SIM-Karte läuft…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakte auf SIM-Karte"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> anrufen"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Diese Nummer kann nicht angerufen werden"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-el/strings.xml b/java/com/android/dialer/dialpadview/res/values-el/strings.xml
index 1bce64b..0205f76 100644
--- a/java/com/android/dialer/dialpadview/res/values-el/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-el/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"συν"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"αυτόματος τηλεφωνητής"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"κλήση"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Για κλήση αυτόματου τηλεφωνητή, πρώτα απενεργοποιήστε τη λειτουργία πτήσης."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Για τη ρύθμιση του αυτόματου τηλεφωνητή, μεταβείτε στο στοιχείο Μενού &gt; Ρυθμίσεις."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Προσθήκη παύσης 2 δευτερολέπτων"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Προσθήκη αναμονής"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Προσθήκη κλήσης"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Φόρτωση από κάρτα SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Επαφές στην κάρτα SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Κλήση <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Δεν μπορείτε να καλέσετε αυτόν τον αριθμό"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
index 62fc547..3f16055 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
index 62fc547..3f16055 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
index 62fc547..3f16055 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml b/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
index 4c29088..5bf2ae8 100644
--- a/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"más"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"buzón de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo avión."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar el buzón de voz, ve a Menú &gt; Configuración."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Agregar pausa de 2 segundos"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Agregar espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado numérico"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Regresar a la llamada en curso"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Agregar llamada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando desde tarjeta SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contactos de la tarjeta SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No se puede llamar a este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-es/strings.xml b/java/com/android/dialer/dialpadview/res/values-es/strings.xml
index 7fd6355..af35908 100644
--- a/java/com/android/dialer/dialpadview/res/values-es/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-es/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"más"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"mensaje de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para llamar al buzón de voz, debes desactivar el modo avión."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar el buzón de voz, ve a Menú &gt; Ajustes."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Añadir pausa de 2 segundos"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Añadir espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado táctil"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Volver a la llamada en curso"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Añadir llamada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando el número de teléfono de la tarjeta SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contactos de la tarjeta SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No se puede llamar a este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-et/strings.xml b/java/com/android/dialer/dialpadview/res/values-et/strings.xml
index e71bd71..c5e4f5f 100644
--- a/java/com/android/dialer/dialpadview/res/values-et/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-et/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tagasilüke"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"kõnepostisõnum"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"helista"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Kõnepostisõnumite kuulamiseks lülitage esmalt välja lennukirežiim."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Kõneposti seadistamiseks tehke valikud Menüü &gt; Seaded."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Lisa kahesekundiline paus"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Lisa ootamine"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Kasuta puutetooniga klahvistikku"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Naase käimasolevale kõnele"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lisa kõne"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laadimine SIM-kaardilt …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kaardi kontaktid"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Helistamine numbrile <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Sellele numbrile ei saa helistada"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-eu/strings.xml b/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
index c70948b..778b199 100644
--- a/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"atzera tekla"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"gehi"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"erantzungailua"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"markatu"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ahots-mezuak entzuteko, Hegaldi modua desaktibatu behar duzu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Erantzungailua konfiguratzeko, joan Menua &gt; Ezarpenak atalera."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Gehitu 2 segundoko pausa"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Gehitu itxaronaldia"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Erabili ukipen-tonuak dituen teklatua"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Itzuli abian den deira"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Gehitu deia"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM txarteletik kargatzen…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM txarteleko kontaktuak"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ezin da deitu zenbaki honetara"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fa/strings.xml b/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
index 716360f..070ca00 100644
--- a/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"برگشت به عقب"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"به‌علاوه"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"پست صوتی"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"شماره‌گیری"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"برای راه‌اندازی پست صوتی به منو &gt; تنظیمات بروید."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"افزودن یک مکث ۲ ثانیه‌ای"</string>
+    <string name="add_wait" msgid="2278146476349811062">"افزودن انتظار"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"استفاده از صفحه‌کلید لمسی"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"برگشت به تماس درحال انجام"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"افزودن تماس"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"در حال بارگیری سیم کارت..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"مخاطبین سیم‌کارت"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"تماس با این شماره ممکن نیست"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fi/strings.xml b/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
index 63e96f6..0a7a791 100644
--- a/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"askelpalautin"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ääniviesti"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"soita"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Poista lentokonetila käytöstä ennen vastaajaan soittamista."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Määritä puhelinvastaajan asetukset kohdassa Valikko &gt; Asetukset."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Lisää 2 sekunnin tauko"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Lisää tauko"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Käytä näppäimistöä"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Palaa meneillään olevaan puheluun"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lisää puhelu"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI-koodi"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ladataan SIM-kortilta…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kortin yhteystiedot"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Numeroon ei voi soittaa."</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml b/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
index bb04545..3080169 100644
--- a/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retour arrière"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"messagerie vocale"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"composer"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Ajouter une pause de 2 s"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Ajouter une attente"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utiliser le clavier DTMF"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reprendre l\'appel en cours"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ajouter un appel"</string>
+    <string name="imei" msgid="7961343816043247280">"IIEM"</string>
+    <string name="meid" msgid="5274167198744847659">"IDEM"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Chargement à partir de la carte SIM en cours…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contacts de la carte SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Vous ne pouvez pas appeler ce numéro"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fr/strings.xml b/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
index ea3e67c..b4fc152 100644
--- a/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retour arrière"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"message vocal"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"composer"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pour pouvoir appeler la messagerie vocale, vous devez désactiver le mode Avion."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Ajouter une pause de 2 s"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Ajouter une attente"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utiliser le clavier DTMF"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reprendre l\'appel en cours"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ajouter un appel"</string>
+    <string name="imei" msgid="7961343816043247280">"Code IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"Code MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Chargement depuis la carte SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contacts de la carte SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Impossible d\'appeler ce numéro"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-gl/strings.xml b/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
index d390194..25ffc27 100644
--- a/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"máis"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"correo de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"marca"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para chamar ao correo de voz, primeiro desactiva o modo avión."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correo de voz, accede a Menú &gt; Configuración."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Engadir pausa de 2 segundos"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Engadir espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado de tons táctiles"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Volver á chamada en curso"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Engadir chamada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando número da tarxeta SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contactos da tarxeta SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Chamar ao <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Non é posible chamar a este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-gu/strings.xml b/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
index 8962694..e4e13b3 100644
--- a/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"પ્લસ"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"વૉઇસમેઇલ"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ડાયલ કરો"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"વૉઇસમેઇલ પર કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"વૉઇસમેઇલ સેટ કરવા માટે, મેનૂ &gt; સેટિંગ્સ પર જાઓ."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-સેકંડનો વિરામ ઉમેરો"</string>
+    <string name="add_wait" msgid="2278146476349811062">"પ્રતીક્ષા ઉમેરો"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ટચ ટોન કીપેડનો ઉપયોગ કરો"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"કૉલ પર પાછા આવવું પ્રગતિ પર છે"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"કૉલ ઉમેરો"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM કાર્ડમાંથી લોડ કરી રહ્યાં છીએ…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM કાર્ડ સંપર્કો"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> પર કૉલ કરો"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"આ નંબર પર કૉલ કરી શકાતો નથી"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hi/strings.xml b/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
index 4388ec2..529f8c7 100644
--- a/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"धन का चिह्न"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"वॉइसमेल"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"डायल करें"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"वॉइसमेल कॉल करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"वॉइसमेल सेट अप करने के लिए, मेनू &gt; सेटिंग पर जाएं."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-सेकंड का विराम जोड़ें"</string>
+    <string name="add_wait" msgid="2278146476349811062">"प्रतीक्षा का समय बढ़ाएं"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"टच टोन कीपैड का उपयोग करें"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"कॉल पर लौटने का कार्य प्रगति पर"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कॉल जोड़ें"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM कार्ड से लोड हो रहा है…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM कार्ड के संपर्क"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"इस नंबर पर कॉल नहीं किया जा सकता"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hr/strings.xml b/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
index b904d23..6ec34d2 100644
--- a/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"povratna tipka"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"biraj"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da biste nazvali govornu poštu, najprije isključite način rada u zrakoplovu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da biste postavili govornu poštu, idite na Izbornik &gt; Postavke."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj pauzu od 2 s."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Dodaj čekanje"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Koristite dodirnu zvučnu tipkovnicu"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Natrag na poziv u tijeku"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj poziv"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitavanje sa SIM kartice..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti na SIM kartici"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće nazvati taj broj"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hu/strings.xml b/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
index 4b1c854..7ef2424 100644
--- a/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plusz"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"hangposta"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"tárcsázás"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Hangposta hívásához kapcsolja ki a Repülőgép üzemmódot."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"A hangposta beállításához válassza a Menü &gt; Beállítások pontot."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 mp-es szünet hozzáadása"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Várakozás hozzáadása"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Hangkódos telefonbillentyűzet használata"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vissza a folyamatban lévő híváshoz"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Hívás hozzáadása"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Betöltés a SIM-kártyáról…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Névjegyek a SIM-kártyán"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nem lehet felhívni ezt a számot"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hy/strings.xml b/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
index 4433c70..0839922 100644
--- a/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"հետշարժ"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"գումարում"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ձայնային փոստ"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"համարհավաքել"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ձայնային փոստին զանգելու համար նախ անջատեք Ինքնաթիռի ռեժիմը:"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ձայնային փոստը կարգավորելու համար անցեք Ընտրացնակ &gt; Կարգավորումներ:"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Ավելացնել 2 վայրկյան դադար"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Ավելացնել սպասելաժամանակ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Օգտագործել տոնային ստեղնաշարը"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Վերադառնալ ընթացիկ զանգին"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ավելացնել զանգ"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Բեռնվում է SIM քարտից…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM քարտի կոնտակտներ"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Զանգել <xliff:g id="NUMBER">%s</xliff:g> համարին"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Հնարավոր չէ զանգել այս համարին"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-in/strings.xml b/java/com/android/dialer/dialpadview/res/values-in/strings.xml
index 7aa4758..4f7a05f 100644
--- a/java/com/android/dialer/dialpadview/res/values-in/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-in/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"tambah"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"pesan suara"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"panggil"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Untuk memanggil pesan suara, nonaktifkan mode Pesawat terlebih dahulu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Untuk menyiapkan pesan suara, buka Menu &gt; Setelan."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Tambahkan jeda 2 dtk"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Tambahkan tunggu"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gunakan keypad nada sentuh"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kembali ke panggilan sedang berlangsung"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tambahkan panggilan"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Memuat dari kartu SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontak di kartu SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Telepon <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Tidak dapat menelepon nomor ini"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-is/strings.xml b/java/com/android/dialer/dialpadview/res/values-is/strings.xml
index 00f7cef..de6b9a2 100644
--- a/java/com/android/dialer/dialpadview/res/values-is/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-is/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"bakklykill"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plús"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"talhólfsskilaboð"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"hringja"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Til að hringja í talhólfið þarftu fyrst að slökkva á flugstillingu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Til að setja upp talhólf þarftu að opna valmyndina og velja Stillingar."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Bæta við 2 sekúndna töf"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Bæta töf við"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Nota snertitónatakkaborð"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Fara aftur í símtal í gangi"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Bæta símtali við"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Hleður af SIM-kortinu…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Tengiliðir á SIM-korti"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Hringja í <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ekki er hægt að hringja í þetta númer"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-it/strings.xml b/java/com/android/dialer/dialpadview/res/values-it/strings.xml
index 9c4302a..cb1b752 100644
--- a/java/com/android/dialer/dialpadview/res/values-it/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-it/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"più"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"messaggio vocale"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"componi"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Per chiamare la segreteria, disattiva la modalità aereo."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Per configurare la segreteria, seleziona Menu &gt; Impostazioni."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Aggiungi pausa 2 sec"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Aggiungi attesa"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usa tastierino per selezione a toni"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Torna alla chiamata in corso"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Aggiungi chiamata"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Caricamento da SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contatti della scheda SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Impossibile chiamare questo numero"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-iw/strings.xml b/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
index c27af37..a8e784e 100644
--- a/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"פלוס"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"דואר קולי"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"חיוג"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"כדי להתקשר לתא הקולי, קודם עליך להשבית את מצב הטיסה."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"כדי להגדיר את התא הקולי, עליך להיכנס לתפריט &gt; הגדרות."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"הוספת השהיה של 2 שניות"</string>
+    <string name="add_wait" msgid="2278146476349811062">"הוספת השהיה"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"שימוש במקלדת עם צלילי חיוג"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"חזרה לשיחה הפעילה"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"הוספת שיחה"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏אנחנו טוענים מכרטיס ה-SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"‏אנשי הקשר בכרטיס ה-SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"התקשרות אל <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"לא ניתן להתקשר אל המספר הזה"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ja/strings.xml b/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
index d560c88..78ab67a 100644
--- a/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"足す"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ボイスメール"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"発信"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"機内モードを OFF にしてからボイスメールを呼び出してください。"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ボイスメールを設定するには、[メニュー] &gt; [設定] の順に開いてください。"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 秒間の停止を追加"</string>
+    <string name="add_wait" msgid="2278146476349811062">"待機を追加"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"プッシュホン式キーパッドを使う"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"通話に戻る"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"通話を追加"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM カードから読み込み中…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM カードの連絡先"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> に発信"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"この番号に発信できません"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ka/strings.xml b/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
index 28e0319..2e3b25b 100644
--- a/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"უკუშლა"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"პლუსი"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ხმოვანი ფოსტა"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"აკრეფა"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ხმოვან ფოსტასთან დასაკავშირებლად, პირველ რიგში, გამორთეთ თვითმფრინავის რეჟიმი."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ხმოვანი ფოსტის დასაყენებლად გადადით: მენიუ &gt; პარამეტრები."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"ორწამიანი პაუზის დამატება"</string>
+    <string name="add_wait" msgid="2278146476349811062">"ლოდინის დამატება"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ტონური რეჟიმის კლავიატურის გამოყენება"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"მიმდინარე ზარზე დაბრუნება"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ზარის დამატება"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"მიმდინარეობს ჩატვირთვა SIM ბარათიდან…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM ბარათის კონტაქტები"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ამ ნომერზე დარეკვა შეუძლებელია"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-kk/strings.xml b/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
index 902a41f..3906017 100644
--- a/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace пернесі"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"қосу"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"дауыстық пошта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"теру"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Дауыстық поштаға қоңырау шалу мүмкін болуы үшін, ұшақ режимін өшіру қажет."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Дауыстық поштаны орнату үшін, \"Mәзір &gt; Параметрлер\" тармағына өтіңіз."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 секундтық үзіліс қосу"</string>
+    <string name="add_wait" msgid="2278146476349811062">"\"Күту\" мүмкіндігін қосу"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Сенсорлы және дыбысты пернетақта"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Басталған қоңырауға оралу"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Жаңа қоңырау қосу"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM картасынан жүктелуде..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM контактілері"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бұл нөмірге қоңырау шалу мүмкін емес"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-km/strings.xml b/java/com/android/dialer/dialpadview/res/values-km/strings.xml
index be9483e..12b04a5 100644
--- a/java/com/android/dialer/dialpadview/res/values-km/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-km/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"លុប​ថយក្រោយ"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"សារ​ជា​សំឡេង"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ចុច"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ដើម្បី​ហៅ​សារ​ជា​សំឡេង ដំបូង​ត្រូវ​បិទ​​មុខងារ​​ពេល​ជិះ​យន្តហោះ។"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ដើម្បី​កំណត់​សារ​ជា​សំឡេង ចូល​ម៉ឺនុយ &gt; ការ​កំណត់។"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"បញ្ចូល​ការផ្អាក 2 វិនាទី"</string>
+    <string name="add_wait" msgid="2278146476349811062">"បញ្ចូល​ការ​រង់ចាំ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ប្រើ​សំឡេង​ប៉ះ​បន្ទះ​លេខ"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"កំពុង​ត្រឡប់​ទៅកាន់​ការ​ហៅ"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"បញ្ចូល​ការហៅទូរសព្ទ"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"កំពុង​ផ្ទុក​ពី​ស៊ីម​កាត..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"ទំនាក់ទំនង​នៅ​ក្នុង​ស៊ីម​កាត"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"ហៅ​ទៅ​កាន់ <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"មិនអាចហៅ​ទៅ​កាន់​លេខនេះបានទេ"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-kn/strings.xml b/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
index 8430580..afc99b6 100644
--- a/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"ಸಂಕಲನ"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ಧ್ವನಿಮೇಲ್"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ಡಯಲ್"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳುಗೆ ಹೋಗಿ."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-ಸೆ ವಿರಾಮವನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="add_wait" msgid="2278146476349811062">"ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ಸ್ಪರ್ಶ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ಕರೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ಈ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
index 748843c..8366ec5 100644
--- a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"백스페이스"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"더하기"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"음성사서함"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"전화걸기"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"음성사서함 메시지를 확인하려면 먼저 비행기 모드를 해제하세요."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"음성사서함을 설정하려면 메뉴 &gt; 설정으로 이동하세요."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2초간 일시중지 추가"</string>
+    <string name="add_wait" msgid="2278146476349811062">"대기 시간 추가"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"터치톤 키패드 사용"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"진행 중인 통화로 돌아가기"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"통화 추가"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM 카드에서 로딩 중…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM 카드 연락처"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g>에 전화걸기"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"이 번호에 전화를 걸 수 없습니다."</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ky/strings.xml b/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
index 703abdb..8ce1727 100644
--- a/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"артка карай өчүрүү"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"кошуу"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"үн почтасы"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"терүү"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Үн почтасын текшерүү үчүн, алгач Учак режимин өчүрүңүз."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Үн почтасын жөндөө үчүн Меню &gt; Жөндөөлөргө кириңиз."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-сек. тыныгууну кошуңуз"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Тыныгуу кошуу"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Тоналдык терүү тактасын колдонуу"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Аткарылып жаткан чалууга кайтуу"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Чалууну кошуу"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM-картадан жүктөлүүдө…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM картадагы байланыштар"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> номерине чалуу"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бул номерге чалуу мүмкүн болбой жатат"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lo/strings.xml b/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
index aefc701..a69e28e 100644
--- a/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ປຸ່ມ backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"ບວກ"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ຂໍ້ຄວາມສຽງ"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ໂທ"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ທ່ານຕ້ອງປິດໂໝດຢູ່ເທິງຍົນກ່ອນເພື່ອໂທຫາເບີຂໍ້ຄວາມສຽງ."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ເພື່ອຕັ້ງຄ່າຂໍ້ຄວາມສຽງ ໃຫ້ໄປທີ່ ເມນູ &gt; ການຕັ້ງຄ່າ."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"ເພີ່ມການຂັ້ນເວລາ 2 ວິນາທີ"</string>
+    <string name="add_wait" msgid="2278146476349811062">"ເພີ່ມການລໍຖ້າ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ໃຊ້ປຸ່ມກົດສັນຍານສຽງ"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ເພີ່ມການໂທ"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ກຳລັງໂຫລດຈາກ SIM card..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"ລາຍຊື່ຜູ້ຕິດຕໍ່ SIM card"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"ໂທ​ຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ບໍ່​ສາ​ມາດ​ໂທ​ຫາ​ເບີ​ນີ້​ໄດ້"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lt/strings.xml b/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
index 0e352d0..3f09cdc 100644
--- a/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"naikinimo klavišas"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"sudėties ženklas"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"balso pašto pranešimas"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"rinkti numerį"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Jei norite skambinti į balso paštą, išjunkite lėktuvo režimą."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Jei norite nustatyti balso paštą, eikite į meniu &gt; „Nustatymai“."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Pridėti 2 sek. pauzę"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Pridėti laukimą"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Naudoti jutiklinę tonų klaviatūrą"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Grįžti prie vykdomo skambučio"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pridėti skambutį"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Įkeliama iš SIM kortelės..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM kortelės kontaktai"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Negalima skambinti šiuo numeriu"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lv/strings.xml b/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
index 4af53a3..bcc2039 100644
--- a/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"atpakaļatkāpe"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"pluszīme"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"balss pasts"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"sastādīt numuru"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Lai piekļūtu balss pastam, vispirms izslēdziet lidojuma režīmu."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Lai iestatītu balss pastu, atveriet sadaļu Izvēlne &gt; Iestatījumi."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Pievienot 2 sekundes ilgu pauzi"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Pievienot gaidīšanas funkciju"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Izmantot skārientastatūru"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Atgriezties pie pašreizējā zvana"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pievienot zvanu"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Notiek ielāde no SIM kartes..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM kartes kontaktpersonas"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Zvanīt: <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Uz šo numuru nevar piezvanīt."</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mk/strings.xml b/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
index 2780e8a..f98deb4 100644
--- a/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"избриши"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плус"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"говорна пошта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"бирај"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"За да се јавите во говорна пошта, исклучете го авионскиот режим."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"За поставување говорна пошта, одете во Мени &gt; Поставки."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Додај пауза од 2 сек."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Додај чекање"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Користете тастатура со тонско бирање"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вратете се на повик во тек"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додај повик"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Се вчитува од SIM-картичка…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Контакти од SIM-картичка"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Повикај <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бројот не може да се повика"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ml/strings.xml b/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
index 7ef8313..77033aa 100644
--- a/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ബാക്ക്‌സ്‌പെയ്‌സ്"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"പ്ലസ്"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"വോയ്‌സ്‌മെയിൽ"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ഡയൽ ചെയ്യുക"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"വോയ്‌സ്‌മെയിൽ വിളിക്കാൻ ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നതിന്, മെനു &gt; ക്രമീകരണങ്ങൾ എന്നതിലേക്ക് പോകുക."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 സെക്കൻഡ് താൽക്കാലികമായി നിർത്തൽ ചേർക്കുക"</string>
+    <string name="add_wait" msgid="2278146476349811062">"കാത്തിരിക്കൽ ചേർക്കുക"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"കോൾ ചേർക്കുക"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"സിം കാർഡിൽ നിന്നും ലോഡുചെയ്യുന്നു…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"സിം കാർഡ് കോൺടാക്റ്റുകൾ"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"വിളിക്കുക <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ഈ നമ്പറിലേക്ക് കോൾ ചെയ്യാനാവില്ല"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mn/strings.xml b/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
index 5bc3bb7..d03bb93 100644
--- a/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ухраах"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"нэмэх"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"дуут шуудан"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"залгах"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Дуут шуудан руу залгахын тулд эхлээд Нислэгийн горимыг идэвхгүй болгоно уу."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Дуут шууданг тохируулахын тулд Цэс &gt; Тохиргоо руу очно уу."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-сек зогсолт нэмэх"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Хүлээлт нэмэх"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Хүрэлтээр дуугардаг гар ашиглах"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Үргэлжилж буй дуудлага руу буцах"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Дуудлага нэмэх"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM картаас ачаалж байна…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM картны харилцагч"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Энэ дугаар руу залгах боломжгүй"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mr/strings.xml b/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
index 6f629e1..7b466a4 100644
--- a/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"अधिक"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"व्हॉइसमेल"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"डायल"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"व्हॉइसमेलला कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"व्हॉइसमेल सेट करण्‍यासाठी, मेनू &gt; सेटिंग्‍ज वर जा."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-सेकंदांचा विराम जोडा"</string>
+    <string name="add_wait" msgid="2278146476349811062">"वाट पाहणे जोडा"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"स्‍पर्श टोन कीपॅडचा वापर करा"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"चालू असलेल्या कॉलवर परत जा"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कॉल जोडा"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"सिम कार्ड मधून लोड करत आहे…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"सिम कार्ड संपर्क"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> वर कॉल करा"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"या नंबरवर कॉल करू शकत नाही"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ms/strings.xml b/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
index f767a25..a3cbbea 100644
--- a/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"undur ruang"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"tambah"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"mel suara"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"dail"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Untuk membuat panggilan ke mel suara, mula-mula matikan mod Pesawat."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Untuk menyediakan mel suara, pergi ke Menu &gt; Tetapan."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Tambah jeda 2 saat"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Tambah penungguan"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gunakan pad kekunci nada sentuh"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kembali ke panggilan yang sedang berlangsung"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tambah panggilan"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Memuatkan daripada kad SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kenalan kad SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Tidak dapat menghubungi nombor ini"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-my/strings.xml b/java/com/android/dialer/dialpadview/res/values-my/strings.xml
index 8778056..4ece9fa 100644
--- a/java/com/android/dialer/dialpadview/res/values-my/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-my/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"နောက်ပြန်ဖျက်ခလုတ်"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"အပေါင်း လက္ခဏာ"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"အသံမေးလ်"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ဖုန်းခေါ်ရန်"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"အသံမေးလ်ခေါ်ဆိုရန်အတွက် လေယာဉ်ပျံမုဒ်ကို ဦးစွာပိတ်ပါ။"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"အသံမေးလ်စနစ်ကို စီစဉ်သတ်မှတ်ရန် မီနူး &gt; ဆက်တင်များသို့ သွားပါ။"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"၂-စက္ကန့် ခဏရပ်ရန်"</string>
+    <string name="add_wait" msgid="2278146476349811062">"စောင့်ဆိုင်းရန်"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"အသံမြည်ခလုတ်ခုံကို အသုံးပြုရန်"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"လက်ရှိဖုန်းပြောနေမှုသို့ ပြန်သွားရန်"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"နောက်ထပ်ဖုန်းတစ်ခု ခေါ်ဆိုရန်"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ဆင်းမ်ကဒ်မှ ဖွင့်နေသည်…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"ဆင်းမ်ကဒ်အဆက်အသွယ်များ"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ကို ဖုန်းခေါ်ရန်"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ဤနံပါတ်ကို မခေါ်ဆိုနိုင်ပါ"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-nb/strings.xml b/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
index c0756b2..0f78eb7 100644
--- a/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tilbaketast"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"talepost"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Legg til pause på 2 sek."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Legg til Vent"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Bruk tonetastatur"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Gå tilbake til aktiv samtale"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Nytt anrop"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Henter fra SIM-kort …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter på SIM-kort"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan ikke ringe dette nummeret"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ne/strings.xml b/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
index 713c6ad..6369eb7 100644
--- a/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ब्याकस्पेस"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"जोड"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"भ्वाइसमेल"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"डायल गर्नुहोस्"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"भ्वाइसमेल जाँच गर्न पहिले हवाइजहाज मोडलाई निष्क्रिय पार्नुहोस्।"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"भ्वाइसमेल सेट गर्न मेनु &gt; सेटिङहरूमा जानुहोस्।"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"२ सेकन्डको पज थप्नुहोस्"</string>
+    <string name="add_wait" msgid="2278146476349811062">"प्रतीक्षाको समय थप्नुहोस्"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"टच टोन किप्याड प्रयोग गर्नुहोस्"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"जारी रहेको कलमा फर्किनुहोस्"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कल थप्नुहोस्"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM कार्डबाट लोड हुँदै"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM कार्डका सम्पर्क ठेगानाहरू"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> मा कल गर्नुहोस्"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"यस नम्बरमा कल गर्न सकिँदैन"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-nl/strings.xml b/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
index c7e0584..19911a1 100644
--- a/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"bellen"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Als je je voicemail wilt bellen, moet je eerst de vliegtuigmodus uitschakelen."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Voor het instellen van voicemail ga je naar Menu &gt; Instellingen."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Pauze van 2 seconden toevoegen"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Wachten toevoegen"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Toetsenblok voor toetsgeluid gebruiken"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Terug naar actieve oproep"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Oproep toevoegen"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laden vanaf simkaart…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contacten op simkaart"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan dit nummer niet bellen"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-no/strings.xml b/java/com/android/dialer/dialpadview/res/values-no/strings.xml
index c0756b2..0f78eb7 100644
--- a/java/com/android/dialer/dialpadview/res/values-no/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-no/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tilbaketast"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"talepost"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Legg til pause på 2 sek."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Legg til Vent"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Bruk tonetastatur"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Gå tilbake til aktiv samtale"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Nytt anrop"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Henter fra SIM-kort …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter på SIM-kort"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan ikke ringe dette nummeret"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pa/strings.xml b/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
index 66378e2..be5dc62 100644
--- a/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ਬੈਕਸਪੇਸ"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"ਪਲਸ"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ਵੌਇਸਮੇਲ"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ਡਾਇਲ ਕਰੋ"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ਵੌਇਸਮੇਲ ਸਥਾਪਤ ਕਰਨ ਲਈ, ਮੀਨੂ &gt; ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-ਸਕਿੰਟ ਦਾ ਵਿਰਾਮ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="add_wait" msgid="2278146476349811062">"ਉਡੀਕ ਦਾ ਸਮਾਂ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ਸਪਰੱਸ਼ ਧੁਨੀ ਕੀ-ਪੈਡ ਵਰਤੋ"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ਜਾਰੀ ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ਸਿਮ ਕਾਰਡ ਤੋਂ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"ਸਿਮ ਕਾਰਡ ਸੰਪਰਕ"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ਇਸ ਨੰਬਰ \'ਤੇ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pl/strings.xml b/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
index b91c2c3..e3045b3 100644
--- a/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"usuń"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"poczta głosowa"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"wybierz numer"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Aby połączyć się z pocztą głosową, najpierw wyłącz tryb samolotowy."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Aby skonfigurować pocztę głosową, kliknij Menu &gt; Ustawienia."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj 2-sekundową pauzę"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Dodaj oczekiwanie"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Użyj klawiatury tonowej"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Wróć do aktywnego połączenia"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj połączenie"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Wczytuję z karty SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty z karty SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nie można zadzwonić pod ten numer"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
index f5d6b97..dc530fb 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"voltar"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"correio de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"discar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 segundos"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado multifrequencial"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Retornar para a chamada em espera"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adicionar chamada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Carregando do cartão SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contatos do cartão SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
index 8d98b07..aa39892 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"retrocesso"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"mensagem de correio de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para efetuar uma chamada para o correio de voz, desative primeiro o modo de avião."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, aceda a Menu &gt; Definições."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 seg."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utilizar teclado numérico com tons de toque"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Voltar à chamada em curso"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adic. cham."</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"A carregar a partir do cartão SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contactos do cartão SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
index f5d6b97..dc530fb 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"voltar"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"correio de voz"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"discar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 segundos"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado multifrequencial"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Retornar para a chamada em espera"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adicionar chamada"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Carregando do cartão SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Contatos do cartão SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ro/strings.xml b/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
index 9607506..87f4836 100644
--- a/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"tasta backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"mesaj vocal"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"apelați"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pentru a apela mesageria vocală, mai întâi dezactivați modul Avion."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pentru a configura mesageria vocală, accesați Meniu &gt; Setări."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Adăugați o pauză de 2 secunde"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Adăugați interval de așteptare"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tastatura tactilă cu sunet"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reveniți la apelul în curs"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adăugați un apel"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Se încarcă de pe cardul SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Agenda de pe cardul SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nu puteți apela acest număr"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ru/strings.xml b/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
index 5f1721d..24dd23c 100644
--- a/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"клавиша Backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"голосовая почта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"набор номера"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Сначала отключите режим полета."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Чтобы настроить голосовую почту, выберите \"Меню &gt; Настройки\"."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Добавить двухсекундную паузу"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Добавить паузу"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Открыть панель тонального набора"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вернуться к текущему вызову"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Добавить вызов"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Загрузка с SIM-карты…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Контакты на SIM-карте"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"На этот номер нельзя позвонить"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-si/strings.xml b/java/com/android/dialer/dialpadview/res/values-si/strings.xml
index 54ba2d7..f9c65b2 100644
--- a/java/com/android/dialer/dialpadview/res/values-si/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-si/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace බොත්තම"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"ධන"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"හඬ තැපෑල"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"අමතන්න"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"හඬ තැපෑල ඇමතීමට, මුලින්ම ගුවන්යානා ප්‍රකාරය වසන්න."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"හඬ තැපෑල පිහිටුවීමට, මෙනුව &gt; සැකසීම් වෙත යන්න."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"තත්පර 2ක විරාමයක් එක් කරන්න"</string>
+    <string name="add_wait" msgid="2278146476349811062">"රැඳී සිටීම එක් කරන්න"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ස්පර්ශ නාද යතුරුපෑඩය භාවිතා කරන්න"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"පවතින ඇමතුමට නැවත යන්න"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ඇමතුම එක් කරන්න"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM කාඩ්පතෙන් පූරණය කරමින්…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM කාඩ්පත් සම්බන්ධතා"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> අමතන්න"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"මෙම අංකයට ඇමතිය නොහැකිය"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sk/strings.xml b/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
index ed584ce..f8d2ae6 100644
--- a/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"spätné mazanie"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"hlasová správa"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"vytáčanie"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ak chcete volať hlasovú schránku, najprv vypnite režim v lietadle."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ak chcete nastaviť hlasovú schránku, prejdite na ponuku &gt; Nastavenia."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Pridať dvojsekundovú pauzu"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Pridať čakanie"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Použiť dotykovú tónovú klávesnicu"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vrátiť sa k prebiehajúcemu hovoru"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pridať hovor"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Načítava sa zo SIM karty..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty na SIM karte"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Volať na číslo <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Na toto číslo sa nedá zavolať"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sl/strings.xml b/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
index 795a023..e406034 100644
--- a/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"vračalka"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"sporočilo v odzivniku"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"pokliči"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Če želite poklicati odzivnik, najprej izklopite način za letalo."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Če želite nastaviti odzivnik, odprite »Meni« &gt; »Nastavitve«."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj 2 sekundi premora"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Dodaj čakanje"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Uporabi številčnico za tonsko izbiranje"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Nazaj na klic, ki poteka"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj klic"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Nalaganje s kartice SIM …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Stiki na kartici SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Te številke ni mogoče poklicati"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sq/strings.xml b/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
index 7eb6af5..fd11259 100644
--- a/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"kthim prapa"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"postë zanore"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"formo numrin"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Për të telefonuar postën zanore, në fillim çaktivizo modalitetin \"në aeroplan\"."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Për të konfiguruar postën zanore, shko te \"Menyja\" &gt; \"Cilësimet\"."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Shto një ndërprerje 2-sekondëshe"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Shto një pritje"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Përdor bllokun e tasteve me prekje"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kthehu te telefonata në vazhdim"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Shto telefonatë"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Po ngarkon nga karta SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontaktet e kartës SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Telefono <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ky numër nuk mund të telefonohet"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sr/strings.xml b/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
index fc9d941..7068813 100644
--- a/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плус"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"говорна пошта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"бирајте број"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Да бисте позвали говорну пошту, прво искључите режим рада у авиону."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Да бисте подесили говорну пошту, идите у Мени &gt; Подешавања."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Додај паузу од 2 секунде"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Додај чекање"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Користи тастатуру за тонско бирање"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Назад у позив који је у току"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додај позив"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Учитава се са SIM картице…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Контакти на SIM картици"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Није могуће позвати овај број"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sv/strings.xml b/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
index 7554b52..00524a8 100644
--- a/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backsteg"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"röstbrevlåda"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Om du vill ringa röstbrevlådan måste du först inaktivera flygplansläget."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Välj Meny &gt; Inställningar om du vill konfigurera röstbrevlådan."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Lägg till en paus på 2 sek."</string>
+    <string name="add_wait" msgid="2278146476349811062">"Lägg till väntetid"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Använd tonvalstelefon"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Återvänd till pågående samtal"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lägg till samtal"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI-kod"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Läser in från SIM-kort …"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter från SIM-kort"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Det går inte att ringa det här numret"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sw/strings.xml b/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
index 84479f0..98ed9ce 100644
--- a/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"nafasi ya nyuma"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"jumlisha"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ujumbe wa sauti"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"piga simu"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ili usikilize ujumbe wa sauti, kwanza zima Hali ya Ndegeni."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ili uweke mipangilio ya ujumbe wa sauti, nenda kwenye Menyu &gt; Mipangilio."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Ongeza usitishaji wa sekunde 2"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Ongeza muda wa kusubiri"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tumia kibao cha kuchapa cha sauti na kugusa"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Rudi kwenye simu inayoendelea"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ongeza simu"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Inapakia kutoka kwenye SIM kadi…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Anwani za SIM kadi"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Haiwezi kupiga simu kwa nambari hii"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ta/strings.xml b/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
index aad784b..667010d 100644
--- a/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"பேக்ஸ்பேஸ்"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"பிளஸ்"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"குரலஞ்சல்"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"டயல் பொத்தான்"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"குரலஞ்சலை அழைக்க, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"குரலஞ்சலை அமைக்க, மெனு &gt; அமைப்புகள் என்பதற்குச் செல்லவும்."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 வினாடி இடைநிறுத்தத்தைச் சேர்"</string>
+    <string name="add_wait" msgid="2278146476349811062">"காத்திருப்பைச் சேர்"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"டச் டோன் விசைத்தளத்தைப் பயன்படுத்து"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"செயலிலுள்ள அழைப்பிற்குத் திரும்பு"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"அழைப்பைச் சேர்"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"சிம் கார்டிலிருந்து ஏற்றுகிறது…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"சிம் கார்டு தொடர்புகள்"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> எண்ணை அழை"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"இந்த எண்ணை அழைக்க முடியாது"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-te/strings.xml b/java/com/android/dialer/dialpadview/res/values-te/strings.xml
index eced150..5e24667 100644
--- a/java/com/android/dialer/dialpadview/res/values-te/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-te/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"బ్యాక్‌స్పేస్"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"కూడిక"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"వాయిస్ మెయిల్"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"డయల్ చేయండి"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"వాయిస్ మెయిల్ కాల్ చేయడానికి, మొదట విమానం మోడ్‌ను ఆపివేయండి."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"వాయిస్ మెయిల్ సెటప్ చేయడానికి, మెను &gt; సెట్టింగ్‌లకు వెళ్లండి."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2-సెకన్ల పాజ్‌ను జోడించండి"</string>
+    <string name="add_wait" msgid="2278146476349811062">"నిరీక్షణ సమయాన్ని జోడించండి"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"టచ్ టోన్ కీప్యాడ్‌ను ఉపయోగించండి"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ప్రస్తుతం నడుస్తున్న కాల్‌కు తిరిగి వెళ్లండి"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"కాల్ జోడించండి"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"సిమ్ కార్డు నుండి లోడ్ చేస్తోంది…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM కార్డ్ పరిచయాలు"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g>కు కాల్ చేయండి"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ఈ నంబర్‌కు కాల్ చేయలేరు"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-th/strings.xml b/java/com/android/dialer/dialpadview/res/values-th/strings.xml
index db2c495..bb4cabd 100644
--- a/java/com/android/dialer/dialpadview/res/values-th/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-th/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"ลบถอยหลัง"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"บวก"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ข้อความเสียง"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"หมุนหมายเลข"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"หากต้องการฟังข้อความเสียง ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"หากต้องการตั้งค่าข้อความเสียง ให้ไปที่เมนู &gt; การตั้งค่า"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"เพิ่มช่วงคั่น 2 วินาที"</string>
+    <string name="add_wait" msgid="2278146476349811062">"เพิ่มการรอ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ใช้ปุ่มกดสัญญาณเสียง"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"กลับไปคุยสายต่อ"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"เพิ่มการโทร"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"กำลังโหลดจากซิมการ์ด…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"รายชื่อติดต่อในซิมการ์ด"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ไม่สามารถโทรไปยังหมายเลขนี้"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-tl/strings.xml b/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
index 223f81e..d23823e 100644
--- a/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"mag-dial"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Upang tumawag sa voicemail, i-off muna ang Airplane mode."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Upang mag-set up ng voicemail, pumunta sa Menu &gt; Mga Setting."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Magdagdag ng pag-pause na 2-seg"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Magdagdag ng paghihintay"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gumamit ng touch tone na keypad"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Bumalik sa kasalukuyang tawag"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Magdagdag ng tawag"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Naglo-load mula sa SIM card…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Mga contact sa SIM card"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Tawagan ang <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Hindi matawagan ang numerong ito"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-tr/strings.xml b/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
index ae81511..b7b8501 100644
--- a/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"geri tuşu"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"artı"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"sesli mesaj"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"telefonu arar"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Sesli mesajı aramak için öncelikle Uçak modunu kapatın."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Sesli mesajı yapılandırmak için Menü &gt; Ayarlar\'a gidin."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 saniyelik duraklama ekle"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Bekleme ekle"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Telefon tuş takımını kullan"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Devam eden çağrıya dön"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Çağrı ekle"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM karttan yükleniyor…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM kart kişileri"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Telefon et: <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu numara aranamaz"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-uk/strings.xml b/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
index 7841c4c..c862fce 100644
--- a/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"видалення символів перед курсором"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"голосова пошта"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"дзвонити"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Щоб перевірити голосову пошту, спочатку вимкніть режим польоту."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Щоб налаштувати голосову пошту, перейдіть у Меню &gt; Налаштування."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Додати 2-секундну паузу"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Додати паузу"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Використовувати тональний набір"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Повернутися до поточного виклику"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додати виклик"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Завантаження із SIM-карти…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Контакти із SIM-карти"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Зателефонувати на номер <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Не можна телефонувати на цей номер"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ur/strings.xml b/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
index 6a537be..a7db8ec 100644
--- a/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"بیک اسپیس"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"جمع"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"صوتی میل"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"ڈائل کریں"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"صوتی میل کو کال کرنے کیلئے، پہلے ہوائی جہاز طرز آف کریں۔"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"صوتی میل سیٹ کرنے کے لئے، مینو &gt; ترتیبات میں جائیں۔"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 سیکنڈ کا توقف شامل کریں"</string>
+    <string name="add_wait" msgid="2278146476349811062">"انتظار شامل کریں"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ٹچ ٹون کی پیڈ کا استعمال کریں"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"جاری کال پر واپس لوٹیں"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"کال شامل کریں"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏SIM کارڈ سے لوڈ ہو رہا ہے…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"‏SIM کارڈ کے رابطے"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> کو کال کریں"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"اس نمبر پر کال نہیں کر سکتے"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-uz/strings.xml b/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
index 6985893..2230c2c 100644
--- a/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"orqaga"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"qo‘shuv belgisi"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ovozli pochta"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"raqam terish"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ovozli pochtaga qo‘ng‘iroq qilish uchun parvoz rejimidan chiqing."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ovozli pochtani sozlab olish uchun Menyu &gt; Sozlamalarga o‘ting."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2 soniyalik pauza qo‘shish"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Pauza qo‘shish"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tovushli raqam tergichni ochish"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Davom etayotgan chaqiruvga qaytish"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Chaqiruv qo‘shish"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM kartadan yuklanmoqda…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM kartadagi kontaktlar"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> raqamiga qo‘ng‘iroq qilish"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu raqamga qo‘ng‘iroq qilib bo‘lmaydi"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-vi/strings.xml b/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
index e68a0b5..5022e79 100644
--- a/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"phím lùi"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"cộng"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"thư thoại"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"quay số"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Để gọi thư thoại, trước tiên hãy tắt Chế độ trên máy bay."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Để thiết lập thư thoại, hãy đi tới Menu &gt; Cài đặt."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Thêm tạm dừng 2 giây"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Thêm chờ"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Sử dụng bàn phím số cảm ứng có âm"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Quay lại cuộc gọi đang thực hiện"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Thêm cuộc gọi"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Đang tải từ thẻ SIM…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Danh bạ trên thẻ SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Không thể gọi số này"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
index 262362d..8d50e8e 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"删除"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"加号"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"语音邮件"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"拨号"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"要呼叫语音信箱，请先关闭飞行模式。"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"要设置语音信箱，请转到“菜单”&gt;“设置”。"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"加入 2 秒暂停时间"</string>
+    <string name="add_wait" msgid="2278146476349811062">"加入等待时间"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用按键式键盘"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回正在进行的通话"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"添加通话"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正从 SIM 卡中加载…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡联系人"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"无法拨打此号码"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
index e7bc606..320217b 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"退格鍵"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"加號"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"留言"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"撥號"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"如要致電留言信箱，請先關閉飛行模式。"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"如要設定留言信箱，請移至 [選單] &gt; [設定]。"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"新增 2 秒暫停功能"</string>
+    <string name="add_wait" msgid="2278146476349811062">"新增插播"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用觸控音頻鍵盤"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回進行中的通話"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"新增通話"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正在從 SIM 卡載入…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡聯絡人"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"無法撥打此號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
index 21d2b8b..b87048f 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"Backspace 鍵"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"加號"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"語音留言"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"撥號"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"如要撥打語音信箱聽取留言，請先關閉飛航模式。"</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"如要設定語音信箱，請依序前往 [選單] &gt; [設定]。"</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"新增 2 秒暫停功能"</string>
+    <string name="add_wait" msgid="2278146476349811062">"新增插播功能"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用觸控音鍵盤"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回進行中的通話"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"新增通話"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正在從 SIM 卡載入…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡聯絡人"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"無法撥打這個號碼"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zu/strings.xml b/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
index 458781f..6b1c5f5 100644
--- a/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"i-backspace"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"hlanganisa"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"ivoyisimeyili"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"dayela"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ukushayela i-voicemail, vala kuqala imodi Yendiza."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ukuya emyalezweni wephimbo, yana ezisethweni &gt; zemenyu."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"Faka ukumisa okwesikhashana kwamasekhondi angu-2"</string>
+    <string name="add_wait" msgid="2278146476349811062">"Yengeza ukulinda"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Sebenzisa ikhiphedi yethoni yokuthinta"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Buyela kukholi eqhubekayo"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Engeza ikholi"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ilayisha kusuka ekhadini le-SIM..."</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"Othintana nabo bekhadi le-SIM"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ayikwazi ukushayela le nombolo"</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/colors.xml b/java/com/android/dialer/dialpadview/res/values/colors.xml
index d27468d..8bea357 100644
--- a/java/com/android/dialer/dialpadview/res/values/colors.xml
+++ b/java/com/android/dialer/dialpadview/res/values/colors.xml
@@ -17,11 +17,9 @@
 <resources>
   <!-- Colors for the dialpad -->
   <color name="background_dialpad">#fcfcfc</color>
-  <color name="background_dialpad_pressed">#ececec</color>
   <color name="dialpad_primary_text_color">@color/dialer_theme_color</color>
   <color name="dialpad_secondary_text_color">#737373</color>
   <color name="dialpad_digits_text_color">#333</color>
-  <color name="dialpad_separator_line_color">#dadada</color>
   <color name="dialpad_icon_tint">#89000000</color>
   <color name="dialpad_voicemail_tint">#919191</color>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/dimens.xml b/java/com/android/dialer/dialpadview/res/values/dimens.xml
index 210c816..1e5880a 100644
--- a/java/com/android/dialer/dialpadview/res/values/dimens.xml
+++ b/java/com/android/dialer/dialpadview/res/values/dimens.xml
@@ -16,7 +16,7 @@
 
 <resources>
   <!-- Text dimensions for dialpad keys -->
-  <dimen name="dialpad_key_numbers_default_size">36sp</dimen>
+  <dimen name="dialpad_key_numbers_default_size">36dp</dimen>
   <dimen name="dialpad_key_letters_size">12sp</dimen>
   <dimen name="dialpad_key_pound_size">23sp</dimen>
   <dimen name="dialpad_key_star_size">36sp</dimen>
@@ -25,17 +25,13 @@
   <!-- Zero key should have less space between self and text because "+" is smaller -->
   <dimen name="dialpad_zero_key_number_default_margin_bottom">1dp</dimen>
   <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
-  <dimen name="dialpad_key_plus_size">18sp</dimen>
-  <dimen name="dialpad_horizontal_padding">5dp</dimen>
   <dimen name="dialpad_digits_text_size">34sp</dimen>
   <dimen name="dialpad_digits_text_min_size">24sp</dimen>
   <dimen name="dialpad_digits_height">60dp</dimen>
   <dimen name="dialpad_digits_padding">16dp</dimen>
   <dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
   <dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
-  <dimen name="dialpad_center_margin">3dp</dimen>
-  <dimen name="dialpad_button_margin">2dp</dimen>
-  <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
+  <dimen name="dialpad_voicemail_icon_size">18dp</dimen>
   <dimen name="dialpad_key_button_translate_y">100dp</dimen>
   <dimen name="dialpad_overflow_margin">8dp</dimen>
   <dimen name="dialpad_space_above_keys">14dp</dimen>
@@ -45,4 +41,7 @@
 
   <!-- Top/Bottom padding around the ILD rate display box. -->
   <dimen name="ild_margin_height">10dp</dimen>
+
+  <!-- Length of dialpad's shadows in dialer. -->
+  <dimen name="shadow_length">10dp</dimen>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/strings.xml b/java/com/android/dialer/dialpadview/res/values/strings.xml
index 920e6e2..b3e92f1 100644
--- a/java/com/android/dialer/dialpadview/res/values/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values/strings.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="dialpad_star_number" translatable="false">*</string>
   <string name="dialpad_pound_number" translatable="false">#</string>
 
@@ -50,4 +50,61 @@
   -->
   <string name="description_voicemail_button">voicemail</string>
 
+  <!-- String describing the Dial ImageButton
+
+         Used by AccessibilityService to announce the purpose of the button.
+    -->
+  <string name="description_dial_button">dial</string>
+
+  <!-- Dialog message which is shown when the user tries to check voicemail
+         while the system is in airplane mode. The user cannot access to
+         voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
+  <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
+
+  <!-- Dialog message which is shown when the user tries to check voicemail
+         while the system isn't ready for the access. [CHAR LIMIT=NONE] -->
+  <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
+
+  <!-- Menu items for dialpad options as part of Pause and Wait ftr [CHAR LIMIT=30] -->
+  <string name="add_2sec_pause">Add 2-sec pause</string>
+  <string name="add_wait">Add wait</string>
+
+  <!-- Item label: jump to the in-call DTMF dialpad.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+  <string name="dialer_useDtmfDialpad">Use touch tone keypad</string>
+
+  <!-- Item label: jump to the in-call UI.
+       (Part of a list of options shown in the dialer when another call
+       is already in progress.) -->
+  <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+
+  <!-- Item label: use the Dialer's keypad to add another call.
+       (Part of a list of options shown in the dialer when another call
+       is already in progress.) -->
+  <string name="dialer_addAnotherCall">Add call</string>
+
+  <!-- The title of a dialog that displays the IMEI of the phone -->
+  <string name="imei">IMEI</string>
+
+  <!-- The title of a dialog that displays the MEID of the CDMA phone -->
+  <string name="meid">MEID</string>
+
+  <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial -->
+  <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
+
+  <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial -->
+  <string name="simContacts_title">SIM card contacts</string>
+
+  <!-- Menu item used to call a contact, containing the number of the contact to call -->
+  <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string>
+
+
+  <!-- Regular expression for prohibiting certain phone numbers in dialpad.
+       Ignored if empty. -->
+  <string name="config_prohibited_phone_number_regexp" translatable="false"></string>
+
+  <!-- Dialog message which is shown when the user tries to make a phone call
+       to prohibited phone numbers [CHAR LIMIT=NONE] -->
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallCapabilities.java b/java/com/android/dialer/enrichedcall/EnrichedCallCapabilities.java
index c3c78c9..32054e8 100644
--- a/java/com/android/dialer/enrichedcall/EnrichedCallCapabilities.java
+++ b/java/com/android/dialer/enrichedcall/EnrichedCallCapabilities.java
@@ -22,18 +22,53 @@
 @AutoValue
 public abstract class EnrichedCallCapabilities {
 
-  public static final EnrichedCallCapabilities NO_CAPABILITIES =
-      EnrichedCallCapabilities.create(false, false, false);
+  public static final EnrichedCallCapabilities NO_CAPABILITIES = builder().build();
 
-  public static EnrichedCallCapabilities create(
-      boolean supportsCallComposer, boolean supportsPostCall, boolean supportsVideoCall) {
-    return new AutoValue_EnrichedCallCapabilities(
-        supportsCallComposer, supportsPostCall, supportsVideoCall);
+  public static final EnrichedCallCapabilities ALL_CAPABILITIES =
+      builder()
+          .setCallComposerCapable(true)
+          .setPostCallCapable(true)
+          .setVideoShareCapable(true)
+          .build();
+
+  public abstract boolean isCallComposerCapable();
+
+  public abstract boolean isPostCallCapable();
+
+  public abstract boolean isVideoShareCapable();
+
+  public abstract Builder toBuilder();
+
+  /**
+   * Returns {@code true} if these capabilities represent those of a user that is temporarily
+   * unavailable. This is an indication that capabilities should be refreshed.
+   */
+  public abstract boolean isTemporarilyUnavailable();
+
+  /**
+   * Creates an instance of {@link Builder}.
+   *
+   * <p>Unless otherwise set, all fields will default to false.
+   */
+  public static Builder builder() {
+    return new AutoValue_EnrichedCallCapabilities.Builder()
+        .setCallComposerCapable(false)
+        .setPostCallCapable(false)
+        .setVideoShareCapable(false)
+        .setTemporarilyUnavailable(false);
   }
 
-  public abstract boolean supportsCallComposer();
+  /** Creates instances of {@link EnrichedCallCapabilities}. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+    public abstract Builder setCallComposerCapable(boolean isCapable);
 
-  public abstract boolean supportsPostCall();
+    public abstract Builder setPostCallCapable(boolean isCapable);
 
-  public abstract boolean supportsVideoShare();
+    public abstract Builder setVideoShareCapable(boolean isCapable);
+
+    public abstract Builder setTemporarilyUnavailable(boolean temporarilyUnavailable);
+
+    public abstract EnrichedCallCapabilities build();
+  }
 }
diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java
index 0d3ed9e..0606a00 100644
--- a/java/com/android/dialer/enrichedcall/EnrichedCallManager.java
+++ b/java/com/android/dialer/enrichedcall/EnrichedCallManager.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.enrichedcall;
 
-import android.support.annotation.IntDef;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -24,9 +23,8 @@
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.enrichedcall.videoshare.VideoShareListener;
+import com.android.dialer.enrichedcall.videoshare.VideoShareSession;
 import com.android.dialer.multimedia.MultimediaData;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.List;
 import java.util.Map;
 
@@ -81,27 +79,6 @@
   @MainThread
   void clearCachedData();
 
-  /** Possible states for call composer sessions. */
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    STATE_NONE,
-    STATE_STARTING,
-    STATE_STARTED,
-    STATE_START_FAILED,
-    STATE_MESSAGE_SENT,
-    STATE_MESSAGE_FAILED,
-    STATE_CLOSED,
-  })
-  @interface State {}
-
-  int STATE_NONE = 0;
-  int STATE_STARTING = STATE_NONE + 1;
-  int STATE_STARTED = STATE_STARTING + 1;
-  int STATE_START_FAILED = STATE_STARTED + 1;
-  int STATE_MESSAGE_SENT = STATE_START_FAILED + 1;
-  int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1;
-  int STATE_CLOSED = STATE_MESSAGE_FAILED + 1;
-
   /**
    * Starts a call composer session with the given remote number.
    *
@@ -119,7 +96,7 @@
    * @param sessionId the id for the session. See {@link #startCallComposerSession(String)}
    * @param data the {@link MultimediaData}
    * @throws IllegalArgumentException if there's no open session with the given number
-   * @throws IllegalStateException if the session isn't in the {@link #STATE_STARTED} state
+   * @throws IllegalStateException if the session isn't in the {@link Session#STATE_STARTED} state
    */
   @MainThread
   void sendCallComposerData(long sessionId, @NonNull MultimediaData data);
@@ -185,12 +162,49 @@
   @Nullable
   Session getSession(long sessionId);
 
+  /**
+   * Returns a list containing viewable string representations of all existing sessions.
+   *
+   * <p>Intended for debug display purposes only.
+   */
+  @MainThread
+  @NonNull
+  List<String> getAllSessionsForDisplay();
+
   @NonNull
   Filter createIncomingCallComposerFilter();
 
   @NonNull
   Filter createOutgoingCallComposerFilter();
 
+  /** Receives updates when the state of an historical data changes. */
+  interface HistoricalDataChangedListener {
+
+    /**
+     * Callback fired when historical data changes. Listeners should call {@link
+     * #getAllHistoricalData(String, CallDetailsEntries)} to retrieve the new data.
+     */
+    void onHistoricalDataChanged();
+  }
+
+  /**
+   * Registers the given {@link HistoricalDataChangedListener}.
+   *
+   * <p>As a result of this method, the listener will receive updates when the state of any enriched
+   * call historical data changes.
+   */
+  @MainThread
+  void registerHistoricalDataChangedListener(@NonNull HistoricalDataChangedListener listener);
+
+  /**
+   * Unregisters the given {@link HistoricalDataChangedListener}.
+   *
+   * <p>As a result of this method, the listener will not receive updates when the state of enriched
+   * call historical data changes.
+   */
+  @MainThread
+  void unregisterHistoricalDataChangedListener(@NonNull HistoricalDataChangedListener listener);
+
   /**
    * Starts an asynchronous process to get all historical data for the given number and set of
    * {@link CallDetailsEntries}.
@@ -212,6 +226,10 @@
   Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData(
       @NonNull String number, @NonNull CallDetailsEntries entries);
 
+  /** Returns true if any enriched calls have been made or received. */
+  @MainThread
+  boolean hasStoredData();
+
   /**
    * Unregisters the given {@link StateChangedListener}.
    *
@@ -310,6 +328,14 @@
   long getVideoShareInviteSessionId(@NonNull String number);
 
   /**
+   * Returns the {@link VideoShareSession} for the given sessionId, or {@code null} if no session
+   * exists.
+   */
+  @MainThread
+  @Nullable
+  VideoShareSession getVideoShareSession(long sessionId);
+
+  /**
    * Ends the given video share session.
    *
    * @param sessionId the id of the session to end
diff --git a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
index 250c643..6f4d975 100644
--- a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
+++ b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java
@@ -16,20 +16,50 @@
 package com.android.dialer.enrichedcall;
 
 import android.support.annotation.NonNull;
-import com.android.dialer.common.Assert;
 
 /** Utility for comparing phone numbers. */
 public class FuzzyPhoneNumberMatcher {
 
-  /** Returns {@code true} if the given numbers can be interpreted to be the same. */
-  public static boolean matches(@NonNull String a, @NonNull String b) {
-    String aNormalized = Assert.isNotNull(a).replaceAll("[^0-9]", "");
-    String bNormalized = Assert.isNotNull(b).replaceAll("[^0-9]", "");
-    if (aNormalized.length() < 7 || bNormalized.length() < 7) {
-      return false;
+  private static final int REQUIRED_MATCHED_DIGITS = 7;
+
+  /**
+   * Returns {@code true} if the given numbers can be interpreted to be the same.
+   *
+   * <p>This method is called numerous times when rendering the call log. Using string methods is
+   * too slow, so character by character matching is used instead.
+   */
+  public static boolean matches(@NonNull String lhs, @NonNull String rhs) {
+    return lastSevenDigitsCharacterByCharacterMatches(lhs, rhs);
+  }
+
+  /**
+   * This strategy examines the numbers character by character starting from the end. If the last
+   * {@link #REQUIRED_MATCHED_DIGITS} match, it returns {@code true}.
+   */
+  private static boolean lastSevenDigitsCharacterByCharacterMatches(
+      @NonNull String lhs, @NonNull String rhs) {
+    int lhsIndex = lhs.length() - 1;
+    int rhsIndex = rhs.length() - 1;
+
+    int matchedDigits = 0;
+
+    while (lhsIndex >= 0 && rhsIndex >= 0) {
+      if (!Character.isDigit(lhs.charAt(lhsIndex))) {
+        --lhsIndex;
+        continue;
+      }
+      if (!Character.isDigit(rhs.charAt(rhsIndex))) {
+        --rhsIndex;
+        continue;
+      }
+      if (lhs.charAt(lhsIndex) != rhs.charAt(rhsIndex)) {
+        break;
+      }
+      --lhsIndex;
+      --rhsIndex;
+      ++matchedDigits;
     }
-    String aMatchable = aNormalized.substring(aNormalized.length() - 7);
-    String bMatchable = bNormalized.substring(bNormalized.length() - 7);
-    return aMatchable.equals(bMatchable);
+
+    return matchedDigits >= REQUIRED_MATCHED_DIGITS;
   }
 }
diff --git a/java/com/android/dialer/enrichedcall/Session.java b/java/com/android/dialer/enrichedcall/Session.java
index b3f2914..06837e3 100644
--- a/java/com/android/dialer/enrichedcall/Session.java
+++ b/java/com/android/dialer/enrichedcall/Session.java
@@ -16,14 +16,37 @@
 
 package com.android.dialer.enrichedcall;
 
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import com.android.dialer.enrichedcall.EnrichedCallManager.State;
 import com.android.dialer.multimedia.MultimediaData;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /** Holds state information and data about enriched calling sessions. */
 public interface Session {
 
+  /** Possible states for call composer sessions. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    STATE_NONE,
+    STATE_STARTING,
+    STATE_STARTED,
+    STATE_START_FAILED,
+    STATE_MESSAGE_SENT,
+    STATE_MESSAGE_FAILED,
+    STATE_CLOSED,
+  })
+  @interface State {}
+
+  int STATE_NONE = 0;
+  int STATE_STARTING = STATE_NONE + 1;
+  int STATE_STARTED = STATE_STARTING + 1;
+  int STATE_START_FAILED = STATE_STARTED + 1;
+  int STATE_MESSAGE_SENT = STATE_START_FAILED + 1;
+  int STATE_MESSAGE_FAILED = STATE_MESSAGE_SENT + 1;
+  int STATE_CLOSED = STATE_MESSAGE_FAILED + 1;
+
   /** Id used for sessions that fail to start. */
   long NO_SESSION_ID = -1;
 
diff --git a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java
index 8a4f640..5d90829 100644
--- a/java/com/android/dialer/enrichedcall/extensions/StateExtension.java
+++ b/java/com/android/dialer/enrichedcall/extensions/StateExtension.java
@@ -18,8 +18,8 @@
 
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.EnrichedCallManager.State;
+import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.enrichedcall.Session.State;
 
 /** Extends the {@link State} to include a toString method. */
 public class StateExtension {
@@ -27,25 +27,25 @@
   /** Returns the string representation for the given {@link State}. */
   @NonNull
   public static String toString(@State int callComposerState) {
-    if (callComposerState == EnrichedCallManager.STATE_NONE) {
+    if (callComposerState == Session.STATE_NONE) {
       return "STATE_NONE";
     }
-    if (callComposerState == EnrichedCallManager.STATE_STARTING) {
+    if (callComposerState == Session.STATE_STARTING) {
       return "STATE_STARTING";
     }
-    if (callComposerState == EnrichedCallManager.STATE_STARTED) {
+    if (callComposerState == Session.STATE_STARTED) {
       return "STATE_STARTED";
     }
-    if (callComposerState == EnrichedCallManager.STATE_START_FAILED) {
+    if (callComposerState == Session.STATE_START_FAILED) {
       return "STATE_START_FAILED";
     }
-    if (callComposerState == EnrichedCallManager.STATE_MESSAGE_SENT) {
+    if (callComposerState == Session.STATE_MESSAGE_SENT) {
       return "STATE_MESSAGE_SENT";
     }
-    if (callComposerState == EnrichedCallManager.STATE_MESSAGE_FAILED) {
+    if (callComposerState == Session.STATE_MESSAGE_FAILED) {
       return "STATE_MESSAGE_FAILED";
     }
-    if (callComposerState == EnrichedCallManager.STATE_CLOSED) {
+    if (callComposerState == Session.STATE_CLOSED) {
       return "STATE_CLOSED";
     }
     Assert.checkArgument(false, "Unexpected callComposerState: %d", callComposerState);
diff --git a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto
index 62d013a..8efb35c 100644
--- a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto
+++ b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto
@@ -4,6 +4,7 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
 package com.android.dialer.enrichedcall.historyquery.proto;
 
 // Holds data that was used in an enrichedcall in the past
diff --git a/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml
new file mode 100644
index 0000000..003ff19
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<!--
+ ~ 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
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.calldetails">
+  <application android:theme="@style/Theme.AppCompat">
+    <activity
+        android:label="@string/enriched_call_simulator_activity"
+        android:name="com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity"
+        android:theme="@style/DialerThemeBase.NoActionBar">
+    </activity>
+  </application>
+</manifest>
diff --git a/java/com/android/dialer/enrichedcall/simulator/EnrichedCallSimulatorActivity.java b/java/com/android/dialer/enrichedcall/simulator/EnrichedCallSimulatorActivity.java
new file mode 100644
index 0000000..bbc1ada
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/EnrichedCallSimulatorActivity.java
@@ -0,0 +1,110 @@
+/*
+ * 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.enrichedcall.simulator;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.enrichedcall.EnrichedCallManager.StateChangedListener;
+
+/**
+ * Activity used to display Enriched call sessions that are currently in memory, and create new
+ * outgoing sessions with various bits of data.
+ *
+ * <p>This activity will dynamically refresh as new sessions are added or updated, but there's no
+ * update when sessions are deleted from memory. Use the refresh button to update the view.
+ */
+public class EnrichedCallSimulatorActivity extends AppCompatActivity
+    implements StateChangedListener, OnClickListener {
+
+  public static Intent newIntent(@NonNull Context context) {
+    return new Intent(Assert.isNotNull(context), EnrichedCallSimulatorActivity.class);
+  }
+
+  private Button refreshButton;
+
+  private SessionsAdapter sessionsAdapter;
+
+  @Override
+  protected void onCreate(@Nullable Bundle bundle) {
+    LogUtil.enterBlock("EnrichedCallSimulatorActivity.onCreate");
+    super.onCreate(bundle);
+    setContentView(R.layout.enriched_call_simulator_activity);
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    toolbar.setTitle(R.string.enriched_call_simulator_activity);
+
+    refreshButton = findViewById(R.id.refresh);
+    refreshButton.setOnClickListener(this);
+
+    RecyclerView recyclerView = findViewById(R.id.sessions_recycler_view);
+    recyclerView.setLayoutManager(new LinearLayoutManager(this));
+
+    sessionsAdapter = new SessionsAdapter();
+    sessionsAdapter.setSessionStrings(getEnrichedCallManager().getAllSessionsForDisplay());
+    recyclerView.setAdapter(sessionsAdapter);
+  }
+
+  @Override
+  protected void onResume() {
+    LogUtil.enterBlock("EnrichedCallSimulatorActivity.onResume");
+    super.onResume();
+    getEnrichedCallManager().registerStateChangedListener(this);
+  }
+
+  @Override
+  protected void onPause() {
+    LogUtil.enterBlock("EnrichedCallSimulatorActivity.onPause");
+    super.onPause();
+    getEnrichedCallManager().unregisterStateChangedListener(this);
+  }
+
+  @Override
+  public void onEnrichedCallStateChanged() {
+    LogUtil.enterBlock("EnrichedCallSimulatorActivity.onEnrichedCallStateChanged");
+    refreshSessions();
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (v == refreshButton) {
+      LogUtil.i("EnrichedCallSimulatorActivity.onClick", "refreshing sessions");
+      refreshSessions();
+    }
+  }
+
+  private void refreshSessions() {
+    sessionsAdapter.setSessionStrings(getEnrichedCallManager().getAllSessionsForDisplay());
+    sessionsAdapter.notifyDataSetChanged();
+  }
+
+  private EnrichedCallManager getEnrichedCallManager() {
+    return EnrichedCallComponent.get(this).getEnrichedCallManager();
+  }
+}
diff --git a/java/com/android/dialer/enrichedcall/simulator/SessionViewHolder.java b/java/com/android/dialer/enrichedcall/simulator/SessionViewHolder.java
new file mode 100644
index 0000000..4443125
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/SessionViewHolder.java
@@ -0,0 +1,37 @@
+/*
+ * 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.enrichedcall.simulator;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+/** ViewHolder for an Enriched call session. */
+class SessionViewHolder extends RecyclerView.ViewHolder {
+
+  private final TextView sessionStringView;
+
+  SessionViewHolder(View view) {
+    super(view);
+    sessionStringView = view.findViewById(R.id.session_string);
+  }
+
+  void updateSession(@NonNull String sessionString) {
+    sessionStringView.setText(sessionString);
+  }
+}
diff --git a/java/com/android/dialer/enrichedcall/simulator/SessionsAdapter.java b/java/com/android/dialer/enrichedcall/simulator/SessionsAdapter.java
new file mode 100644
index 0000000..25edfc7
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/SessionsAdapter.java
@@ -0,0 +1,51 @@
+/*
+ * 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.enrichedcall.simulator;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import com.android.dialer.common.Assert;
+import java.util.List;
+
+/** Adapter for the RecyclerView in {@link EnrichedCallSimulatorActivity}. */
+class SessionsAdapter extends RecyclerView.Adapter<SessionViewHolder> {
+
+  /** List of the string representation of all in-memory sessions */
+  private List<String> sessionStrings;
+
+  void setSessionStrings(@NonNull List<String> sessionStrings) {
+    this.sessionStrings = Assert.isNotNull(sessionStrings);
+  }
+
+  @Override
+  public SessionViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+    LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+    return new SessionViewHolder(inflater.inflate(R.layout.session_view_holder, viewGroup, false));
+  }
+
+  @Override
+  public void onBindViewHolder(SessionViewHolder viewHolder, int i) {
+    viewHolder.updateSession(sessionStrings.get(i));
+  }
+
+  @Override
+  public int getItemCount() {
+    return sessionStrings.size();
+  }
+}
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/layout/enriched_call_simulator_activity.xml b/java/com/android/dialer/enrichedcall/simulator/res/layout/enriched_call_simulator_activity.xml
new file mode 100644
index 0000000..be9aa7d
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/layout/enriched_call_simulator_activity.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+  <com.android.dialer.widget.DialerToolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+
+  <android.support.v7.widget.RecyclerView
+      android:id="@+id/sessions_recycler_view"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1"/>
+
+  <Button
+      android:id="@+id/refresh"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/refresh"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/layout/session_view_holder.xml b/java/com/android/dialer/enrichedcall/simulator/res/layout/session_view_holder.xml
new file mode 100644
index 0000000..65543bd
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/layout/session_view_holder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/session_string"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="2dp"/>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values/strings.xml
new file mode 100644
index 0000000..06b0465
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <string name="enriched_call_simulator_activity" translatable="false">Enriched Call Simulator Activity</string>
+
+  <string name="refresh" translatable="false">refresh</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java
index 0540d91..87d99de 100644
--- a/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java
+++ b/java/com/android/dialer/enrichedcall/stub/EnrichedCallManagerStub.java
@@ -27,7 +27,9 @@
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.enrichedcall.videoshare.VideoShareListener;
+import com.android.dialer.enrichedcall.videoshare.VideoShareSession;
 import com.android.dialer.multimedia.MultimediaData;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -85,6 +87,14 @@
     return null;
   }
 
+  @MainThread
+  @NonNull
+  @Override
+  public List<String> getAllSessionsForDisplay() {
+    Assert.isMainThread();
+    return Collections.emptyList();
+  }
+
   @NonNull
   @Override
   public Filter createIncomingCallComposerFilter() {
@@ -97,6 +107,14 @@
     return session -> false;
   }
 
+  @Override
+  public void registerHistoricalDataChangedListener(
+      @NonNull HistoricalDataChangedListener listener) {}
+
+  @Override
+  public void unregisterHistoricalDataChangedListener(
+      @NonNull HistoricalDataChangedListener listener) {}
+
   @Nullable
   @Override
   @MainThread
@@ -106,6 +124,12 @@
     return null;
   }
 
+  @Override
+  public boolean hasStoredData() {
+    Assert.isMainThread();
+    return false;
+  }
+
   @MainThread
   @Override
   public void requestAllHistoricalData(
@@ -154,6 +178,14 @@
     return Session.NO_SESSION_ID;
   }
 
+  @MainThread
+  @Nullable
+  @Override
+  public VideoShareSession getVideoShareSession(long sessionId) {
+    Assert.isMainThread();
+    return null;
+  }
+
   @Override
   public void endVideoShareSession(long sessionId) {}
 }
diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java
index f24724a..0e5f79f 100644
--- a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java
+++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.android.dialer.enrichedcall.videoshare;
 
 import android.support.annotation.MainThread;
diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java
new file mode 100644
index 0000000..b0f24ff
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareSession.java
@@ -0,0 +1,39 @@
+/*
+ * 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.enrichedcall.videoshare;
+
+import android.support.annotation.NonNull;
+import android.view.SurfaceView;
+
+/** Holds state information and data about video share sessions. */
+public interface VideoShareSession {
+  void setSessionId(long sessionId);
+
+  long getSessionId();
+
+  int getState();
+
+  void pause();
+
+  void unpause();
+
+  void dispose();
+
+  void setSurfaceView(@NonNull SurfaceView surfaceView);
+
+  void setCamera(String cameraId);
+}
diff --git a/java/com/android/dialer/function/Supplier.java b/java/com/android/dialer/function/Supplier.java
new file mode 100644
index 0000000..1a16183
--- /dev/null
+++ b/java/com/android/dialer/function/Supplier.java
@@ -0,0 +1,23 @@
+/*
+ * 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.function;
+
+/** Functional interface for supplying generic values. */
+public interface Supplier<T> {
+
+  /** Supplies a value. */
+  T get();
+}
diff --git a/java/com/android/dialer/inject/ApplicationContext.java b/java/com/android/dialer/inject/ApplicationContext.java
new file mode 100644
index 0000000..913e36e
--- /dev/null
+++ b/java/com/android/dialer/inject/ApplicationContext.java
@@ -0,0 +1,22 @@
+/*
+ * 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.inject;
+
+import javax.inject.Qualifier;
+
+/** Annotation for retrieving the application context. */
+@Qualifier
+public @interface ApplicationContext {}
diff --git a/java/com/android/dialer/inject/ContextModule.java b/java/com/android/dialer/inject/ContextModule.java
index aa83f01..e3da08e 100644
--- a/java/com/android/dialer/inject/ContextModule.java
+++ b/java/com/android/dialer/inject/ContextModule.java
@@ -22,17 +22,18 @@
 import dagger.Module;
 import dagger.Provides;
 
-/** Provides the singleton context object. */
+/** Provides the singleton application context object. */
 @Module
 public final class ContextModule {
 
   @NonNull private final Context context;
 
-  public ContextModule(@NonNull Context context) {
-    this.context = Assert.isNotNull(context);
+  public ContextModule(@NonNull Context appContext) {
+    this.context = Assert.isNotNull(appContext);
   }
 
   @Provides
+  @ApplicationContext
   Context provideContext() {
     return context;
   }
diff --git a/java/com/android/dialer/interactions/PhoneNumberInteraction.java b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
index 52f9d20..c42be42 100644
--- a/java/com/android/dialer/interactions/PhoneNumberInteraction.java
+++ b/java/com/android/dialer/interactions/PhoneNumberInteraction.java
@@ -15,7 +15,6 @@
  */
 package com.android.dialer.interactions;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -28,7 +27,6 @@
 import android.content.Intent;
 import android.content.Loader;
 import android.content.Loader.OnLoadCompleteListener;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -42,7 +40,6 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -54,16 +51,21 @@
 import com.android.contacts.common.Collapser.Collapsible;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.InteractionEvent;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.TransactionSafeActivity;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -181,6 +183,7 @@
         intent =
             new CallIntentBuilder(phoneNumber, callSpecificAppData)
                 .setIsVideoCall(isVideoCall)
+                .setAllowAssistedDial(callSpecificAppData.getAllowAssistedDialing())
                 .build();
         break;
     }
@@ -218,20 +221,27 @@
     // It's possible for a shortcut to have been created, and then permissions revoked. To avoid a
     // crash when the user tries to use such a shortcut, check for this condition and ask the user
     // for the permission.
-    if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE)
-        != PackageManager.PERMISSION_GRANTED) {
-      LogUtil.i("PhoneNumberInteraction.startInteraction", "No phone permissions");
+    String[] deniedPhonePermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            mContext, PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+    if (deniedPhonePermissions.length > 0) {
+      LogUtil.i(
+          "PhoneNumberInteraction.startInteraction",
+          "Need phone permissions: " + Arrays.toString(deniedPhonePermissions));
       ActivityCompat.requestPermissions(
-          (Activity) mContext, new String[] {Manifest.permission.CALL_PHONE}, REQUEST_CALL_PHONE);
+          (Activity) mContext, deniedPhonePermissions, REQUEST_CALL_PHONE);
       return;
     }
-    if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.READ_CONTACTS)
-        != PackageManager.PERMISSION_GRANTED) {
-      LogUtil.i("PhoneNumberInteraction.startInteraction", "No contact permissions");
+
+    String[] deniedContactsPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            mContext, PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedContactsPermissions.length > 0) {
+      LogUtil.i(
+          "PhoneNumberInteraction.startInteraction",
+          "Need contact permissions: " + Arrays.toString(deniedContactsPermissions));
       ActivityCompat.requestPermissions(
-          (Activity) mContext,
-          new String[] {Manifest.permission.READ_CONTACTS},
-          REQUEST_READ_CONTACTS);
+          (Activity) mContext, deniedContactsPermissions, REQUEST_READ_CONTACTS);
       return;
     }
 
@@ -543,6 +553,12 @@
         final PhoneItem phoneItem = mPhoneList.get(which);
         final CheckBox checkBox = (CheckBox) alertDialog.findViewById(R.id.setPrimary);
         if (checkBox.isChecked()) {
+          if (mCallSpecificAppData.getCallInitiationType() == CallInitiationType.Type.SPEED_DIAL) {
+            Logger.get(getContext())
+                .logInteraction(
+                    InteractionEvent.Type.SPEED_DIAL_SET_DEFAULT_NUMBER_FOR_AMBIGUOUS_CONTACT);
+          }
+
           // Request to mark the data as primary in the background.
           final Intent serviceIntent =
               ContactUpdateService.createSetSuperPrimaryIntent(activity, phoneItem.id);
diff --git a/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml b/java/com/android/dialer/interactions/res/layout/phone_disambig_item.xml
old mode 100644
new mode 100755
diff --git a/java/com/android/dialer/interactions/res/values-bs/strings.xml b/java/com/android/dialer/interactions/res/values-bs/strings.xml
index d7434f8..24601b5 100644
--- a/java/com/android/dialer/interactions/res/values-bs/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-bs/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Izaberite broj"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Izaberite broj"</string>
+    <string name="sms_disambig_title" msgid="369677069797534410">"Odaberite broj"</string>
+    <string name="call_disambig_title" msgid="2395382326030227603">"Odaberite broj"</string>
     <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-uz/strings.xml b/java/com/android/dialer/interactions/res/values-uz/strings.xml
index 7eb8175..026198c 100644
--- a/java/com/android/dialer/interactions/res/values-uz/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-uz/strings.xml
@@ -19,5 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sms_disambig_title" msgid="369677069797534410">"Raqamni tanlang"</string>
     <string name="call_disambig_title" msgid="2395382326030227603">"Raqamni tanlang"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Ushbu tanlov eslab qolinsin"</string>
+    <string name="make_primary" msgid="9069345357862475091">"Bu tanlov eslab qolinsin"</string>
 </resources>
diff --git a/java/com/android/dialer/lettertile/AndroidManifest.xml b/java/com/android/dialer/lettertile/AndroidManifest.xml
new file mode 100644
index 0000000..dce6806
--- /dev/null
+++ b/java/com/android/dialer/lettertile/AndroidManifest.xml
@@ -0,0 +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.lettertile">
+</manifest>
diff --git a/java/com/android/dialer/lettertile/LetterTileDrawable.java b/java/com/android/dialer/lettertile/LetterTileDrawable.java
new file mode 100644
index 0000000..c8b75c5
--- /dev/null
+++ b/java/com/android/dialer/lettertile/LetterTileDrawable.java
@@ -0,0 +1,439 @@
+/*
+ * Copyright (C) 2013 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.lettertile;
+
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Outline;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.telecom.TelecomManager;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A drawable that encapsulates all the functionality needed to display a letter tile to represent a
+ * contact image.
+ */
+public class LetterTileDrawable extends Drawable {
+
+  /**
+   * ContactType indicates the avatar type of the contact. For a person or for the default when no
+   * name is provided, it is {@link #TYPE_DEFAULT}, otherwise, for a business it is {@link
+   * #TYPE_BUSINESS}, and voicemail contacts should use {@link #TYPE_VOICEMAIL}.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({TYPE_PERSON, TYPE_BUSINESS, TYPE_VOICEMAIL, TYPE_GENERIC_AVATAR, TYPE_SPAM})
+  public @interface ContactType {}
+
+  /** Contact type constants */
+  public static final int TYPE_PERSON = 1;
+
+  public static final int TYPE_BUSINESS = 2;
+  public static final int TYPE_VOICEMAIL = 3;
+  /**
+   * A generic avatar that features the default icon, default color, and no letter. Useful for
+   * situations where a contact is anonymous.
+   */
+  public static final int TYPE_GENERIC_AVATAR = 4;
+
+  public static final int TYPE_SPAM = 5;
+  public static final int TYPE_CONFERENCE = 6;
+  @ContactType public static final int TYPE_DEFAULT = TYPE_PERSON;
+
+  /**
+   * Shape indicates the letter tile shape. It can be either a {@link #SHAPE_CIRCLE}, otherwise, it
+   * is a {@link #SHAPE_RECTANGLE}.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({SHAPE_CIRCLE, SHAPE_RECTANGLE})
+  public @interface Shape {}
+
+  /** Shape constants */
+  public static final int SHAPE_CIRCLE = 1;
+
+  public static final int SHAPE_RECTANGLE = 2;
+
+  /** 54% opacity */
+  private static final int ALPHA = 138;
+  /** 100% opacity */
+  private static final int SPAM_ALPHA = 255;
+  /** Default icon scale for vector drawable. */
+  private static final float VECTOR_ICON_SCALE = 0.7f;
+
+  /** Reusable components to avoid new allocations */
+  private final Paint mPaint = new Paint();
+
+  private final Rect mRect = new Rect();
+  private final char[] mFirstChar = new char[1];
+
+  /** Letter tile */
+  @NonNull private final TypedArray mColors;
+
+  private final int mSpamColor;
+  private final int mDefaultColor;
+  private final int mTileFontColor;
+  private final float mLetterToTileRatio;
+  @NonNull private final Drawable mDefaultPersonAvatar;
+  @NonNull private final Drawable mDefaultBusinessAvatar;
+  @NonNull private final Drawable mDefaultVoicemailAvatar;
+  @NonNull private final Drawable mDefaultSpamAvatar;
+  @NonNull private final Drawable mDefaultConferenceAvatar;
+
+  @ContactType private int mContactType = TYPE_DEFAULT;
+  private float mScale = 1.0f;
+  private float mOffset = 0.0f;
+  private boolean mIsCircle = false;
+
+  private int mColor;
+  private Character mLetter = null;
+
+  private String mDisplayName;
+
+  public LetterTileDrawable(final Resources res) {
+    mColors = res.obtainTypedArray(R.array.letter_tile_colors);
+    mSpamColor = res.getColor(R.color.spam_contact_background);
+    mDefaultColor = res.getColor(R.color.letter_tile_default_color);
+    mTileFontColor = res.getColor(R.color.letter_tile_font_color);
+    mLetterToTileRatio = res.getFraction(R.dimen.letter_to_tile_ratio, 1, 1);
+    mDefaultPersonAvatar =
+        res.getDrawable(R.drawable.product_logo_avatar_anonymous_white_color_120, null);
+    mDefaultBusinessAvatar = res.getDrawable(R.drawable.quantum_ic_business_vd_theme_24, null);
+    mDefaultVoicemailAvatar = res.getDrawable(R.drawable.quantum_ic_voicemail_vd_theme_24, null);
+    mDefaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null);
+    mDefaultConferenceAvatar = res.getDrawable(R.drawable.quantum_ic_group_vd_theme_24, null);
+
+    mPaint.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
+    mPaint.setTextAlign(Align.CENTER);
+    mPaint.setAntiAlias(true);
+    mPaint.setFilterBitmap(true);
+    mPaint.setDither(true);
+    mColor = mDefaultColor;
+  }
+
+  private Rect getScaledBounds(float scale, float offset) {
+    // The drawable should be drawn in the middle of the canvas without changing its width to
+    // height ratio.
+    final Rect destRect = copyBounds();
+    // Crop the destination bounds into a square, scaled and offset as appropriate
+    final int halfLength = (int) (scale * Math.min(destRect.width(), destRect.height()) / 2);
+
+    destRect.set(
+        destRect.centerX() - halfLength,
+        (int) (destRect.centerY() - halfLength + offset * destRect.height()),
+        destRect.centerX() + halfLength,
+        (int) (destRect.centerY() + halfLength + offset * destRect.height()));
+    return destRect;
+  }
+
+  private Drawable getDrawableForContactType(int contactType) {
+    switch (contactType) {
+      case TYPE_BUSINESS:
+        mScale = VECTOR_ICON_SCALE;
+        return mDefaultBusinessAvatar;
+      case TYPE_VOICEMAIL:
+        mScale = VECTOR_ICON_SCALE;
+        return mDefaultVoicemailAvatar;
+      case TYPE_SPAM:
+        mScale = VECTOR_ICON_SCALE;
+        return mDefaultSpamAvatar;
+      case TYPE_CONFERENCE:
+        mScale = VECTOR_ICON_SCALE;
+        return mDefaultConferenceAvatar;
+      case TYPE_PERSON:
+      case TYPE_GENERIC_AVATAR:
+      default:
+        return mDefaultPersonAvatar;
+    }
+  }
+
+  private static boolean isEnglishLetter(final char c) {
+    return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z');
+  }
+
+  @Override
+  public void draw(@NonNull final Canvas canvas) {
+    final Rect bounds = getBounds();
+    if (!isVisible() || bounds.isEmpty()) {
+      return;
+    }
+    // Draw letter tile.
+    drawLetterTile(canvas);
+  }
+
+  public Bitmap getBitmap(int width, int height) {
+    Bitmap bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+    this.setBounds(0, 0, width, height);
+    Canvas canvas = new Canvas(bitmap);
+    this.draw(canvas);
+    return bitmap;
+  }
+
+  private void drawLetterTile(final Canvas canvas) {
+    // Draw background color.
+    mPaint.setColor(mColor);
+
+    final Rect bounds = getBounds();
+    final int minDimension = Math.min(bounds.width(), bounds.height());
+
+    if (mIsCircle) {
+      canvas.drawCircle(bounds.centerX(), bounds.centerY(), minDimension / 2, mPaint);
+    } else {
+      canvas.drawRect(bounds, mPaint);
+    }
+
+    // Draw letter/digit only if the first character is an english letter or there's a override
+    if (mLetter != null) {
+      // Draw letter or digit.
+      mFirstChar[0] = mLetter;
+
+      // Scale text by canvas bounds and user selected scaling factor
+      mPaint.setTextSize(mScale * mLetterToTileRatio * minDimension);
+      mPaint.getTextBounds(mFirstChar, 0, 1, mRect);
+      mPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
+      mPaint.setColor(mTileFontColor);
+      mPaint.setAlpha(ALPHA);
+
+      // Draw the letter in the canvas, vertically shifted up or down by the user-defined
+      // offset
+      canvas.drawText(
+          mFirstChar,
+          0,
+          1,
+          bounds.centerX(),
+          bounds.centerY() + mOffset * bounds.height() - mRect.exactCenterY(),
+          mPaint);
+    } else {
+      // Draw the default image if there is no letter/digit to be drawn
+      Drawable drawable = getDrawableForContactType(mContactType);
+      if (drawable == null) {
+        throw Assert.createIllegalStateFailException(
+            "Unable to find drawable for contact type " + mContactType);
+      }
+
+      drawable.setBounds(getScaledBounds(mScale, mOffset));
+      drawable.setAlpha(drawable == mDefaultSpamAvatar ? SPAM_ALPHA : ALPHA);
+      drawable.draw(canvas);
+    }
+  }
+
+  public int getColor() {
+    return mColor;
+  }
+
+  public LetterTileDrawable setColor(int color) {
+    mColor = color;
+    return this;
+  }
+
+  /** Returns a deterministic color based on the provided contact identifier string. */
+  private int pickColor(final String identifier) {
+    if (mContactType == TYPE_SPAM) {
+      return mSpamColor;
+    }
+
+    if (mContactType == TYPE_VOICEMAIL
+        || mContactType == TYPE_BUSINESS
+        || TextUtils.isEmpty(identifier)) {
+      return mDefaultColor;
+    }
+
+    // String.hashCode() implementation is not supposed to change across java versions, so
+    // this should guarantee the same email address always maps to the same color.
+    // The email should already have been normalized by the ContactRequest.
+    final int color = Math.abs(identifier.hashCode()) % mColors.length();
+    return mColors.getColor(color, mDefaultColor);
+  }
+
+  @Override
+  public void setAlpha(final int alpha) {
+    mPaint.setAlpha(alpha);
+  }
+
+  @Override
+  public void setColorFilter(final ColorFilter cf) {
+    mPaint.setColorFilter(cf);
+  }
+
+  @Override
+  public int getOpacity() {
+    return android.graphics.PixelFormat.OPAQUE;
+  }
+
+  @Override
+  public void getOutline(Outline outline) {
+    if (mIsCircle) {
+      outline.setOval(getBounds());
+    } else {
+      outline.setRect(getBounds());
+    }
+
+    outline.setAlpha(1);
+  }
+
+  /**
+   * Scale the drawn letter tile to a ratio of its default size
+   *
+   * @param scale The ratio the letter tile should be scaled to as a percentage of its default size,
+   *     from a scale of 0 to 2.0f. The default is 1.0f.
+   */
+  public LetterTileDrawable setScale(float scale) {
+    mScale = scale;
+    return this;
+  }
+
+  /**
+   * Assigns the vertical offset of the position of the letter tile to the ContactDrawable
+   *
+   * @param offset The provided offset must be within the range of -0.5f to 0.5f. If set to -0.5f,
+   *     the letter will be shifted upwards by 0.5 times the height of the canvas it is being drawn
+   *     on, which means it will be drawn with the center of the letter starting at the top edge of
+   *     the canvas. If set to 0.5f, the letter will be shifted downwards by 0.5 times the height of
+   *     the canvas it is being drawn on, which means it will be drawn with the center of the letter
+   *     starting at the bottom edge of the canvas. The default is 0.0f.
+   */
+  public LetterTileDrawable setOffset(float offset) {
+    Assert.checkArgument(offset >= -0.5f && offset <= 0.5f);
+    mOffset = offset;
+    return this;
+  }
+
+  public LetterTileDrawable setLetter(Character letter) {
+    mLetter = letter;
+    return this;
+  }
+
+  public Character getLetter() {
+    return this.mLetter;
+  }
+
+  private LetterTileDrawable setLetterAndColorFromContactDetails(
+      final String displayName, final String identifier) {
+    if (!TextUtils.isEmpty(displayName) && isEnglishLetter(displayName.charAt(0))) {
+      mLetter = Character.toUpperCase(displayName.charAt(0));
+    } else {
+      mLetter = null;
+    }
+    mColor = pickColor(identifier);
+    return this;
+  }
+
+  private LetterTileDrawable setContactType(@ContactType int contactType) {
+    mContactType = contactType;
+    return this;
+  }
+
+  @ContactType
+  public int getContactType() {
+    return this.mContactType;
+  }
+
+  public LetterTileDrawable setIsCircular(boolean isCircle) {
+    mIsCircle = isCircle;
+    return this;
+  }
+
+  public boolean tileIsCircular() {
+    return this.mIsCircle;
+  }
+
+  /**
+   * Creates a canonical letter tile for use across dialer fragments.
+   *
+   * @param displayName The display name to produce the letter in the tile. Null values or numbers
+   *     yield no letter.
+   * @param identifierForTileColor The string used to produce the tile color.
+   * @param shape The shape of the tile.
+   * @param contactType The type of contact, e.g. TYPE_VOICEMAIL.
+   * @return this
+   */
+  public LetterTileDrawable setCanonicalDialerLetterTileDetails(
+      @Nullable final String displayName,
+      @Nullable final String identifierForTileColor,
+      @Shape final int shape,
+      final int contactType) {
+
+    this.setIsCircular(shape == SHAPE_CIRCLE);
+
+    /**
+     * We return quickly under the following conditions: 1. We are asked to draw a default tile, and
+     * no coloring information is provided, meaning no further initialization is necessary OR 2.
+     * We've already invoked this method before, set mDisplayName, and found that it has not
+     * changed. This is useful during events like hangup, when we lose the call state for special
+     * types of contacts, like voicemail. We keep track of the special case until we encounter a new
+     * display name.
+     */
+    if (contactType == TYPE_DEFAULT
+        && ((displayName == null && identifierForTileColor == null)
+            || (displayName != null && displayName.equals(mDisplayName)))) {
+      return this;
+    }
+
+    this.mDisplayName = displayName;
+    setContactType(contactType);
+
+    // Special contact types receive default color and no letter tile, but special iconography.
+    if (contactType != TYPE_PERSON) {
+      this.setLetterAndColorFromContactDetails(null, null);
+    } else {
+      if (identifierForTileColor != null) {
+        this.setLetterAndColorFromContactDetails(displayName, identifierForTileColor);
+      } else {
+        this.setLetterAndColorFromContactDetails(displayName, displayName);
+      }
+    }
+    return this;
+  }
+
+  /**
+   * Returns the appropriate LetterTileDrawable.TYPE_ based on the given primitive conditions.
+   *
+   * <p>If no special state is detected, yields TYPE_DEFAULT
+   */
+  public static @ContactType int getContactTypeFromPrimitives(
+      boolean isVoicemailNumber,
+      boolean isSpam,
+      boolean isBusiness,
+      int numberPresentation,
+      boolean isConference) {
+    if (isVoicemailNumber) {
+      return LetterTileDrawable.TYPE_VOICEMAIL;
+    } else if (isSpam) {
+      return LetterTileDrawable.TYPE_SPAM;
+    } else if (isBusiness) {
+      return LetterTileDrawable.TYPE_BUSINESS;
+    } else if (numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
+      return LetterTileDrawable.TYPE_GENERIC_AVATAR;
+    } else if (isConference) {
+      return LetterTileDrawable.TYPE_CONFERENCE;
+    } else {
+      return LetterTileDrawable.TYPE_DEFAULT;
+    }
+  }
+}
diff --git a/java/com/android/dialer/lettertile/res/values/colors.xml b/java/com/android/dialer/lettertile/res/values/colors.xml
new file mode 100644
index 0000000..406b490
--- /dev/null
+++ b/java/com/android/dialer/lettertile/res/values/colors.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <array name="letter_tile_colors">
+    <item>#DB4437</item>
+    <item>#E91E63</item>
+    <item>#9C27B0</item>
+    <item>#673AB7</item>
+    <item>#3F51B5</item>
+    <item>#4285F4</item>
+    <item>#039BE5</item>
+    <item>#0097A7</item>
+    <item>#009688</item>
+    <item>#0F9D58</item>
+    <item>#689F38</item>
+    <item>#EF6C00</item>
+    <item>#FF5722</item>
+    <item>#757575</item>
+  </array>
+
+  <color name="spam_contact_background">#A52714</color>
+
+  <color name="letter_tile_default_color">#cccccc</color>
+
+  <color name="letter_tile_font_color">#ffffff</color>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/lettertile/res/values/dimens.xml b/java/com/android/dialer/lettertile/res/values/dimens.xml
new file mode 100644
index 0000000..c804431
--- /dev/null
+++ b/java/com/android/dialer/lettertile/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <!-- Dimensions for contact letter tiles -->
+  <item name="letter_to_tile_ratio" type="dimen">67%</item>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/lightbringer/Lightbringer.java b/java/com/android/dialer/lightbringer/Lightbringer.java
index 8caafda..9120b24 100644
--- a/java/com/android/dialer/lightbringer/Lightbringer.java
+++ b/java/com/android/dialer/lightbringer/Lightbringer.java
@@ -22,16 +22,27 @@
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.telecom.Call;
+import android.telecom.PhoneAccountHandle;
 
 public interface Lightbringer {
 
+  boolean isEnabled();
+
   @MainThread
-  boolean isReachable(@NonNull Context context, @NonNull String number);
+  boolean isReachable(@NonNull Context context, @Nullable String number);
+
+  @MainThread
+  boolean supportsUpgrade(@NonNull Context context, @Nullable String number);
 
   @MainThread
   Intent getIntent(@NonNull Context context, @NonNull String number);
 
   @MainThread
+  void requestUpgrade(Call call);
+
+  @MainThread
   void registerListener(@NonNull LightbringerListener listener);
 
   @MainThread
@@ -39,9 +50,21 @@
 
   @Nullable
   @MainThread
-  ComponentName getPhoneAccountComponentName(@NonNull Context context);
+  ComponentName getPhoneAccountComponentName();
 
-  @NonNull
+  @Nullable
   @MainThread
-  String getPackageName(@NonNull Context context);
+  PhoneAccountHandle getPhoneAccountHandle();
+
+  @Nullable
+  @MainThread
+  String getPackageName();
+
+  @StringRes
+  @MainThread
+  int getOutgoingCallTypeText();
+
+  @StringRes
+  @MainThread
+  int getIncomingCallTypeText();
 }
diff --git a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
index f9bb4cd..c98ae09 100644
--- a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
+++ b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
@@ -19,7 +19,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.telecom.Call;
+import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerListener;
@@ -31,29 +36,83 @@
   public LightbringerStub() {}
 
   @Override
-  public boolean isReachable(Context context, String number) {
+  public boolean isEnabled() {
     return false;
   }
 
+  @MainThread
   @Override
-  public Intent getIntent(Context context, String number) {
+  public boolean isReachable(@NonNull Context context, @Nullable String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    return false;
+  }
+
+  @MainThread
+  @Override
+  public boolean supportsUpgrade(@NonNull Context context, @Nullable String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    return false;
+  }
+
+  @MainThread
+  @Override
+  public Intent getIntent(@NonNull Context context, @NonNull String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    Assert.isNotNull(number);
     return null;
   }
 
+  @MainThread
   @Override
-  public void registerListener(LightbringerListener listener) {}
+  public void requestUpgrade(Call call) {
+    Assert.isMainThread();
+    Assert.isNotNull(call);
+  }
 
+  @MainThread
   @Override
-  public void unregisterListener(LightbringerListener listener) {}
+  public void registerListener(LightbringerListener listener) {
+    Assert.isMainThread();
+    Assert.isNotNull(listener);
+  }
 
+  @MainThread
   @Override
-  public ComponentName getPhoneAccountComponentName(Context context) {
+  public void unregisterListener(LightbringerListener listener) {
+    Assert.isMainThread();
+    Assert.isNotNull(listener);
+  }
+
+  @Nullable
+  @Override
+  public ComponentName getPhoneAccountComponentName() {
     return null;
   }
 
-  @NonNull
+  @Nullable
   @Override
-  public String getPackageName(@NonNull Context context) {
-    throw Assert.createUnsupportedOperationFailException();
+  public PhoneAccountHandle getPhoneAccountHandle() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public String getPackageName() {
+    return null;
+  }
+
+  @StringRes
+  @Override
+  public int getOutgoingCallTypeText() {
+    return -1;
+  }
+
+  @StringRes
+  @Override
+  public int getIncomingCallTypeText() {
+    return -1;
   }
 }
diff --git a/java/com/android/dialer/location/CountryDetector.java b/java/com/android/dialer/location/CountryDetector.java
index a90febf..110cf45 100644
--- a/java/com/android/dialer/location/CountryDetector.java
+++ b/java/com/android/dialer/location/CountryDetector.java
@@ -33,8 +33,8 @@
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutors;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.util.PermissionsUtil;
 import java.util.List;
 import java.util.Locale;
@@ -72,7 +72,7 @@
   // exceedingly rare event that the device does not have a default locale set for some reason.
   private static final String DEFAULT_COUNTRY_ISO = "US";
 
-  @VisibleForTesting static CountryDetector sInstance;
+  @VisibleForTesting public static CountryDetector sInstance;
 
   private final TelephonyManager telephonyManager;
   private final LocaleProvider localeProvider;
@@ -80,7 +80,7 @@
   private final Context appContext;
 
   @VisibleForTesting
-  CountryDetector(
+  public CountryDetector(
       Context appContext,
       TelephonyManager telephonyManager,
       LocationManager locationManager,
@@ -192,7 +192,7 @@
   }
 
   /** Interface for accessing the current locale. */
-  interface LocaleProvider {
+  public interface LocaleProvider {
     Locale getLocale();
   }
 
@@ -216,7 +216,9 @@
 
   private static void processLocationUpdate(
       Context appContext, Geocoder geocoder, Location location) {
-    DialerExecutors.createNonUiTaskBuilder(new GeocodeCountryWorker(geocoder))
+    DialerExecutorComponent.get(appContext)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new GeocodeCountryWorker(geocoder))
         .onSuccess(
             country -> {
               if (country == null) {
diff --git a/java/com/android/dialer/location/GeoUtil.java b/java/com/android/dialer/location/GeoUtil.java
index 1be4054..b39256d 100644
--- a/java/com/android/dialer/location/GeoUtil.java
+++ b/java/com/android/dialer/location/GeoUtil.java
@@ -17,11 +17,6 @@
 package com.android.dialer.location;
 
 import android.content.Context;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
-import java.util.Locale;
 
 /** Static methods related to Geo. */
 public class GeoUtil {
@@ -31,17 +26,4 @@
     // The {@link CountryDetector} should never return null so this is safe to return as-is.
     return CountryDetector.getInstance(context).getCurrentCountryIso();
   }
-
-  public static String getGeocodedLocationFor(Context context, String phoneNumber) {
-    final PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance();
-    final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
-    try {
-      final Phonenumber.PhoneNumber structuredPhoneNumber =
-          phoneNumberUtil.parse(phoneNumber, getCurrentCountryIso(context));
-      final Locale locale = context.getResources().getConfiguration().locale;
-      return geocoder.getDescriptionForNumber(structuredPhoneNumber, locale);
-    } catch (NumberParseException e) {
-      return null;
-    }
-  }
 }
diff --git a/java/com/android/dialer/logging/LoggingBindings.java b/java/com/android/dialer/logging/LoggingBindings.java
index 526cb20..ca9a053 100644
--- a/java/com/android/dialer/logging/LoggingBindings.java
+++ b/java/com/android/dialer/logging/LoggingBindings.java
@@ -14,8 +14,8 @@
 
 package com.android.dialer.logging;
 
-
 import android.app.Activity;
+import android.widget.QuickContactBadge;
 
 /** Allows the container application to gather analytics. */
 public interface LoggingBindings {
@@ -62,6 +62,29 @@
    */
   void logScreenView(com.android.dialer.logging.ScreenEvent.Type screenEvent, Activity activity);
 
+  /** Logs the composition of contact tiles in the speed dial tab. */
+  void logSpeedDialContactComposition(
+      int counter,
+      int starredContactsCount,
+      int pinnedContactsCount,
+      int multipleNumbersContactsCount,
+      int contactsWithPhotoCount,
+      int contactsWithNameCount,
+      int lightbringerReachableContactsCount);
+
   /** Logs a hit event to the analytics server. */
   void sendHitEventAnalytics(String category, String action, String label, long value);
+
+  /** Logs where a quick contact badge is clicked */
+  void logQuickContactOnTouch(
+      QuickContactBadge quickContact,
+      InteractionEvent.Type interactionEvent,
+      boolean shouldPerformClick);
+
+  /** Logs People Api lookup result with error */
+  void logPeopleApiLookupReportWithError(
+      long latency, int httpResponseCode, PeopleApiLookupError.Type errorType);
+
+  /** Logs successful People Api lookup result */
+  void logSuccessfulPeopleApiLookupReport(long latency, int httpResponseCode);
 }
diff --git a/java/com/android/dialer/logging/LoggingBindingsStub.java b/java/com/android/dialer/logging/LoggingBindingsStub.java
index f7ca6ec..2dbcc3f 100644
--- a/java/com/android/dialer/logging/LoggingBindingsStub.java
+++ b/java/com/android/dialer/logging/LoggingBindingsStub.java
@@ -15,6 +15,7 @@
 package com.android.dialer.logging;
 
 import android.app.Activity;
+import android.widget.QuickContactBadge;
 
 /** Default implementation for logging bindings. */
 public class LoggingBindingsStub implements LoggingBindings {
@@ -36,5 +37,28 @@
   public void logScreenView(ScreenEvent.Type screenEvent, Activity activity) {}
 
   @Override
+  public void logSpeedDialContactComposition(
+      int counter,
+      int starredContactsCount,
+      int pinnedContactsCount,
+      int multipleNumbersContactsCount,
+      int contactsWithPhotoCount,
+      int contactsWithNameCount,
+      int lightbringerReachableContactsCount) {}
+
+  @Override
   public void sendHitEventAnalytics(String category, String action, String label, long value) {}
+
+  @Override
+  public void logQuickContactOnTouch(
+      QuickContactBadge quickContact,
+      InteractionEvent.Type interactionEvent,
+      boolean shouldPerformClick) {}
+
+  @Override
+  public void logPeopleApiLookupReportWithError(
+      long latency, int httpResponseCode, PeopleApiLookupError.Type errorType) {}
+
+  @Override
+  public void logSuccessfulPeopleApiLookupReport(long latency, int httpResponseCode) {}
 }
diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto
index 835d7d7..6c83908 100644
--- a/java/com/android/dialer/logging/contact_lookup_result.proto
+++ b/java/com/android/dialer/logging/contact_lookup_result.proto
@@ -5,6 +5,9 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message ContactLookupResult {
   // The different results of a contact lookup done using a phone number.
   enum Type {
@@ -16,10 +19,10 @@
     // Contact was found in the local database.
     LOCAL_CONTACT = 2;
 
-    // Contact was found in Google Dialer's internal phone number cache
+    // DEPRECATED: see subcategories below
     LOCAL_CACHE = 3;
 
-    // Contact was found via Google Caller ID
+    // DEPRECATED: see subcategories below
     REMOTE = 4;
 
     // Phone number was an emergency phone number
@@ -27,5 +30,40 @@
 
     // Phone number was the SIM card's voicemail number
     VOICEMAIL = 6;
+
+    // Phone number was identified via the places part of the People API.
+    REMOTE_PLACES = 7;
+
+    // Phone number was identified via the profile part of the People API.
+    REMOTE_PROFILE = 8;
+
+    // Number was found in Dialer's local cache but we don't know how it was
+    // originally identified.
+    LOCAL_CACHE_UNKNOWN = 9;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // as a personal contact.
+    LOCAL_CACHE_DIRECTORY = 10;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via a custom extended directory.
+    LOCAL_CACHE_EXTENDED = 11;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via the places part of the People API.
+    LOCAL_CACHE_PLACES = 12;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via the profile part of the People API.
+    LOCAL_CACHE_PROFILE = 13;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via Caller Name Presentation (CNAP) information. Calls in this
+    // category would have had ContactLookupResultType NOT_FOUND originally.
+    LOCAL_CACHE_CNAP = 14;
+
+    // Number was found in Dialer's local cache and was originally identified
+    // via Cequint caller ID.
+    LOCAL_CACHE_CEQUINT = 15;
   }
 }
diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto
index 470cf8b..3a24da1 100644
--- a/java/com/android/dialer/logging/contact_source.proto
+++ b/java/com/android/dialer/logging/contact_source.proto
@@ -5,6 +5,9 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message ContactSource {
   // Applies only to reports made from call history. If we have contact
   // information for the phone number, this field indicates its source.
diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto
index 5416146..ef249c2 100644
--- a/java/com/android/dialer/logging/dialer_impression.proto
+++ b/java/com/android/dialer/logging/dialer_impression.proto
@@ -5,11 +5,13 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message DialerImpression {
   // Event enums to be used for Impression Logging in Dialer.
   // It's perfectly acceptable for this enum to be large
   // Values should be from 1000 to 100000.
-  // Next Tag:1191
   enum Type {
 
     UNKNOWN_AOSP_EVENT_TYPE = 1000;
@@ -47,6 +49,7 @@
     // This happens when the user had initially blocked a number and also claimed the number was
     // spam and had now proceeded to undo that.
     REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER = 1009
+
       ;
 
     // A number that was identified as spam and the user proceeded to block it. However this
@@ -62,10 +65,12 @@
     // the number via call log. This is for case where the user wants to block a number and also
     // report it as spam
     REPORT_CALL_AS_SPAM_VIA_CALL_LOG_BLOCK_REPORT_SPAM_SENT_VIA_BLOCK_NUMBER_DIALOG = 1011
+
       ;
 
     // User made it to the last step and actually blocked the number
     USER_ACTION_BLOCKED_NUMBER = 1012
+
       ;
 
     // User made it to the last step and actually unblocked the number
@@ -88,16 +93,19 @@
 
     // User added the number to contacts from the after call notification
     SPAM_AFTER_CALL_NOTIFICATION_ADD_TO_CONTACTS = 1019
+
       ;
 
     // User marked the number as spam on the after call notification flow
     SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM = 1020
+
       ;
 
     SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_NOT_SPAM_AND_BLOCKED = 1021;
 
     // User reported the number as not spam
     SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM = 1022
+
       ;
 
     // User dismissed the spam notification
@@ -119,6 +127,7 @@
     // able to stitch different types of events if they make sense e.g user pressed a speaker button
     // and we want to associate that to a call event
     USER_PARTICIPATED_IN_A_CALL = 1028
+
       ;
 
     // Incoming call is a spam call
@@ -151,44 +160,54 @@
 
     // User deleted a call log entry
     USER_DELETED_CALL_LOG_ITEM = 1048
+
       ;
 
     // User tapped on "Send a message"
     CALL_LOG_SEND_MESSAGE = 1049
+
       ;
 
     // User tapped on "Add to contact"
     CALL_LOG_ADD_TO_CONTACT = 1050
+
       ;
 
     // User tapped on "Create new contact"
     CALL_LOG_CREATE_NEW_CONTACT = 1051
+
       ;
 
     // User deleted an entry from the voicemail tab
     VOICEMAIL_DELETE_ENTRY = 1052
+
       ;
 
     // Voicemail call log entry was expanded. Could be either if the user tapped the voicemail
     // call log entry or pressed the play button when the voicemail call log entry was not expanded
     VOICEMAIL_EXPAND_ENTRY = 1053
+
       ;
 
     // The play button for voicemail call log entry was tapped directly (i.e when the voicemail
     // call log entry was not expanded and the playbutton was tapped)
     VOICEMAIL_PLAY_AUDIO_DIRECTLY= 1054
+
       ;
 
     // The play button after expanding the voicemail call log entry was tapped
     VOICEMAIL_PLAY_AUDIO_AFTER_EXPANDING_ENTRY= 1055
+
       ;
 
     // Incoming call was rejected from the notifications
     REJECT_INCOMING_CALL_FROM_NOTIFICATION= 1056
+
       ;
 
     // Incoming call was rejected from the answer screen including rejecting via sms and talkback
     REJECT_INCOMING_CALL_FROM_ANSWER_SCREEN= 1057
+
       ;
 
     // User tapped block and spam buttons in context menu, same as buttons in
@@ -248,24 +267,24 @@
     VOICEMAIL_CONFIGURATION_STATE_CORRUPTION_DETECTED_FROM_NOTIFICATION = 1080;
 
     // Android Auto Backup and Restore (Dolly)
-    BACKUP_ON_BACKUP = 1081;
-    BACKUP_ON_FULL_BACKUP = 1082;
-    BACKUP_ON_BACKUP_DISABLED = 1083;
-    BACKUP_VOICEMAIL_BACKED_UP = 1084;
-    BACKUP_FULL_BACKED_UP = 1085;
-    BACKUP_ON_BACKUP_JSON_EXCEPTION = 1086;
+    BACKUP_ON_BACKUP = 1081 [deprecated = true];
+    BACKUP_ON_FULL_BACKUP = 1082 [deprecated = true];
+    BACKUP_ON_BACKUP_DISABLED = 1083 [deprecated = true];
+    BACKUP_VOICEMAIL_BACKED_UP = 1084 [deprecated = true];
+    BACKUP_FULL_BACKED_UP = 1085 [deprecated = true];
+    BACKUP_ON_BACKUP_JSON_EXCEPTION = 1086 [deprecated = true];
 
-    BACKUP_ON_QUOTA_EXCEEDED = 1087;
+    BACKUP_ON_QUOTA_EXCEEDED = 1087 [deprecated = true];
 
-    BACKUP_ON_RESTORE = 1088;
-    BACKUP_RESTORED_FILE = 1089;
-    BACKUP_RESTORED_VOICEMAIL = 1090;
-    BACKUP_ON_RESTORE_FINISHED = 1091;
-    BACKUP_ON_RESTORE_DISABLED = 1092;
-    BACKUP_ON_RESTORE_JSON_EXCEPTION = 1093;
-    BACKUP_ON_RESTORE_IO_EXCEPTION = 1094;
+    BACKUP_ON_RESTORE = 1088 [deprecated = true];
+    BACKUP_RESTORED_FILE = 1089 [deprecated = true];
+    BACKUP_RESTORED_VOICEMAIL = 1090 [deprecated = true];
+    BACKUP_ON_RESTORE_FINISHED = 1091 [deprecated = true];
+    BACKUP_ON_RESTORE_DISABLED = 1092 [deprecated = true];
+    BACKUP_ON_RESTORE_JSON_EXCEPTION = 1093 [deprecated = true];
+    BACKUP_ON_RESTORE_IO_EXCEPTION = 1094 [deprecated = true];
 
-    BACKUP_MAX_VM_BACKUP_REACHED = 1095;
+    BACKUP_MAX_VM_BACKUP_REACHED = 1095 [deprecated = true];
 
     EVENT_ANSWER_HINT_ACTIVATED = 1096;
     EVENT_ANSWER_HINT_DEACTIVATED = 1097;
@@ -279,7 +298,7 @@
     INCOMING_VIDEO_CALL = 1102;
     USER_PARTICIPATED_IN_A_VIDEO_CALL = 1103;
 
-    BACKUP_ON_RESTORE_VM_DUPLICATE_NOT_RESTORING = 1104;
+    BACKUP_ON_RESTORE_VM_DUPLICATE_NOT_RESTORING = 1104 [deprecated = true];
 
     // User tapped the 'Share and call' button to start the call composer
     CALL_LOG_SHARE_AND_CALL = 1105;
@@ -361,14 +380,19 @@
     EMERGENCY_LAUNCHED_MAP = 1173;
 
     VIDEO_CALL_UPGRADE_REQUESTED = 1174
+
         ;
     VIDEO_CALL_REQUEST_ACCEPTED = 1175
+
         ;
     VIDEO_CALL_REQUEST_ACCEPTED_AS_AUDIO = 1176
+
         ;
     VIDEO_CALL_REQUEST_DECLINED = 1177
+
         ;
     VIDEO_CALL_REQUEST_RECEIVED = 1178
+
         ;
 
     RCS_VIDEO_SHARE_UPGRADE_REQUESTED = 1179;
@@ -386,5 +410,125 @@
     VVM_STATUS_CHECK_REACTIVATION = 1189;
 
     VVM_ARCHIVE_AUTO_DELETE_FAILED_DUE_TO_FAILED_QUOTA_CHECK = 1190;
+
+    // User pressed the speaker phone button on the return-to-call bubble
+    BUBBLE_TURN_ON_SPEAKERPHONE = 1191;
+    // User pressed the speaker phone button again on the return-to-call bubble
+    BUBBLE_TURN_ON_WIRED_OR_EARPIECE = 1192;
+    // User muted the call from the return-to-call bubble
+    BUBBLE_MUTE_CALL = 1193;
+    // User unmuted the call from the return-to-call bubble
+    BUBBLE_UNMUTE_CALL = 1194;
+    // User ended the call from the return-to-call bubble
+    BUBBLE_END_CALL = 1195;
+
+    LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH = 1196;
+    LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG =
+        1197;  // Including call history
+    IMS_VIDEO_REQUESTED_FROM_SEARCH = 1198;
+    IMS_VIDEO_REQUESTED_FROM_CALL_LOG = 1199;  // Including call history
+
+    // Multi select impressions
+    MULTISELECT_LONG_PRESS_ENTER_MULTI_SELECT_MODE = 1200;
+    MULTISELECT_LONG_PRESS_TAP_ENTRY = 1201;
+    MULTISELECT_SINGLE_PRESS_SELECT_ENTRY = 1202;
+    MULTISELECT_SINGLE_PRESS_UNSELECT_ENTRY = 1203;
+    MULTISELECT_SINGLE_PRESS_TAP_VIA_CONTACT_BADGE = 1204;
+    MULTISELECT_SELECT_ALL = 1205;
+    MULTISELECT_UNSELECT_ALL = 1206;
+    MULTISELECT_TAP_DELETE_ICON = 1207;
+    MULTISELECT_DISPLAY_DELETE_CONFIRMATION_DIALOG = 1208;
+    MULTISELECT_DELETE_ENTRY_VIA_CONFIRMATION_DIALOG = 1209;
+    MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_BUTTON = 1210;
+    MULTISELECT_CANCEL_CONFIRMATION_DIALOG_VIA_CANCEL_TOUCH = 1211;
+    MULTISELECT_ROTATE_AND_SHOW_ACTION_MODE= 1212;
+
+    // Impressions for verizon VVM with backup and transcription ToS
+    VOICEMAIL_VVM3_TOS_V2_CREATED = 1213;
+    VOICEMAIL_VVM3_TOS_V2_ACCEPTED = 1214;
+    VOICEMAIL_VVM3_TOS_V2_DECLINE_CLICKED = 1215;
+    // Impressions for dialer voicemail with backup and transcription ToS
+    VOICEMAIL_DIALER_TOS_CREATED = 1216;
+    VOICEMAIL_DIALER_TOS_ACCEPTED = 1217;
+    VOICEMAIL_DIALER_TOS_DECLINE_CLICKED = 1218;
+
+    // Add or create contact
+    // Creating new contact fab was logged as NEW_CONTACT_FAB
+    CREATE_NEW_CONTACT_FROM_CALL_LOG = 1219;
+    CREATE_NEW_CONTACT_FROM_DIALPAD = 1220;
+    CREATE_NEW_CONTACT_FROM_VOICEMAIL = 1221;
+    CREATE_NEW_CONTACT_FROM_CALL_HISTORY = 1222;
+    ADD_TO_A_CONTACT_FROM_CALL_LOG = 1223;
+    ADD_TO_A_CONTACT_FROM_DIALPAD = 1224;
+    ADD_TO_A_CONTACT_FROM_VOICEMAIL = 1225;
+    ADD_TO_A_CONTACT_FROM_CALL_HISTORY = 1226;
+
+    // Impressions for dialer reporting caller id as inaccurate
+    CALLER_ID_REPORTED = 1227;
+    CALLER_ID_REPORT_FAILED = 1228;
+
+    // Impressions for interactions with the voicemail transcription server
+    VVM_TRANSCRIPTION_REQUEST_SENT = 1229;
+    VVM_TRANSCRIPTION_REQUEST_RETRY = 1230;
+    VVM_TRANSCRIPTION_RESPONSE_SUCCESS = 1231;
+    VVM_TRANSCRIPTION_RESPONSE_EMPTY = 1232;
+    VVM_TRANSCRIPTION_RESPONSE_INVALID = 1233;
+    VVM_TRANSCRIPTION_RESPONSE_RECOVERABLE_ERROR = 1234;
+    VVM_TRANSCRIPTION_RESPONSE_FATAL_ERROR = 1235;
+
+    // In in call UI
+    UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN = 1236;
+
+    // Bubble primary button first click to expand bubble
+    BUBBLE_PRIMARY_BUTTON_EXPAND = 1237;
+    // Bubble prinary button second click to return to call
+    BUBBLE_PRIMARY_BUTTON_RETURN_TO_CALL = 1238;
+
+    // Dialer Key/Value Backup and Restore
+    BACKUP_KEY_VALUE_ON_BACKUP = 1239;
+    BACKUP_KEY_VALUE_ON_RESTORE = 1240;
+    BACKUP_KEY_VALUE_ON_RESTORE_FINISHED = 1241;
+    BACKUP_KEY_VALUE_GET_BACKUP_SPECIFICATION = 1242;
+    BACKUP_KEY_VALUE_BACKUP_AGENT_CONSTRUCTOR = 1243;
+
+    // In the in call UI
+    UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN_FOR_LIGHTBRINGER = 1244;
+    UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN_FOR_IMS = 1245;
+    UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN_FOR_RCS = 1246;
+    LIGHTBRINGER_UPGRADE_REQUESTED = 1247;
+
+    // Found Lightbringer reachable contact when launching Dialer
+    HAS_LIGHTBRINGER_REACHABLE_CONTACTS = 1248;
+
+    // This impression is logged once per process when the number of
+    // notifications is very high and the system may suppress future
+    // notifications.
+    HIGH_GLOBAL_NOTIFICATION_COUNT_REACHED = 1249;
+
+    // More impressions for interactions with the voicemail transcription server
+    VVM_TRANSCRIPTION_REQUEST_SENT_ASYNC = 1250;
+    VVM_TRANSCRIPTION_VOICEMAIL_RECEIVED = 1251;
+    VVM_TRANSCRIPTION_VOICEMAIL_FORMAT_NOT_SUPPORTED = 1252;
+    VVM_TRANSCRIPTION_VOICEMAIL_INVALID_DATA = 1253;
+    VVM_TRANSCRIPTION_VOICEMAIL_UPLOAD_FAILED = 1254;
+    VVM_TRANSCRIPTION_RESPONSE_LANGUAGE_NOT_SUPPORTED = 1255;
+    VVM_TRANSCRIPTION_RESPONSE_NO_SPEECH_DETECTED = 1256;
+    VVM_TRANSCRIPTION_RESPONSE_EXPIRED = 1257;
+    VVM_TRANSCRIPTION_RESPONSE_TOO_MANY_ERRORS = 1258;
+    VVM_TRANSCRIPTION_POLLING_TIMEOUT = 1259;
+
+    // Bubble collapse initiated by user, i.e. no hiding after collapse
+    BUBBLE_COLLAPSE_BY_USER = 1260;
+
+    // In in-call UI
+    IN_CALL_SHOW_DIALPAD_BUTTON_PRESSED = 1261;
+    IN_CALL_ADD_CALL_BUTTON_PRESSED = 1262;
+    IN_CALL_MERGE_BUTTON_PRESSED = 1263;
+    IN_CALL_SWAP_SECONDARY_BUTTON_PRESSED = 1264;
+
+    // In in-call dialpad
+    IN_CALL_DIALPAD_NUMBER_BUTTON_PRESSED = 1265;
+    IN_CALL_DIALPAD_HANG_UP_BUTTON_PRESSED = 1266;
+    IN_CALL_DIALPAD_CLOSE_BUTTON_PRESSED = 1267;
   }
 }
diff --git a/java/com/android/dialer/logging/interaction_event.proto b/java/com/android/dialer/logging/interaction_event.proto
index b9af1b7..47ea534 100644
--- a/java/com/android/dialer/logging/interaction_event.proto
+++ b/java/com/android/dialer/logging/interaction_event.proto
@@ -5,7 +5,11 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message InteractionEvent {
+  // Next Tag: 38
   enum Type {
 
     UNKNOWN = 0;
@@ -41,5 +45,23 @@
 
     // The user unblocked a number then undid the unblock
     UNDO_UNBLOCK_NUMBER = 24;
+
+    // Actions in speed dial
+    SPEED_DIAL_PIN_CONTACT = 25;
+    SPEED_DIAL_REMOVE_CONTACT = 26;
+    SPEED_DIAL_OPEN_CONTACT_CARD = 27;
+    SPEED_DIAL_CLICK_CONTACT_WITH_AMBIGUOUS_NUMBER = 28;
+
+    SPEED_DIAL_SET_DEFAULT_NUMBER_FOR_AMBIGUOUS_CONTACT = 29;
+
+    // Open quick contact from where
+    OPEN_QUICK_CONTACT_FROM_CALL_LOG = 30;
+    OPEN_QUICK_CONTACT_FROM_CALL_DETAILS = 31;
+    OPEN_QUICK_CONTACT_FROM_ALL_CONTACTS_GENERAL = 32;
+    OPEN_QUICK_CONTACT_FROM_CONTACTS_FRAGMENT_BADGE = 33;
+    OPEN_QUICK_CONTACT_FROM_CONTACTS_FRAGMENT_ITEM = 34;
+    OPEN_QUICK_CONTACT_FROM_SEARCH = 35;
+    OPEN_QUICK_CONTACT_FROM_VOICEMAIL = 36;
+    OPEN_QUICK_CONTACT_FROM_CALL_HISTORY = 37;
   }
 }
diff --git a/java/com/android/dialer/logging/people_api_lookup_error.proto b/java/com/android/dialer/logging/people_api_lookup_error.proto
new file mode 100644
index 0000000..e37d10a
--- /dev/null
+++ b/java/com/android/dialer/logging/people_api_lookup_error.proto
@@ -0,0 +1,19 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+
+
+message PeopleApiLookupError {
+  enum Type {
+    UNKNOWN = 0;
+    HTTP_RESPONSE_ERROR = 1;
+    WRONG_KIND_VALUE = 2;
+    NO_ITEM_FOUND = 3;
+    JSON_PARSING_ERROR = 4;
+  }
+}
diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto
index 7286948..3c1baf0 100644
--- a/java/com/android/dialer/logging/reporting_location.proto
+++ b/java/com/android/dialer/logging/reporting_location.proto
@@ -5,6 +5,9 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message ReportingLocation {
   // Spam reporting location
   enum Type {
diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto
index 2430bfd..603f710 100644
--- a/java/com/android/dialer/logging/screen_event.proto
+++ b/java/com/android/dialer/logging/screen_event.proto
@@ -5,6 +5,9 @@
 option java_multiple_files = true;
 option optimize_for = LITE_RUNTIME;
 
+
+
+
 message ScreenEvent {
   enum Type {
 
diff --git a/java/com/android/dialer/logging/ui_action.proto b/java/com/android/dialer/logging/ui_action.proto
new file mode 100644
index 0000000..886fe04
--- /dev/null
+++ b/java/com/android/dialer/logging/ui_action.proto
@@ -0,0 +1,45 @@
+syntax = "proto2";
+
+package com.android.dialer.logging;
+option java_package = "com.android.dialer.logging";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+
+
+message UiAction {
+  enum Type {
+    UNKNOWN = 0;
+
+    // General action starting from 1
+    CHANGE_TAB_TO_FAVORITE = 1;
+    CHANGE_TAB_TO_CALL_LOG = 2;
+    CHANGE_TAB_TO_CONTACTS = 3;
+    CHANGE_TAB_TO_VOICEMAIL = 4;
+    PRESS_ANDROID_BACK_BUTTON = 5;
+    TEXT_CHANGE_WITH_INPUT = 6;
+    SCROLL = 7;
+
+    // In call log, starting from 100
+    CLICK_CALL_LOG_ITEM = 100;
+    OPEN_CALL_DETAIL = 101;
+    CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON = 102;
+    COPY_NUMBER_IN_CALL_DETAIL = 103;
+    EDIT_NUMBER_BEFORE_CALL_IN_CALL_DETAIL = 104;
+
+    // In dialpad, starting from 200
+    OPEN_DIALPAD = 200;
+    CLOSE_DIALPAD = 201;
+    PRESS_CALL_BUTTON_WITHOUT_CALLING = 202;
+
+    // In search, starting from 300
+    OPEN_SEARCH = 300;
+    HIDE_KEYBOARD_IN_SEARCH = 301;
+    CLOSE_SEARCH_WITH_HIDE_BUTTON = 302;
+
+    // In call history, starting from 400
+    OPEN_CALL_HISTORY = 400;
+    CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON = 401;
+  }
+}
diff --git a/java/com/android/dialer/main/Main.java b/java/com/android/dialer/main/Main.java
new file mode 100644
index 0000000..14ac7e4
--- /dev/null
+++ b/java/com/android/dialer/main/Main.java
@@ -0,0 +1,27 @@
+/*
+ * 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.main;
+
+import android.content.Context;
+
+/** Used to display the main activity for Dialer. This hosts favorites, dial pad, search, etc... */
+public interface Main {
+  boolean isNewUiEnabled(Context context);
+
+  // TODO(38502365): Remove this when we're ready to launch the new UI. */
+  void createNewUiLauncherShortcut(Context context);
+}
diff --git a/java/com/android/dialer/main/MainComponent.java b/java/com/android/dialer/main/MainComponent.java
new file mode 100644
index 0000000..e735457
--- /dev/null
+++ b/java/com/android/dialer/main/MainComponent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.main;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.main.impl.MainModule;
+import dagger.Subcomponent;
+
+/** Subcomponent that can be used to access the main implementation. */
+@Subcomponent(modules = MainModule.class)
+public abstract class MainComponent {
+
+  public abstract Main getMain();
+
+  public static MainComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .mainComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    MainComponent mainComponent();
+  }
+}
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml
new file mode 100644
index 0000000..8edde50
--- /dev/null
+++ b/java/com/android/dialer/main/impl/AndroidManifest.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.android.dialer.main.impl">
+
+  <application>
+
+    <activity
+      android:clearTaskOnLaunch="true"
+      android:directBootAware="true"
+      android:enabled="false"
+      android:exported="true"
+      android:icon="@drawable/nui_launcher_icon"
+      android:label="@string/main_activity_label"
+      android:launchMode="singleTask"
+      android:name="com.android.dialer.main.impl.MainActivity"
+      android:resizeableActivity="true"
+      android:theme="@style/NuiMainActivityTheme"
+      android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+
+      <!-- LINT.IfChange -->
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.item/phone"/>
+        <data android:mimeType="vnd.android.cursor.item/person"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="voicemail"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.DIAL"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <action android:name="android.intent.action.DIAL"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:scheme="tel"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data android:mimeType="vnd.android.cursor.dir/calls"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.CALL_BUTTON"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+      <!-- This was never intended to be public, but is here for backward
+           compatibility.  Use Intent.ACTION_DIAL instead. -->
+      <intent-filter>
+        <action android:name="com.android.phone.action.TOUCH_DIALER"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+      <intent-filter android:label="@string/main_call_history_tab_description">
+        <action android:name="com.android.phone.action.RECENT_CALLS"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.TAB"/>
+      </intent-filter>
+      <!-- LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml) -->
+
+      <meta-data
+        android:name="com.android.keyguard.layout"
+        android:resource="@layout/keyguard_preview"/>
+    </activity>
+
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java
new file mode 100644
index 0000000..52b39f0
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainActivity.java
@@ -0,0 +1,95 @@
+/*
+ * 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.main.impl;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+import com.android.dialer.common.LogUtil;
+
+/** This is the main activity for dialer. It hosts favorites, call log, search, dialpad, etc... */
+public final class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+  /**
+   * @param context Context of the application package implementing MainActivity class.
+   * @return intent for MainActivity.class
+   */
+  public static Intent getIntent(Context context) {
+    return new Intent(context, MainActivity.class)
+        .setAction(Intent.ACTION_VIEW)
+        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    LogUtil.enterBlock("MainActivity.onCreate");
+    setContentView(R.layout.main_activity);
+    initLayout();
+  }
+
+  private void initLayout() {
+    findViewById(R.id.fab).setOnClickListener(this);
+
+    ViewPager pager = findViewById(R.id.pager);
+    MainPagerAdapter pagerAdapter = new MainPagerAdapter(this, getSupportFragmentManager());
+    pager.setAdapter(pagerAdapter);
+
+    TabLayout tabLayout = findViewById(R.id.tab_layout);
+    tabLayout.setupWithViewPager(pager);
+
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    toolbar.setPopupTheme(android.R.style.Theme_Material_Light);
+    setSupportActionBar(toolbar);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.main_menu, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    Toast.makeText(this, "Not yet implemented", Toast.LENGTH_SHORT).show();
+    if (item.getItemId() == R.id.search) {
+      // open search
+      return true;
+    } else if (item.getItemId() == R.id.contacts) {
+      // open contacts
+      return true;
+    } else {
+      // TODO(calderwoodra) handle other menu items
+      return super.onOptionsItemSelected(item);
+    }
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (v.getId() == R.id.fab) {
+      // open dialpad search
+    }
+  }
+}
diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java
new file mode 100644
index 0000000..675533c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainImpl.java
@@ -0,0 +1,90 @@
+/*
+ * 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.main.impl;
+
+import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
+import android.support.v4.content.pm.ShortcutInfoCompat;
+import android.support.v4.content.pm.ShortcutManagerCompat;
+import android.support.v4.graphics.drawable.IconCompat;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.main.Main;
+import javax.inject.Inject;
+
+/** The entry point for the main feature. */
+final class MainImpl implements Main {
+  private static final String SHORTCUT_KEY = "nui_launcher_shortcut";
+
+  @Inject
+  MainImpl() {}
+
+  @Override
+  public boolean isNewUiEnabled(Context context) {
+    return BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled();
+  }
+
+  @Override
+  public void createNewUiLauncherShortcut(Context context) {
+    enableComponent(context);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      createLauncherShortcutO(context);
+    } else {
+      createLauncherShortcutPreO(context);
+    }
+  }
+
+  /**
+   * Enables the NUI activity component. By default the component is disabled and can't be accessed.
+   * Once the component has been enabled the user will get an option to use the new UI to handle
+   * DIAL (and other) intents.
+   */
+  private static void enableComponent(Context context) {
+    context
+        .getPackageManager()
+        .setComponentEnabledSetting(
+            new ComponentName(context, MainActivity.class),
+            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+            PackageManager.DONT_KILL_APP);
+  }
+
+  @TargetApi(VERSION_CODES.O)
+  private static void createLauncherShortcutO(Context context) {
+    ShortcutInfoCompat shortcutInfo =
+        new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY)
+            .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon))
+            .setIntent(MainActivity.getIntent(context))
+            .setShortLabel(context.getString(R.string.nui_shortcut_name))
+            .build();
+    ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null);
+  }
+
+  private static void createLauncherShortcutPreO(Context context) {
+    Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
+    intent.putExtra(
+        Intent.EXTRA_SHORTCUT_ICON,
+        Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon));
+    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name));
+    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, MainActivity.getIntent(context));
+    context.sendBroadcast(intent);
+  }
+}
diff --git a/java/com/android/dialer/main/impl/MainModule.java b/java/com/android/dialer/main/impl/MainModule.java
new file mode 100644
index 0000000..90342cf
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainModule.java
@@ -0,0 +1,30 @@
+/*
+ * 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.main.impl;
+
+import com.android.dialer.main.Main;
+import dagger.Module;
+import dagger.Provides;
+
+/** This module provides an instance of {@link Main}. */
+@Module
+public final class MainModule {
+  @Provides
+  public static Main provideMain() {
+    return new MainImpl();
+  }
+}
diff --git a/java/com/android/dialer/main/impl/MainPagerAdapter.java b/java/com/android/dialer/main/impl/MainPagerAdapter.java
new file mode 100644
index 0000000..10256a1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/MainPagerAdapter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.main.impl;
+
+import android.content.Context;
+import android.support.annotation.IntDef;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import com.android.dialer.calllog.ui.NewCallLogFragment;
+import com.android.dialer.common.Assert;
+import com.android.dialer.voicemail.listui.VoicemailFragment;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Adapter for {@link MainActivity} ViewPager. */
+final class MainPagerAdapter extends FragmentStatePagerAdapter {
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    TabIndex.SPEED_DIAL,
+    TabIndex.HISTORY,
+    TabIndex.VOICEMAIL,
+  })
+  private @interface TabIndex {
+    int SPEED_DIAL = 0;
+    int HISTORY = 1;
+    int VOICEMAIL = 2;
+  }
+
+  private final Context context;
+
+  MainPagerAdapter(Context context, FragmentManager fragmentManager) {
+    super(fragmentManager);
+    this.context = context;
+  }
+
+  @Override
+  public int getCount() {
+    // TODO(calderwoodra): add logic to hide/show voicemail tab
+    return 3;
+  }
+
+  @Override
+  public Fragment getItem(@TabIndex int position) {
+    // TODO(calderwoodra): implement tabs
+    switch (position) {
+      case TabIndex.VOICEMAIL:
+        return new VoicemailFragment();
+      case TabIndex.HISTORY:
+        return new NewCallLogFragment();
+      default:
+        return new StubFragment();
+    }
+  }
+
+  @Override
+  public CharSequence getPageTitle(int position) {
+    switch (position) {
+      case TabIndex.SPEED_DIAL:
+        return context.getString(R.string.tab_title_speed_dial);
+      case TabIndex.HISTORY:
+        return context.getString(R.string.tab_title_call_history);
+      case TabIndex.VOICEMAIL:
+        return context.getString(R.string.tab_title_voicemail);
+      default:
+        throw Assert.createIllegalStateFailException("Tab position with no title: " + position);
+    }
+  }
+}
diff --git a/java/com/android/dialer/main/impl/StubFragment.java b/java/com/android/dialer/main/impl/StubFragment.java
new file mode 100644
index 0000000..8e0accf
--- /dev/null
+++ b/java/com/android/dialer/main/impl/StubFragment.java
@@ -0,0 +1,35 @@
+/*
+ * 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.main.impl;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/** Stub Fragment for Dialer. */
+public class StubFragment extends Fragment {
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.stub_fragment, container, false);
+  }
+}
diff --git a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
new file mode 100644
index 0000000..7845ebc
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
Binary files differ
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
new file mode 100644
index 0000000..73b2eae
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:textColor="@android:color/secondary_text_dark_nodisable"/>
+
+  <android.support.design.widget.CoordinatorLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppBarTheme">
+
+      <android.support.v7.widget.Toolbar
+          android:id="@+id/toolbar"
+          android:layout_height="wrap_content"
+          android:layout_width="match_parent"
+          android:background="?android:attr/colorPrimary"/>
+
+      <android.support.design.widget.TabLayout
+          android:id="@+id/tab_layout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="?android:attr/colorPrimary"
+          app:tabIndicatorColor="?android:attr/colorAccent"
+          app:layout_scrollFlags="enterAlwaysCollapsed"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/quantum_ic_dialpad_white_24"
+        app:backgroundTint="?android:attr/colorAccent"/>
+  </android.support.design.widget.CoordinatorLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml b/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
new file mode 100644
index 0000000..3bb744f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:text="hello world!"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/menu/main_menu.xml b/java/com/android/dialer/main/impl/res/menu/main_menu.xml
new file mode 100644
index 0000000..09bcbf8
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/menu/main_menu.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+  <item
+      android:id="@+id/search"
+      android:icon="@drawable/quantum_ic_search_white_24"
+      android:title="@string/search"
+      android:contentDescription="@string/description_search"
+      app:showAsAction="always"/>
+
+  <item
+      android:id="@+id/contacts"
+      android:icon="@drawable/quantum_ic_person_white_24"
+      android:title="@string/contacts"
+      android:contentDescription="@string/description_contacts"
+      app:showAsAction="always"/>
+
+  <item
+      android:id="@+id/call_history"
+      android:title="@string/tab_title_call_history"
+      app:showAsAction="collapseActionView"/>
+
+  <item
+      android:id="@+id/settings"
+      android:title="@string/settings"
+      app:showAsAction="collapseActionView"/>
+
+  <item
+      android:id="@+id/feedback"
+      android:title="@string/main_send_feedback"
+      app:showAsAction="collapseActionView"/>
+</menu>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/values-af/strings.xml b/java/com/android/dialer/main/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..fd1a859
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-af/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Foon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Foon-NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Oproepgeskiedenis"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Deursoek kontakte en plekke"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakte"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Bekyk kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Oproepgeskiedenis"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Spoedbel"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Stemboodskap"</string>
+    <string name="settings" msgid="7614336599112169779">"Instellings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Stuur terugvoer"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-am/strings.xml b/java/com/android/dialer/main/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..273c019
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-am/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ስልክ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ስልክ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"የጥሪ ታሪክ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ዕውቂያዎችን እና ቦታዎችን ይፈልጉ"</string>
+    <string name="contacts" msgid="4464246185723317911">"እውቂያዎች"</string>
+    <string name="description_contacts" msgid="12768481422137448">"እውቂያዎችን ይመልከቱ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"የጥሪ ታሪክ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"አቋራጭ መደወያ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"የድምፅ መልዕክት"</string>
+    <string name="settings" msgid="7614336599112169779">"ቅንብሮች"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ግብረመልስ ይላኩ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ar/strings.xml b/java/com/android/dialer/main/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..2be1289
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ar/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"الهاتف"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"واجهة مستخدم جديدة للهاتف"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"سجل المكالمات"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"البحث عن جهات الاتصال والأماكن"</string>
+    <string name="contacts" msgid="4464246185723317911">"جهات الاتصال"</string>
+    <string name="description_contacts" msgid="12768481422137448">"عرض جهات الاتصال"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"سجلّ المكالمات"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"اتصال سريع"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"بريد صوتي"</string>
+    <string name="settings" msgid="7614336599112169779">"الإعدادات"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"إرسال تعليقات"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-az/strings.xml b/java/com/android/dialer/main/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..db9c17d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-az/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefon Yeni İİ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zəng tarixçəsi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakt və yer axtarın"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktlar"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontaktlara Baxın"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Zəng Tarixçəsi"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Cəld Yığım"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"E-məktub"</string>
+    <string name="settings" msgid="7614336599112169779">"Ayarlar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Cavab rəyi göndərin"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..75be4b8
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Novi UI Telefona"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Istorija poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretražite kontakte i mesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Pregledajte kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Ist. poziva"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Brzo poz."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Gov. pošta"</string>
+    <string name="settings" msgid="7614336599112169779">"Podešavanja"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Pošalji povr. inform."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-be/strings.xml b/java/com/android/dialer/main/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..c83b770
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-be/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Тэлефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Новы карыстальніцкі інтэрфейс тэлефона"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Гісторыя выклікаў"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Пошук кантактаў і месцаў"</string>
+    <string name="contacts" msgid="4464246185723317911">"Кантакты"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прагляд кантактаў"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Выклікі"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Хуткі наб."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гал. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Налады"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Адправіць водгук"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bg/strings.xml b/java/com/android/dialer/main/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..075e3e9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bg/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Телефон – НПИ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"История на обажданията"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Търсене на контакти и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Преглед на контактите"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"История"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Бързо наб."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гл. поща"</string>
+    <string name="settings" msgid="7614336599112169779">"Настройки"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Изпращане на отзиви"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bn/strings.xml b/java/com/android/dialer/main/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..e5b56ff
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bn/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ফোন"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ফোন NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"কলের ইতিহাস"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"পরিচিতি এবং স্থানগুলি অনুসন্ধান করুন"</string>
+    <string name="contacts" msgid="4464246185723317911">"পরিচিতিগুলি"</string>
+    <string name="description_contacts" msgid="12768481422137448">"পরিচিতিগুলি দেখুন"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"কলের ইতিহাস"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"দ্রুত ডায়াল"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ভয়েসমেল"</string>
+    <string name="settings" msgid="7614336599112169779">"সেটিংস"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"প্রতিক্রিয়া পাঠান"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-bs/strings.xml b/java/com/android/dialer/main/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..989fa5c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-bs/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historija poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretraži kontakte i mjesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaži kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"His. pozi."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Brzo bira."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Govor. poš."</string>
+    <string name="settings" msgid="7614336599112169779">"Postavke"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Poša. povrat. infor."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ca/strings.xml b/java/com/android/dialer/main/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..48c5904
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ca/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telèfon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU de telèfon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de trucades"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cerca contactes i llocs"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactes"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Mostra contactes"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Hist. trucades"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marc. ràpid"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Miss. de veu"</string>
+    <string name="settings" msgid="7614336599112169779">"Configuració"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Envia suggeriments"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-cs/strings.xml b/java/com/android/dialer/main/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..71fd8f3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-cs/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nové rozhraní Telefonu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historie volání"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Hledat kontakty a místa"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Zobrazit kontakty"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historie volání"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Oblíbené"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Schránka"</string>
+    <string name="settings" msgid="7614336599112169779">"Nastavení"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Poslat zpětnou vazbu"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-da/strings.xml b/java/com/android/dialer/main/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..67f0e92
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-da/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Ny genvej til telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Opkaldshistorik"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søg efter kontaktpersoner og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktpersoner"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontaktpersoner"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Opkaldshistorik"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hurtigkald"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Talebesked"</string>
+    <string name="settings" msgid="7614336599112169779">"Indstillinger"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Send feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-de/strings.xml b/java/com/android/dialer/main/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..a305ed4
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-de/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Neue Benutzeroberfläche für Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anrufliste"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakte und Orte suchen"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakte"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontakte ansehen"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Anrufliste"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Kurzwahl"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mailbox"</string>
+    <string name="settings" msgid="7614336599112169779">"Einstellungen"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Feedback geben"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-el/strings.xml b/java/com/android/dialer/main/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..8591032
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-el/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Τηλέφωνο"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Νέα διεπαφή χρήστη για το Τηλέφωνο"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Ιστορικό κλήσεων"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Αναζητήστε επαφές και μέρη"</string>
+    <string name="contacts" msgid="4464246185723317911">"Επαφές"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Προβολή επαφών"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Ιστορικό"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Ταχεία κλ."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Αυτ. τηλ."</string>
+    <string name="settings" msgid="7614336599112169779">"Ρυθμίσεις"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Αποστολή σχολίων"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..b6c139f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telephone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Call history"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Search contacts and places"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"View contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Call history"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Settings"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sending feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..e62a6e6
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nueva IU del teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de llamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Buscar contactos y lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Hist. llam"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marc. ráp."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Buz. voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Configuración"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentarios"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-es/strings.xml b/java/com/android/dialer/main/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..5ccc9e9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-es/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nueva interfaz de usuario del teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de llamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Buscar contactos y sitios"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historial"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marcación"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Buzón"</string>
+    <string name="settings" msgid="7614336599112169779">"Ajustes"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentarios"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-et/strings.xml b/java/com/android/dialer/main/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..1c082fe
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-et/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefoni uus kasutajaliides"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Kõneajalugu"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Otsige kontakte ja soovitusi"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktid"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Vaadake kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Kõneajalugu"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Kiirvalimine"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Kõnepost"</string>
+    <string name="settings" msgid="7614336599112169779">"Seaded"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Tagasiside saatmine"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-eu/strings.xml b/java/com/android/dialer/main/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..a7100f0
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-eu/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefonoa"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefonoko erabiltzaile-interfaze naturala"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Deien historia"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Ikusi kontaktuak eta tokiak"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktuak"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ikusi kontaktuak"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Deien historia"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Mark. biz."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Erantzung."</string>
+    <string name="settings" msgid="7614336599112169779">"Ezarpenak"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Bidali iritzia"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fa/strings.xml b/java/com/android/dialer/main/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..f855670
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fa/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"تلفن"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"رابط کاربری جدید تلفن"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"سابقه تماس"</string>
+    <string name="search" msgid="3570654445331155513">"‎@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"جستجوی مخاطبین و مکان‌ها"</string>
+    <string name="contacts" msgid="4464246185723317911">"مخاطبین"</string>
+    <string name="description_contacts" msgid="12768481422137448">"مشاهده مخاطبین"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"سابقه تماس"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"شماره‌گیری سریع"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"پست صوتی"</string>
+    <string name="settings" msgid="7614336599112169779">"تنظیمات"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ارسال بازخورد"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fi/strings.xml b/java/com/android/dialer/main/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..7b7e053
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fi/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Puhelin"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Puhelimen uusi UI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Soittohistoria"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/haku_aloita"</string>
+    <string name="description_search" msgid="3443578912463129718">"Haku yhteystiedoista ja paikoista"</string>
+    <string name="contacts" msgid="4464246185723317911">"Yhteystiedot"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Näytä yhteystiedot"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Soittohistoria"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Pikavalinta"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Vastaaja"</string>
+    <string name="settings" msgid="7614336599112169779">"Asetukset"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Lähetä palautetta"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..5d81972
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Téléphoner"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Téléphoner (nouvelle IU)"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historique des appels"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Rechercher dans les contacts et les lieux"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Afficher les contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Appels"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Comp. abr."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mess. voc."</string>
+    <string name="settings" msgid="7614336599112169779">"Paramètres"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Envoyer commentaires"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-fr/strings.xml b/java/com/android/dialer/main/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..39b2fa5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-fr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Téléphone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Téléphone (nouvelle version)"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historique des appels"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Recherchez des contacts et des adresses"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacts"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Consultez vos contacts"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historique"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Num. abrégée"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Messagerie"</string>
+    <string name="settings" msgid="7614336599112169779">"Paramètres"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Envoyer commentaires"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-gl/strings.xml b/java/com/android/dialer/main/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..a8b4b4e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-gl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Teléfono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU do teléfono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historial de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Busca contactos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Mira os contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historial"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marc. ráp."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Correo voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Configuración"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentarios"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-gu/strings.xml b/java/com/android/dialer/main/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..2bf6137
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-gu/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ફોન"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ફોન NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"કૉલ ઇતિહાસ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"સંપર્કો અને સ્થાનો શોધો"</string>
+    <string name="contacts" msgid="4464246185723317911">"સંપર્કો"</string>
+    <string name="description_contacts" msgid="12768481422137448">"સંપર્કો જુઓ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"કૉલ ઇતિહાસ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"સ્પીડ ડાયલ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"વૉઇસમેઇલ"</string>
+    <string name="settings" msgid="7614336599112169779">"સેટિંગ્સ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"પ્રતિસાદ મોકલો"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hi/strings.xml b/java/com/android/dialer/main/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..99cc780
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hi/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फ़ोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"फ़ोन NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कॉल इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"संपर्क और स्थान खोजें"</string>
+    <string name="contacts" msgid="4464246185723317911">"संपर्क"</string>
+    <string name="description_contacts" msgid="12768481422137448">"संपर्क देखें"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कॉल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"स्पीड डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"वॉइसमेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिंग"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"फ़ीडबैक भेजें"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hr/strings.xml b/java/com/android/dialer/main/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..0376d00
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefona"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Povijest poziva"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pretraži kontakte i mjesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaži kontakte"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Povijest poziva"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Brzo biranje"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Govorna pošta"</string>
+    <string name="settings" msgid="7614336599112169779">"Postavke"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Pošaljite povratne informacije"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hu/strings.xml b/java/com/android/dialer/main/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..246d71d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hu/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefon új felhasználói felülete"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Híváslista"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Névjegyek és helyek keresése"</string>
+    <string name="contacts" msgid="4464246185723317911">"Névjegyek"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Névjegyek megtekintése"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Előzmények"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Gyorshívó"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Hangposta"</string>
+    <string name="settings" msgid="7614336599112169779">"Beállítások"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Visszajelzés küldése"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-hy/strings.xml b/java/com/android/dialer/main/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..e8334ca
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-hy/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Հեռախոս"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Հեռախոսի նոր միջերես"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Զանգերի պատմություն"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Գտնել կոնտակտներ և վայրեր"</string>
+    <string name="contacts" msgid="4464246185723317911">"Կոնտակտներ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Դիտել կոնտակտները"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Զանգերի պատմ."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Արագ հավաքում"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ձայն. փոստ"</string>
+    <string name="settings" msgid="7614336599112169779">"Կարգավորումներ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Կարծիք հայտնել"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-in/strings.xml b/java/com/android/dialer/main/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..9cbab60
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-in/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telepon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI Telepon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histori panggilan"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Telusuri kontak dan tempat"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontak"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Lihat Kontak"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Histori Panggilan"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Panggilan Cepat"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Pesan Suara"</string>
+    <string name="settings" msgid="7614336599112169779">"Setelan"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Kirim masukan"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-is/strings.xml b/java/com/android/dialer/main/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..6be2056
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-is/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Sími"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nýtt viðmót síma"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Símtalaferill"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Leita að tengiliðum og stöðum"</string>
+    <string name="contacts" msgid="4464246185723317911">"Tengiliðir"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Skoða tengiliði"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Símtalaferill"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hraðval"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Talhólf"</string>
+    <string name="settings" msgid="7614336599112169779">"Stillingar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Senda ábendingu"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-it/strings.xml b/java/com/android/dialer/main/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..52dc74b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-it/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI telefono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Cronologia chiamate"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cerca contatti e luoghi"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatti"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Visualizza contatti"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Cronologia"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Chiamata rapida"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Segreteria"</string>
+    <string name="settings" msgid="7614336599112169779">"Impostazioni"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Invia feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-iw/strings.xml b/java/com/android/dialer/main/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..645ef20
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-iw/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"טלפון"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ממשק משתמש חדש לטלפון"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"היסטוריית שיחות"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"חיפוש אנשי קשר ומקומות"</string>
+    <string name="contacts" msgid="4464246185723317911">"אנשי קשר"</string>
+    <string name="description_contacts" msgid="12768481422137448">"הצגת אנשי הקשר"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"היסטוריית שיחות"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"חיוג מהיר"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"דואר קולי"</string>
+    <string name="settings" msgid="7614336599112169779">"הגדרות"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"משוב"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ja/strings.xml b/java/com/android/dialer/main/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..9b8cc79
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ja/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"電話"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"電話 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話履歴"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"連絡先や場所を検索"</string>
+    <string name="contacts" msgid="4464246185723317911">"連絡先"</string>
+    <string name="description_contacts" msgid="12768481422137448">"連絡先を表示"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通話履歴"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"クイックアクセス"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ボイスメール"</string>
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"フィードバックを送信"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ka/strings.xml b/java/com/android/dialer/main/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..02f6c26
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ka/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ტელეფონი"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ტელეფონის NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ზარების ისტორია"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"კონტაქტებისა და ადგილების ძიება"</string>
+    <string name="contacts" msgid="4464246185723317911">"კონტაქტები"</string>
+    <string name="description_contacts" msgid="12768481422137448">"კონტაქტების ნახვა"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ზარის ისტ."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"სწრ.აკრეფა"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ხმოვ.ფოსტა"</string>
+    <string name="settings" msgid="7614336599112169779">"პარამეტრები"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"გამოხმაურება"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-kk/strings.xml b/java/com/android/dialer/main/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..f3075a5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-kk/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Телефонға арналған жаңа пайдаланушы интерфейсі"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Қоңыраулар тарихы"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Контактілер мен орындарды іздеу"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контактілер"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Контактілерді көру"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Қоңыраулар тарихы"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Жылдам теру"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Дауыстық хабар"</string>
+    <string name="settings" msgid="7614336599112169779">"Параметрлер"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Пікір жіберу"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-km/strings.xml b/java/com/android/dialer/main/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..bf8f51e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-km/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ទូរសព្ទ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ទូរសព្ទ"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ប្រវត្តិហៅ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ទំនាក់ទំនង និង​កន្លែង​ស្វែងរក"</string>
+    <string name="contacts" msgid="4464246185723317911">"ទំនាក់ទំនង"</string>
+    <string name="description_contacts" msgid="12768481422137448">"មើលទំនាក់ទំនង"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ប្រវត្តិហៅ​ទូរសព្ទ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ការហៅរហ័ស"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"សារ​ជា​សំឡេង"</string>
+    <string name="settings" msgid="7614336599112169779">"ការ​កំណត់"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ផ្ញើ​មតិ​ស្ថាបនា"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-kn/strings.xml b/java/com/android/dialer/main/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..640bdcc
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-kn/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ಫೋನ್"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ಫೋನ್ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ಕರೆ ಇತಿಹಾಸ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಸ್ಥಳಗಳನ್ನು ಹುಡುಕಿ"</string>
+    <string name="contacts" msgid="4464246185723317911">"ಸಂಪರ್ಕಗಳು"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ಸಂಪರ್ಕ ವೀಕ್ಷಿಸು"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ಕರೆ ಇತಿಹಾಸ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ಸ್ಪೀಡ್ ಡಯಲ್"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ಧ್ವನಿಮೇಲ್"</string>
+    <string name="settings" msgid="7614336599112169779">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ko/strings.xml b/java/com/android/dialer/main/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..1f98f7f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ko/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"전화"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"새 전화 UI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"통화 기록"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"연락처 및 장소 검색"</string>
+    <string name="contacts" msgid="4464246185723317911">"연락처"</string>
+    <string name="description_contacts" msgid="12768481422137448">"연락처 보기"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"통화 기록"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"단축 다이얼"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"음성사서함"</string>
+    <string name="settings" msgid="7614336599112169779">"설정"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"의견 보내기"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ky/strings.xml b/java/com/android/dialer/main/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..517a789
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ky/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Чалуу"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Жаы интерфейсте чалуу"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Чалуулар таржымалы"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Байланыштарды жана жерлерди издөө"</string>
+    <string name="contacts" msgid="4464246185723317911">"Байланыштар"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Байланыштарды көрүү"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Чалуу таржымалы"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Тез терүү"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Үн почтасы"</string>
+    <string name="settings" msgid="7614336599112169779">"Жөндөөлөр"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Жооп пикир жөнөтүү"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lo/strings.xml b/java/com/android/dialer/main/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..8b7e547
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lo/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ໂທລະສັບ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ປະຫວັດການໂທ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ສະຖານທີ່"</string>
+    <string name="contacts" msgid="4464246185723317911">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ປະຫວັດການໂທ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ໂທດ່ວນ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ຂໍ້ຄວາມສຽງ"</string>
+    <string name="settings" msgid="7614336599112169779">"ການຕັ້ງຄ່າ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ສົ່ງຄຳຕິຊົມ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lt/strings.xml b/java/com/android/dialer/main/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..4b3e3b9
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lt/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefonas"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nauja telefono NS"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Skambučių istorija"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Ieškoti kontaktų ir vietų"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktai"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Žr. kontaktus"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Sk. istor."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Sp. rink."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Balso p."</string>
+    <string name="settings" msgid="7614336599112169779">"Nustatymai"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Siųsti atsiliepimą"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-lv/strings.xml b/java/com/android/dialer/main/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..b1520b3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-lv/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Tālrunis"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Tālruņa jaunā lietotāja saskarne"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zvanu vēsture"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Meklēt kontaktpersonas un vietas"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktpersonas"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Skatīt kontaktpersonas"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Vēsture"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Ātrā izv."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Balss pasts"</string>
+    <string name="settings" msgid="7614336599112169779">"Iestatījumi"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Sūtīt atsauksmes"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mk/strings.xml b/java/com/android/dialer/main/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..4a04b4d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mk/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Нов интерфејс на телефон"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Историја на повици"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Пребарајте контакти и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прикажи контакти"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Историја"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Брзо бирање"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гов. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Поставки"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Повратни информации"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ml/strings.xml b/java/com/android/dialer/main/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..b41d82f
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ml/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ഫോണ്‍"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ഫോൺ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"കോള്‍‌ ചരിത്രം"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"കോൺടാക്റ്റുകളും സ്ഥലങ്ങളും തിരയുക"</string>
+    <string name="contacts" msgid="4464246185723317911">"കോൺടാക്റ്റുകൾ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"കോൺടാക്റ്റുകൾ കാണുക"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"കോള്‍‌ ചരിത്രം"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"സ്‌പീഡ് ഡയൽ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"വോയ്‌സ്‌മെയിൽ"</string>
+    <string name="settings" msgid="7614336599112169779">"ക്രമീകരണം"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mn/strings.xml b/java/com/android/dialer/main/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..6dee167
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mn/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Утас"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Утас NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Дуудлагын түүх"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Харилцагчид, газруудаас хайх"</string>
+    <string name="contacts" msgid="4464246185723317911">"Харилцагчид"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Харилцагчдыг харах"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Дуудлагын түүх"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Шуурхай залгах"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Дуут шуудан"</string>
+    <string name="settings" msgid="7614336599112169779">"Тохиргоо"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Санал хүсэл илгээх"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-mr/strings.xml b/java/com/android/dialer/main/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..4662461
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-mr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"फोन NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कॉल इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"संपर्क आणि स्थाने शोधा"</string>
+    <string name="contacts" msgid="4464246185723317911">"संपर्क"</string>
+    <string name="description_contacts" msgid="12768481422137448">"संपर्क पहा"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कॉल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"जलद डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"व्हॉइसमेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिंग्ज"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"अभिप्राय पाठवा"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ms/strings.xml b/java/com/android/dialer/main/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..36cb14b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ms/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Sejarah panggilan"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Cari kenalan dan tempat"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kenalan"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Lihat Kenalan"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Sjrh Pgln"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Dail Laju"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Mel suara"</string>
+    <string name="settings" msgid="7614336599112169779">"Tetapan"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Hantar maklum balas"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-my/strings.xml b/java/com/android/dialer/main/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..b71a8a5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-my/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ဖုန်း"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ဖုန်း"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ခေါ်ဆိုမှုမှတ်တမ်း"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"အဆက်အသွယ်များနှင့် နေရာများကို ရှာဖွေရန်"</string>
+    <string name="contacts" msgid="4464246185723317911">"အဆက်အသွယ်များ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"အဆက်အသွယ်များကို ကြည့်ရှုရန်"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ခေါ်ဆိုမှု"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"နံပါတ်ကွက်"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"အသံမေးလ်"</string>
+    <string name="settings" msgid="7614336599112169779">"ဆက်တင်များ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"အကြံပြုချက် ပို့ရန်"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-nb/strings.xml b/java/com/android/dialer/main/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..78ac920
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-nb/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anropslogg"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søk etter kontakter og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Google-kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontakter"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Anropslogg"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hurtigvalg"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Talepost"</string>
+    <string name="settings" msgid="7614336599112169779">"Innstillinger"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Send tilbakemelding"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ne/strings.xml b/java/com/android/dialer/main/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..794b058
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ne/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"फोन"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI फोन"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"कलको इतिहास"</string>
+    <string name="search" msgid="3570654445331155513">"@android:स्ट्रिङ/खोज_जानुहोस्"</string>
+    <string name="description_search" msgid="3443578912463129718">"सम्पर्क र स्थानहरू खोज्‍नुहोस्"</string>
+    <string name="contacts" msgid="4464246185723317911">"सम्पर्कहरू"</string>
+    <string name="description_contacts" msgid="12768481422137448">"सम्पर्कहरू हेर्नुहोस्"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"कल इतिहास"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"स्पिड डायल"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"भ्वाइस मेल"</string>
+    <string name="settings" msgid="7614336599112169779">"सेटिङहरू"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"प्रतिक्रिया पठाउने"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-nl/strings.xml b/java/com/android/dialer/main/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..1e8d5f1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-nl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Bellen"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nieuwe UI van telefoon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Oproepgeschiedenis"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Contacten en plaatsen zoeken"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contacten"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Contacten bekijken"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Oproepen"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Snelkeuze"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Instellingen"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Feedback verzenden"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-no/strings.xml b/java/com/android/dialer/main/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..78ac920
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-no/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Anropslogg"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Søk etter kontakter og steder"</string>
+    <string name="contacts" msgid="4464246185723317911">"Google-kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Se kontakter"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Anropslogg"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hurtigvalg"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Talepost"</string>
+    <string name="settings" msgid="7614336599112169779">"Innstillinger"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Send tilbakemelding"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pa/strings.xml b/java/com/android/dialer/main/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..57d3334
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pa/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ਫ਼ੋਨ"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ਫ਼ੋਨ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ਕਾਲ ਇਤਿਹਾਸ"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ਸੰਪਰਕਾਂ ਅਤੇ ਥਾਂਵਾਂ ਨੂੰ ਖੋਜੋ"</string>
+    <string name="contacts" msgid="4464246185723317911">"ਸੰਪਰਕ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ਸੰਪਰਕ ਵੇਖੋ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ਕਾਲ ਇਤਿਹਾਸ"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ਸਪੀਡ ਡਾਇਲ"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ਵੌਇਸਮੇਲ"</string>
+    <string name="settings" msgid="7614336599112169779">"ਸੈਟਿੰਗਾਂ"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pl/strings.xml b/java/com/android/dialer/main/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..70f535e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nowy interfejs telefonu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historia połączeń"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Wyszukaj kontakty i miejsca"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Wyświetl kontakty"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historia połączeń"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Szybkie wybieranie"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Poczta głosowa"</string>
+    <string name="settings" msgid="7614336599112169779">"Ustawienia"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Prześlij opinię"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e722727
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU: Telefone"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contatos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contatos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Histórico"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Discagem rápida"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Correio de voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Configurações"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..07043fc
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NIU do telemóvel"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contactos e locais"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contactos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contactos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Chamadas"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Marcação"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Corr. voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Definições"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar comentários"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-pt/strings.xml b/java/com/android/dialer/main/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..e722727
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-pt/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefone"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nova IU: Telefone"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Histórico de chamadas"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Pesquisar contatos e lugares"</string>
+    <string name="contacts" msgid="4464246185723317911">"Contatos"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Ver contatos"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Histórico"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Discagem rápida"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Correio de voz"</string>
+    <string name="settings" msgid="7614336599112169779">"Configurações"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Enviar feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ro/strings.xml b/java/com/android/dialer/main/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..02158cf
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ro/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Noua IU pentru Telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Istoricul apelurilor"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Căutați persoane de contact și locuri"</string>
+    <string name="contacts" msgid="4464246185723317911">"Agendă"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Afișați Agenda"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Istoric"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Apel rapid"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ms. vocală"</string>
+    <string name="settings" msgid="7614336599112169779">"Setări"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Trimiteți feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ru/strings.xml b/java/com/android/dialer/main/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..4a60cfc
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ru/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Позвонить"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Позвонить в новом интерфейсе"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Журнал звонков"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Поиск контактов и мест"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакты"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Посмотреть контакты"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Звонки"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Быстрый набор"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гол. почта"</string>
+    <string name="settings" msgid="7614336599112169779">"Настройки"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Отправить отзыв"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-si/strings.xml b/java/com/android/dialer/main/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..938bb39
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-si/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"දුරකථනය"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ඇමතුම් ඉතිහාසය"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"සම්බන්ධතා සහ ස්ථාන සොයන්න"</string>
+    <string name="contacts" msgid="4464246185723317911">"සම්බන්ධතා"</string>
+    <string name="description_contacts" msgid="12768481422137448">"සම්බන්ධතා බලන්න"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ඇමතුම් ඉති"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"වේග ඇමතීම"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"හඬ තැපෑල"</string>
+    <string name="settings" msgid="7614336599112169779">"සැකසීම්"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ප්‍රතිපෝෂණය යවන්න"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sk/strings.xml b/java/com/android/dialer/main/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..74e7ebd
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sk/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefón"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nové rozhranie Telefónu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"História hovorov"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Hľadať kontakty a miesta"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakty"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Zobraziť kontakty"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"História hovorov"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Rých. voľ."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Hlas. sch."</string>
+    <string name="settings" msgid="7614336599112169779">"Nastavenia"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Odoslať spätnú väzbu"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sl/strings.xml b/java/com/android/dialer/main/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..f6746bd
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nov uporabniški vmesnik za telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Zgodovina klicev"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Iskanje po stikih in mestih"</string>
+    <string name="contacts" msgid="4464246185723317911">"Stiki"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Prikaz stikov"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Zg. klicev"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hitro izb."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Odzivnik"</string>
+    <string name="settings" msgid="7614336599112169779">"Nastavitve"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Pošilj. povr. info."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sq/strings.xml b/java/com/android/dialer/main/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..faf6518
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sq/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefoni"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Ndërfaqja e re e përdoruesit e telefonit"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Historiku i telefonatave"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kërko për kontakte dhe vende"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktet"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Shiko kontaktet"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Historiku i telefonatave"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Telefonatë e shpejtë"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Posta zanore"</string>
+    <string name="settings" msgid="7614336599112169779">"Cilësimet"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Dërgo komentin"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sr/strings.xml b/java/com/android/dialer/main/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..542460e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Нови UI Телефона"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Историја позива"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Претражите контакте и места"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Прегледајте контакте"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Ист. позива"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Брзо поз."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гов. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Подешавања"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Пошаљи повр. информ."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sv/strings.xml b/java/com/android/dialer/main/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..cefefb3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sv/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Nytt användargränssnitt för telefon"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Samtalshistorik"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Sök efter kontakter och platser"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontakter"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Visa kontakter"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Samt.hist."</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Snabbval"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Röstbrevl."</string>
+    <string name="settings" msgid="7614336599112169779">"Inställningar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Skicka feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-sw/strings.xml b/java/com/android/dialer/main/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..0c50bd5
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-sw/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Simu"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ya Simu"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Rekodi ya simu zilizopigwa"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Tafuta anwani na mahali"</string>
+    <string name="contacts" msgid="4464246185723317911">"Anwani"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Angalia Anwani"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Simu Zilizopigwa"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Mnaowasiliana Sana"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ujumbe wa sauti"</string>
+    <string name="settings" msgid="7614336599112169779">"Mipangilio"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Tupe maoni yako"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ta/strings.xml b/java/com/android/dialer/main/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..81e02ef
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ta/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ஃபோன்"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ஃபோன் NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"அழைப்பு வரலாறு"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"தொடர்புகளையும் இடங்களையும் தேடுவதற்கான பொத்தான்"</string>
+    <string name="contacts" msgid="4464246185723317911">"தொடர்புகள்"</string>
+    <string name="description_contacts" msgid="12768481422137448">"தொடர்புகளைக் காட்டுவதற்கான பொத்தான்"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"கால் தகவல்"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"ஸ்பீட்டைல்"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"குரலஞ்சல்"</string>
+    <string name="settings" msgid="7614336599112169779">"அமைப்புகள்"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"கருத்துத் தெரிவி"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-te/strings.xml b/java/com/android/dialer/main/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..c337cf3
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-te/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"ఫోన్"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"ఫోన్ NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"కాల్ చరిత్ర"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"పరిచయాలు మరియు స్థలాలను శోధించు"</string>
+    <string name="contacts" msgid="4464246185723317911">"పరిచయాలు"</string>
+    <string name="description_contacts" msgid="12768481422137448">"పరిచయాలను వీక్షించండి"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"కాల్ చరిత్ర"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"స్పీడ్ డయల్"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"వాయిస్ మెయిల్"</string>
+    <string name="settings" msgid="7614336599112169779">"సెట్టింగ్‌లు"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"అభిప్రాయాన్ని పంపండి"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-th/strings.xml b/java/com/android/dialer/main/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..aa83f81
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-th/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"โทรศัพท์"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ของโทรศัพท์"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"ประวัติการโทร"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"ค้นหารายชื่อติดต่อและสถานที่"</string>
+    <string name="contacts" msgid="4464246185723317911">"รายชื่อติดต่อ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"ดูรายชื่อติดต่อ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"ประวัติการโทร"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"โทรด่วน"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"ข้อความเสียง"</string>
+    <string name="settings" msgid="7614336599112169779">"การตั้งค่า"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"ส่งความคิดเห็น"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-tl/strings.xml b/java/com/android/dialer/main/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..bbfe10c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-tl/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telepono"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI ng telepono"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"History ng tawag"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Maghanap ng mga contact at mga lugar"</string>
+    <string name="contacts" msgid="4464246185723317911">"Mga Contact"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Tingnan ang Mga Contact"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"History ng Tawag"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Speed Dial"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Voicemail"</string>
+    <string name="settings" msgid="7614336599112169779">"Mga Setting"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Padala ng feedback"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-tr/strings.xml b/java/com/android/dialer/main/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..31e15be
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-tr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Telefon"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Telefonun Yeni Kullanıcı Arayüzü"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Çağrı geçmişi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kişileri ve yerleri ara"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kişiler"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kişileri Göster"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Çağrı Gçmş"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Hızlı Ara"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Sesli msj"</string>
+    <string name="settings" msgid="7614336599112169779">"Ayarlar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Geri bildirim gönder"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-uk/strings.xml b/java/com/android/dialer/main/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..7691054
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-uk/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Телефон"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Новий елемент інтерфейсу телефону"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Історія дзвінків"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Шукати контакти й місця"</string>
+    <string name="contacts" msgid="4464246185723317911">"Контакти"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Переглянути контакти"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Історія"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Шв. набір"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Гол. пошта"</string>
+    <string name="settings" msgid="7614336599112169779">"Налаштування"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Надіслати відгук"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-ur/strings.xml b/java/com/android/dialer/main/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..5795faa
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-ur/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"فون"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"‏فون NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"کال کی سرگزشت"</string>
+    <string name="search" msgid="3570654445331155513">"‎@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"رابطے اور مقامات تلاش کریں"</string>
+    <string name="contacts" msgid="4464246185723317911">"رابطے"</string>
+    <string name="description_contacts" msgid="12768481422137448">"رابطے دیکھیں"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"کال کی سرگزشت"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"اسپیڈ ڈائل"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"صوتی میل"</string>
+    <string name="settings" msgid="7614336599112169779">"ترتیبات"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"تاثرات بھیجیں"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-uz/strings.xml b/java/com/android/dialer/main/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..8083322
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-uz/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Chaqiruv"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"Yangi interfeysdan foydalanib qo‘ng‘iroq qilish"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Qo‘ng‘iroqlar tarixi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Kontakt va joylarni qidirish"</string>
+    <string name="contacts" msgid="4464246185723317911">"Kontaktlar"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Kontaktlarni ko‘rish"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Tarix"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Tez. ter."</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ov. pochta"</string>
+    <string name="settings" msgid="7614336599112169779">"Sozlamalar"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Fikr-mulohaza yubor."</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-vi/strings.xml b/java/com/android/dialer/main/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..73fd31b
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-vi/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Điện thoại"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"NUI điện thoại"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Nhật ký cuộc gọi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Tìm kiếm liên hệ và địa điểm"</string>
+    <string name="contacts" msgid="4464246185723317911">"Danh bạ"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Xem Danh bạ"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Nhật ký cuộc gọi"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Quay số nhanh"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Thư thoại"</string>
+    <string name="settings" msgid="7614336599112169779">"Cài đặt"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Gửi phản hồi"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..9649748
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"拨打电话"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"电话 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通话记录"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜索联系人和地点"</string>
+    <string name="contacts" msgid="4464246185723317911">"联系人"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看联系人"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通话记录"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"快速拨号"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"语音邮件"</string>
+    <string name="settings" msgid="7614336599112169779">"设置"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"发送反馈"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..5595a9d
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"電話"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"電話 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話記錄"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜尋聯絡人和地點"</string>
+    <string name="contacts" msgid="4464246185723317911">"通訊錄"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看通訊錄"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通話記錄"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"快速撥號"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"留言"</string>
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"提供意見"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..abda680
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"手機"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"手機 NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"通話紀錄"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"搜尋聯絡人和地點"</string>
+    <string name="contacts" msgid="4464246185723317911">"聯絡人"</string>
+    <string name="description_contacts" msgid="12768481422137448">"查看聯絡人"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"通話紀錄"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"快速撥號"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"語音信箱"</string>
+    <string name="settings" msgid="7614336599112169779">"設定"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"提供意見"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values-zu/strings.xml b/java/com/android/dialer/main/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..8529550
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-zu/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_activity_label" msgid="3121599977875141886">"Ifoni"</string>
+    <string name="nui_shortcut_name" msgid="6370942901789984087">"I-Phone NUI"</string>
+    <string name="main_call_history_tab_description" msgid="1705569872650796265">"Umlando wekholi"</string>
+    <string name="search" msgid="3570654445331155513">"@android:string/search_go"</string>
+    <string name="description_search" msgid="3443578912463129718">"Sesha oxhumana nabo nezindawo"</string>
+    <string name="contacts" msgid="4464246185723317911">"Oxhumana nabo"</string>
+    <string name="description_contacts" msgid="12768481422137448">"Buka oxhumana nabo"</string>
+    <string name="tab_title_call_history" msgid="5191872501729332994">"Umlando wekholi"</string>
+    <string name="tab_title_speed_dial" msgid="1968484500112572774">"Ukudayela okusheshayo"</string>
+    <string name="tab_title_voicemail" msgid="4777655983569268504">"Ivoyisimeyili"</string>
+    <string name="settings" msgid="7614336599112169779">"Izilungiselelo"</string>
+    <string name="main_send_feedback" msgid="2446919533981327373">"Thumela impendulo"</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml
new file mode 100644
index 0000000..d3eb6d7
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Name of the main activity. -->
+  <string name="main_activity_label" tools:ignore="UnusedResources">Phone</string>
+
+  <!-- Name of launcher shortcut for the new UI main activity.
+       TODO(38502365): Remove this once we're ready to launch the new UI. -->
+  <string name="nui_shortcut_name">Phone NUI</string>
+
+  <!-- The description text for the call log tab. -->
+  <string name="main_call_history_tab_description" tools:ignore="UnusedResources">Call history</string>
+
+  <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] -->
+  <string name="search">@android:string/search_go</string>
+  <!-- A11y announcement to let users know a button will let them search for contacts and places [CHAR LIMIT=NONE] -->
+  <string name="description_search">Search contacts and places</string>
+
+  <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] -->
+  <string name="contacts">Contacts</string>
+  <!-- A11y announcement to let users know a button will let them view their contacts [CHAR LIMIT=NONE] -->
+  <string name="description_contacts">View Contacts</string>
+
+  <!-- Tab text to show users their call log/call history [CHAR LIMIT=10] -->
+  <string name="tab_title_call_history">Call History</string>
+  <!-- Tab text to show users their favorite contacts that they can call in 1 click [CHAR LIMIT=10] -->
+  <string name="tab_title_speed_dial">Speed Dial</string>
+  <!-- Tab text to show users their voicemails  [CHAR LIMIT=10] -->
+  <string name="tab_title_voicemail">Voicemail</string>
+
+  <!-- Show users their settings [CHAR LIMIT=20] -->
+  <string name="settings">Settings</string>
+  <!-- Send feedback about the app [CHAR LIMIT=20] -->
+  <string name="main_send_feedback">Send feedback</string>
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml
new file mode 100644
index 0000000..38c5008
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values/styles.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <style name="NuiMainActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:colorAccent">@color/dialer_secondary_color</item>
+  </style>
+
+  <style name="AppBarTheme" parent="Theme.AppCompat">
+    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
+    <item name="android:colorAccent">@color/dialer_secondary_color</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/multimedia/MultimediaData.java b/java/com/android/dialer/multimedia/MultimediaData.java
index 22bb764..dee0cff 100644
--- a/java/com/android/dialer/multimedia/MultimediaData.java
+++ b/java/com/android/dialer/multimedia/MultimediaData.java
@@ -20,6 +20,7 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
 import com.google.auto.value.AutoValue;
 
@@ -63,6 +64,11 @@
   /** Returns {@code true} if this data is marked as important. */
   public abstract boolean isImportant();
 
+  /** Returns true if this has image, text or location data. */
+  public boolean hasData() {
+    return hasImageData() || !TextUtils.isEmpty(getText()) || getLocation() != null;
+  }
+
   /** Returns the string form of this MultimediaData with no PII. */
   @Override
   public String toString() {
diff --git a/java/com/android/dialer/notification/AndroidManifest.xml b/java/com/android/dialer/notification/AndroidManifest.xml
index 741f481..b89d8f8 100644
--- a/java/com/android/dialer/notification/AndroidManifest.xml
+++ b/java/com/android/dialer/notification/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2017 The Android Open Source Project
   ~
@@ -13,19 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.notification">
-
-  <uses-sdk android:minSdkVersion="23"/>
-  <application>
-    <receiver android:name=".PackageUpdatedReceiver"
-              android:directBootAware="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
-        <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
-      </intent-filter>
-    </receiver>
-  </application>
 </manifest>
diff --git a/java/com/android/dialer/notification/DialerNotificationManager.java b/java/com/android/dialer/notification/DialerNotificationManager.java
new file mode 100644
index 0000000..0e34201
--- /dev/null
+++ b/java/com/android/dialer/notification/DialerNotificationManager.java
@@ -0,0 +1,125 @@
+/*
+ * 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.notification;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.text.TextUtils;
+import android.util.Pair;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+
+/**
+ * Wrapper around the notification manager APIs. The wrapper ensures that channels are set and that
+ * notifications are limited to 10 per group.
+ */
+public final class DialerNotificationManager {
+  public static void notify(@NonNull Context context, int id, @NonNull Notification notification) {
+    Assert.isNotNull(context);
+    Assert.isNotNull(notification);
+    throw Assert.createUnsupportedOperationFailException("all notifications must have tags");
+  }
+
+  public static void notify(
+      @NonNull Context context, @NonNull String tag, int id, @NonNull Notification notification) {
+    Assert.isNotNull(context);
+    Assert.isNotNull(notification);
+    Assert.checkArgument(!TextUtils.isEmpty(tag));
+
+    if (BuildCompat.isAtLeastO()) {
+      Assert.checkArgument(!TextUtils.isEmpty(notification.getChannelId()));
+    }
+
+    getNotificationManager(context).notify(tag, id, notification);
+    NotificationThrottler.throttle(context, notification);
+  }
+
+  public static void cancel(@NonNull Context context, int id) {
+    Assert.isNotNull(context);
+    throw Assert.createUnsupportedOperationFailException(
+        "notification IDs are not unique across the app, a tag must be specified");
+  }
+
+  public static void cancel(@NonNull Context context, @NonNull String tag, int id) {
+    Assert.isNotNull(context);
+    Assert.checkArgument(!TextUtils.isEmpty(tag));
+
+    NotificationManager notificationManager = getNotificationManager(context);
+    StatusBarNotification[] notifications = notificationManager.getActiveNotifications();
+
+    String groupKey = findGroupKey(notifications, tag, id);
+    if (!TextUtils.isEmpty(groupKey)) {
+      Pair<StatusBarNotification, Integer> groupSummaryAndCount =
+          getGroupSummaryAndCount(notifications, groupKey);
+      if (groupSummaryAndCount.first != null && groupSummaryAndCount.second <= 1) {
+        LogUtil.i(
+            "DialerNotificationManager.cancel",
+            "last notification in group (%s) removed, also removing group summary",
+            groupKey);
+        notificationManager.cancel(
+            groupSummaryAndCount.first.getTag(), groupSummaryAndCount.first.getId());
+      }
+    }
+
+    notificationManager.cancel(tag, id);
+  }
+
+  public static StatusBarNotification[] getActiveNotifications(@NonNull Context context) {
+    Assert.isNotNull(context);
+    return getNotificationManager(context).getActiveNotifications();
+  }
+
+  @Nullable
+  private static String findGroupKey(
+      @NonNull StatusBarNotification[] notifications, @NonNull String tag, int id) {
+    for (StatusBarNotification notification : notifications) {
+      if (TextUtils.equals(tag, notification.getTag()) && id == notification.getId()) {
+        return notification.getNotification().getGroup();
+      }
+    }
+    return null;
+  }
+
+  @NonNull
+  private static Pair<StatusBarNotification, Integer> getGroupSummaryAndCount(
+      @NonNull StatusBarNotification[] notifications, @NonNull String groupKey) {
+    StatusBarNotification groupSummaryNotification = null;
+    int groupCount = 0;
+    for (StatusBarNotification notification : notifications) {
+      if (TextUtils.equals(groupKey, notification.getNotification().getGroup())) {
+        if ((notification.getNotification().flags & Notification.FLAG_GROUP_SUMMARY) != 0) {
+          groupSummaryNotification = notification;
+        } else {
+          groupCount++;
+        }
+      }
+    }
+    return new Pair<>(groupSummaryNotification, groupCount);
+  }
+
+  @NonNull
+  private static NotificationManager getNotificationManager(@NonNull Context context) {
+    return context.getSystemService(NotificationManager.class);
+  }
+
+  private DialerNotificationManager() {}
+}
diff --git a/java/com/android/dialer/notification/GroupedNotificationUtil.java b/java/com/android/dialer/notification/GroupedNotificationUtil.java
deleted file mode 100644
index 3925248..0000000
--- a/java/com/android/dialer/notification/GroupedNotificationUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.notification;
-
-import android.app.NotificationManager;
-import android.service.notification.StatusBarNotification;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import java.util.Objects;
-
-/** Utilities for dealing with grouped notifications */
-public final class GroupedNotificationUtil {
-
-  /**
-   * Remove notification(s) that were added as part of a group. Will ensure that if this is the last
-   * notification in the group the summary will be removed.
-   *
-   * @param tag String tag as included in {@link NotificationManager#notify(String, int,
-   *     android.app.Notification)}. If null will remove all notifications under id
-   * @param id notification id as included with {@link NotificationManager#notify(String, int,
-   *     android.app.Notification)}.
-   * @param summaryTag String tag of the summary notification
-   */
-  public static void removeNotification(
-      @NonNull NotificationManager notificationManager,
-      @Nullable String tag,
-      int id,
-      @NonNull String summaryTag) {
-    if (tag == null) {
-      // Clear all grouped notifications
-      for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
-        if (notification.getId() == id) {
-          notificationManager.cancel(notification.getTag(), id);
-        }
-      }
-    } else {
-      notificationManager.cancel(tag, id);
-
-      // See if other non-summary grouped notifications exist, and if not then clear the summary
-      boolean clearSummary = true;
-      for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
-        if (notification.getId() == id && !Objects.equals(summaryTag, notification.getTag())) {
-          clearSummary = false;
-          break;
-        }
-      }
-      if (clearSummary) {
-        notificationManager.cancel(summaryTag, id);
-      }
-    }
-  }
-}
diff --git a/java/com/android/dialer/notification/NotificationChannelId.java b/java/com/android/dialer/notification/NotificationChannelId.java
new file mode 100644
index 0000000..4ab3d44
--- /dev/null
+++ b/java/com/android/dialer/notification/NotificationChannelId.java
@@ -0,0 +1,41 @@
+/*
+ * 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.notification;
+
+import android.support.annotation.StringDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Centralized source of all notification channels used by Dialer. */
+@Retention(RetentionPolicy.SOURCE)
+@StringDef({
+  NotificationChannelId.INCOMING_CALL,
+  NotificationChannelId.ONGOING_CALL,
+  NotificationChannelId.MISSED_CALL,
+  NotificationChannelId.DEFAULT,
+})
+public @interface NotificationChannelId {
+  // This value is white listed in the system.
+  // See /vendor/google/nexus_overlay/common/frameworks/base/core/res/res/values/config.xml
+  String INCOMING_CALL = "phone_incoming_call";
+
+  String ONGOING_CALL = "phone_ongoing_call";
+
+  String MISSED_CALL = "phone_missed_call";
+
+  String DEFAULT = "phone_default";
+}
diff --git a/java/com/android/dialer/notification/NotificationChannelManager.java b/java/com/android/dialer/notification/NotificationChannelManager.java
index 8867906..790aac3 100644
--- a/java/com/android/dialer/notification/NotificationChannelManager.java
+++ b/java/com/android/dialer/notification/NotificationChannelManager.java
@@ -17,366 +17,156 @@
 package com.android.dialer.notification;
 
 import android.annotation.TargetApi;
-import android.app.Notification;
 import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.media.AudioAttributes;
-import android.net.Uri;
 import android.os.Build.VERSION_CODES;
-import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StringDef;
 import android.support.v4.os.BuildCompat;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.dialer.buildtype.BuildType;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutors;
-import com.android.dialer.telecom.TelecomUtil;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-import java.util.Objects;
+import java.util.Set;
 
-/** Contains info on how to create {@link NotificationChannel NotificationChannels} */
-public class NotificationChannelManager {
-
-  private static final String PREFS_FILENAME = "NotificationChannelManager";
-  private static final String PREF_NEED_FIRST_INIT = "needFirstInit";
-  private static NotificationChannelManager instance;
-
-  public static NotificationChannelManager getInstance() {
-    if (instance == null) {
-      instance = new NotificationChannelManager();
-    }
-    return instance;
-  }
+/** Creates all notification channels for Dialer. */
+@TargetApi(VERSION_CODES.O)
+public final class NotificationChannelManager {
 
   /**
-   * Set the channel of notification appropriately. Will create the channel if it does not already
-   * exist. Safe to call pre-O (will no-op).
+   * Creates all the notification channels Dialer will need. This method is called at app startup
+   * and must be fast. Currently it takes between 3 to 7 milliseconds on a Pixel XL.
    *
-   * <p>phoneAccount should only be null if channelName is {@link Channel#DEFAULT} or {@link
-   * Channel#MISSED_CALL} since these do not have account-specific settings.
+   * <p>An alternative approach would be to lazily create channels when we actualy post a
+   * notification. The advatange to precreating channels is that:
+   *
+   * <ul>
+   *   <li>channels will be available to user right away. For example, users can customize voicemail
+   *       sounds when they first get their device without waiting for a voicemail to arrive first.
+   *   <li>code that posts a notification can be simpler
+   *   <li>channel management code is simpler and it's easier to ensure that the correct set of
+   *       channels are visible.
+   *       <ul>
    */
-  @TargetApi(26)
-  public static void applyChannel(
-      @NonNull Notification.Builder notification,
-      @NonNull Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccount) {
-    checkNullity(channelName, phoneAccount);
+  public static void initChannels(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
 
-    if (BuildCompat.isAtLeastO()) {
-      NotificationChannel channel =
-          NotificationChannelManager.getInstance().getChannel(context, channelName, phoneAccount);
-      notification.setChannelId(channel.getId());
-    }
-  }
-
-  private static void checkNullity(
-      @Channel String channelName, @Nullable PhoneAccountHandle phoneAccount) {
-    if (phoneAccount != null || channelAllowsNullPhoneAccountHandle(channelName)) {
-      return;
-    }
-
-    // TODO (b/36568553): don't throw an exception once most cases have been identified
-    IllegalArgumentException exception =
-        new IllegalArgumentException(
-            "Phone account handle must not be null on channel " + channelName);
-    if (BuildType.get() == BuildType.RELEASE) {
-      LogUtil.e("NotificationChannelManager.applyChannel", null, exception);
-    } else {
-      throw exception;
-    }
-  }
-
-  private static boolean channelAllowsNullPhoneAccountHandle(@Channel String channelName) {
-    switch (channelName) {
-      case Channel.DEFAULT:
-      case Channel.MISSED_CALL:
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  /** The base Channel IDs for {@link NotificationChannel} */
-  @Retention(RetentionPolicy.SOURCE)
-  @StringDef({
-    Channel.INCOMING_CALL,
-    Channel.ONGOING_CALL,
-    Channel.ONGOING_CALL_OLD,
-    Channel.MISSED_CALL,
-    Channel.VOICEMAIL,
-    Channel.EXTERNAL_CALL,
-    Channel.DEFAULT
-  })
-  public @interface Channel {
-    @Deprecated String ONGOING_CALL_OLD = "ongoingCall";
-    String INCOMING_CALL = "incomingCall";
-    String ONGOING_CALL = "ongoingCall2";
-    String MISSED_CALL = "missedCall";
-    String VOICEMAIL = "voicemail";
-    String EXTERNAL_CALL = "externalCall";
-    String DEFAULT = "default";
-  }
-
-  @Channel
-  private static final String[] prepopulatedAccountChannels =
-      new String[] {Channel.INCOMING_CALL, Channel.ONGOING_CALL, Channel.VOICEMAIL};
-
-  @Channel
-  private static final String[] prepopulatedGlobalChannels =
-      new String[] {Channel.MISSED_CALL, Channel.DEFAULT};
-
-  private NotificationChannelManager() {}
-
-  public void firstInitIfNeeded(@NonNull Context context) {
-    if (BuildCompat.isAtLeastO()) {
-      DialerExecutors.createNonUiTaskBuilder(this::firstInitIfNeededSync)
-          .build()
-          .executeSerial(context);
-    }
-  }
-
-  private boolean firstInitIfNeededSync(@NonNull Context context) {
-    if (needsFirstInit(context)) {
-      initChannels(context);
-      return true;
-    }
-    return false;
-  }
-
-  public boolean needsFirstInit(@NonNull Context context) {
-    return (BuildCompat.isAtLeastO()
-        && getSharedPreferences(context).getBoolean(PREF_NEED_FIRST_INIT, true));
-  }
-
-  @RequiresApi(VERSION_CODES.N)
-  private SharedPreferences getSharedPreferences(@NonNull Context context) {
-    // Use device protected storage since in some cases this will need to be accessed while device
-    // is locked
-    context = context.createDeviceProtectedStorageContext();
-    return context.getSharedPreferences(PREFS_FILENAME, Context.MODE_PRIVATE);
-  }
-
-  @RequiresApi(26)
-  public Intent getSettingsIntentForChannel(
-      @NonNull Context context, @Channel String channelName, PhoneAccountHandle accountHandle) {
-    checkNullity(channelName, accountHandle);
-    Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
-    intent.putExtra(
-        Settings.EXTRA_CHANNEL_ID, getChannel(context, channelName, accountHandle).getId());
-    intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
-    return intent;
-  }
-
-  @TargetApi(26)
-  @SuppressWarnings("AndroidApiChecker")
-  public void initChannels(@NonNull Context context) {
-    if (!BuildCompat.isAtLeastO()) {
-      return;
-    }
-    LogUtil.enterBlock("NotificationChannelManager.initChannels");
-    List<PhoneAccountHandle> phoneAccounts = TelecomUtil.getCallCapablePhoneAccounts(context);
-
-    // Remove notification channels for PhoneAccounts that don't exist anymore
     NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-    List<NotificationChannelGroup> notificationChannelGroups =
-        notificationManager.getNotificationChannelGroups();
-    notificationChannelGroups
-        .stream()
-        .filter(group -> !idExists(group.getId(), phoneAccounts))
-        .forEach(group -> deleteGroup(notificationManager, group));
+    Set<String> desiredChannelIds = getAllDesiredChannelIds(context);
+    Set<String> existingChannelIds = getAllExistingChannelIds(context);
 
-    for (PhoneAccountHandle phoneAccountHandle : phoneAccounts) {
-      for (@Channel String channel : prepopulatedAccountChannels) {
-        getChannel(context, channel, phoneAccountHandle);
+    if (desiredChannelIds.equals(existingChannelIds)) {
+      return;
+    }
+    LogUtil.i(
+        "NotificationChannelManager.initChannels",
+        "doing an expensive initialization of all notification channels");
+    LogUtil.i(
+        "NotificationChannelManager.initChannels", "desired channel IDs: " + desiredChannelIds);
+    LogUtil.i(
+        "NotificationChannelManager.initChannels", "existing channel IDs: " + existingChannelIds);
+
+    // Delete any old channels that we don't use any more. This is safe because if we're recreate
+    // this later then any user settings will be restored. An example is SIM specific voicemail
+    // channel that gets deleted when the user removes the SIM and is then restored when the user
+    // re-inserts the SIM.
+    for (String existingChannelId : existingChannelIds) {
+      if (!desiredChannelIds.contains(existingChannelId)) {
+        notificationManager.deleteNotificationChannel(existingChannelId);
       }
     }
 
-    for (@Channel String channel : prepopulatedGlobalChannels) {
-      getChannel(context, channel, null);
-    }
-    getSharedPreferences(context).edit().putBoolean(PREF_NEED_FIRST_INIT, false).apply();
-  }
-
-  @TargetApi(26)
-  private void deleteGroup(
-      @NonNull NotificationManager notificationManager, @NonNull NotificationChannelGroup group) {
-    for (NotificationChannel channel : group.getChannels()) {
-      notificationManager.deleteNotificationChannel(channel.getId());
-    }
-    notificationManager.deleteNotificationChannelGroup(group.getId());
-  }
-
-  private boolean idExists(String id, List<PhoneAccountHandle> phoneAccountHandles) {
-    for (PhoneAccountHandle handle : phoneAccountHandles) {
-      if (Objects.equals(handle.getId(), id)) {
-        return true;
-      }
-    }
-    return false;
+    // Just recreate all desired channels. We won't do this often so it's ok to do this now.
+    createIncomingCallChannel(context);
+    createOngoingCallChannel(context);
+    createMissedCallChannel(context);
+    createDefaultChannel(context);
+    VoicemailChannelUtils.createAllChannels(context);
   }
 
   @NonNull
-  @RequiresApi(26)
-  private NotificationChannel getChannel(
-      @NonNull Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccount) {
-    String channelId = channelNameToId(channelName, phoneAccount);
-    NotificationChannel channel = getNotificationManager(context).getNotificationChannel(channelId);
-    if (channel == null) {
-      channel = createChannel(context, channelName, phoneAccount);
+  public static String getVoicemailChannelId(
+      @NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+    return VoicemailChannelUtils.getChannelId(context, handle);
+  }
+
+  private static Set<String> getAllExistingChannelIds(@NonNull Context context) {
+    Set<String> result = new ArraySet<>();
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (NotificationChannel channel : notificationManager.getNotificationChannels()) {
+      result.add(channel.getId());
     }
-    return channel;
+    return result;
   }
 
-  private static String channelNameToId(
-      @Channel String name, @Nullable PhoneAccountHandle phoneAccountHandle) {
-    if (phoneAccountHandle == null) {
-      return name;
-    } else {
-      return name + ":" + phoneAccountHandle.getId();
-    }
+  private static Set<String> getAllDesiredChannelIds(@NonNull Context context) {
+    Set<String> result = new ArraySet<>();
+    result.add(NotificationChannelId.INCOMING_CALL);
+    result.add(NotificationChannelId.ONGOING_CALL);
+    result.add(NotificationChannelId.MISSED_CALL);
+    result.add(NotificationChannelId.DEFAULT);
+    result.addAll(VoicemailChannelUtils.getAllChannelIds(context));
+    return result;
   }
 
-  @RequiresApi(26)
-  private NotificationChannel createChannel(
-      Context context,
-      @Channel String channelName,
-      @Nullable PhoneAccountHandle phoneAccountHandle) {
-    String channelId = channelNameToId(channelName, phoneAccountHandle);
-
-    if (phoneAccountHandle != null) {
-      PhoneAccount account = getTelecomManager(context).getPhoneAccount(phoneAccountHandle);
-      NotificationChannelGroup group =
-          new NotificationChannelGroup(
-              phoneAccountHandle.getId(),
-              (account == null) ? phoneAccountHandle.getId() : account.getLabel().toString());
-      getNotificationManager(context)
-          .createNotificationChannelGroup(group); // No-op if already exists
-    } else if (!channelAllowsNullPhoneAccountHandle(channelName)) {
-      LogUtil.w(
-          "NotificationChannelManager.createChannel",
-          "Null PhoneAccountHandle with channel " + channelName);
-    }
-
-    Uri silentRingtone = Uri.EMPTY;
-
-    CharSequence name;
-    int importance;
-    boolean canShowBadge;
-    boolean lights;
-    boolean vibration;
-    Uri sound;
-    switch (channelName) {
-      case Channel.INCOMING_CALL:
-        name = context.getText(R.string.notification_channel_incoming_call);
-        importance = NotificationManager.IMPORTANCE_MAX;
-        canShowBadge = false;
-        lights = true;
-        vibration = false;
-        sound = silentRingtone;
-        break;
-      case Channel.MISSED_CALL:
-        name = context.getText(R.string.notification_channel_missed_call);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = true;
-        lights = true;
-        vibration = true;
-        sound = silentRingtone;
-        break;
-      case Channel.ONGOING_CALL:
-        name = context.getText(R.string.notification_channel_ongoing_call);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = false;
-        lights = false;
-        vibration = false;
-        sound = silentRingtone;
-        deleteOldOngoingCallChannelIfNeeded(context, phoneAccountHandle);
-        break;
-      case Channel.VOICEMAIL:
-        name = context.getText(R.string.notification_channel_voicemail);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = true;
-        lights = true;
-        vibration =
-            TelephonyManagerCompat.isVoicemailVibrationEnabled(
-                getTelephonyManager(context), phoneAccountHandle);
-        sound =
-            TelephonyManagerCompat.getVoicemailRingtoneUri(
-                getTelephonyManager(context), phoneAccountHandle);
-        break;
-      case Channel.EXTERNAL_CALL:
-        name = context.getText(R.string.notification_channel_external_call);
-        importance = NotificationManager.IMPORTANCE_HIGH;
-        canShowBadge = false;
-        lights = true;
-        vibration = true;
-        sound = null;
-        break;
-      case Channel.DEFAULT:
-        name = context.getText(R.string.notification_channel_misc);
-        importance = NotificationManager.IMPORTANCE_DEFAULT;
-        canShowBadge = false;
-        lights = true;
-        vibration = true;
-        sound = null;
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown channel: " + channelName);
-    }
-
-    NotificationChannel channel = new NotificationChannel(channelId, name, importance);
-    channel.setShowBadge(canShowBadge);
-    if (sound != null) {
-      // silentRingtone acts as a sentinel value to indicate that setSound should still be called,
-      // but with a null value to indicate no sound.
-      channel.setSound(
-          sound.equals(silentRingtone) ? null : sound,
-          new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
-    }
-    channel.enableLights(lights);
-    channel.enableVibration(vibration);
-    getNotificationManager(context).createNotificationChannel(channel);
-    return channel;
+  private static void createIncomingCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.INCOMING_CALL,
+            context.getText(R.string.notification_channel_incoming_call),
+            NotificationManager.IMPORTANCE_MAX);
+    channel.setShowBadge(false);
+    channel.enableLights(true);
+    channel.enableVibration(false);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  @RequiresApi(26)
-  private void deleteOldOngoingCallChannelIfNeeded(
-      @NonNull Context context, PhoneAccountHandle phoneAccountHandle) {
-    String channelId = channelNameToId(Channel.ONGOING_CALL_OLD, phoneAccountHandle);
-    NotificationManager notificationManager = getNotificationManager(context);
-    NotificationChannel channel = notificationManager.getNotificationChannel(channelId);
-    if (channel != null) {
-      LogUtil.i(
-          "NotificationManager.deleteOldOngoingCallChannelIfNeeded",
-          "Old ongoing channel found. Deleting to create new channel");
-      notificationManager.deleteNotificationChannel(channel.getId());
-    }
+  private static void createOngoingCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.ONGOING_CALL,
+            context.getText(R.string.notification_channel_ongoing_call),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(false);
+    channel.enableLights(false);
+    channel.enableVibration(false);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static NotificationManager getNotificationManager(@NonNull Context context) {
-    return context.getSystemService(NotificationManager.class);
+  private static void createMissedCallChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.MISSED_CALL,
+            context.getText(R.string.notification_channel_missed_call),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(true);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    channel.setSound(
+        null, new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static TelephonyManager getTelephonyManager(@NonNull Context context) {
-    return context.getSystemService(TelephonyManager.class);
+  private static void createDefaultChannel(@NonNull Context context) {
+    NotificationChannel channel =
+        new NotificationChannel(
+            NotificationChannelId.DEFAULT,
+            context.getText(R.string.notification_channel_misc),
+            NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(false);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
   }
 
-  private static TelecomManager getTelecomManager(@NonNull Context context) {
-    return context.getSystemService(TelecomManager.class);
-  }
+  private NotificationChannelManager() {}
 }
diff --git a/java/com/android/dialer/notification/NotificationManagerUtils.java b/java/com/android/dialer/notification/NotificationManagerUtils.java
new file mode 100644
index 0000000..d99a903
--- /dev/null
+++ b/java/com/android/dialer/notification/NotificationManagerUtils.java
@@ -0,0 +1,41 @@
+/*
+ * 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.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+
+/** Utilities to manage notifications. */
+public final class NotificationManagerUtils {
+  public static void cancelAllInGroup(@NonNull Context context, @NonNull String groupKey) {
+    Assert.isNotNull(context);
+    Assert.checkArgument(!TextUtils.isEmpty(groupKey));
+
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      if (TextUtils.equals(groupKey, notification.getNotification().getGroup())) {
+        notificationManager.cancel(notification.getTag(), notification.getId());
+      }
+    }
+  }
+
+  private NotificationManagerUtils() {}
+}
diff --git a/java/com/android/dialer/notification/NotificationThrottler.java b/java/com/android/dialer/notification/NotificationThrottler.java
new file mode 100644
index 0000000..9db744d
--- /dev/null
+++ b/java/com/android/dialer/notification/NotificationThrottler.java
@@ -0,0 +1,126 @@
+/*
+ * 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.notification;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.service.notification.StatusBarNotification;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Utility to ensure that only a certain number of notifications are shown for a particular
+ * notification type. Once the limit is reached, older notifications are cancelled.
+ */
+/* package */ class NotificationThrottler {
+  /**
+   * For gropued bundled notifications, the system UI will only display the last 8. For grouped
+   * unbundled notifications, the system displays all notifications until a global maximum of 50 is
+   * reached.
+   */
+  private static final int MAX_NOTIFICATIONS_PER_TAG = 10;
+
+  private static final int HIGH_GLOBAL_NOTIFICATION_COUNT = 45;
+
+  private static boolean didLogHighGlobalNotificationCountReached;
+
+  /* package */ static void throttle(@NonNull Context context, @NonNull Notification notification) {
+    Assert.isNotNull(context);
+    Assert.isNotNull(notification);
+
+    // No limiting for non-grouped notifications.
+    String groupKey = notification.getGroup();
+    if (TextUtils.isEmpty(groupKey)) {
+      return;
+    }
+
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    StatusBarNotification[] activeNotifications = notificationManager.getActiveNotifications();
+    if (activeNotifications.length > HIGH_GLOBAL_NOTIFICATION_COUNT
+        && !didLogHighGlobalNotificationCountReached) {
+      LogUtil.i(
+          "NotificationThrottler.throttle",
+          "app has %d notifications, system may suppress future notifications",
+          activeNotifications.length);
+      didLogHighGlobalNotificationCountReached = true;
+      Logger.get(context)
+          .logImpression(DialerImpression.Type.HIGH_GLOBAL_NOTIFICATION_COUNT_REACHED);
+    }
+
+    // Count the number of notificatons for this group (excluding the summary).
+    int count = 0;
+    for (StatusBarNotification currentNotification : activeNotifications) {
+      if (isNotificationInGroup(currentNotification, groupKey)) {
+        count++;
+      }
+    }
+
+    if (count > MAX_NOTIFICATIONS_PER_TAG) {
+      LogUtil.i(
+          "NotificationThrottler.throttle",
+          "groupKey: %s is over limit, count: %d, limit: %d",
+          groupKey,
+          count,
+          MAX_NOTIFICATIONS_PER_TAG);
+      List<StatusBarNotification> notifications = getSortedMatchingNotifications(context, groupKey);
+      for (int i = 0; i < (count - MAX_NOTIFICATIONS_PER_TAG); i++) {
+        notificationManager.cancel(notifications.get(i).getTag(), notifications.get(i).getId());
+      }
+    }
+  }
+
+  private static List<StatusBarNotification> getSortedMatchingNotifications(
+      @NonNull Context context, @NonNull String groupKey) {
+    List<StatusBarNotification> notifications = new ArrayList<>();
+    NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+    for (StatusBarNotification notification : notificationManager.getActiveNotifications()) {
+      if (isNotificationInGroup(notification, groupKey)) {
+        notifications.add(notification);
+      }
+    }
+    Collections.sort(
+        notifications,
+        new Comparator<StatusBarNotification>() {
+          @Override
+          public int compare(StatusBarNotification left, StatusBarNotification right) {
+            return Long.compare(left.getPostTime(), right.getPostTime());
+          }
+        });
+    return notifications;
+  }
+
+  private static boolean isNotificationInGroup(
+      @NonNull StatusBarNotification notification, @NonNull String groupKey) {
+    // Don't include group summaries.
+    if ((notification.getNotification().flags & Notification.FLAG_GROUP_SUMMARY) != 0) {
+      return false;
+    }
+
+    return TextUtils.equals(groupKey, notification.getNotification().getGroup());
+  }
+
+  private NotificationThrottler() {}
+}
diff --git a/java/com/android/dialer/notification/PackageUpdatedReceiver.java b/java/com/android/dialer/notification/PackageUpdatedReceiver.java
deleted file mode 100644
index feed402..0000000
--- a/java/com/android/dialer/notification/PackageUpdatedReceiver.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.notification;
-
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.os.BuildCompat;
-
-/** Inits the notification channels when Dialer or OS is updated */
-public class PackageUpdatedReceiver extends BroadcastReceiver {
-
-  @Override
-  @TargetApi(26)
-  public void onReceive(Context context, Intent intent) {
-    if (!BuildCompat.isAtLeastO()) {
-      return;
-    }
-    context = context.createDeviceProtectedStorageContext();
-    NotificationChannelManager.getInstance().initChannels(context);
-  }
-}
diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java
new file mode 100644
index 0000000..e2d0f3a
--- /dev/null
+++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java
@@ -0,0 +1,217 @@
+/*
+ * 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.notification;
+
+import android.annotation.TargetApi;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.os.Build.VERSION_CODES;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/** Utilities for working with voicemail channels. */
+@TargetApi(VERSION_CODES.O)
+/* package */ final class VoicemailChannelUtils {
+  private static final String GLOBAL_VOICEMAIL_CHANNEL_ID = "phone_voicemail";
+  private static final String PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX = "phone_voicemail_account_";
+
+  static Set<String> getAllChannelIds(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    Set<String> result = new ArraySet<>();
+    if (isSingleSimDevice(context)) {
+      result.add(GLOBAL_VOICEMAIL_CHANNEL_ID);
+    } else {
+      for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+        result.add(getChannelIdForAccount(handle));
+      }
+    }
+    return result;
+  }
+
+  static void createAllChannels(@NonNull Context context) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    if (isSingleSimDevice(context)) {
+      createGlobalVoicemailChannel(context);
+    } else {
+      for (PhoneAccountHandle handle : getAllEligableAccounts(context)) {
+        createVoicemailChannelForAccount(context, handle);
+      }
+    }
+  }
+
+  @NonNull
+  static String getChannelId(@NonNull Context context, @Nullable PhoneAccountHandle handle) {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isNotNull(context);
+
+    // Most devices we deal with have a single SIM slot. No need to distinguish between phone
+    // accounts.
+    if (isSingleSimDevice(context)) {
+      return GLOBAL_VOICEMAIL_CHANNEL_ID;
+    }
+
+    // We can get a null phone account at random points (modem reboot, etc...). Gracefully degrade
+    // by using the default channel.
+    if (handle == null) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "no phone account on a multi-SIM device, using default channel");
+      return NotificationChannelId.DEFAULT;
+    }
+
+    // Voicemail notifications should always be associated with a SIM based phone account.
+    if (!isChannelAllowedForAccount(context, handle)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "phone account is not for a SIM, using default channel");
+      return NotificationChannelId.DEFAULT;
+    }
+
+    // Now we're in the multi-SIM case.
+    String channelId = getChannelIdForAccount(handle);
+    if (!doesChannelExist(context, channelId)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.getChannelId",
+          "voicemail channel not found for phone account (possible SIM swap?), creating a new one");
+      createVoicemailChannelForAccount(context, handle);
+    }
+    return channelId;
+  }
+
+  private static boolean doesChannelExist(@NonNull Context context, @NonNull String channelId) {
+    return context.getSystemService(NotificationManager.class).getNotificationChannel(channelId)
+        != null;
+  }
+
+  private static String getChannelIdForAccount(@NonNull PhoneAccountHandle handle) {
+    Assert.isNotNull(handle);
+    return PER_ACCOUNT_VOICEMAIL_CHANNEL_ID_PREFIX + ":" + handle.getId();
+  }
+
+  /**
+   * Creates a voicemail channel but doesn't associate it with a SIM. For devices with only one SIM
+   * slot this is ideal because there won't be duplication in the settings UI.
+   */
+  private static void createGlobalVoicemailChannel(@NonNull Context context) {
+    NotificationChannel channel = newChannel(context, GLOBAL_VOICEMAIL_CHANNEL_ID, null);
+
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    PhoneAccountHandle handle =
+        telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    if (handle == null) {
+      LogUtil.i(
+          "VoicemailChannelUtils.createGlobalVoicemailChannel",
+          "phone account is null, not migrating sound settings");
+    } else if (!isChannelAllowedForAccount(context, handle)) {
+      LogUtil.i(
+          "VoicemailChannelUtils.createGlobalVoicemailChannel",
+          "phone account is not eligable, not migrating sound settings");
+    } else {
+      migrateVoicemailSoundSettings(context, channel, handle);
+    }
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+  }
+
+  private static List<PhoneAccountHandle> getAllEligableAccounts(@NonNull Context context) {
+    List<PhoneAccountHandle> handles = new ArrayList<>();
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    for (PhoneAccountHandle handle : telecomManager.getCallCapablePhoneAccounts()) {
+      if (isChannelAllowedForAccount(context, handle)) {
+        handles.add(handle);
+      }
+    }
+    return handles;
+  }
+
+  private static void createVoicemailChannelForAccount(
+      @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+    PhoneAccount phoneAccount =
+        context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    NotificationChannel channel =
+        newChannel(context, getChannelIdForAccount(handle), phoneAccount.getLabel());
+    migrateVoicemailSoundSettings(context, channel, handle);
+    context.getSystemService(NotificationManager.class).createNotificationChannel(channel);
+  }
+
+  private static void migrateVoicemailSoundSettings(
+      @NonNull Context context,
+      @NonNull NotificationChannel channel,
+      @NonNull PhoneAccountHandle handle) {
+    TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    channel.enableVibration(telephonyManager.isVoicemailVibrationEnabled(handle));
+    channel.setSound(
+        telephonyManager.getVoicemailRingtoneUri(handle),
+        new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+  }
+
+  private static boolean isChannelAllowedForAccount(
+      @NonNull Context context, @NonNull PhoneAccountHandle handle) {
+    PhoneAccount phoneAccount =
+        context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    if (phoneAccount == null) {
+      return false;
+    }
+    if (!phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+      return false;
+    }
+    return true;
+  }
+
+  private static NotificationChannel newChannel(
+      @NonNull Context context, @NonNull String channelId, @Nullable CharSequence nameSuffix) {
+    CharSequence name = context.getText(R.string.notification_channel_voicemail);
+    // TODO(sail): Use a string resource template after v10.
+    if (!TextUtils.isEmpty(nameSuffix)) {
+      name = TextUtils.concat(name, ": ", nameSuffix);
+    }
+
+    NotificationChannel channel =
+        new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_DEFAULT);
+    channel.setShowBadge(true);
+    channel.enableLights(true);
+    channel.enableVibration(true);
+    channel.setSound(
+        Settings.System.DEFAULT_NOTIFICATION_URI,
+        new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());
+    return channel;
+  }
+
+  private static boolean isSingleSimDevice(@NonNull Context context) {
+    return context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1;
+  }
+
+  private VoicemailChannelUtils() {}
+}
diff --git a/java/com/android/dialer/notification/res/values-af/strings.xml b/java/com/android/dialer/notification/res/values-af/strings.xml
index 08dd754..e48249b 100644
--- a/java/com/android/dialer/notification/res/values-af/strings.xml
+++ b/java/com/android/dialer/notification/res/values-af/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Deurlopende oproepe"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepe"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Stemboodskappe"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ekterne oproepe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Verstek"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-am/strings.xml b/java/com/android/dialer/notification/res/values-am/strings.xml
index 56d6c2c..0983e05 100644
--- a/java/com/android/dialer/notification/res/values-am/strings.xml
+++ b/java/com/android/dialer/notification/res/values-am/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"በመካሄድ ላይ ያሉ ጥሪዎች"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ያመለጡ ጥሪዎች"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"የድምፅ መልዕክቶች"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ውጫዊ ጥሪዎች"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ነባሪ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ar/strings.xml b/java/com/android/dialer/notification/res/values-ar/strings.xml
index 71857c2..ab6059f 100644
--- a/java/com/android/dialer/notification/res/values-ar/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ar/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"المكالمات الجارية"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"المكالمات الفائتة"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"رسائل البريد الصوتي"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"المكالمات الخارجية"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"افتراضي"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-az/strings.xml b/java/com/android/dialer/notification/res/values-az/strings.xml
index f907e55..425f30a 100644
--- a/java/com/android/dialer/notification/res/values-az/strings.xml
+++ b/java/com/android/dialer/notification/res/values-az/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Gedən zənglər"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Buraxılmış zənglər"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Səsli məktublar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Defolt"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
index 4d5b5e7..4598e76 100644
--- a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u toku"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Govorne poruke"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Spoljni pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Podrazumevano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-be/strings.xml b/java/com/android/dialer/notification/res/values-be/strings.xml
index 70defe3..586a36c 100644
--- a/java/com/android/dialer/notification/res/values-be/strings.xml
+++ b/java/com/android/dialer/notification/res/values-be/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Адбываючыяся выклікі"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Прапушчаныя выклікі"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Галасавая пошта"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Знешнія выклікі"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Стандартны"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bg/strings.xml b/java/com/android/dialer/notification/res/values-bg/strings.xml
index 1ec202e..9bc8f8f 100644
--- a/java/com/android/dialer/notification/res/values-bg/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bg/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущи обаждания"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуснати обаждания"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Гласови съобщения"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Външни обаждания"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"По подразбиране"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bn/strings.xml b/java/com/android/dialer/notification/res/values-bn/strings.xml
index 886f831..1d77817 100644
--- a/java/com/android/dialer/notification/res/values-bn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"সংযুক্ত কল"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"মিস করা কল"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ভয়েসমেল"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"বাহ্যিক কল"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ডিফল্ট"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bs/strings.xml b/java/com/android/dialer/notification/res/values-bs/strings.xml
index e408a64..dedbb1c 100644
--- a/java/com/android/dialer/notification/res/values-bs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bs/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Tekući pozivi"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Vanjski pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ca/strings.xml b/java/com/android/dialer/notification/res/values-ca/strings.xml
index ea81b62..1c19d0f 100644
--- a/java/com/android/dialer/notification/res/values-ca/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ca/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Trucades en curs"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Trucades perdudes"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Missatges de veu"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Trucades externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminat"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-cs/strings.xml b/java/com/android/dialer/notification/res/values-cs/strings.xml
index 9ea7b61..c428ca2 100644
--- a/java/com/android/dialer/notification/res/values-cs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-cs/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Probíhající hovory"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové zprávy"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externí hovory"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Výchozí"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-da/strings.xml b/java/com/android/dialer/notification/res/values-da/strings.xml
index e4fc4dd..7f0ce9f 100644
--- a/java/com/android/dialer/notification/res/values-da/strings.xml
+++ b/java/com/android/dialer/notification/res/values-da/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Igangværende opkald"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ubesvarede opkald"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talebeskeder"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne opkald"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-de/strings.xml b/java/com/android/dialer/notification/res/values-de/strings.xml
index 7fce6bf..86b7520 100644
--- a/java/com/android/dialer/notification/res/values-de/strings.xml
+++ b/java/com/android/dialer/notification/res/values-de/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Laufende Anrufe"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Entgangene Anrufe"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mailboxnachrichten"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externe Anrufe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-el/strings.xml b/java/com/android/dialer/notification/res/values-el/strings.xml
index a25bb43..812dc25 100644
--- a/java/com/android/dialer/notification/res/values-el/strings.xml
+++ b/java/com/android/dialer/notification/res/values-el/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Κλήσεις σε εξέλιξη"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Αναπάντητες κλήσεις"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Μηνύματα αυτόματου τηλεφωνητή"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Εξωτερικές κλήσεις"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Προεπιλογή"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
index 7d4bd82..43b722b 100644
--- a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"External calls"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
index fe8fe13..c56edcf 100644
--- a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Llamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es/strings.xml b/java/com/android/dialer/notification/res/values-es/strings.xml
index fe8fe13..c56edcf 100644
--- a/java/com/android/dialer/notification/res/values-es/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Llamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-et/strings.xml b/java/com/android/dialer/notification/res/values-et/strings.xml
index 4162395..9c60a31 100644
--- a/java/com/android/dialer/notification/res/values-et/strings.xml
+++ b/java/com/android/dialer/notification/res/values-et/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käimasolevad kõned"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastamata kõned"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Kõnepostisõnumid"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Välised kõned"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Vaikeseade"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-eu/strings.xml b/java/com/android/dialer/notification/res/values-eu/strings.xml
index 326ac0a..d94ac0a 100644
--- a/java/com/android/dialer/notification/res/values-eu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-eu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Abian diren deiak"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Dei galduak"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ahots-mezuak"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Kanpoko deiak"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Lehenetsia"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fa/strings.xml b/java/com/android/dialer/notification/res/values-fa/strings.xml
index f1a7efc..edbc983 100644
--- a/java/com/android/dialer/notification/res/values-fa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fa/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"تماس‌های درحال انجام"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"تماس‌های بی‌پاسخ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"پست‌های صوتی"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"تماس‌های خارجی"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"پیش‌فرض"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fi/strings.xml b/java/com/android/dialer/notification/res/values-fi/strings.xml
index c88c232..87652f8 100644
--- a/java/com/android/dialer/notification/res/values-fi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käynnissä olevat puhelut"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastaamattomat puhelut"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Vastaajaviestit"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ulkopuoliset puhelut"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Oletus"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
index a21d6b2..5a2d7dc 100644
--- a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Appels externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr/strings.xml b/java/com/android/dialer/notification/res/values-fr/strings.xml
index a21d6b2..5a2d7dc 100644
--- a/java/com/android/dialer/notification/res/values-fr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Appels externes"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gl/strings.xml b/java/com/android/dialer/notification/res/values-gl/strings.xml
index 3b57a59..0e7fb61 100644
--- a/java/com/android/dialer/notification/res/values-gl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas saíntes"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correos de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gu/strings.xml b/java/com/android/dialer/notification/res/values-gu/strings.xml
index f185e59..a4a0a7a 100644
--- a/java/com/android/dialer/notification/res/values-gu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ચાલુ કૉલ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"છૂટેલા કૉલ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"વૉઇસમેઇલ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"બાહ્ય કૉલ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ડિફૉલ્ટ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hi/strings.xml b/java/com/android/dialer/notification/res/values-hi/strings.xml
index 89c8e55..69ed9b0 100644
--- a/java/com/android/dialer/notification/res/values-hi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"चल रहे कॉल"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"छूटे कॉल"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"वॉइसमेल"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाहरी कॉल"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"डिफ़ॉल्ट"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hr/strings.xml b/java/com/android/dialer/notification/res/values-hr/strings.xml
index 9f786d7..a5924c3 100644
--- a/java/com/android/dialer/notification/res/values-hr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u tijeku"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Vanjski pozivi"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hu/strings.xml b/java/com/android/dialer/notification/res/values-hu/strings.xml
index 09fa795..719252f 100644
--- a/java/com/android/dialer/notification/res/values-hu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Kimenő hívások"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Nem fogadott hívások"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hangüzenetek"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Külső hívások"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Alapértelmezett"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hy/strings.xml b/java/com/android/dialer/notification/res/values-hy/strings.xml
index 693898a..6bb2c34 100644
--- a/java/com/android/dialer/notification/res/values-hy/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hy/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ընթացիկ զանգեր"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Բաց թողնված զանգեր"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ձայնային փոստ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Արտաքին զանգեր"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Կանխադրված"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-in/strings.xml b/java/com/android/dialer/notification/res/values-in/strings.xml
index 405b292..88ef3d5 100644
--- a/java/com/android/dialer/notification/res/values-in/strings.xml
+++ b/java/com/android/dialer/notification/res/values-in/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan keluar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan tak terjawab"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Pesan suara"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Panggilan eksternal"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-is/strings.xml b/java/com/android/dialer/notification/res/values-is/strings.xml
index be84917..166d974 100644
--- a/java/com/android/dialer/notification/res/values-is/strings.xml
+++ b/java/com/android/dialer/notification/res/values-is/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Símtöl í gangi"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ósvöruð símtöl"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talhólfsskilaboð"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Utanaðkomandi símtöl"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Sjálfgefið"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-it/strings.xml b/java/com/android/dialer/notification/res/values-it/strings.xml
index 1ac6e2d..7b55da9 100644
--- a/java/com/android/dialer/notification/res/values-it/strings.xml
+++ b/java/com/android/dialer/notification/res/values-it/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chiamate in uscita"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chiamate perse"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messaggi vocali"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chiamate esterne"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinito"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-iw/strings.xml b/java/com/android/dialer/notification/res/values-iw/strings.xml
index ed07b86..2b8b9df 100644
--- a/java/com/android/dialer/notification/res/values-iw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-iw/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"שיחות יוצאות"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"שיחות שלא נענו"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"הודעות קוליות"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"שיחות חיצוניות"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ברירת מחדל"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ja/strings.xml b/java/com/android/dialer/notification/res/values-ja/strings.xml
index 3265d72..2ff8da7 100644
--- a/java/com/android/dialer/notification/res/values-ja/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ja/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"通話中"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"不在着信"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ボイスメール"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"デフォルト"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ka/strings.xml b/java/com/android/dialer/notification/res/values-ka/strings.xml
index 6d81465..73394ef 100644
--- a/java/com/android/dialer/notification/res/values-ka/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ka/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"გამავალი ზარები"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"გამოტოვებული ზარები"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ხმოვანი ფოსტა"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"გარე ზარები"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ნაგულისხმევი"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kk/strings.xml b/java/com/android/dialer/notification/res/values-kk/strings.xml
index 35733fb..8151c9c 100644
--- a/java/com/android/dialer/notification/res/values-kk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Қазіргі қоңыраулар"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Қабылданбаған қоңыраулар"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дауыстық хабарлар"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Сыртқы қоңыраулар"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Әдепкі"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-km/strings.xml b/java/com/android/dialer/notification/res/values-km/strings.xml
index 42bc113..22131ff 100644
--- a/java/com/android/dialer/notification/res/values-km/strings.xml
+++ b/java/com/android/dialer/notification/res/values-km/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ការ​ហៅ​បន្ត"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ការ​ហៅ​ដែល​មិន​បាន​ទទួល"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"សារ​ជា​សំឡេង"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ការ​ហៅខាង​ក្រៅ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"លំ​នាំ​ដើម"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kn/strings.xml b/java/com/android/dialer/notification/res/values-kn/strings.xml
index 45f26e3..d6e55bd 100644
--- a/java/com/android/dialer/notification/res/values-kn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗಳು"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ಧ್ವನಿಮೇಲ್‌ಗಳು"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ಹೊರಗಿನ ಕರೆಗಳು"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ಡಿಫಾಲ್ಟ್"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ko/strings.xml b/java/com/android/dialer/notification/res/values-ko/strings.xml
index d806cad..5a66717 100644
--- a/java/com/android/dialer/notification/res/values-ko/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ko/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"진행 중인 전화"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"부재중 전화"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"음성사서함"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"외부 전화"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"기본"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ky/strings.xml b/java/com/android/dialer/notification/res/values-ky/strings.xml
index eb6adf6..c525931 100644
--- a/java/com/android/dialer/notification/res/values-ky/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ky/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Учурдагы чалуулар"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Кабыл алынбаган чалуулар"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Үнкаттар"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Тышкы чалуулар"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Демейки"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lo/strings.xml b/java/com/android/dialer/notification/res/values-lo/strings.xml
index f439807..a52d9df 100644
--- a/java/com/android/dialer/notification/res/values-lo/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lo/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ສາຍໂທອອກ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ສາຍບໍ່ໄດ້ຮັບ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ສາຍພາຍນອກ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ຄ່າເລີ່ມຕົ້ນ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lt/strings.xml b/java/com/android/dialer/notification/res/values-lt/strings.xml
index f08697a..6f26d3e 100644
--- a/java/com/android/dialer/notification/res/values-lt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lt/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Vykstantys skambučiai"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Praleisti skambučiai"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balso pašto pranešimai"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Išoriniai skambučiai"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Numatytasis"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lv/strings.xml b/java/com/android/dialer/notification/res/values-lv/strings.xml
index d465b68..1819d81 100644
--- a/java/com/android/dialer/notification/res/values-lv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lv/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktīvie zvani"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neatbildētie zvani"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balss pasta ziņojumi"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Ārējie zvani"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Noklusējums"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mk/strings.xml b/java/com/android/dialer/notification/res/values-mk/strings.xml
index 838065b..56459c4 100644
--- a/java/com/android/dialer/notification/res/values-mk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Појдовни повици"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени повици"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорни пораки"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Надворешни повици"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Стандардно"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ml/strings.xml b/java/com/android/dialer/notification/res/values-ml/strings.xml
index 448186a..49a64e8 100644
--- a/java/com/android/dialer/notification/res/values-ml/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ml/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"നിലവിലുള്ള കോളുകൾ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"മിസ്‌ഡ് കോളുകൾ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"വോയ്‌സ്മെയിലുകൾ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"എക്‌സ്റ്റേണൽ കോളുകൾ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ഡിഫോൾട്ട്"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mn/strings.xml b/java/com/android/dialer/notification/res/values-mn/strings.xml
index 3dca52e..28297b3 100644
--- a/java/com/android/dialer/notification/res/values-mn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mn/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Үргэлжилж буй дуудлага"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Аваагүй дуудлага"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дуут шуудан"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Гадаад дуудлага"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Өгөгдмөл"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mr/strings.xml b/java/com/android/dialer/notification/res/values-mr/strings.xml
index 5685376..38fbd60 100644
--- a/java/com/android/dialer/notification/res/values-mr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"सुरू असलेले कॉल"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"सुटलेले कॉल"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"व्हॉइसमेल"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाह्य कॉल"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"डीफॉल्ट"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ms/strings.xml b/java/com/android/dialer/notification/res/values-ms/strings.xml
index a1961c4..ec7be04 100644
--- a/java/com/android/dialer/notification/res/values-ms/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ms/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan sedang berlangsung"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan terlepas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mel suara"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Panggilan luar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Lalai"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-my/strings.xml b/java/com/android/dialer/notification/res/values-my/strings.xml
index 26398b4..44df847 100644
--- a/java/com/android/dialer/notification/res/values-my/strings.xml
+++ b/java/com/android/dialer/notification/res/values-my/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"လက်ရှိခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"လွဲသွားသော ခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"အသံစာပို့စနစ်များ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ပြင်ပခေါ်ဆိုမှုများ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"မူရင်း"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nb/strings.xml b/java/com/android/dialer/notification/res/values-nb/strings.xml
index e4ccd48..8e63fd2 100644
--- a/java/com/android/dialer/notification/res/values-nb/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nb/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne anrop"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ne/strings.xml b/java/com/android/dialer/notification/res/values-ne/strings.xml
index 8ccd299..e653bb3 100644
--- a/java/com/android/dialer/notification/res/values-ne/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ne/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"जारी रहेका कलहरू"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"छुटेका कलहरू"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"भ्वाइस मेलहरू"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"बाह्य कलहरू"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"पूर्वनिर्धारित मान"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nl/strings.xml b/java/com/android/dialer/notification/res/values-nl/strings.xml
index e46dd19..094cc35 100644
--- a/java/com/android/dialer/notification/res/values-nl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Actieve oproepen"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepen"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemails"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externe oproepen"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standaard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-no/strings.xml b/java/com/android/dialer/notification/res/values-no/strings.xml
index e4ccd48..8e63fd2 100644
--- a/java/com/android/dialer/notification/res/values-no/strings.xml
+++ b/java/com/android/dialer/notification/res/values-no/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Eksterne anrop"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pa/strings.xml b/java/com/android/dialer/notification/res/values-pa/strings.xml
index 40709c1..c4ee97b 100644
--- a/java/com/android/dialer/notification/res/values-pa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pa/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"ਖੁੰਝੀਆਂ ਕਾਲਾਂ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ਵੌਇਸਮੇਲਾਂ"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"ਬਾਹਰੀ ਕਾਲਾਂ"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pl/strings.xml b/java/com/android/dialer/notification/res/values-pl/strings.xml
index 73b795c..4b33460 100644
--- a/java/com/android/dialer/notification/res/values-pl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Połączenia trwające"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Połączenia nieodebrane"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Wiadomości głosowe"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Połączenia zewnętrzne"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Domyślny"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
index f6e41cb..4b988c3 100644
--- a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
index ec42a5b..45b31eb 100644
--- a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas efetuadas"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas não atendidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensagens de correio de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinição"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt/strings.xml b/java/com/android/dialer/notification/res/values-pt/strings.xml
index f6e41cb..4b988c3 100644
--- a/java/com/android/dialer/notification/res/values-pt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Chamadas externas"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ro/strings.xml b/java/com/android/dialer/notification/res/values-ro/strings.xml
index 7deeabb..040c58a 100644
--- a/java/com/android/dialer/notification/res/values-ro/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ro/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Apeluri în desfășurare"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Apeluri nepreluate"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mesaje vocale"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Apeluri externe"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Prestabilit"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ru/strings.xml b/java/com/android/dialer/notification/res/values-ru/strings.xml
index 3a11404..a811799 100644
--- a/java/com/android/dialer/notification/res/values-ru/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ru/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущие вызовы"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущенные вызовы"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосовые сообщения"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Внешние вызовы"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"По умолчанию"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-si/strings.xml b/java/com/android/dialer/notification/res/values-si/strings.xml
index bf0a5a7..3ad0af7 100644
--- a/java/com/android/dialer/notification/res/values-si/strings.xml
+++ b/java/com/android/dialer/notification/res/values-si/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"යන ඇමතුම්"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"මඟ හැරුණු ඇමතුම්"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"හඬ තැපැල්"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"බාහිර ඇමතුම්"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"පෙරනිමි"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sk/strings.xml b/java/com/android/dialer/notification/res/values-sk/strings.xml
index 4a67e60..30941bc 100644
--- a/java/com/android/dialer/notification/res/values-sk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Prebiehajúce hovory"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové správy"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externé hovory"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Predvolené"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sl/strings.xml b/java/com/android/dialer/notification/res/values-sl/strings.xml
index e54111d..70474b8 100644
--- a/java/com/android/dialer/notification/res/values-sl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktivni klici"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neodgovorjeni klici"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sporočila v odzivniku"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Zunanji klici"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Privzeto"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sq/strings.xml b/java/com/android/dialer/notification/res/values-sq/strings.xml
index 42d4daa..03bc247 100644
--- a/java/com/android/dialer/notification/res/values-sq/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sq/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Telefonatat në vazhdim"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Telefonatat e humbura"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Postat zanore"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Telefonatat e jashtme"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"I parazgjedhur"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sr/strings.xml b/java/com/android/dialer/notification/res/values-sr/strings.xml
index 1047717..8326c04 100644
--- a/java/com/android/dialer/notification/res/values-sr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Позиви у току"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени позиви"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорне поруке"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Спољни позиви"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Подразумевано"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sv/strings.xml b/java/com/android/dialer/notification/res/values-sv/strings.xml
index 6c9ff83..e3170d4 100644
--- a/java/com/android/dialer/notification/res/values-sv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sv/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtal"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missade samtal"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Röstmeddelanden"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Externa samtal"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sw/strings.xml b/java/com/android/dialer/notification/res/values-sw/strings.xml
index a493f88..d0a65b0 100644
--- a/java/com/android/dialer/notification/res/values-sw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sw/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Simu zinazoendelea"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Simu ambazo hukujibu"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ujumbe wa sauti"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Simu za nje"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Chaguo-msingi"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ta/strings.xml b/java/com/android/dialer/notification/res/values-ta/strings.xml
index d3000cf..8a6ae89 100644
--- a/java/com/android/dialer/notification/res/values-ta/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ta/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"செயலில் உள்ள அழைப்புகள்"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"தவறிய அழைப்புகள்"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"குரலஞ்சல்கள்"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"வெளி அழைப்புகள்"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"இயல்பு"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-te/strings.xml b/java/com/android/dialer/notification/res/values-te/strings.xml
index b14b210..b1911d3 100644
--- a/java/com/android/dialer/notification/res/values-te/strings.xml
+++ b/java/com/android/dialer/notification/res/values-te/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"కొనసాగుతున్న కాల్‌లు"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"సమాధానమివ్వని కాల్‌లు"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"వాయిస్ మెయిల్‌లు"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"బాహ్య కాల్‌లు"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"డిఫాల్ట్"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-th/strings.xml b/java/com/android/dialer/notification/res/values-th/strings.xml
index 45248bb..b2949e4 100644
--- a/java/com/android/dialer/notification/res/values-th/strings.xml
+++ b/java/com/android/dialer/notification/res/values-th/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"สายที่สนทนาอยู่"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"สายที่ไม่ได้รับ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"ข้อความเสียง"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"สายนอก"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ค่าเริ่มต้น"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tl/strings.xml b/java/com/android/dialer/notification/res/values-tl/strings.xml
index 3e88a05..1219ad8 100644
--- a/java/com/android/dialer/notification/res/values-tl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tl/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Mga kasalukuyang tawag"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Mga hindi nasagot na tawag"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mga voicemail"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Mga external na tawag"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tr/strings.xml b/java/com/android/dialer/notification/res/values-tr/strings.xml
index d4e063b..71c91c8 100644
--- a/java/com/android/dialer/notification/res/values-tr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tr/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Devam eden çağrılar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cevapsız çağrılar"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sesli mesajlar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Harici çağrılar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Varsayılan"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uk/strings.xml b/java/com/android/dialer/notification/res/values-uk/strings.xml
index a83a584..a002f42 100644
--- a/java/com/android/dialer/notification/res/values-uk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uk/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Поточні виклики"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущені виклики"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосова пошта"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Зовнішні виклики"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"За умовчанням"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ur/strings.xml b/java/com/android/dialer/notification/res/values-ur/strings.xml
index ba6e0d1..805fe08 100644
--- a/java/com/android/dialer/notification/res/values-ur/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ur/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"جاری کالیں"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"چھوٹی ہوئی کالیں"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"صوتی میلز"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"بیرونی کالیں"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"ڈیفالٹ"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uz/strings.xml b/java/com/android/dialer/notification/res/values-uz/strings.xml
index d45ff47..16075b0 100644
--- a/java/com/android/dialer/notification/res/values-uz/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uz/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Davom etayotgan suhbatlar"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Javobsiz chaqiruvlar"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ovozli xabarlar"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Tashqi chaqiruvlar"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Standart"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-vi/strings.xml b/java/com/android/dialer/notification/res/values-vi/strings.xml
index 6df8872..b6ab3d2 100644
--- a/java/com/android/dialer/notification/res/values-vi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-vi/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Cuộc gọi đến"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cuộc gọi nhỡ"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Thư thoại"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Cuộc gọi bên ngoài"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Mặc định"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
index fa5f0a6..1ef46c2 100644
--- a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"正在进行的通话"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接电话"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"语音邮件"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部来电"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"默认"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
index 307a7f9..43a6fab 100644
--- a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"留言信箱"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
index 054a2d7..35236be 100644
--- a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"語音留言"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"外部通話"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zu/strings.xml b/java/com/android/dialer/notification/res/values-zu/strings.xml
index 744ffc8..f3d9553 100644
--- a/java/com/android/dialer/notification/res/values-zu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zu/strings.xml
@@ -21,6 +21,5 @@
     <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Amakholi aqhubekayo"</string>
     <string name="notification_channel_missed_call" msgid="5820652855908217695">"Amakholi akuphuthile"</string>
     <string name="notification_channel_voicemail" msgid="9206363659849426204">"Amavoyisimeyili"</string>
-    <string name="notification_channel_external_call" msgid="2200143959948071132">"Amakholi angaphandle"</string>
     <string name="notification_channel_misc" msgid="5595452227577858518">"Okuzenzakalelayo"</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values/ids.xml b/java/com/android/dialer/notification/res/values/ids.xml
deleted file mode 100644
index c965f31..0000000
--- a/java/com/android/dialer/notification/res/values/ids.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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
-  -->
-
-<resources>
-  <item name="notification_ongoing_call" type="id"/>
-  <item name="notification_missed_call" type="id"/>
-  <item name="notification_visual_voicemail" type="id"/>
-  <item name="notification_legacy_voicemail" type="id"/>
-  <item name="notification_external_call" type="id"/>
-  <item name="notification_call_blocking_disabled_by_emergency_call" type="id"/>
-  <item name="notification_spam_call" type="id"/>
-  <item name="notification_feedback" type="id"/>
-</resources>
diff --git a/java/com/android/dialer/notification/res/values/strings.xml b/java/com/android/dialer/notification/res/values/strings.xml
index cb3119f..a3c6935 100644
--- a/java/com/android/dialer/notification/res/values/strings.xml
+++ b/java/com/android/dialer/notification/res/values/strings.xml
@@ -20,7 +20,6 @@
   <string name="notification_channel_ongoing_call">Ongoing calls</string>
   <string name="notification_channel_missed_call">Missed calls</string>
   <string name="notification_channel_voicemail">Voicemails</string>
-  <string name="notification_channel_external_call">External calls</string>
   <!-- [CHAR LIMIT=NONE] Catch-all channel for notifications that don't fit into one of the others -->
   <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java
index 095ee4e..7b6ddbc 100644
--- a/java/com/android/dialer/oem/CequintCallerIdManager.java
+++ b/java/com/android/dialer/oem/CequintCallerIdManager.java
@@ -18,7 +18,6 @@
 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;
@@ -29,9 +28,8 @@
 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 com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -73,17 +71,12 @@
   private static final String IMAGE = "cid_pLogo";
   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<>();
-  private static final ConcurrentHashMap<String, CequintCallerIdContact> incallIncomingCallCache =
-      new ConcurrentHashMap<>();
-  private static final ConcurrentHashMap<String, CequintCallerIdContact> incallOutgoingCallCache =
-      new ConcurrentHashMap<>();
-  private static boolean hasRegisteredContentObserver;
   private static boolean hasAlreadyCheckedCequintCallerIdPackage;
   private static boolean isCequintCallerIdEnabled;
 
+  // TODO(wangqi): Revisit it and maybe remove it if it's not necessary.
+  private final ConcurrentHashMap<String, CequintCallerIdContact> callLogCache;
+
   /** Cequint caller id contact information. */
   public static class CequintCallerIdContact {
     public final String name;
@@ -117,9 +110,35 @@
     return isCequintCallerIdEnabled;
   }
 
+  public static CequintCallerIdManager createInstanceForCallLog() {
+    return new CequintCallerIdManager();
+  }
+
   @WorkerThread
   @Nullable
-  public static CequintCallerIdContact getCequintCallerIdContact(Context context, String number) {
+  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);
+    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)};
+    return lookup(context, CONTENT_URI_FOR_INCALL, number, flags);
+  }
+
+  @WorkerThread
+  @Nullable
+  public CequintCallerIdContact getCequintCallerIdContact(Context context, String number) {
     Assert.isWorkerThread();
     LogUtil.d(
         "CequintCallerIdManager.getCequintCallerIdContact",
@@ -142,43 +161,6 @@
 
   @WorkerThread
   @Nullable
-  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);
-    if (isIncoming && incallIncomingCallCache.containsKey(number)) {
-      return incallIncomingCallCache.get(number);
-    } else if (!isIncoming && incallOutgoingCallCache.containsKey(number)) {
-      return incallOutgoingCallCache.get(number);
-    }
-    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) {
-      if (isIncoming) {
-        incallIncomingCallCache.put(number, cequintCallerIdContact);
-      } else {
-        incallOutgoingCallCache.put(number, cequintCallerIdContact);
-      }
-    }
-    return cequintCallerIdContact;
-  }
-
-  @WorkerThread
-  @Nullable
   private static CequintCallerIdContact lookup(
       Context context, Uri uri, @NonNull String number, String[] flags) {
     Assert.isWorkerThread();
@@ -285,33 +267,7 @@
     return geoDescription;
   }
 
-  private static synchronized void registerContentObserver(Context context) {
-    if (!PermissionsUtil.hasCequintPermissions(context)) {
-      LogUtil.i("CequintCallerIdManager.registerContentObserver", "no cequint permissions");
-      return;
-    }
-
-    if (hasRegisteredContentObserver) {
-      return;
-    }
-    ContentObserver contentObserver =
-        new ContentObserver(null) {
-          @Override
-          public void onChange(boolean selfChange) {
-            invalidateCache();
-          }
-        };
-
-    context
-        .getContentResolver()
-        .registerContentObserver(CONTENT_URI_FOR_INCALL, true, contentObserver);
-    hasRegisteredContentObserver = true;
+  private CequintCallerIdManager() {
+    callLogCache = new ConcurrentHashMap<>();
   }
-
-  private static void invalidateCache() {
-    incallIncomingCallCache.clear();
-    incallOutgoingCallCache.clear();
-  }
-
-  private CequintCallerIdManager() {}
 }
diff --git a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
index 9cf145b..79abff0 100644
--- a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
+++ b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
@@ -67,9 +67,7 @@
   }
 
   private MotorolaHiddenMenuKeySequence(Context context) {
-    featureHiddenMenuEnabled =
-        MotorolaUtils.isSpnMatched(context)
-            && context.getResources().getBoolean(R.bool.motorola_feature_hidden_menu);
+    featureHiddenMenuEnabled = MotorolaUtils.isSupportingHiddenMenu(context);
     // In case we do have a SPN from resource we need to match from service; otherwise we are
     // free to go
     if (featureHiddenMenuEnabled) {
diff --git a/java/com/android/dialer/oem/MotorolaUtils.java b/java/com/android/dialer/oem/MotorolaUtils.java
index db2b890..ffab8ea 100644
--- a/java/com/android/dialer/oem/MotorolaUtils.java
+++ b/java/com/android/dialer/oem/MotorolaUtils.java
@@ -18,8 +18,11 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.telephony.TelephonyManager;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PackageUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /** Util class for Motorola OEM devices. */
 public class MotorolaUtils {
@@ -39,6 +42,8 @@
   // This is used to check if a Motorola device supports WiFi call feature, by checking if a certain
   // package is enabled.
   private static final String WIFI_CALL_PACKAGE_NAME = "com.motorola.sprintwfc";
+  // Thi is used to check if a Motorola device supports hidden menu feature.
+  private static final String HIDDEN_MENU_FEATURE = "com.motorola.software.sprint.hidden_menu";
 
   // Feature flag indicates it's a HD call, currently this is only used by Motorola system build.
   // TODO(b/35359461): Use reference to android.provider.CallLog once it's in new SDK.
@@ -64,6 +69,10 @@
     }
   }
 
+  static boolean isSupportingHiddenMenu(Context context) {
+    return context.getPackageManager().hasSystemFeature(HIDDEN_MENU_FEATURE);
+  }
+
   public static boolean shouldBlinkHdIconWhenConnectingCall(Context context) {
     return ConfigProviderBindings.get(context)
             .getBoolean(CONFIG_HD_CODEC_BLINKING_ICON_WHEN_CONNECTING_CALL_ENABLED, true)
@@ -102,6 +111,22 @@
     return MotorolaHiddenMenuKeySequence.handleCharSequence(context, input);
   }
 
+  public static boolean isWifiCallingAvailable(Context context) {
+    if (!isSupportingSprintWifiCall(context)) {
+      return false;
+    }
+    TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    try {
+      Method method = TelephonyManager.class.getMethod("isWifiCallingAvailable");
+      boolean isWifiCallingAvailable = (boolean) method.invoke(telephonyManager);
+      LogUtil.d("MotorolaUtils.isWifiCallingAvailable", "%b", isWifiCallingAvailable);
+      return isWifiCallingAvailable;
+    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+      LogUtil.e("MotorolaUtils.isWifiCallingAvailable", "", e);
+    }
+    return false;
+  }
+
   private static boolean isSupportingSprintHdCodec(Context context) {
     return isSpnMatched(context)
         && context.getResources().getBoolean(R.bool.motorola_sprint_hd_codec)
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
index 7f63bee..ac33975 100644
--- a/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
   <string name="motorola_enabled_spn">Sprint</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
index 39b72cd..c5cb0d1 100644
--- a/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
index 39b72cd..c5cb0d1 100644
--- a/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
index 39b72cd..c5cb0d1 100644
--- a/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
index 39b72cd..c5cb0d1 100644
--- a/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
index 39b72cd..c5cb0d1 100644
--- a/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <bool name="motorola_feature_hidden_menu">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values/motorola_config.xml b/java/com/android/dialer/oem/res/values/motorola_config.xml
index f875d57..46e7a16 100644
--- a/java/com/android/dialer/oem/res/values/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values/motorola_config.xml
@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <!-- Flag to control if HD codec is supported by Sprint. -->
   <bool name="motorola_sprint_hd_codec">false</bool>
 
   <!-- Hidden menu configuration for Motorola. -->
-  <!-- Flag to control if the Hidden Menu sequence will be supported by Sprint. -->
-  <bool name="motorola_feature_hidden_menu">false</bool>
-
   <!-- This defines the specific key seuquence that will be catched in the SpecialCharSequenceMgr
        such as, ##OMADM# -->
   <string-array name="motorola_hidden_menu_key_sequence">
diff --git a/java/com/android/dialer/p13n/inference/P13nRanking.java b/java/com/android/dialer/p13n/inference/P13nRanking.java
index 0682e85..79b4d71 100644
--- a/java/com/android/dialer/p13n/inference/P13nRanking.java
+++ b/java/com/android/dialer/p13n/inference/P13nRanking.java
@@ -22,7 +22,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.p13n.inference.protocol.P13nRanker;
 import com.android.dialer.p13n.inference.protocol.P13nRankerFactory;
 import java.util.List;
diff --git a/java/com/android/dialer/performancereport/PerformanceReport.java b/java/com/android/dialer/performancereport/PerformanceReport.java
new file mode 100644
index 0000000..4359c01
--- /dev/null
+++ b/java/com/android/dialer/performancereport/PerformanceReport.java
@@ -0,0 +1,160 @@
+/*
+ * 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.performancereport;
+
+import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.widget.AbsListView;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.UiAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/** Tracks UI performance for a call. */
+public final class PerformanceReport {
+
+  private static final long INVALID_TIME = -1;
+  private static final long ACTIVE_DURATION = TimeUnit.MINUTES.toMillis(5);
+
+  private static final List<UiAction.Type> actions = new ArrayList<>();
+  private static final List<Long> actionTimestamps = new ArrayList<>();
+
+  private static final RecyclerView.OnScrollListener recordOnScrollListener =
+      new RecyclerView.OnScrollListener() {
+        @Override
+        public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+          if (newState == RecyclerView.SCROLL_STATE_SETTLING) {
+            PerformanceReport.recordClick(UiAction.Type.SCROLL);
+          }
+          super.onScrollStateChanged(recyclerView, newState);
+        }
+      };
+
+  private static boolean recording = false;
+  private static long appLaunchTimeMillis = INVALID_TIME;
+  private static long firstClickTimeMillis = INVALID_TIME;
+  private static long lastActionTimeMillis = INVALID_TIME;
+
+  @Nullable private static UiAction.Type ignoreActionOnce = null;
+
+  private static int startingTabIndex = -1; // UNKNOWN
+
+  private PerformanceReport() {}
+
+  public static void startRecording() {
+    LogUtil.enterBlock("PerformanceReport.startRecording");
+
+    appLaunchTimeMillis = SystemClock.elapsedRealtime();
+    lastActionTimeMillis = appLaunchTimeMillis;
+    if (!actions.isEmpty()) {
+      actions.clear();
+      actionTimestamps.clear();
+    }
+    recording = true;
+  }
+
+  public static void stopRecording() {
+    LogUtil.enterBlock("PerformanceReport.stopRecording");
+    recording = false;
+  }
+
+  public static void recordClick(UiAction.Type action) {
+    if (!recording) {
+      return;
+    }
+
+    if (action == ignoreActionOnce) {
+      LogUtil.i("PerformanceReport.recordClick", "%s is ignored", action.toString());
+      ignoreActionOnce = null;
+      return;
+    }
+    ignoreActionOnce = null;
+
+    LogUtil.v("PerformanceReport.recordClick", action.toString());
+
+    // Timeout
+    long currentTime = SystemClock.elapsedRealtime();
+    if (currentTime - lastActionTimeMillis > ACTIVE_DURATION) {
+      startRecording();
+      recordClick(action);
+      return;
+    }
+
+    lastActionTimeMillis = currentTime;
+    if (actions.isEmpty()) {
+      firstClickTimeMillis = currentTime;
+    }
+    actions.add(action);
+    actionTimestamps.add(currentTime - appLaunchTimeMillis);
+  }
+
+  public static void recordScrollStateChange(int scrollState) {
+    if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
+      recordClick(UiAction.Type.SCROLL);
+    }
+  }
+
+  public static void logOnScrollStateChange(RecyclerView recyclerView) {
+    // Remove the listener in case it was added before
+    recyclerView.removeOnScrollListener(recordOnScrollListener);
+    recyclerView.addOnScrollListener(recordOnScrollListener);
+  }
+
+  public static boolean isRecording() {
+    return recording;
+  }
+
+  public static long getTimeSinceAppLaunch() {
+    if (appLaunchTimeMillis == INVALID_TIME) {
+      return INVALID_TIME;
+    }
+    return SystemClock.elapsedRealtime() - appLaunchTimeMillis;
+  }
+
+  public static long getTimeSinceFirstClick() {
+    if (firstClickTimeMillis == INVALID_TIME) {
+      return INVALID_TIME;
+    }
+    return SystemClock.elapsedRealtime() - firstClickTimeMillis;
+  }
+
+  public static List<UiAction.Type> getActions() {
+    return actions;
+  }
+
+  public static List<Long> getActionTimestamps() {
+    return actionTimestamps;
+  }
+
+  public static int getStartingTabIndex() {
+    return startingTabIndex;
+  }
+
+  public static void setStartingTabIndex(int startingTabIndex) {
+    PerformanceReport.startingTabIndex = startingTabIndex;
+  }
+
+  public static void setIgnoreActionOnce(@Nullable UiAction.Type ignoreActionOnce) {
+    PerformanceReport.ignoreActionOnce = ignoreActionOnce;
+    LogUtil.i(
+        "PerformanceReport.setIgnoreActionOnce",
+        "next action will be ignored once if it is %s",
+        ignoreActionOnce.toString());
+  }
+}
diff --git a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
index 5c7a28c..8bd8335 100644
--- a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
+++ b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
@@ -27,6 +27,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.support.v4.os.UserManagerCompat;
+import com.android.dialer.common.LogUtil;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -58,6 +59,16 @@
   private static final String LOG_DIRECTORY = "persistent_log";
   private static final String NEXT_FILE_INDEX_PREFIX = "persistent_long_next_file_index_";
 
+  private static final byte[] ENTRY_PREFIX = {'P'};
+  private static final byte[] ENTRY_POSTFIX = {'L'};
+
+  private static class LogCorruptionException extends Exception {
+
+    public LogCorruptionException(String message) {
+      super(message);
+    }
+  };
+
   private File logDirectory;
   private final String subfolder;
   private final int fileSizeLimit;
@@ -106,8 +117,10 @@
     try (DataOutputStream outputStream =
         new DataOutputStream(new FileOutputStream(outputFile, true))) {
       for (byte[] log : logs) {
+        outputStream.write(ENTRY_PREFIX);
         outputStream.writeInt(log.length);
         outputStream.write(log);
+        outputStream.write(ENTRY_POSTFIX);
       }
       outputStream.close();
       if (outputFile.length() > fileSizeLimit) {
@@ -116,6 +129,21 @@
     }
   }
 
+  void writeRawLogsForTest(byte[] data) throws IOException {
+    if (outputFile == null) {
+      selectNextFileToWrite();
+    }
+    outputFile.createNewFile();
+    try (DataOutputStream outputStream =
+        new DataOutputStream(new FileOutputStream(outputFile, true))) {
+      outputStream.write(data);
+      outputStream.close();
+      if (outputFile.length() > fileSizeLimit) {
+        selectNextFileToWrite();
+      }
+    }
+  }
+
   /** Concatenate all log files in chronicle order and return a byte array. */
   @WorkerThread
   @NonNull
@@ -149,10 +177,21 @@
         logs.add(log);
         log = readLog(input);
       }
+    } catch (LogCorruptionException e) {
+      LogUtil.e("PersistentLogFileHandler.getLogs", "logs corrupted, deleting", e);
+      deleteLogs();
+      return new ArrayList<>();
     }
     return logs;
   }
 
+  private void deleteLogs() throws IOException {
+    for (File file : getLogFiles()) {
+      file.delete();
+    }
+    selectNextFileToWrite();
+  }
+
   @WorkerThread
   private void selectNextFileToWrite() throws IOException {
     File[] files = getLogFiles();
@@ -186,10 +225,28 @@
 
   @Nullable
   @WorkerThread
-  private static byte[] readLog(DataInputStream inputStream) throws IOException {
+  private byte[] readLog(DataInputStream inputStream) throws IOException, LogCorruptionException {
     try {
-      byte[] data = new byte[inputStream.readInt()];
+      byte[] prefix = new byte[ENTRY_PREFIX.length];
+      if (inputStream.read(prefix) == -1) {
+        // EOF
+        return null;
+      }
+      if (!Arrays.equals(prefix, ENTRY_PREFIX)) {
+        throw new LogCorruptionException("entry prefix mismatch");
+      }
+      int dataLength = inputStream.readInt();
+      if (dataLength > fileSizeLimit) {
+        throw new LogCorruptionException("data length over max size");
+      }
+      byte[] data = new byte[dataLength];
       inputStream.read(data);
+
+      byte[] postfix = new byte[ENTRY_POSTFIX.length];
+      inputStream.read(postfix);
+      if (!Arrays.equals(postfix, ENTRY_POSTFIX)) {
+        throw new LogCorruptionException("entry postfix mismatch");
+      }
       return data;
     } catch (EOFException e) {
       return null;
diff --git a/java/com/android/dialer/persistentlog/PersistentLogger.java b/java/com/android/dialer/persistentlog/PersistentLogger.java
index cf43b8c..5fdefd1 100644
--- a/java/com/android/dialer/persistentlog/PersistentLogger.java
+++ b/java/com/android/dialer/persistentlog/PersistentLogger.java
@@ -26,6 +26,7 @@
 import android.support.v4.os.UserManagerCompat;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.strictmode.DialerStrictMode;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -43,7 +44,7 @@
  * com.google.android.apps.dialer.crashreporter.SilentCrashReporter} is expected to handle such
  * cases.
  *
- * <p>{@link #logText(String, String)} should be used to log ad-hoc text logs. TODO: switch
+ * <p>{@link #logText(String, String)} should be used to log ad-hoc text logs. TODO(twyen): switch
  * to structured logging
  */
 public final class PersistentLogger {
@@ -110,6 +111,16 @@
     loggerThreadHandler.sendEmptyMessageDelayed(MESSAGE_FLUSH, FLUSH_DELAY_MILLIS);
   }
 
+  @VisibleForTesting
+  /** write raw bytes directly to the log file, likely corrupting it. */
+  static void rawLogForTest(byte[] data) {
+    try {
+      fileHandler.writeRawLogsForTest(data);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /** Dump the log as human readable string. Blocks until the dump is finished. */
   @NonNull
   @WorkerThread
@@ -167,7 +178,7 @@
   }
 
   private static byte[] buildTextLog(String tag, String string) {
-    Calendar c = Calendar.getInstance();
+    Calendar c = DialerStrictMode.bypass(() -> Calendar.getInstance());
     return String.format("%tm-%td %tH:%tM:%tS.%tL - %s - %s", c, c, c, c, c, c, tag, string)
         .getBytes(StandardCharsets.UTF_8);
   }
diff --git a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
index 2aed9e7..c398251 100644
--- a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+++ b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
@@ -49,6 +49,8 @@
 
   boolean canReportAsInvalid(ContactSource.Type sourceType, String objectId);
 
+  boolean reportAsInvalid(Context context, CachedContactInfo cachedContactInfo);
+
   /** @return return {@link Uri} to the photo or return {@code null} when failing to add photo */
   @Nullable
   Uri addPhoto(Context context, String number, InputStream in);
diff --git a/java/com/android/dialer/phonenumbercache/CallLogQuery.java b/java/com/android/dialer/phonenumbercache/CallLogQuery.java
index 6d47569..2ebc302 100644
--- a/java/com/android/dialer/phonenumbercache/CallLogQuery.java
+++ b/java/com/android/dialer/phonenumbercache/CallLogQuery.java
@@ -60,6 +60,9 @@
   @RequiresApi(VERSION_CODES.N)
   public static final int VIA_NUMBER = 25;
 
+  @RequiresApi(VERSION_CODES.O)
+  public static final int TRANSCRIPTION_STATE = 26;
+
   private static final String[] PROJECTION_M =
       new String[] {
         Calls._ID, // 0
@@ -97,8 +100,23 @@
     PROJECTION_N = projectionList.toArray(new String[projectionList.size()]);
   }
 
+  private static final String[] PROJECTION_O;
+
+  // TODO(mdooley): remove when this becomes a public api
+  // Copied from android.provider.CallLog.Calls
+  private static final String TRANSCRIPTION_STATE_COLUMN = "transcription_state";
+
+  static {
+    List<String> projectionList = new ArrayList<>(Arrays.asList(PROJECTION_N));
+    projectionList.add(TRANSCRIPTION_STATE_COLUMN);
+    PROJECTION_O = projectionList.toArray(new String[projectionList.size()]);
+  }
+
   @NonNull
   public static String[] getProjection() {
+    if (VERSION.SDK_INT >= VERSION_CODES.O) {
+      return PROJECTION_O;
+    }
     if (VERSION.SDK_INT >= VERSION_CODES.N) {
       return PROJECTION_N;
     }
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfo.java b/java/com/android/dialer/phonenumbercache/ContactInfo.java
index 5546553..a620a23 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfo.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfo.java
@@ -17,11 +17,11 @@
 package com.android.dialer.phonenumbercache;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
-import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.logging.ContactSource;
+import com.android.dialer.util.UriUtils;
 
 /** Information for a contact as needed by the Call Log. */
 public class ContactInfo {
@@ -59,7 +59,7 @@
   public boolean isBadData;
   public String objectId;
   public @UserType long userType;
-  public @Nullable ContactSource.Type sourceType = ContactSource.Type.UNKNOWN_SOURCE_TYPE;
+  public @NonNull ContactSource.Type sourceType = ContactSource.Type.UNKNOWN_SOURCE_TYPE;
   /**
    * True if local contact exists. This is only used for Cequint Caller ID so it won't overwrite
    * photo if local contact exists.
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
index bd4ba97..b680bd5 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
@@ -38,7 +38,6 @@
 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.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.ContactSource;
@@ -48,6 +47,7 @@
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.UriUtils;
 import java.util.ArrayList;
 import java.util.List;
 import org.json.JSONException;
@@ -203,6 +203,7 @@
     return info;
   }
 
+  @Nullable
   public ContactInfo lookupNumber(String number, String countryIso) {
     return lookupNumber(number, countryIso, -1);
   }
@@ -223,12 +224,14 @@
   @SuppressWarnings("ReferenceEquality")
   public ContactInfo lookupNumber(String number, String countryIso, long directoryId) {
     if (TextUtils.isEmpty(number)) {
+      LogUtil.d("ContactInfoHelper.lookupNumber", "number is empty");
       return null;
     }
 
     ContactInfo info;
 
     if (PhoneNumberHelper.isUriNumber(number)) {
+      LogUtil.d("ContactInfoHelper.lookupNumber", "number is sip");
       // The number is a SIP address..
       info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
       if (info == null || info == ContactInfo.EMPTY) {
@@ -246,6 +249,7 @@
     final ContactInfo updatedInfo;
     if (info == null) {
       // The lookup failed.
+      LogUtil.d("ContactInfoHelper.lookupNumber", "lookup failed");
       updatedInfo = null;
     } else {
       // If we did not find a matching contact, generate an empty contact info for the number.
@@ -325,9 +329,11 @@
    */
   ContactInfo lookupContactFromUri(Uri uri) {
     if (uri == null) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "uri is null");
       return null;
     }
     if (!PermissionsUtil.hasContactsReadPermissions(mContext)) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "no contact permission, return empty");
       return ContactInfo.EMPTY;
     }
 
@@ -336,10 +342,12 @@
       String[] projection = PhoneQuery.getPhoneLookupProjection(uri);
       phoneLookupCursor = mContext.getContentResolver().query(uri, projection, null, null, null);
     } catch (NullPointerException e) {
+      LogUtil.e("ContactInfoHelper.lookupContactFromUri", "phone lookup", e);
       // Trap NPE from pre-N CP2
       return null;
     }
     if (phoneLookupCursor == null) {
+      LogUtil.d("ContactInfoHelper.lookupContactFromUri", "phoneLookupCursor is null");
       return null;
     }
 
@@ -408,19 +416,32 @@
   private ContactInfo queryContactInfoForPhoneNumber(
       String number, String countryIso, long directoryId) {
     if (TextUtils.isEmpty(number)) {
+      LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "number is empty");
       return null;
     }
 
     ContactInfo info = lookupContactFromUri(getContactInfoLookupUri(number, directoryId));
+    if (info == null) {
+      LogUtil.d("ContactInfoHelper.queryContactInfoForPhoneNumber", "info looked up is null");
+    }
     if (info != null && info != ContactInfo.EMPTY) {
       info.formattedNumber = formatPhoneNumber(number, null, countryIso);
+      if (directoryId == -1) {
+        // Contact found in the default directory
+        info.sourceType = ContactSource.Type.SOURCE_TYPE_DIRECTORY;
+      } else {
+        // Contact found in the extended directory specified by directoryId
+        info.sourceType = ContactSource.Type.SOURCE_TYPE_EXTENDED;
+      }
     } else if (mCachedNumberLookupService != null) {
       CachedContactInfo cacheInfo =
           mCachedNumberLookupService.lookupCachedContactFromNumber(mContext, number);
       if (cacheInfo != null) {
-        info = cacheInfo.getContactInfo().isBadData ? null : cacheInfo.getContactInfo();
-      } else {
-        info = null;
+        if (!cacheInfo.getContactInfo().isBadData) {
+          info = cacheInfo.getContactInfo();
+        } else {
+          LogUtil.i("ContactInfoHelper.queryContactInfoForPhoneNumber", "info is bad data");
+        }
       }
     }
     return info;
@@ -601,13 +622,17 @@
    * will be updated if available.
    */
   @WorkerThread
-  public void updateFromCequintCallerId(ContactInfo info, String number) {
+  public void updateFromCequintCallerId(
+      @Nullable CequintCallerIdManager cequintCallerIdManager, ContactInfo info, String number) {
     Assert.isWorkerThread();
     if (!CequintCallerIdManager.isCequintCallerIdEnabled(mContext)) {
       return;
     }
+    if (cequintCallerIdManager == null) {
+      return;
+    }
     CequintCallerIdContact cequintCallerIdContact =
-        CequintCallerIdManager.getCequintCallerIdContact(mContext, number);
+        cequintCallerIdManager.getCequintCallerIdContact(mContext, number);
     if (cequintCallerIdContact == null) {
       return;
     }
diff --git a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java
new file mode 100644
index 0000000..2005abc
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java
@@ -0,0 +1,24 @@
+/*
+ * 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.phonenumbergeoutil;
+
+import android.content.Context;
+
+/** Interface for getting geo information for phone number. */
+public interface PhoneNumberGeoUtil {
+  String getGeoDescription(Context context, String number);
+}
diff --git a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java
new file mode 100644
index 0000000..a49005e
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtilComponent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.phonenumbergeoutil;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component for phone number geo util. */
+@Subcomponent
+public abstract class PhoneNumberGeoUtilComponent {
+
+  public abstract PhoneNumberGeoUtil getPhoneNumberGeoUtil();
+
+  public static PhoneNumberGeoUtilComponent get(Context context) {
+    return ((PhoneNumberGeoUtilComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .phoneNumberGeoUtilComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    PhoneNumberGeoUtilComponent phoneNumberGeoUtilComponent();
+  }
+}
diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java
new file mode 100644
index 0000000..32f6592
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java
@@ -0,0 +1,77 @@
+/*
+ * 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.phonenumbergeoutil.impl;
+
+import android.content.Context;
+import android.text.TextUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber;
+import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
+import java.util.Locale;
+import javax.inject.Inject;
+
+/** Implementation of {@link PhoneNumberGeoUtil}. */
+public class PhoneNumberGeoUtilImpl implements PhoneNumberGeoUtil {
+
+  @Inject
+  public PhoneNumberGeoUtilImpl() {}
+
+  @Override
+  public String getGeoDescription(Context context, String number) {
+    LogUtil.v("PhoneNumberGeoUtilImpl.getGeoDescription", "" + LogUtil.sanitizePii(number));
+
+    if (TextUtils.isEmpty(number)) {
+      return null;
+    }
+
+    PhoneNumberUtil util = PhoneNumberUtil.getInstance();
+    PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance();
+
+    Locale locale = CompatUtils.getLocale(context);
+    String countryIso = PhoneNumberHelper.getCurrentCountryIso(context, locale);
+    Phonenumber.PhoneNumber pn = null;
+    try {
+      LogUtil.v(
+          "PhoneNumberGeoUtilImpl.getGeoDescription",
+          "parsing '" + LogUtil.sanitizePii(number) + "' for countryIso '" + countryIso + "'...");
+      pn = util.parse(number, countryIso);
+      LogUtil.v(
+          "PhoneNumberGeoUtilImpl.getGeoDescription",
+          "- parsed number: " + LogUtil.sanitizePii(pn));
+    } catch (NumberParseException e) {
+      LogUtil.e(
+          "PhoneNumberGeoUtilImpl.getGeoDescription",
+          "getGeoDescription: NumberParseException for incoming number '"
+              + LogUtil.sanitizePii(number)
+              + "'");
+    }
+
+    if (pn != null) {
+      String description = geocoder.getDescriptionForNumber(pn, locale);
+      LogUtil.v(
+          "PhoneNumberGeoUtilImpl.getGeoDescription", "- got description: '" + description + "'");
+      return description;
+    }
+
+    return null;
+  }
+}
diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
new file mode 100644
index 0000000..3878ac5
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
@@ -0,0 +1,31 @@
+/*
+ * 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.phonenumbergeoutil.impl;
+
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+/** Module which binds {@link PhoneNumberGeoUtilImpl}. */
+@Module
+public abstract class PhoneNumberGeoUtilModule {
+
+  @Binds
+  @Singleton
+  public abstract PhoneNumberGeoUtil bindPhoneNumberGeoUtil(PhoneNumberGeoUtilImpl impl);
+}
diff --git a/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java
new file mode 100644
index 0000000..4c5b3b0
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java
@@ -0,0 +1,32 @@
+/*
+ * 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.phonenumbergeoutil.stub;
+
+import android.content.Context;
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
+import javax.inject.Inject;
+
+/** Stub implementation of {@link PhoneNumberGeoUtil}. */
+public final class PhoneNumberGeoUtilStub implements PhoneNumberGeoUtil {
+  @Inject
+  public PhoneNumberGeoUtilStub() {}
+
+  @Override
+  public String getGeoDescription(Context context, String number) {
+    return null;
+  }
+}
diff --git a/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java
new file mode 100644
index 0000000..82252cc
--- /dev/null
+++ b/java/com/android/dialer/phonenumbergeoutil/stub/StubPhoneNumberGeoUtilModule.java
@@ -0,0 +1,30 @@
+/*
+ * 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.phonenumbergeoutil.stub;
+
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+/** Module which binds {@link PhoneNumberGeoUtilStub}. */
+@Module
+public abstract class StubPhoneNumberGeoUtilModule {
+  @Binds
+  @Singleton
+  public abstract PhoneNumberGeoUtil bindPhoneNumberGeoUtil(PhoneNumberGeoUtilStub stub);
+}
diff --git a/java/com/android/dialer/phonenumberproto/Converter.java b/java/com/android/dialer/phonenumberproto/Converter.java
new file mode 100644
index 0000000..453b988
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/Converter.java
@@ -0,0 +1,120 @@
+/*
+ * 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.phonenumberproto;
+
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+/**
+ * Methods for converting from {@link PhoneNumber} POJOs to {@link DialerInternalPhoneNumber} protos
+ * and back.
+ */
+class Converter {
+
+  static DialerInternalPhoneNumber pojoToProto(PhoneNumber pojo) {
+    DialerInternalPhoneNumber.Builder proto = DialerInternalPhoneNumber.newBuilder();
+    if (pojo.hasCountryCode()) {
+      proto.setCountryCode(pojo.getCountryCode());
+    }
+    if (pojo.hasCountryCodeSource()) {
+      switch (pojo.getCountryCodeSource()) {
+        case FROM_NUMBER_WITH_PLUS_SIGN:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+          break;
+        case FROM_NUMBER_WITH_IDD:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+          break;
+        case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+          break;
+        case FROM_DEFAULT_COUNTRY:
+          proto.setCountryCodeSource(
+              DialerInternalPhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+          break;
+        default:
+          throw new IllegalArgumentException(
+              "unsupported country code source: " + pojo.getCountryCodeSource());
+      }
+    }
+    if (pojo.hasExtension()) {
+      proto.setExtension(pojo.getExtension());
+    }
+    if (pojo.hasItalianLeadingZero()) {
+      proto.setItalianLeadingZero(pojo.isItalianLeadingZero());
+    }
+    if (pojo.hasNationalNumber()) {
+      proto.setNationalNumber(pojo.getNationalNumber());
+    }
+    if (pojo.hasNumberOfLeadingZeros()) {
+      proto.setNumberOfLeadingZeros(pojo.getNumberOfLeadingZeros());
+    }
+    if (pojo.hasPreferredDomesticCarrierCode()) {
+      proto.setPreferredDomesticCarrierCode(pojo.getPreferredDomesticCarrierCode());
+    }
+    if (pojo.hasRawInput()) {
+      proto.setRawInput(pojo.getRawInput());
+    }
+    return proto.build();
+  }
+
+  static PhoneNumber protoToPojo(DialerInternalPhoneNumber proto) {
+    PhoneNumber pojo = new PhoneNumber();
+    if (proto.hasCountryCode()) {
+      pojo.setCountryCode(proto.getCountryCode());
+    }
+    if (proto.hasCountryCodeSource()) {
+      switch (proto.getCountryCodeSource()) {
+        case FROM_NUMBER_WITH_PLUS_SIGN:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN);
+          break;
+        case FROM_NUMBER_WITH_IDD:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_IDD);
+          break;
+        case FROM_NUMBER_WITHOUT_PLUS_SIGN:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_NUMBER_WITHOUT_PLUS_SIGN);
+          break;
+        case FROM_DEFAULT_COUNTRY:
+          pojo.setCountryCodeSource(PhoneNumber.CountryCodeSource.FROM_DEFAULT_COUNTRY);
+          break;
+        default:
+          throw new IllegalArgumentException(
+              "unsupported country code source: " + proto.getCountryCodeSource());
+      }
+    }
+    if (proto.hasExtension()) {
+      pojo.setExtension(proto.getExtension());
+    }
+    if (proto.hasItalianLeadingZero()) {
+      pojo.setItalianLeadingZero(proto.getItalianLeadingZero());
+    }
+    if (proto.hasNationalNumber()) {
+      pojo.setNationalNumber(proto.getNationalNumber());
+    }
+    if (proto.hasNumberOfLeadingZeros()) {
+      pojo.setNumberOfLeadingZeros(proto.getNumberOfLeadingZeros());
+    }
+    if (proto.hasPreferredDomesticCarrierCode()) {
+      pojo.setPreferredDomesticCarrierCode(proto.getPreferredDomesticCarrierCode());
+    }
+    if (proto.hasRawInput()) {
+      pojo.setRawInput(proto.getRawInput());
+    }
+    return pojo;
+  }
+}
diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
new file mode 100644
index 0000000..cc509f4
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
@@ -0,0 +1,108 @@
+/*
+ * 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.phonenumberproto;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.DialerInternalPhoneNumber;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.DialerPhoneNumber.RawInput;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+
+/**
+ * Wrapper for selected methods in {@link PhoneNumberUtil} which uses the {@link DialerPhoneNumber}
+ * lite proto instead of the {@link com.google.i18n.phonenumbers.Phonenumber.PhoneNumber} POJO.
+ *
+ * <p>All methods should be called on a worker thread.
+ */
+public class DialerPhoneNumberUtil {
+  private final PhoneNumberUtil phoneNumberUtil;
+
+  @WorkerThread
+  public DialerPhoneNumberUtil(@NonNull PhoneNumberUtil phoneNumberUtil) {
+    Assert.isWorkerThread();
+    this.phoneNumberUtil = Assert.isNotNull(phoneNumberUtil);
+  }
+
+  /**
+   * Parses the provided raw phone number into a {@link DialerPhoneNumber}.
+   *
+   * @see PhoneNumberUtil#parse(String, String)
+   */
+  @WorkerThread
+  public DialerPhoneNumber parse(@Nullable String numberToParse, @Nullable String defaultRegion) {
+    Assert.isWorkerThread();
+
+    DialerPhoneNumber.Builder dialerPhoneNumber = DialerPhoneNumber.newBuilder();
+    RawInput.Builder rawInput = RawInput.newBuilder();
+    // Numbers can be null or empty for incoming "unknown" calls.
+    if (numberToParse != null) {
+      rawInput.setNumber(numberToParse);
+    }
+    if (defaultRegion != null) {
+      rawInput.setCountryIso(defaultRegion);
+    }
+    dialerPhoneNumber.setRawInput(rawInput.build());
+
+    try {
+      dialerPhoneNumber.setDialerInternalPhoneNumber(
+          Converter.pojoToProto(phoneNumberUtil.parse(numberToParse, defaultRegion)));
+    } catch (NumberParseException e) {
+      LogUtil.w("DialerPhoneNumberUtil.parse", "couldn't parse phone number", e);
+    }
+    return dialerPhoneNumber.build();
+  }
+
+  /**
+   * Returns true if the two numbers were parseable by libphonenumber and are an {@link
+   * MatchType#EXACT_MATCH} or if they have the same raw input.
+   */
+  @WorkerThread
+  public boolean isExactMatch(
+      @NonNull DialerPhoneNumber firstNumberIn, @NonNull DialerPhoneNumber secondNumberIn) {
+    Assert.isWorkerThread();
+    if (!Assert.isNotNull(firstNumberIn).hasDialerInternalPhoneNumber()
+        || !Assert.isNotNull(secondNumberIn).hasDialerInternalPhoneNumber()) {
+      return firstNumberIn.getRawInput().equals(secondNumberIn.getRawInput());
+    }
+    return isNumberMatch(
+            firstNumberIn.getDialerInternalPhoneNumber(),
+            secondNumberIn.getDialerInternalPhoneNumber())
+        == MatchType.EXACT_MATCH;
+  }
+
+  /**
+   * Compares the provided phone numbers.
+   *
+   * @see PhoneNumberUtil#isNumberMatch(com.google.i18n.phonenumbers.Phonenumber.PhoneNumber,
+   *     com.google.i18n.phonenumbers.Phonenumber.PhoneNumber)
+   */
+  @WorkerThread
+  private MatchType isNumberMatch(
+      @NonNull DialerInternalPhoneNumber firstNumberIn,
+      @NonNull DialerInternalPhoneNumber secondNumberIn) {
+    Assert.isWorkerThread();
+    return phoneNumberUtil.isNumberMatch(
+        Converter.protoToPojo(Assert.isNotNull(firstNumberIn)),
+        Converter.protoToPojo(Assert.isNotNull(secondNumberIn)));
+  }
+}
diff --git a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
new file mode 100644
index 0000000..97b7519
--- /dev/null
+++ b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto
@@ -0,0 +1,173 @@
+// 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
+
+syntax = "proto2";
+
+option java_package = "com.android.dialer";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer;
+
+// A phone number for use in the dialer application. It consists of a
+// DialerInternalPhoneNumber, which is a copy of libphonenumber's PhoneNumber
+// proto, and the raw input used to create it.
+message DialerPhoneNumber {
+  // libphonenumber representation of the phone number. May be empty if the raw
+  // input failed to parse, in which case raw_input should be used.
+  optional DialerInternalPhoneNumber dialer_internal_phone_number = 1;
+
+  // The raw input which was used to create a DialerPhoneNumber.
+  message RawInput {
+    // The phone number as it was entered or received.
+    optional string number = 1;
+    // The ISO 3166-1 two letter country code of the country where the user made
+    // or received the call.
+    optional string country_iso = 2;
+  }
+  // Prefer to use dialer_internal_phone_number if present.
+  optional RawInput raw_input = 2;
+}
+
+// This is a copy of libphonenumber proto file for use in the dialer codebase.
+// We cannot depend on the real libphonenumber proto because it is not exposed
+// in any open source library. As such, this file could fall out of sync with
+// that proto over time.
+//
+// The only difference between this proto and the libphonenumber proto (as of
+// when this file was created) is the package name and proto name.
+//
+// If the libphonenumber proto becomes accessible some day, it may be possible
+// to remove this proto and use the real libphonenumber proto assuming this
+// proto is kept wire-compatible with it.
+message DialerInternalPhoneNumber {
+  // The country calling code for this number, as defined by the International
+  // Telecommunication Union (ITU). For example, this would be 1 for NANPA
+  // countries, and 33 for France.
+  required int32 country_code = 1;
+
+  // The National (significant) Number, as defined in International
+  // Telecommunication Union (ITU) Recommendation E.164, without any leading
+  // zero. The leading-zero is stored separately if required, since this is an
+  // uint64 and hence cannot store such information. Do not use this field
+  // directly: if you want the national significant number, call the
+  // getNationalSignificantNumber method of PhoneNumberUtil.
+  //
+  // For countries which have the concept of an "area code" or "national
+  // destination code", this is included in the National (significant) Number.
+  // Although the ITU says the maximum length should be 15, we have found longer
+  // numbers in some countries e.g. Germany.
+  // Note that the National (significant) Number does not contain the National
+  // (trunk) prefix. Obviously, as a uint64, it will never contain any
+  // formatting (hyphens, spaces, parentheses), nor any alphanumeric spellings.
+  required uint64 national_number = 2 [jstype = JS_NUMBER];
+
+  // Extension is not standardized in ITU recommendations, except for being
+  // defined as a series of numbers with a maximum length of 40 digits. It is
+  // defined as a string here to accommodate for the possible use of a leading
+  // zero in the extension (organizations have complete freedom to do so, as
+  // there is no standard defined). Other than digits, some other dialling
+  // characters such as "," (indicating a wait) may be stored here.
+  optional string extension = 3;
+
+  // In some countries, the national (significant) number starts with one or
+  // more "0"s without this being a national prefix or trunk code of some kind.
+  // For example, the leading zero in the national (significant) number of an
+  // Italian phone number indicates the number is a fixed-line number.  There
+  // have been plans to migrate fixed-line numbers to start with the digit two
+  // since December 2000, but it has not happened yet. See
+  // http://en.wikipedia.org/wiki/%2B39 for more details.
+  //
+  // These fields can be safely ignored (there is no need to set them) for most
+  // countries. Some limited number of countries behave like Italy - for these
+  // cases, if the leading zero(s) of a number would be retained even when
+  // dialling internationally, set this flag to true, and also set the number of
+  // leading zeros.
+  //
+  // Clients who use the parsing or conversion functionality of the i18n phone
+  // number libraries (go/phonenumbers) will have these fields set if necessary
+  // automatically.
+  optional bool italian_leading_zero = 4;
+  optional int32 number_of_leading_zeros = 8 [default = 1];
+
+  // The next few fields are non-essential fields for a phone number. They
+  // retain extra information about the form the phone number was in when it was
+  // provided to us to parse. They can be safely ignored by most clients. To
+  // populate them, call parseAndKeepRawInput on PhoneNumberUtil.
+
+  // This field is used to store the raw input string containing phone numbers
+  // before it was canonicalized by the library. For example, it could be used
+  // to store alphanumerical numbers such as "1-800-GOOG-411".
+  optional string raw_input = 5;
+
+  // The source from which the country_code is derived. This is not set in the
+  // general parsing method, but in the method that parses and keeps raw_input.
+  // New fields could be added upon request.
+  enum CountryCodeSource {
+    // The country_code is derived based on a phone number with a leading "+",
+    // e.g. the French number "+33 1 42 68 53 00".
+    FROM_NUMBER_WITH_PLUS_SIGN = 1;
+
+    // The country_code is derived based on a phone number with a leading IDD,
+    // e.g. the French number "011 33 1 42 68 53 00", as it is dialled from US.
+    FROM_NUMBER_WITH_IDD = 5;
+
+    // The country_code is derived based on a phone number without a leading
+    // "+", e.g. the French number "33 1 42 68 53 00" when defaultCountry is
+    // supplied as France.
+    FROM_NUMBER_WITHOUT_PLUS_SIGN = 10;
+
+    // The country_code is derived NOT based on the phone number itself, but
+    // from the defaultCountry parameter provided in the parsing function by the
+    // clients. This happens mostly for numbers written in the national format
+    // (without country code). For example, this would be set when parsing the
+    // French number "01 42 68 53 00", when defaultCountry is supplied as
+    // France.
+    FROM_DEFAULT_COUNTRY = 20;
+  }
+
+  // The source from which the country_code is derived.
+  optional CountryCodeSource country_code_source = 6;
+
+  // The carrier selection code that is preferred when calling this phone number
+  // domestically. This also includes codes that need to be dialed in some
+  // countries when calling from landlines to mobiles or vice versa. For
+  // example, in Columbia, a "3" needs to be dialed before the phone number
+  // itself when calling from a mobile phone to a domestic landline phone and
+  // vice versa.
+  //
+  // Note this is the "preferred" code, which means other codes may work as
+  // well.
+  optional string preferred_domestic_carrier_code = 7;
+}
+
+// Examples:
+//
+// Google MTV, +1 650-253-0000, (650) 253-0000
+// country_code: 1
+// national_number: 6502530000
+//
+// Google Paris, +33 (0)1 42 68 53 00, 01 42 68 53 00
+// country_code: 33
+// national_number: 142685300
+//
+// Google Beijing, +86-10-62503000, (010) 62503000
+// country_code: 86
+// national_number: 1062503000
+//
+// Google Italy, +39 02-36618 300, 02-36618 300
+// country_code: 39
+// national_number: 236618300
+// italian_leading_zero: true
diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
index ea4396f..1189a9b 100644
--- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
+++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
@@ -24,11 +24,8 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.telecom.TelecomUtil;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Locale;
@@ -96,43 +93,11 @@
 
   /**
    * @return a geographical description string for the specified number.
-   * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder
    */
   public static String getGeoDescription(Context context, String number) {
-    LogUtil.v("PhoneNumberHelper.getGeoDescription", "" + LogUtil.sanitizePii(number));
-
-    if (TextUtils.isEmpty(number)) {
-      return null;
-    }
-
-    PhoneNumberUtil util = PhoneNumberUtil.getInstance();
-    PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance();
-
-    Locale locale = context.getResources().getConfiguration().locale;
-    String countryIso = getCurrentCountryIso(context, locale);
-    Phonenumber.PhoneNumber pn = null;
-    try {
-      LogUtil.v(
-          "PhoneNumberHelper.getGeoDescription",
-          "parsing '" + LogUtil.sanitizePii(number) + "' for countryIso '" + countryIso + "'...");
-      pn = util.parse(number, countryIso);
-      LogUtil.v(
-          "PhoneNumberHelper.getGeoDescription", "- parsed number: " + LogUtil.sanitizePii(pn));
-    } catch (NumberParseException e) {
-      LogUtil.e(
-          "PhoneNumberHelper.getGeoDescription",
-          "getGeoDescription: NumberParseException for incoming number '"
-              + LogUtil.sanitizePii(number)
-              + "'");
-    }
-
-    if (pn != null) {
-      String description = geocoder.getDescriptionForNumber(pn, locale);
-      LogUtil.v("PhoneNumberHelper.getGeoDescription", "- got description: '" + description + "'");
-      return description;
-    }
-
-    return null;
+    return PhoneNumberGeoUtilComponent.get(context)
+        .getPhoneNumberGeoUtil()
+        .getGeoDescription(context, number);
   }
 
   /**
@@ -211,10 +176,9 @@
     return number.substring(0, delimiterIndex);
   }
 
-
   private static boolean isVerizon(Context context) {
     // Verizon MCC/MNC codes copied from com/android/voicemailomtp/res/xml/vvm_config.xml.
-    // TODO: Need a better way to do per carrier and per OEM configurations.
+    // TODO(sail): Need a better way to do per carrier and per OEM configurations.
     switch (context.getSystemService(TelephonyManager.class).getSimOperator()) {
       case "310004":
       case "310010":
diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml
index 79ca5d5..a097505 100644
--- a/java/com/android/dialer/postcall/AndroidManifest.xml
+++ b/java/com/android/dialer/postcall/AndroidManifest.xml
@@ -15,14 +15,13 @@
  -->
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.dialer.callcomposer">
+  package="com.android.dialer.postcall">
 
   <application android:theme="@style/Theme.AppCompat">
     <activity
       android:name="com.android.dialer.postcall.PostCallActivity"
       android:exported="false"
-      android:theme="@style/Theme.AppCompat.NoActionBar"
-      android:windowSoftInputMode="adjustResize"
-      android:screenOrientation="portrait"/>
+      android:theme="@style/DialerThemeBase.NoActionBar"
+      android:windowSoftInputMode="adjustResize"/>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index 586b473..011fbc9 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -26,26 +26,27 @@
 import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
-import com.android.dialer.buildtype.BuildType;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProvider;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 
 /** Helper class to handle all post call actions. */
 public class PostCall {
 
-  private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
   private static final String KEY_POST_CALL_CALL_DISCONNECT_TIME = "post_call_call_disconnect_time";
+  private static final String KEY_POST_CALL_CALL_CONNECT_TIME = "post_call_call_connect_time";
   private static final String KEY_POST_CALL_CALL_NUMBER = "post_call_call_number";
   private static final String KEY_POST_CALL_MESSAGE_SENT = "post_call_message_sent";
+  private static final String KEY_POST_CALL_DISCONNECT_PRESSED = "post_call_disconnect_pressed";
 
   private static Snackbar activeSnackbar;
 
@@ -55,6 +56,8 @@
         promptUserToViewSentMessage(activity, rootView);
       } else if (shouldPromptUserToSendMessage(activity)) {
         promptUserToSendMessage(activity, rootView);
+      } else {
+        clear(activity);
       }
     }
   }
@@ -77,18 +80,18 @@
         LogUtil.sanitizePhoneNumber(getPhoneNumber(activity)),
         capabilities);
 
-    boolean isRcsPostCall = capabilities != null && capabilities.supportsPostCall();
+    boolean isRcsPostCall = capabilities != null && capabilities.isPostCallCapable();
     String actionText =
         isRcsPostCall
             ? activity.getString(R.string.post_call_add_message)
             : activity.getString(R.string.post_call_send_message);
 
+    String number = Assert.isNotNull(getPhoneNumber(activity));
     OnClickListener onClickListener =
         v -> {
           Logger.get(activity)
               .logImpression(DialerImpression.Type.POST_CALL_PROMPT_USER_TO_SEND_MESSAGE_CLICKED);
-          activity.startActivity(
-              PostCallActivity.newIntent(activity, getPhoneNumber(activity), isRcsPostCall));
+          activity.startActivity(PostCallActivity.newIntent(activity, number, isRcsPostCall));
         };
 
     int durationMs =
@@ -112,12 +115,13 @@
         "returned from sending a post call message, message sent.");
     String message = activity.getString(R.string.post_call_message_sent);
     String addMessage = activity.getString(R.string.view);
+    String number = Assert.isNotNull(getPhoneNumber(activity));
     OnClickListener onClickListener =
         v -> {
           Logger.get(activity)
               .logImpression(
                   DialerImpression.Type.POST_CALL_PROMPT_USER_TO_VIEW_SENT_MESSAGE_CLICKED);
-          Intent intent = IntentUtil.getSendSmsIntent(getPhoneNumber(activity));
+          Intent intent = IntentUtil.getSendSmsIntent(number);
           DialerUtils.startActivityWithErrorToast(activity, intent);
         };
 
@@ -143,6 +147,13 @@
         .apply();
   }
 
+  public static void onDisconnectPressed(Context context) {
+    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+        .edit()
+        .putBoolean(KEY_POST_CALL_DISCONNECT_PRESSED, true)
+        .apply();
+  }
+
   public static void onCallDisconnected(Context context, String number, long callConnectedMillis) {
     DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
         .edit()
@@ -160,6 +171,19 @@
         .apply();
   }
 
+  /**
+   * Restart performance recording if there is a recent call (disconnect time to now is under
+   * threshold)
+   */
+  public static void restartPerformanceRecordingIfARecentCallExist(Context context) {
+    long disconnectTimeMillis =
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+            .getLong(PostCall.KEY_POST_CALL_CALL_DISCONNECT_TIME, -1);
+    if (disconnectTimeMillis != -1 && PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+  }
+
   private static void clear(Context context) {
     activeSnackbar = null;
 
@@ -169,6 +193,7 @@
         .remove(KEY_POST_CALL_CALL_NUMBER)
         .remove(KEY_POST_CALL_MESSAGE_SENT)
         .remove(KEY_POST_CALL_CALL_CONNECT_TIME)
+        .remove(KEY_POST_CALL_DISCONNECT_PRESSED)
         .apply();
   }
 
@@ -181,6 +206,8 @@
     long timeSinceDisconnect = System.currentTimeMillis() - disconnectTimeMillis;
     long callDurationMillis = disconnectTimeMillis - connectTimeMillis;
 
+    boolean callDisconnectedByUser = manager.getBoolean(KEY_POST_CALL_DISCONNECT_PRESSED, false);
+
     ConfigProvider binding = ConfigProviderBindings.get(context);
     return disconnectTimeMillis != -1
         && connectTimeMillis != -1
@@ -188,7 +215,8 @@
         && binding.getLong("postcall_last_call_threshold", 30_000) > timeSinceDisconnect
         && (connectTimeMillis == 0
             || binding.getLong("postcall_call_duration_threshold", 35_000) > callDurationMillis)
-        && getPhoneNumber(context) != null;
+        && getPhoneNumber(context) != null
+        && callDisconnectedByUser;
   }
 
   private static boolean shouldPromptUserToViewSentMessage(Context context) {
@@ -203,19 +231,7 @@
   }
 
   private static boolean isEnabled(Context context) {
-    @BuildType.Type int type = BuildType.get();
-    switch (type) {
-      case BuildType.BUGFOOD:
-      case BuildType.DOGFOOD:
-      case BuildType.FISHFOOD:
-      case BuildType.TEST:
-        return ConfigProviderBindings.get(context).getBoolean("enable_post_call", true);
-      case BuildType.RELEASE:
-        return ConfigProviderBindings.get(context).getBoolean("enable_post_call_prod", true);
-      default:
-        Assert.fail();
-        return false;
-    }
+    return ConfigProviderBindings.get(context).getBoolean("enable_post_call_prod", true);
   }
 
   private static boolean isSimReady(Context context) {
diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
index 256c110..c42764e 100644
--- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
+++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
@@ -14,20 +14,21 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:background="@color/background_dialer_white"
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <FrameLayout
-    android:id="@+id/message_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:background="@color/background_dialer_white"/>
+  android:layout_height="match_parent"
+  android:background="@color/background_dialer_white">
 
   <com.android.dialer.widget.DialerToolbar
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"/>
-</RelativeLayout>
\ No newline at end of file
+
+  <FrameLayout
+    android:id="@+id/message_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_dialer_white"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/protos/ProtoParsers.java b/java/com/android/dialer/protos/ProtoParsers.java
index b77c069..e529206 100644
--- a/java/com/android/dialer/protos/ProtoParsers.java
+++ b/java/com/android/dialer/protos/ProtoParsers.java
@@ -18,13 +18,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
+import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
-import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
-import java.io.IOException;
 
 /** Useful methods for using Protocol Buffers with Android. */
 public final class ProtoParsers {
@@ -33,13 +30,16 @@
 
   /** Retrieve a proto from a Bundle which was not created within the current executable/version. */
   @SuppressWarnings("unchecked") // We want to eventually optimize away parser classes, so cast
-  public static <T extends MessageLite> T get(Bundle bundle, String key, T defaultInstance)
+  public static <T extends MessageLite> T get(
+      @NonNull Bundle bundle, @NonNull String key, @NonNull T defaultInstance)
       throws InvalidProtocolBufferException {
-    // Class loaders are unique to each Class instance, so we need to specify how to decode
-    // the information again, even though we set the class loaders when serializing the data.
-    bundle.setClassLoader(ProtoParsers.class.getClassLoader());
-    InternalDontUse parcelable = bundle.getParcelable(key);
-    return (T) parcelable.getMessageUnsafe(defaultInstance.getDefaultInstanceForType());
+
+    Assert.isNotNull(bundle);
+    Assert.isNotNull(key);
+    Assert.isNotNull(defaultInstance);
+
+    byte[] bytes = bundle.getByteArray(key);
+    return (T) mergeFrom(bytes, defaultInstance.getDefaultInstanceForType());
   }
 
   /**
@@ -47,11 +47,12 @@
    *
    * @throws RuntimeException if the proto cannot be parsed
    */
-  public static <T extends MessageLite> T getTrusted(Bundle bundle, String key, T defaultInstance) {
+  public static <T extends MessageLite> T getTrusted(
+      @NonNull Bundle bundle, @NonNull String key, @NonNull T defaultInstance) {
     try {
       return get(bundle, key, defaultInstance);
     } catch (InvalidProtocolBufferException e) {
-      throw new RuntimeException(e);
+      throw Assert.createIllegalStateFailException(e.toString());
     }
   }
 
@@ -60,7 +61,9 @@
    *
    * @throws RuntimeException if the proto cannot be parsed
    */
-  public static <T extends MessageLite> T getTrusted(Intent intent, String key, T defaultInstance) {
+  public static <T extends MessageLite> T getTrusted(
+      @NonNull Intent intent, @NonNull String key, @NonNull T defaultInstance) {
+    Assert.isNotNull(intent);
     return getTrusted(intent.getExtras(), key, defaultInstance);
   }
 
@@ -68,121 +71,33 @@
    * Stores a proto in a Bundle, for later retrieval by {@link #get(Bundle, String, MessageLite)} or
    * {@link #getFromInstanceState(Bundle, String, MessageLite)}.
    */
-  public static void put(Bundle bundle, String key, MessageLite message) {
-    bundle.putParcelable(key, new InternalDontUse<>(null, message));
+  public static void put(
+      @NonNull Bundle bundle, @NonNull String key, @NonNull MessageLite message) {
+    Assert.isNotNull(message);
+    Assert.isNotNull(bundle);
+    Assert.isNotNull(key);
+    bundle.putByteArray(key, message.toByteArray());
   }
 
   /**
    * Stores a proto in an Intent, for later retrieval by {@link #get(Bundle, String, MessageLite)}.
    * Needs separate method because Intent has similar to but different API than Bundle.
    */
-  public static void put(Intent intent, String key, MessageLite message) {
-    intent.putExtra(key, new InternalDontUse<>(null, message));
-  }
-
-  /** Returns a {@linkplain Parcelable} representation of this protobuf message. */
-  public static <T extends MessageLite> ParcelableProto<T> asParcelable(T message) {
-    return new InternalDontUse<>(null, message);
-  }
-
-  /**
-   * A protobuf message that can be stored in a {@link Parcel}.
-   *
-   * <p><b>Note:</b> This <code>Parcelable</code> can only be used in single app. Attempting to send
-   * it to another app through an <code>Intent</code> will result in an exception due to Proguard
-   * obfusation when the target application attempts to load the <code>ParcelableProto</code> class.
-   */
-  public interface ParcelableProto<T extends MessageLite> extends Parcelable {
-    /**
-     * @throws IllegalStateException if the parceled data does not correspond to the defaultInstance
-     *     type.
-     */
-    T getMessage(T defaultInstance);
-  }
-
-  /** Public because of Parcelable requirements. Do not use. */
-  public static final class InternalDontUse<T extends MessageLite> implements ParcelableProto<T> {
-    /* One of these two fields is always populated - since the bytes field never escapes this
-     * object, there is no risk of concurrent modification by multiple threads, and volatile
-     * is sufficient to be thread-safe. */
-    private volatile byte[] bytes;
-    private volatile T message;
-
-    /**
-     * Ideally, we would have type safety here. However, a static field {@link Creator} is required
-     * by {@link Parcelable}. Static fields are inherently not type safe, since only 1 exists per
-     * class (rather than 1 per type).
-     */
-    public static final Parcelable.Creator<InternalDontUse<?>> CREATOR =
-        new Creator<InternalDontUse<?>>() {
-          @Override
-          public InternalDontUse<?> createFromParcel(Parcel parcel) {
-            int serializedSize = parcel.readInt();
-            byte[] array = new byte[serializedSize];
-            parcel.readByteArray(array);
-            return new InternalDontUse<>(array, null);
-          }
-
-          @Override
-          public InternalDontUse<?>[] newArray(int i) {
-            return new InternalDontUse[i];
-          }
-        };
-
-    private InternalDontUse(byte[] bytes, T message) {
-      Assert.checkArgument(bytes != null || message != null, "Must have a message or bytes");
-      this.bytes = bytes;
-      this.message = message;
-    }
-
-    @Override
-    public int describeContents() {
-      return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel parcel, int i) {
-      if (bytes == null) {
-        final byte[] flatArray = new byte[message.getSerializedSize()];
-        try {
-          message.writeTo(CodedOutputStream.newInstance(flatArray));
-          bytes = flatArray;
-        } catch (IOException impossible) {
-          throw new AssertionError(impossible);
-        }
-      }
-      parcel.writeInt(bytes.length);
-      parcel.writeByteArray(bytes);
-    }
-
-    @Override
-    public T getMessage(T defaultInstance) {
-      try {
-        // The proto should never be invalid if it came from our application, so if it is, throw.
-        return getMessageUnsafe(defaultInstance);
-      } catch (InvalidProtocolBufferException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    @SuppressWarnings("unchecked") // We're being deserialized, so there's no real type safety
-    T getMessageUnsafe(T defaultInstance) throws InvalidProtocolBufferException {
-      // There's a risk that we'll double-parse the bytes, but that's OK, because it'll end up
-      // as the same immutable object anyway.
-      if (message == null) {
-        message = (T) defaultInstance.toBuilder().mergeFrom(bytes).build();
-      }
-      return message;
-    }
+  public static void put(
+      @NonNull Intent intent, @NonNull String key, @NonNull MessageLite message) {
+    Assert.isNotNull(message);
+    Assert.isNotNull(intent);
+    Assert.isNotNull(key);
+    intent.putExtra(key, message.toByteArray());
   }
 
   /** Parses a proto, throwing parser errors as runtime exceptions. */
   @SuppressWarnings("unchecked") // We want to eventually optimize away parser classes
-  public static <T extends MessageLite> T mergeFrom(byte[] bytes, T defaultInstance) {
+  private static <T extends MessageLite> T mergeFrom(byte[] bytes, T defaultInstance) {
     try {
       return (T) defaultInstance.toBuilder().mergeFrom(bytes).build();
     } catch (InvalidProtocolBufferException e) {
-      throw new RuntimeException(e);
+      throw Assert.createIllegalStateFailException(e.toString());
     }
   }
 }
diff --git a/java/com/android/dialer/searchfragment/README.md b/java/com/android/dialer/searchfragment/README.md
new file mode 100644
index 0000000..b3b9135
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/README.md
@@ -0,0 +1,62 @@
+# Dialer Search Ui
+
+searchfragment/ contains all code relevant to loading, rendering and filtering
+search results in both dialpad search and regular search.
+
+## Loading
+
+### On Device Contacts
+
+On device contacts loading happens in SearchContactsCursorLoader. It is used in
+conjunction with NewSearchFragment and Loader Callbacks to return a cursor from
+cp2 containing all of the relevant info needed to rendering.
+
+### Business Search
+
+// TODO(calderwoodra)
+
+### Google Directory Search
+
+// TODO(calderwoodra)
+
+## Rendering
+
+NewSearchFragment, SearchAdapter, SearchContactViewHolder and
+SearchCursorManager are used to render contact information. The fragment's
+recyclerview, adapter and viewholder work as expected like a normal recyclerview
+paradigm.
+
+The are three things to note about rendering:
+
+*   There are three data sources rendered: On device contacts, business search
+    results and google directory results.
+*   SearchContactsCursorLoader returns its cursor from cp2 and we filter/wrap it
+    with SearchContactCursor to render useful results (see below).
+*   SearchCursorManager is used to coalesce all three data sources to help with
+    determining row count, row type and returning the correct data source for
+    each position.
+
+## Filtering
+
+On device contacts are filtered using SearchContactCursor. We wrap the cursor
+returned from SearchContactsCursorLoader in NewSearchFragment#onLoadFinished in
+order to abstract away the filtering logic from the recyclerview adapter and
+viewholders.
+
+SearchContactCursor applies filtering in SearchContactCursor#filter to remove
+duplicate phone numbers returned from cp2 and phone numbers that do not match
+the given search query.
+
+Filtering methods used are:
+
+*   T9/dialpad search methods
+    *   Initial match (957 matches [W]illiam [J]ohn [S]mith)
+    *   Number + name match (1800946 matches [1800-Win]-A-Prize)
+*   Numeric/dialpad search methods
+    *   Simple number match (510333 matches [510-333]-7596)
+    *   Country-code agnostic matching for E164 normalized numbers (9177 matches
+        +65[9177]6930)
+    *   Country-code agnostic matching (510333 matches 1-[510-333]-7596)
+    *   Area-code agnostic matching (333 matches 510-[333]-7596)
+*   Name/keyboard search methods:
+    *   Simple name match (564 matches [Joh]n)
diff --git a/java/com/android/dialer/searchfragment/common/AndroidManifest.xml b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
new file mode 100644
index 0000000..178cd83
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.searchfragment.common"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/common/Projections.java b/java/com/android/dialer/searchfragment/common/Projections.java
new file mode 100644
index 0000000..078c3e5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/Projections.java
@@ -0,0 +1,52 @@
+/*
+ * 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.searchfragment.common;
+
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+
+/** Class containing relevant projections for searching contacts. */
+public class Projections {
+
+  public static final int PHONE_ID = 0;
+  public static final int PHONE_TYPE = 1;
+  public static final int PHONE_LABEL = 2;
+  public static final int PHONE_NUMBER = 3;
+  public static final int PHONE_DISPLAY_NAME = 4;
+  public static final int PHONE_PHOTO_ID = 5;
+  public static final int PHONE_PHOTO_URI = 6;
+  public static final int PHONE_LOOKUP_KEY = 7;
+  public static final int PHONE_CARRIER_PRESENCE = 8;
+  public static final int PHONE_CONTACT_ID = 9;
+
+  @SuppressWarnings("unused")
+  public static final int PHONE_SORT_KEY = 10;
+
+  public static final String[] PHONE_PROJECTION =
+      new String[] {
+        Phone._ID, // 0
+        Phone.TYPE, // 1
+        Phone.LABEL, // 2
+        Phone.NUMBER, // 3
+        Phone.DISPLAY_NAME_PRIMARY, // 4
+        Phone.PHOTO_ID, // 5
+        Phone.PHOTO_THUMBNAIL_URI, // 6
+        Phone.LOOKUP_KEY, // 7
+        Phone.CARRIER_PRESENCE, // 8
+        Phone.CONTACT_ID, // 9
+        Phone.SORT_KEY_PRIMARY // 10
+      };
+}
diff --git a/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
new file mode 100644
index 0000000..4413252
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/QueryBoldingUtil.java
@@ -0,0 +1,151 @@
+/*
+ * 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.searchfragment.common;
+
+import android.graphics.Typeface;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.StyleSpan;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/** Utility class for handling bolding queries contained in string. */
+public class QueryBoldingUtil {
+
+  /**
+   * Compares a name and query and returns a {@link CharSequence} with bolded characters.
+   *
+   * <p>Some example of matches:
+   *
+   * <ul>
+   *   <li>"query" would bold "John [query] Smith"
+   *   <li>"222" would bold "[AAA] Mom"
+   *   <li>"222" would bold "[A]llen [A]lex [A]aron"
+   * </ul>
+   *
+   * <p>Some examples of non-matches:
+   *
+   * <ul>
+   *   <li>"ss" would not match "Jessica Jones"
+   *   <li>"77" would not match "Jessica Jones"
+   * </ul>
+   *
+   * @param query containing any characters
+   * @param name of a contact/string that query will compare to
+   * @return name with query bolded if query can be found in the name.
+   */
+  public static CharSequence getNameWithQueryBolded(@Nullable String query, @NonNull String name) {
+    if (TextUtils.isEmpty(query)) {
+      return name;
+    }
+
+    if (!QueryFilteringUtil.nameMatchesT9Query(query, name)) {
+      Pattern pattern = Pattern.compile("(^|\\s)" + Pattern.quote(query.toLowerCase()));
+      Matcher matcher = pattern.matcher(name.toLowerCase());
+      if (matcher.find()) {
+        // query matches the start of a name (i.e. "jo" -> "Jessica [Jo]nes")
+        return getBoldedString(name, matcher.start(), query.length());
+      } else {
+        // query not found in name
+        return name;
+      }
+    }
+
+    Pattern pattern = Pattern.compile("(^|\\s)" + Pattern.quote(query.toLowerCase()));
+    Matcher matcher = pattern.matcher(QueryFilteringUtil.getT9Representation(name));
+    if (matcher.find()) {
+      // query matches the start of a T9 name (i.e. 75 -> "Jessica [Jo]nes")
+      int index = matcher.start();
+      // TODO(calderwoodra): investigate why this is consistently off by one.
+      index = index == 0 ? 0 : index + 1;
+      return getBoldedString(name, index, query.length());
+
+    } else {
+      // query match the T9 initials (i.e. 222 -> "[A]l [B]ob [C]harlie")
+      return getNameWithInitialsBolded(query, name);
+    }
+  }
+
+  private static CharSequence getNameWithInitialsBolded(String query, String name) {
+    SpannableString boldedInitials = new SpannableString(name);
+    name = name.toLowerCase();
+    int initialsBolded = 0;
+    int nameIndex = -1;
+
+    while (++nameIndex < name.length() && initialsBolded < query.length()) {
+      if ((nameIndex == 0 || name.charAt(nameIndex - 1) == ' ')
+          && QueryFilteringUtil.getDigit(name.charAt(nameIndex)) == query.charAt(initialsBolded)) {
+        boldedInitials.setSpan(
+            new StyleSpan(Typeface.BOLD),
+            nameIndex,
+            nameIndex + 1,
+            Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        initialsBolded++;
+      }
+    }
+    return boldedInitials;
+  }
+
+  /**
+   * Compares a number and a query and returns a {@link CharSequence} with bolded characters.
+   *
+   * <ul>
+   *   <li>"123" would bold "(650)34[1-23]24"
+   *   <li>"123" would bold "+1([123])111-2222
+   * </ul>
+   *
+   * @param query containing only numbers and phone number related characters "(", ")", "-", "+"
+   * @param number phone number of a contact that the query will compare to.
+   * @return number with query bolded if query can be found in the number.
+   */
+  public static CharSequence getNumberWithQueryBolded(
+      @Nullable String query, @NonNull String number) {
+    if (TextUtils.isEmpty(query) || !QueryFilteringUtil.numberMatchesNumberQuery(query, number)) {
+      return number;
+    }
+
+    int index = QueryFilteringUtil.indexOfQueryNonDigitsIgnored(query, number);
+    int boldedCharacters = query.length();
+
+    for (char c : query.toCharArray()) {
+      if (!Character.isDigit(c)) {
+        boldedCharacters--;
+      }
+    }
+
+    for (int i = 0; i < index + boldedCharacters; i++) {
+      if (!Character.isDigit(number.charAt(i))) {
+        if (i <= index) {
+          index++;
+        } else {
+          boldedCharacters++;
+        }
+      }
+    }
+    return getBoldedString(number, index, boldedCharacters);
+  }
+
+  private static SpannableString getBoldedString(String s, int index, int numBolded) {
+    SpannableString span = new SpannableString(s);
+    span.setSpan(
+        new StyleSpan(Typeface.BOLD), index, index + numBolded, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+    return span;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
new file mode 100644
index 0000000..775f8de
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/QueryFilteringUtil.java
@@ -0,0 +1,167 @@
+/*
+ * 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.searchfragment.common;
+
+import android.support.annotation.NonNull;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+import java.util.regex.Pattern;
+
+/** Utility class for filtering, comparing and handling strings and queries. */
+public class QueryFilteringUtil {
+
+  /** Matches strings with "-", "(", ")", 2-9 of at least length one. */
+  private static final Pattern T9_PATTERN = Pattern.compile("[\\-()2-9]+");
+
+  /**
+   * Returns true if the query is of T9 format and the name's T9 representation belongs to the query
+   *
+   * <p>Examples:
+   *
+   * <ul>
+   *   <li>#nameMatchesT9Query("7", "John Smith") returns true, 7 -> 'S'
+   *   <li>#nameMatchesT9Query("55", "Jessica Jones") returns true, 55 -> 'JJ'
+   *   <li>#nameMatchesT9Query("56", "Jessica Jones") returns true, 56 -> 'Jo'
+   *   <li>#nameMatchesT9Query("7", "Jessica Jones") returns false, no names start with P,Q,R or S
+   * </ul>
+   */
+  public static boolean nameMatchesT9Query(String query, String name) {
+    if (!T9_PATTERN.matcher(query).matches()) {
+      return false;
+    }
+
+    query = digitsOnly(query);
+    Pattern pattern = Pattern.compile("(^|\\s)" + Pattern.quote(query));
+    if (pattern.matcher(getT9Representation(name)).find()) {
+      // query matches the start of a T9 name (i.e. 75 -> "Jessica [Jo]nes")
+      return true;
+    }
+
+    // Check matches initials
+    // TODO(calderwoodra) investigate faster implementation
+    int queryIndex = 0;
+
+    String[] names = name.toLowerCase().split("\\s");
+    for (int i = 0; i < names.length && queryIndex < query.length(); i++) {
+      if (TextUtils.isEmpty(names[i])) {
+        continue;
+      }
+
+      if (getDigit(names[i].charAt(0)) == query.charAt(queryIndex)) {
+        queryIndex++;
+      }
+    }
+
+    return queryIndex == query.length();
+  }
+
+  /**
+   * Returns true if the subparts of the name (split by white space) begin with the query.
+   *
+   * <p>Examples:
+   *
+   * <ul>
+   *   <li>#nameContainsQuery("b", "Brandon") returns true
+   *   <li>#nameContainsQuery("o", "Bob") returns false
+   *   <li>#nameContainsQuery("o", "Bob Olive") returns true
+   * </ul>
+   */
+  public static boolean nameContainsQuery(String query, String name) {
+    return Pattern.compile("(^|\\s)" + Pattern.quote(query.toLowerCase()))
+        .matcher(name.toLowerCase())
+        .find();
+  }
+
+  /** @return true if the number belongs to the query. */
+  public static boolean numberMatchesNumberQuery(String query, String number) {
+    return PhoneNumberUtils.isGlobalPhoneNumber(query)
+        && indexOfQueryNonDigitsIgnored(query, number) != -1;
+  }
+
+  /**
+   * Checks if query is contained in number while ignoring all characters in both that are not
+   * digits (i.e. {@link Character#isDigit(char)} returns false).
+   *
+   * @return index where query is found with all non-digits removed, -1 if it's not found.
+   */
+  static int indexOfQueryNonDigitsIgnored(@NonNull String query, @NonNull String number) {
+    return digitsOnly(number).indexOf(digitsOnly(query));
+  }
+
+  // Returns string with letters replaced with their T9 representation.
+  static String getT9Representation(String s) {
+    StringBuilder builder = new StringBuilder(s.length());
+    for (char c : s.toLowerCase().toCharArray()) {
+      builder.append(getDigit(c));
+    }
+    return builder.toString();
+  }
+
+  /** @return String s with only digits recognized by Character#isDigit() remaining */
+  public static String digitsOnly(String s) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < s.length(); i++) {
+      char c = s.charAt(i);
+      if (Character.isDigit(c)) {
+        sb.append(c);
+      }
+    }
+    return sb.toString();
+  }
+
+  // Returns the T9 representation of a lower case character, otherwise returns the character.
+  static char getDigit(char c) {
+    switch (c) {
+      case 'a':
+      case 'b':
+      case 'c':
+        return '2';
+      case 'd':
+      case 'e':
+      case 'f':
+        return '3';
+      case 'g':
+      case 'h':
+      case 'i':
+        return '4';
+      case 'j':
+      case 'k':
+      case 'l':
+        return '5';
+      case 'm':
+      case 'n':
+      case 'o':
+        return '6';
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+        return '7';
+      case 't':
+      case 'u':
+      case 'v':
+        return '8';
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+        return '9';
+      default:
+        return c;
+    }
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/common/RowClickListener.java b/java/com/android/dialer/searchfragment/common/RowClickListener.java
new file mode 100644
index 0000000..e82f3f7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/RowClickListener.java
@@ -0,0 +1,43 @@
+/*
+ * 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.searchfragment.common;
+
+import com.android.dialer.dialercontact.DialerContact;
+
+/** Interface of possible actions that can be performed by search elements. */
+public interface RowClickListener {
+
+  /**
+   * Places a traditional voice call.
+   *
+   * @param ranking position in the list relative to the other elements
+   */
+  void placeVoiceCall(String phoneNumber, int ranking);
+
+  /**
+   * Places an IMS video call.
+   *
+   * @param ranking position in the list relative to the other elements
+   */
+  void placeVideoCall(String phoneNumber, int ranking);
+
+  /** Places a Duo video call. */
+  void placeDuoCall(String phoneNumber);
+
+  /** Opens the enriched calling/call composer interface. */
+  void openCallAndShare(DialerContact dialerContact);
+}
diff --git a/java/com/android/dialer/searchfragment/common/SearchCursor.java b/java/com/android/dialer/searchfragment/common/SearchCursor.java
new file mode 100644
index 0000000..368ee09
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/SearchCursor.java
@@ -0,0 +1,38 @@
+/*
+ * 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.searchfragment.common;
+
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+/** Base cursor interface needed for all cursors used in search. */
+public interface SearchCursor extends Cursor {
+
+  String[] HEADER_PROJECTION = {"header_text"};
+
+  int HEADER_TEXT_POSITION = 0;
+
+  /** Returns true if the current cursor position is a header */
+  boolean isHeader();
+
+  /**
+   * Notifies the cursor that the query has updated.
+   *
+   * @return true if the data set has changed.
+   */
+  boolean updateQuery(@NonNull String query);
+}
diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
new file mode 100644
index 0000000..dd871af
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/search_row_height"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:background="?android:attr/selectableItemBackground">
+
+  <QuickContactBadge
+      android:id="@+id/photo"
+      android:layout_width="@dimen/search_row_height"
+      android:layout_height="@dimen/search_row_height"
+      android:padding="@dimen/search_photo_padding"
+      android:clickable="false"/>
+
+  <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_toEndOf="@+id/photo"
+      android:layout_toStartOf="@+id/call_to_action"
+      android:layout_centerVertical="true">
+
+    <TextView
+        android:id="@+id/primary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/search_text_padding_start"
+        android:gravity="center_vertical|start"
+        android:fontFamily="sans-serif"
+        style="@style/PrimaryText"/>
+
+    <TextView
+        android:id="@+id/secondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/search_text_padding_start"
+        android:gravity="center_vertical|start"
+        android:fontFamily="sans-serif"
+        style="@style/SecondaryText"/>
+  </LinearLayout>
+
+  <ImageView
+      android:id="@+id/call_to_action"
+      android:layout_width="@dimen/search_row_height"
+      android:layout_height="@dimen/search_row_height"
+      android:layout_alignParentEnd="true"
+      android:padding="@dimen/call_to_action_padding"
+      android:tint="@color/dialer_secondary_text_color"
+      android:visibility="gone"
+      android:scaleType="center"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/common/res/values/dimens.xml b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
new file mode 100644
index 0000000..f666416
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/common/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <dimen name="search_row_height">56dp</dimen>
+  <dimen name="search_photo_padding">8dp</dimen>
+  <dimen name="call_to_action_padding">8dp</dimen>
+  <dimen name="search_text_padding_start">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/cp2/AndroidManifest.xml b/java/com/android/dialer/searchfragment/cp2/AndroidManifest.xml
new file mode 100644
index 0000000..8d2efca
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.searchfragment.cp2"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/cp2/ContactFilterCursor.java b/java/com/android/dialer/searchfragment/cp2/ContactFilterCursor.java
new file mode 100644
index 0000000..6fd053c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/ContactFilterCursor.java
@@ -0,0 +1,393 @@
+/*
+ * 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.searchfragment.cp2;
+
+import android.content.ContentResolver;
+import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryFilteringUtil;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Wrapper for a cursor containing all on device contacts.
+ *
+ * <p>This cursor removes duplicate phone numbers associated with the same contact and can filter
+ * contacts based on a query by calling {@link #filter(String)}.
+ */
+final class ContactFilterCursor implements Cursor {
+
+  private final Cursor cursor;
+  // List of cursor ids that are valid for displaying after filtering.
+  private final List<Integer> queryFilteredPositions = new ArrayList<>();
+
+  private int currentPosition = 0;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    Qualification.NUMBERS_ARE_NOT_DUPLICATES,
+    Qualification.NEW_NUMBER_IS_MORE_QUALIFIED,
+    Qualification.CURRENT_MORE_QUALIFIED
+  })
+  private @interface Qualification {
+    /** Numbers are not duplicates (i.e. neither is more qualified than the other). */
+    int NUMBERS_ARE_NOT_DUPLICATES = 0;
+    /** Number are duplicates and new number is more qualified than the existing number. */
+    int NEW_NUMBER_IS_MORE_QUALIFIED = 1;
+    /** Numbers are duplicates but current/existing number is more qualified than new number. */
+    int CURRENT_MORE_QUALIFIED = 2;
+  }
+
+  /**
+   * @param cursor with projection {@link Projections#PHONE_PROJECTION}.
+   * @param query to filter cursor results.
+   */
+  ContactFilterCursor(Cursor cursor, @Nullable String query) {
+    // TODO(calderwoodra) investigate copying this into a MatrixCursor and holding in memory
+    this.cursor = cursor;
+    filter(query);
+  }
+
+  /**
+   * Filters out contacts that do not match the query.
+   *
+   * <p>The query can have at least 1 of 3 forms:
+   *
+   * <ul>
+   *   <li>A phone number
+   *   <li>A T9 representation of a name (matches {@link QueryFilteringUtil#T9_PATTERN}).
+   *   <li>A name
+   * </ul>
+   *
+   * <p>A contact is considered a match if:
+   *
+   * <ul>
+   *   <li>Its phone number contains the phone number query
+   *   <li>Its name represented in T9 contains the T9 query
+   *   <li>Its name contains the query
+   * </ul>
+   */
+  public void filter(@Nullable String query) {
+    if (query == null) {
+      query = "";
+    }
+    queryFilteredPositions.clear();
+
+    // On some devices, contacts have multiple rows with identical phone numbers. These numbers are
+    // considered duplicates. Since the order might not be guaranteed, we compare all of the numbers
+    // and hold onto the most qualified one as the one we want to display to the user.
+    // See #getQualification for details on how qualification is determined.
+    int previousMostQualifiedPosition = 0;
+    String previousName = "";
+    String previousMostQualifiedNumber = "";
+
+    query = query.toLowerCase();
+    cursor.moveToPosition(-1);
+
+    while (cursor.moveToNext()) {
+      int position = cursor.getPosition();
+      String currentNumber = cursor.getString(Projections.PHONE_NUMBER);
+      String currentName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+
+      if (!previousName.equals(currentName)) {
+        previousName = currentName;
+        previousMostQualifiedNumber = currentNumber;
+        previousMostQualifiedPosition = position;
+      } else {
+        // Since the contact name is the same, check if this number is a duplicate
+        switch (getQualification(currentNumber, previousMostQualifiedNumber)) {
+          case Qualification.CURRENT_MORE_QUALIFIED:
+            // Number is a less qualified duplicate, ignore it.
+            continue;
+          case Qualification.NEW_NUMBER_IS_MORE_QUALIFIED:
+            // If number wasn't filtered out before, remove it and add it's more qualified version.
+            int index = queryFilteredPositions.indexOf(previousMostQualifiedPosition);
+            if (index != -1) {
+              queryFilteredPositions.remove(index);
+              queryFilteredPositions.add(position);
+            }
+            previousMostQualifiedNumber = currentNumber;
+            previousMostQualifiedPosition = position;
+            continue;
+          case Qualification.NUMBERS_ARE_NOT_DUPLICATES:
+          default:
+            previousMostQualifiedNumber = currentNumber;
+            previousMostQualifiedPosition = position;
+        }
+      }
+
+      if (TextUtils.isEmpty(query)
+          || QueryFilteringUtil.nameMatchesT9Query(query, previousName)
+          || QueryFilteringUtil.numberMatchesNumberQuery(query, previousMostQualifiedNumber)
+          || QueryFilteringUtil.nameContainsQuery(query, previousName)) {
+        queryFilteredPositions.add(previousMostQualifiedPosition);
+      }
+    }
+    currentPosition = 0;
+    cursor.moveToFirst();
+  }
+
+  /**
+   * @param number that may or may not be more qualified than the existing most qualified number
+   * @param mostQualifiedNumber currently most qualified number associated with same contact
+   * @return {@link Qualification} where the more qualified number is the number with the most
+   *     digits. If the digits are the same, the number with the most formatting is more qualified.
+   */
+  private @Qualification int getQualification(String number, String mostQualifiedNumber) {
+    // Ignore formatting
+    String numberDigits = QueryFilteringUtil.digitsOnly(number);
+    String qualifiedNumberDigits = QueryFilteringUtil.digitsOnly(mostQualifiedNumber);
+
+    // If the numbers are identical, return version with more formatting
+    if (qualifiedNumberDigits.equals(numberDigits)) {
+      if (mostQualifiedNumber.length() >= number.length()) {
+        return Qualification.CURRENT_MORE_QUALIFIED;
+      } else {
+        return Qualification.NEW_NUMBER_IS_MORE_QUALIFIED;
+      }
+    }
+
+    // If one number is a suffix of another, then return the longer one.
+    // If they are equal, then return the current most qualified number.
+    if (qualifiedNumberDigits.endsWith(numberDigits)) {
+      return Qualification.CURRENT_MORE_QUALIFIED;
+    }
+    if (numberDigits.endsWith(qualifiedNumberDigits)) {
+      return Qualification.NEW_NUMBER_IS_MORE_QUALIFIED;
+    }
+    return Qualification.NUMBERS_ARE_NOT_DUPLICATES;
+  }
+
+  @Override
+  public boolean moveToPosition(int position) {
+    currentPosition = position;
+    return currentPosition < getCount()
+        && cursor.moveToPosition(queryFilteredPositions.get(currentPosition));
+  }
+
+  @Override
+  public boolean move(int offset) {
+    currentPosition += offset;
+    return moveToPosition(currentPosition);
+  }
+
+  @Override
+  public int getCount() {
+    return queryFilteredPositions.size();
+  }
+
+  @Override
+  public boolean isFirst() {
+    return currentPosition == 0;
+  }
+
+  @Override
+  public boolean isLast() {
+    return currentPosition == getCount() - 1;
+  }
+
+  @Override
+  public int getPosition() {
+    return currentPosition;
+  }
+
+  @Override
+  public boolean moveToFirst() {
+    return moveToPosition(0);
+  }
+
+  @Override
+  public boolean moveToLast() {
+    return moveToPosition(getCount() - 1);
+  }
+
+  @Override
+  public boolean moveToNext() {
+    return moveToPosition(++currentPosition);
+  }
+
+  @Override
+  public boolean moveToPrevious() {
+    return moveToPosition(--currentPosition);
+  }
+
+  // Methods below simply call the corresponding method in cursor.
+  @Override
+  public boolean isBeforeFirst() {
+    return cursor.isBeforeFirst();
+  }
+
+  @Override
+  public boolean isAfterLast() {
+    return cursor.isAfterLast();
+  }
+
+  @Override
+  public int getColumnIndex(String columnName) {
+    return cursor.getColumnIndex(columnName);
+  }
+
+  @Override
+  public int getColumnIndexOrThrow(String columnName) {
+    return cursor.getColumnIndexOrThrow(columnName);
+  }
+
+  @Override
+  public String getColumnName(int columnIndex) {
+    return cursor.getColumnName(columnIndex);
+  }
+
+  @Override
+  public String[] getColumnNames() {
+    return cursor.getColumnNames();
+  }
+
+  @Override
+  public int getColumnCount() {
+    return cursor.getColumnCount();
+  }
+
+  @Override
+  public byte[] getBlob(int columnIndex) {
+    return cursor.getBlob(columnIndex);
+  }
+
+  @Override
+  public String getString(int columnIndex) {
+    return cursor.getString(columnIndex);
+  }
+
+  @Override
+  public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
+    cursor.copyStringToBuffer(columnIndex, buffer);
+  }
+
+  @Override
+  public short getShort(int columnIndex) {
+    return cursor.getShort(columnIndex);
+  }
+
+  @Override
+  public int getInt(int columnIndex) {
+    return cursor.getInt(columnIndex);
+  }
+
+  @Override
+  public long getLong(int columnIndex) {
+    return cursor.getLong(columnIndex);
+  }
+
+  @Override
+  public float getFloat(int columnIndex) {
+    return cursor.getFloat(columnIndex);
+  }
+
+  @Override
+  public double getDouble(int columnIndex) {
+    return cursor.getDouble(columnIndex);
+  }
+
+  @Override
+  public int getType(int columnIndex) {
+    return cursor.getType(columnIndex);
+  }
+
+  @Override
+  public boolean isNull(int columnIndex) {
+    return cursor.isNull(columnIndex);
+  }
+
+  @Override
+  public void deactivate() {
+    cursor.deactivate();
+  }
+
+  @Override
+  public boolean requery() {
+    return cursor.requery();
+  }
+
+  @Override
+  public void close() {
+    cursor.close();
+  }
+
+  @Override
+  public boolean isClosed() {
+    return cursor.isClosed();
+  }
+
+  @Override
+  public void registerContentObserver(ContentObserver observer) {
+    cursor.registerContentObserver(observer);
+  }
+
+  @Override
+  public void unregisterContentObserver(ContentObserver observer) {
+    cursor.unregisterContentObserver(observer);
+  }
+
+  @Override
+  public void registerDataSetObserver(DataSetObserver observer) {
+    cursor.registerDataSetObserver(observer);
+  }
+
+  @Override
+  public void unregisterDataSetObserver(DataSetObserver observer) {
+    cursor.unregisterDataSetObserver(observer);
+  }
+
+  @Override
+  public void setNotificationUri(ContentResolver cr, Uri uri) {
+    cursor.setNotificationUri(cr, uri);
+  }
+
+  @Override
+  public Uri getNotificationUri() {
+    return cursor.getNotificationUri();
+  }
+
+  @Override
+  public boolean getWantsAllOnMoveCalls() {
+    return cursor.getWantsAllOnMoveCalls();
+  }
+
+  @Override
+  public void setExtras(Bundle extras) {
+    cursor.setExtras(extras);
+  }
+
+  @Override
+  public Bundle getExtras() {
+    return cursor.getExtras();
+  }
+
+  @Override
+  public Bundle respond(Bundle extras) {
+    return cursor.respond(extras);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
new file mode 100644
index 0000000..327fe53
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
@@ -0,0 +1,299 @@
+/*
+ * 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.searchfragment.cp2;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Contacts;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.dialer.common.Assert;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.searchfragment.common.RowClickListener;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** ViewHolder for a contact row. */
+public final class SearchContactViewHolder extends ViewHolder implements OnClickListener {
+
+  /** IntDef for the different types of actions that can be shown. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    CallToAction.NONE,
+    CallToAction.VIDEO_CALL,
+    CallToAction.DUO_CALL,
+    CallToAction.SHARE_AND_CALL
+  })
+  @interface CallToAction {
+    int NONE = 0;
+    int VIDEO_CALL = 1;
+    int DUO_CALL = 2;
+    int SHARE_AND_CALL = 3;
+  }
+
+  private final RowClickListener listener;
+  private final QuickContactBadge photo;
+  private final TextView nameOrNumberView;
+  private final TextView numberView;
+  private final ImageView callToActionView;
+  private final Context context;
+
+  private int position;
+  private String number;
+  private DialerContact dialerContact;
+  private @CallToAction int currentAction;
+
+  public SearchContactViewHolder(View view, RowClickListener listener) {
+    super(view);
+    this.listener = listener;
+    view.setOnClickListener(this);
+    photo = view.findViewById(R.id.photo);
+    nameOrNumberView = view.findViewById(R.id.primary);
+    numberView = view.findViewById(R.id.secondary);
+    callToActionView = view.findViewById(R.id.call_to_action);
+    context = view.getContext();
+  }
+
+  /**
+   * Binds the ViewHolder with a cursor from {@link SearchContactsCursorLoader} with the data found
+   * at the cursors set position.
+   */
+  public void bind(SearchCursor cursor, String query) {
+    dialerContact = getDialerContact(context, cursor);
+    position = cursor.getPosition();
+    number = cursor.getString(Projections.PHONE_NUMBER);
+    String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+    String label = getLabel(context.getResources(), cursor);
+    String secondaryInfo =
+        TextUtils.isEmpty(label)
+            ? number
+            : context.getString(
+                com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
+
+    nameOrNumberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+    numberView.setText(QueryBoldingUtil.getNumberWithQueryBolded(query, secondaryInfo));
+    setCallToAction(cursor, query);
+
+    if (shouldShowPhoto(cursor)) {
+      nameOrNumberView.setVisibility(View.VISIBLE);
+      photo.setVisibility(View.VISIBLE);
+      String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+      ContactPhotoManager.getInstance(context)
+          .loadDialerThumbnailOrPhoto(
+              photo,
+              getContactUri(cursor),
+              cursor.getLong(Projections.PHONE_PHOTO_ID),
+              photoUri == null ? null : Uri.parse(photoUri),
+              name,
+              LetterTileDrawable.TYPE_DEFAULT);
+    } else {
+      nameOrNumberView.setVisibility(View.GONE);
+      photo.setVisibility(View.INVISIBLE);
+    }
+  }
+
+  // Show the contact photo next to only the first number if a contact has multiple numbers
+  private boolean shouldShowPhoto(SearchCursor cursor) {
+    int currentPosition = cursor.getPosition();
+    String currentLookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    cursor.moveToPosition(currentPosition - 1);
+
+    if (!cursor.isHeader() && !cursor.isBeforeFirst()) {
+      String previousLookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+      cursor.moveToPosition(currentPosition);
+      return !currentLookupKey.equals(previousLookupKey);
+    }
+    cursor.moveToPosition(currentPosition);
+    return true;
+  }
+
+  private static Uri getContactUri(Cursor cursor) {
+    long contactId = cursor.getLong(Projections.PHONE_ID);
+    String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    return Contacts.getLookupUri(contactId, lookupKey);
+  }
+
+  // TODO(calderwoodra): handle CNAP and cequint types.
+  // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType
+  private static String getLabel(Resources resources, Cursor cursor) {
+    int numberType = cursor.getInt(Projections.PHONE_TYPE);
+    String numberLabel = cursor.getString(Projections.PHONE_LABEL);
+
+    // Returns empty label instead of "custom" if the custom label is empty.
+    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
+      return "";
+    }
+    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
+  }
+
+  private void setCallToAction(SearchCursor cursor, String query) {
+    currentAction = getCallToAction(context, cursor, query);
+    switch (currentAction) {
+      case CallToAction.NONE:
+        callToActionView.setVisibility(View.GONE);
+        callToActionView.setOnClickListener(null);
+        break;
+      case CallToAction.SHARE_AND_CALL:
+        callToActionView.setVisibility(View.VISIBLE);
+        callToActionView.setImageDrawable(
+            context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
+        callToActionView.setOnClickListener(this);
+        break;
+      case CallToAction.DUO_CALL:
+      case CallToAction.VIDEO_CALL:
+        callToActionView.setVisibility(View.VISIBLE);
+        callToActionView.setImageDrawable(
+            context.getDrawable(R.drawable.quantum_ic_videocam_white_24));
+        callToActionView.setOnClickListener(this);
+        break;
+      default:
+        throw Assert.createIllegalStateFailException(
+            "Invalid Call to action type: " + currentAction);
+    }
+  }
+
+  private static @CallToAction int getCallToAction(
+      Context context, SearchCursor cursor, String query) {
+    int carrierPresence = cursor.getInt(Projections.PHONE_CARRIER_PRESENCE);
+    String number = cursor.getString(Projections.PHONE_NUMBER);
+    if ((carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) == 1) {
+      return CallToAction.VIDEO_CALL;
+    }
+
+    if (LightbringerComponent.get(context).getLightbringer().isReachable(context, number)) {
+      return CallToAction.DUO_CALL;
+    }
+
+    EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager();
+    EnrichedCallCapabilities capabilities = manager.getCapabilities(number);
+    if (capabilities != null && capabilities.isCallComposerCapable()) {
+      return CallToAction.SHARE_AND_CALL;
+    } else if (shouldRequestCapabilities(cursor, capabilities, query)) {
+      manager.requestCapabilities(number);
+    }
+    return CallToAction.NONE;
+  }
+
+  /**
+   * An RPC is initiated for each number we request capabilities for, so to limit the network load
+   * and latency on slow networks, we only want to request capabilities for potential contacts the
+   * user is interested in calling. The requirements are that:
+   *
+   * <ul>
+   *   <li>The search query must be 3 or more characters; OR
+   *   <li>There must be 4 or fewer contacts listed in the cursor.
+   * </ul>
+   */
+  private static boolean shouldRequestCapabilities(
+      SearchCursor cursor,
+      @Nullable EnrichedCallCapabilities capabilities,
+      @Nullable String query) {
+    if (capabilities != null) {
+      return false;
+    }
+
+    if (query != null && query.length() >= 3) {
+      return true;
+    }
+
+    // TODO(calderwoodra): implement SearchCursor#getHeaderCount
+    if (cursor.getCount() <= 5) { // 4 contacts + 1 header row element
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public void onClick(View view) {
+    if (view == callToActionView) {
+      switch (currentAction) {
+        case CallToAction.SHARE_AND_CALL:
+          listener.openCallAndShare(dialerContact);
+          break;
+        case CallToAction.VIDEO_CALL:
+          listener.placeVideoCall(number, position);
+          break;
+        case CallToAction.DUO_CALL:
+          listener.placeDuoCall(number);
+          break;
+        case CallToAction.NONE:
+        default:
+          throw Assert.createIllegalStateFailException(
+              "Invalid Call to action type: " + currentAction);
+      }
+    } else {
+      listener.placeVoiceCall(number, position);
+    }
+  }
+
+  private static DialerContact getDialerContact(Context context, Cursor cursor) {
+    DialerContact.Builder contact = DialerContact.newBuilder();
+    String displayName = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+    String number = cursor.getString(Projections.PHONE_NUMBER);
+    Uri contactUri =
+        Contacts.getLookupUri(
+            cursor.getLong(Projections.PHONE_CONTACT_ID),
+            cursor.getString(Projections.PHONE_LOOKUP_KEY));
+
+    contact
+        .setNumber(number)
+        .setPhotoId(cursor.getLong(Projections.PHONE_PHOTO_ID))
+        .setContactType(LetterTileDrawable.TYPE_DEFAULT)
+        .setNameOrNumber(displayName)
+        .setNumberLabel(
+            Phone.getTypeLabel(
+                    context.getResources(),
+                    cursor.getInt(Projections.PHONE_TYPE),
+                    cursor.getString(Projections.PHONE_LABEL))
+                .toString());
+
+    String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+    if (photoUri != null) {
+      contact.setPhotoUri(photoUri);
+    }
+
+    if (contactUri != null) {
+      contact.setContactUri(contactUri.toString());
+    }
+
+    if (!TextUtils.isEmpty(displayName)) {
+      contact.setDisplayNumber(number);
+    }
+
+    return contact.build();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursor.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursor.java
new file mode 100644
index 0000000..18c9ecd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursor.java
@@ -0,0 +1,64 @@
+/*
+ * 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.searchfragment.cp2;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
+import android.support.annotation.Nullable;
+import com.android.dialer.searchfragment.common.SearchCursor;
+
+/**
+ * {@link SearchCursor} implementation for displaying on device contacts.
+ *
+ * <p>Inserts header "All Contacts" at position 0.
+ */
+final class SearchContactsCursor extends MergeCursor implements SearchCursor {
+
+  private final ContactFilterCursor contactFilterCursor;
+
+  public static SearchContactsCursor newInstnace(
+      Context context, ContactFilterCursor contactFilterCursor) {
+    MatrixCursor headerCursor = new MatrixCursor(HEADER_PROJECTION);
+    headerCursor.addRow(new String[] {context.getString(R.string.all_contacts)});
+    return new SearchContactsCursor(new Cursor[] {headerCursor, contactFilterCursor});
+  }
+
+  private SearchContactsCursor(Cursor[] cursors) {
+    super(cursors);
+    contactFilterCursor = (ContactFilterCursor) cursors[1];
+  }
+
+  @Override
+  public boolean isHeader() {
+    return isFirst();
+  }
+
+  @Override
+  public boolean updateQuery(@Nullable String query) {
+    contactFilterCursor.filter(query);
+    return true;
+  }
+
+  @Override
+  public int getCount() {
+    // If we don't have any contents, we don't want to show the header
+    int count = contactFilterCursor.getCount();
+    return count == 0 ? 0 : count + 1;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
new file mode 100644
index 0000000..84fd64a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
@@ -0,0 +1,52 @@
+/*
+ * 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.searchfragment.cp2;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.Nullable;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor Loader for CP2 contacts. */
+public final class SearchContactsCursorLoader extends CursorLoader {
+
+  private final String query;
+
+  /** @param query Contacts cursor will be filtered based on this query. */
+  public SearchContactsCursorLoader(Context context, @Nullable String query) {
+    super(
+        context,
+        Phone.CONTENT_URI,
+        Projections.PHONE_PROJECTION,
+        null,
+        null,
+        Phone.SORT_KEY_PRIMARY + " ASC");
+    this.query = query;
+  }
+
+  @Override
+  public Cursor loadInBackground() {
+    // All contacts
+    Cursor cursor = super.loadInBackground();
+    // Filtering logic
+    ContactFilterCursor contactFilterCursor = new ContactFilterCursor(cursor, query);
+    // Header logic
+    return SearchContactsCursor.newInstnace(getContext(), contactFilterCursor);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml
new file mode 100644
index 0000000..10a86a4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakte"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml
new file mode 100644
index 0000000..4d530eb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ሁሉም እውቂያዎች"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml
new file mode 100644
index 0000000..5f0084b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"جميع جهات الاتصال"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml
new file mode 100644
index 0000000..f28fd5f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Bütün kontaktlar"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..aaf2a2a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml
new file mode 100644
index 0000000..d67743d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Усе кантакты"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml
new file mode 100644
index 0000000..2004db8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Всички контакти"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml
new file mode 100644
index 0000000..8a78098
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"সমস্ত পরিচিতি"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml
new file mode 100644
index 0000000..aaf2a2a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml
new file mode 100644
index 0000000..b3cf9b3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tots els contactes"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml
new file mode 100644
index 0000000..0544dc2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Všechny kontakty"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml
new file mode 100644
index 0000000..2295070
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle kontaktpersoner"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml
new file mode 100644
index 0000000..5f9d38b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle Kontakte"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml
new file mode 100644
index 0000000..a1ea818
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Όλες οι επαφές"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..51d8367
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..51d8367
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..51d8367
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..8790597
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos los contactos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml
new file mode 100644
index 0000000..8790597
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos los contactos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml
new file mode 100644
index 0000000..d8ea3b2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Kõik kontaktid"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml
new file mode 100644
index 0000000..bdea9a9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Kontaktu guztiak"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml
new file mode 100644
index 0000000..6d23a54
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"همه مخاطبین"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml
new file mode 100644
index 0000000..957fc79
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Kaikki yhteystiedot"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..c6bf954
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tous les contacts"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml
new file mode 100644
index 0000000..c6bf954
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tous les contacts"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml
new file mode 100644
index 0000000..e69e199
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos os contactos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml
new file mode 100644
index 0000000..9adc2bc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"બધા સંપર્કો"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml
new file mode 100644
index 0000000..1eb07a7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"सभी संपर्क"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml
new file mode 100644
index 0000000..aaf2a2a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml
new file mode 100644
index 0000000..34c206c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Összes névjegy"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml
new file mode 100644
index 0000000..350662f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Բոլոր կոնտակտները"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml
new file mode 100644
index 0000000..753dd3d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Semua kontak"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml
new file mode 100644
index 0000000..aba498d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Allir tengiliðir"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml
new file mode 100644
index 0000000..b523cb6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tutti i contatti"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml
new file mode 100644
index 0000000..d71c523
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"כל אנשי הקשר"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml
new file mode 100644
index 0000000..5a36ea1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"すべての連絡先"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml
new file mode 100644
index 0000000..11a1d70
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ყველა კონტაქტი"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml
new file mode 100644
index 0000000..7eeb039
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Барлық контактілер"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml
new file mode 100644
index 0000000..951fc16
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ទំនាក់ទំនង​ទាំងអស់"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml
new file mode 100644
index 0000000..899787d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml
new file mode 100644
index 0000000..c702564
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"모든 연락처"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml
new file mode 100644
index 0000000..b115ab4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Бардык байланыштар"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml
new file mode 100644
index 0000000..166d1e0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml
new file mode 100644
index 0000000..b3efc6b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Visi kontaktai"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml
new file mode 100644
index 0000000..3c7a34a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Visas kontaktpersonas"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml
new file mode 100644
index 0000000..1ef92dd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Сите контакти"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml
new file mode 100644
index 0000000..b9daf87
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml
new file mode 100644
index 0000000..9325de5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Бүх харилцагчид"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml
new file mode 100644
index 0000000..4b9d6bd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"सर्व संपर्क"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml
new file mode 100644
index 0000000..29cb581
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Semua kenalan"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml
new file mode 100644
index 0000000..31e3ec5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"အဆက်အသွယ်အားလုံး"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml
new file mode 100644
index 0000000..4a1e562
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakter"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml
new file mode 100644
index 0000000..a987d0e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"सबै सम्पर्कहरू"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml
new file mode 100644
index 0000000..b29ac65
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle contacten"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml
new file mode 100644
index 0000000..4a1e562
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakter"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml
new file mode 100644
index 0000000..1b26c22
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"ਸਾਰੇ ਸੰਪਰਕ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml
new file mode 100644
index 0000000..23190de
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Wszystkie kontakty"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..ccc0c91
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos os contatos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..e69e199
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos os contactos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml
new file mode 100644
index 0000000..ccc0c91
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Todos os contatos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml
new file mode 100644
index 0000000..503c0e5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Toată agenda"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml
new file mode 100644
index 0000000..38cf675
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Все контакты"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml
new file mode 100644
index 0000000..ceafda0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"සියලුම සම්බන්ධතා"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml
new file mode 100644
index 0000000..a214b6b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Všetky kontakty"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml
new file mode 100644
index 0000000..3d65765
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Vsi stiki"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml
new file mode 100644
index 0000000..cb6501c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Të gjitha kontaktet"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml
new file mode 100644
index 0000000..6b86da9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Сви контакти"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml
new file mode 100644
index 0000000..1914803
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Alla kontakter"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml
new file mode 100644
index 0000000..2865645
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Anwani zote"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml
new file mode 100644
index 0000000..e8cf9e7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"எல்லாத் தொடர்புகளும்"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml
new file mode 100644
index 0000000..431de21
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"అన్ని పరిచయాలు"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml
new file mode 100644
index 0000000..4b7cb44
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"รายชื่อทั้งหมด"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml
new file mode 100644
index 0000000..ad973da
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Lahat ng contact"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml
new file mode 100644
index 0000000..6bb043a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tüm kişiler"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml
new file mode 100644
index 0000000..6a24a69
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Усі контакти"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml
new file mode 100644
index 0000000..2a84916
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"سبھی رابطے"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml
new file mode 100644
index 0000000..b562c4e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Barcha kontaktlar"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml
new file mode 100644
index 0000000..0bdf9e2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Tất cả địa chỉ liên hệ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..fe8b1ff
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"所有联系人"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..5191ae9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"所有聯絡人"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..5191ae9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"所有聯絡人"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml
new file mode 100644
index 0000000..e6812c0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="all_contacts" msgid="2155583160607462513">"Bonke oxhumana nabo"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values/strings.xml
new file mode 100644
index 0000000..5462dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/cp2/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <!-- Label for a list of all contacts on device. [CHAR LIMIT=30]-->
+  <string name="all_contacts">All contacts</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/AndroidManifest.xml b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
new file mode 100644
index 0000000..e0890cc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.searchfragment.list"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
new file mode 100644
index 0000000..dd35b13
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/HeaderViewHolder.java
@@ -0,0 +1,36 @@
+/*
+ * 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.searchfragment.list;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+/** ViewHolder for header rows in {@link NewSearchFragment}. */
+final class HeaderViewHolder extends RecyclerView.ViewHolder {
+
+  private final TextView header;
+
+  HeaderViewHolder(View view) {
+    super(view);
+    header = view.findViewById(R.id.header);
+  }
+
+  public void setHeader(String header) {
+    this.header.setText(header);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
new file mode 100644
index 0000000..7fee969
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -0,0 +1,300 @@
+/*
+ * 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.searchfragment.list;
+
+import android.app.Fragment;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Loader;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v13.app.FragmentCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Interpolator;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.animation.AnimUtils;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import com.android.dialer.searchfragment.cp2.SearchContactsCursorLoader;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlacesCursorLoader;
+import com.android.dialer.searchfragment.remote.RemoteContactsCursorLoader;
+import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader;
+import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader.Directory;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.ViewUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/** Fragment used for searching contacts. */
+public final class NewSearchFragment extends Fragment
+    implements LoaderCallbacks<Cursor>,
+        OnEmptyViewActionButtonClickedListener,
+        CapabilitiesListener {
+
+  // Since some of our queries can generate network requests, we should delay them until the user
+  // stops typing to prevent generating too much network traffic.
+  private static final int NETWORK_SEARCH_DELAY_MILLIS = 300;
+  // To prevent constant capabilities updates refreshing the adapter, we want to add a delay between
+  // updates so they are bundled together
+  private static final int ENRICHED_CALLING_CAPABILITIES_UPDATED_DELAY = 400;
+
+  @VisibleForTesting public static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
+
+  private static final int CONTACTS_LOADER_ID = 0;
+  private static final int NEARBY_PLACES_LOADER_ID = 1;
+  private static final int REMOTE_DIRECTORIES_LOADER_ID = 2;
+  private static final int REMOTE_CONTACTS_LOADER_ID = 3;
+
+  private EmptyContentView emptyContentView;
+  private RecyclerView recyclerView;
+  private SearchAdapter adapter;
+  private String query;
+  private CallInitiationType.Type callInitiationType = CallInitiationType.Type.UNKNOWN_INITIATION;
+  private boolean remoteDirectoriesDisabledForTesting;
+
+  private final List<Directory> directories = new ArrayList<>();
+  private final Runnable loadNearbyPlacesRunnable =
+      () -> getLoaderManager().restartLoader(NEARBY_PLACES_LOADER_ID, null, this);
+  private final Runnable loadRemoteContactsRunnable =
+      () -> getLoaderManager().restartLoader(REMOTE_CONTACTS_LOADER_ID, null, this);
+  private final Runnable capabilitiesUpdatedRunnable = () -> adapter.notifyDataSetChanged();
+
+  private Runnable updatePositionRunnable;
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle bundle) {
+    View view = inflater.inflate(R.layout.fragment_search, parent, false);
+    adapter = new SearchAdapter(getActivity(), new SearchCursorManager());
+    adapter.setCallInitiationType(callInitiationType);
+    emptyContentView = view.findViewById(R.id.empty_view);
+    recyclerView = view.findViewById(R.id.recycler_view);
+    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+    recyclerView.setAdapter(adapter);
+
+    if (!PermissionsUtil.hasContactsReadPermissions(getContext())) {
+      emptyContentView.setDescription(R.string.new_permission_no_search);
+      emptyContentView.setActionLabel(R.string.permission_single_turn_on);
+      emptyContentView.setActionClickedListener(this);
+      emptyContentView.setImage(R.drawable.empty_contacts);
+      emptyContentView.setVisibility(View.VISIBLE);
+    } else {
+      initLoaders();
+    }
+
+    if (updatePositionRunnable != null) {
+      ViewUtil.doOnPreDraw(view, false, updatePositionRunnable);
+    }
+    return view;
+  }
+
+  private void initLoaders() {
+    getLoaderManager().initLoader(CONTACTS_LOADER_ID, null, this);
+    loadNearbyPlacesCursor();
+    loadRemoteDirectoriesCursor();
+  }
+
+  @Override
+  public Loader<Cursor> onCreateLoader(int id, Bundle bundle) {
+    if (id == CONTACTS_LOADER_ID) {
+      return new SearchContactsCursorLoader(getContext(), query);
+    } else if (id == NEARBY_PLACES_LOADER_ID) {
+      return new NearbyPlacesCursorLoader(getContext(), query);
+    } else if (id == REMOTE_DIRECTORIES_LOADER_ID) {
+      return new RemoteDirectoriesCursorLoader(getContext());
+    } else if (id == REMOTE_CONTACTS_LOADER_ID) {
+      return new RemoteContactsCursorLoader(getContext(), query, directories);
+    } else {
+      throw new IllegalStateException("Invalid loader id: " + id);
+    }
+  }
+
+  @Override
+  public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+    if (cursor != null
+        && !(loader instanceof RemoteDirectoriesCursorLoader)
+        && !(cursor instanceof SearchCursor)) {
+      throw Assert.createIllegalStateFailException("Cursors must implement SearchCursor");
+    }
+
+    if (loader instanceof SearchContactsCursorLoader) {
+      adapter.setContactsCursor((SearchCursor) cursor);
+
+    } else if (loader instanceof NearbyPlacesCursorLoader) {
+      adapter.setNearbyPlacesCursor((SearchCursor) cursor);
+
+    } else if (loader instanceof RemoteContactsCursorLoader) {
+      adapter.setRemoteContactsCursor((SearchCursor) cursor);
+
+    } else if (loader instanceof RemoteDirectoriesCursorLoader) {
+      directories.clear();
+      cursor.moveToPosition(-1);
+      while (cursor.moveToNext()) {
+        directories.add(RemoteDirectoriesCursorLoader.readDirectory(cursor));
+      }
+      loadRemoteContactsCursors();
+
+    } else {
+      throw new IllegalStateException("Invalid loader: " + loader);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(Loader<Cursor> loader) {
+    adapter.clear();
+    recyclerView.setAdapter(null);
+  }
+
+  public void setQuery(String query) {
+    this.query = query;
+    if (adapter != null) {
+      adapter.setQuery(query);
+      loadNearbyPlacesCursor();
+      loadRemoteContactsCursors();
+    }
+  }
+
+  public void setCallInitiationType(CallInitiationType.Type callInitiationType) {
+    this.callInitiationType = callInitiationType;
+    if (adapter != null) {
+      adapter.setCallInitiationType(callInitiationType);
+    }
+  }
+
+  public void animatePosition(int start, int end, int duration) {
+    // Called before the view is ready, prepare a runnable to run in onCreateView
+    if (getView() == null) {
+      updatePositionRunnable = () -> animatePosition(start, end, 0);
+      return;
+    }
+    boolean slideUp = start > end;
+    Interpolator interpolator = slideUp ? AnimUtils.EASE_IN : AnimUtils.EASE_OUT;
+    getView().setTranslationY(start);
+    getView().animate().translationY(end).setInterpolator(interpolator).setDuration(duration);
+    updatePositionRunnable = null;
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadRemoteContactsRunnable);
+    ThreadUtil.getUiThreadHandler().removeCallbacks(capabilitiesUpdatedRunnable);
+  }
+
+  private void loadNearbyPlacesCursor() {
+    // Cancel existing load if one exists.
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
+
+    // If nearby places is not enabled, do not try to load them.
+    if (!PhoneDirectoryExtenderAccessor.get(getContext()).isEnabled(getContext())) {
+      return;
+    }
+    ThreadUtil.getUiThreadHandler()
+        .postDelayed(loadNearbyPlacesRunnable, NETWORK_SEARCH_DELAY_MILLIS);
+  }
+
+  @Override
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    if (requestCode == READ_CONTACTS_PERMISSION_REQUEST_CODE) {
+      if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
+        // Force a refresh of the data since we were missing the permission before this.
+        emptyContentView.setVisibility(View.GONE);
+        initLoaders();
+      }
+    }
+  }
+
+  @Override
+  public void onEmptyViewActionButtonClicked() {
+    String[] deniedPermissions =
+        PermissionsUtil.getPermissionsCurrentlyDenied(
+            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+    if (deniedPermissions.length > 0) {
+      LogUtil.i(
+          "NewSearchFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      FragmentCompat.requestPermissions(
+          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+    }
+  }
+
+  private void loadRemoteDirectoriesCursor() {
+    if (!remoteDirectoriesDisabledForTesting) {
+      getLoaderManager().initLoader(REMOTE_DIRECTORIES_LOADER_ID, null, this);
+    }
+  }
+
+  private void loadRemoteContactsCursors() {
+    if (remoteDirectoriesDisabledForTesting) {
+      return;
+    }
+
+    // Cancel existing load if one exists.
+    ThreadUtil.getUiThreadHandler().removeCallbacks(loadRemoteContactsRunnable);
+    ThreadUtil.getUiThreadHandler()
+        .postDelayed(loadRemoteContactsRunnable, NETWORK_SEARCH_DELAY_MILLIS);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    EnrichedCallComponent.get(getContext())
+        .getEnrichedCallManager()
+        .registerCapabilitiesListener(this);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    EnrichedCallComponent.get(getContext())
+        .getEnrichedCallManager()
+        .unregisterCapabilitiesListener(this);
+  }
+
+  @Override
+  public void onCapabilitiesUpdated() {
+    ThreadUtil.getUiThreadHandler().removeCallbacks(capabilitiesUpdatedRunnable);
+    ThreadUtil.getUiThreadHandler()
+        .postDelayed(capabilitiesUpdatedRunnable, ENRICHED_CALLING_CAPABILITIES_UPDATED_DELAY);
+  }
+
+  // Currently, setting up multiple FakeContentProviders doesn't work and results in this fragment
+  // being untestable while it can query multiple datasources. This is a temporary fix.
+  // TODO(b/64099602): Remove this method and test this fragment with multiple data sources
+  @VisibleForTesting
+  public void setRemoteDirectoriesDisabled(boolean disabled) {
+    remoteDirectoriesDisabledForTesting = disabled;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
new file mode 100644
index 0000000..f08d60e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
@@ -0,0 +1,179 @@
+/*
+ * 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.searchfragment.list;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import com.android.dialer.callcomposer.CallComposerActivity;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.callintent.CallSpecificAppData;
+import com.android.dialer.common.Assert;
+import com.android.dialer.constants.ActivityRequestCodes;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.searchfragment.common.RowClickListener;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import com.android.dialer.searchfragment.cp2.SearchContactViewHolder;
+import com.android.dialer.searchfragment.list.SearchCursorManager.RowType;
+import com.android.dialer.searchfragment.nearbyplaces.NearbyPlaceViewHolder;
+import com.android.dialer.searchfragment.remote.RemoteContactViewHolder;
+import com.android.dialer.util.DialerUtils;
+
+/** RecyclerView adapter for {@link NewSearchFragment}. */
+@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+public final class SearchAdapter extends RecyclerView.Adapter<ViewHolder>
+    implements RowClickListener {
+
+  private final SearchCursorManager searchCursorManager;
+  private final Activity activity;
+
+  private String query;
+  private CallInitiationType.Type callInitiationType = CallInitiationType.Type.UNKNOWN_INITIATION;
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public SearchAdapter(Activity activity, SearchCursorManager searchCursorManager) {
+    this.activity = activity;
+    this.searchCursorManager = searchCursorManager;
+  }
+
+  @Override
+  public ViewHolder onCreateViewHolder(ViewGroup root, @RowType int rowType) {
+    switch (rowType) {
+      case RowType.CONTACT_ROW:
+        return new SearchContactViewHolder(
+            LayoutInflater.from(activity).inflate(R.layout.search_contact_row, root, false), this);
+      case RowType.NEARBY_PLACES_ROW:
+        return new NearbyPlaceViewHolder(
+            LayoutInflater.from(activity).inflate(R.layout.search_contact_row, root, false));
+      case RowType.CONTACT_HEADER:
+      case RowType.DIRECTORY_HEADER:
+      case RowType.NEARBY_PLACES_HEADER:
+        return new HeaderViewHolder(
+            LayoutInflater.from(activity).inflate(R.layout.header_layout, root, false));
+      case RowType.DIRECTORY_ROW:
+        return new RemoteContactViewHolder(
+            LayoutInflater.from(activity).inflate(R.layout.search_contact_row, root, false));
+      case RowType.INVALID:
+      default:
+        throw Assert.createIllegalStateFailException("Invalid RowType: " + rowType);
+    }
+  }
+
+  @Override
+  public @RowType int getItemViewType(int position) {
+    return searchCursorManager.getRowType(position);
+  }
+
+  @Override
+  public void onBindViewHolder(ViewHolder holder, int position) {
+    if (holder instanceof SearchContactViewHolder) {
+      ((SearchContactViewHolder) holder).bind(searchCursorManager.getCursor(position), query);
+    } else if (holder instanceof NearbyPlaceViewHolder) {
+      ((NearbyPlaceViewHolder) holder).bind(searchCursorManager.getCursor(position), query);
+    } else if (holder instanceof RemoteContactViewHolder) {
+      ((RemoteContactViewHolder) holder).bind(searchCursorManager.getCursor(position), query);
+    } else if (holder instanceof HeaderViewHolder) {
+      String header =
+          searchCursorManager.getCursor(position).getString(SearchCursor.HEADER_TEXT_POSITION);
+      ((HeaderViewHolder) holder).setHeader(header);
+    } else {
+      throw Assert.createIllegalStateFailException("Invalid ViewHolder: " + holder);
+    }
+  }
+
+  public void setContactsCursor(SearchCursor cursor) {
+    searchCursorManager.setContactsCursor(cursor);
+    notifyDataSetChanged();
+  }
+
+  void clear() {
+    searchCursorManager.clear();
+  }
+
+  @Override
+  public int getItemCount() {
+    return searchCursorManager.getCount();
+  }
+
+  public void setQuery(String query) {
+    this.query = query;
+    if (searchCursorManager.setQuery(query)) {
+      notifyDataSetChanged();
+    }
+  }
+
+  void setCallInitiationType(CallInitiationType.Type callInitiationType) {
+    this.callInitiationType = callInitiationType;
+  }
+
+  public void setNearbyPlacesCursor(SearchCursor nearbyPlacesCursor) {
+    if (searchCursorManager.setNearbyPlacesCursor(nearbyPlacesCursor)) {
+      notifyDataSetChanged();
+    }
+  }
+
+  public void setRemoteContactsCursor(SearchCursor remoteContactsCursor) {
+    if (searchCursorManager.setCorpDirectoryCursor(remoteContactsCursor)) {
+      notifyDataSetChanged();
+    }
+  }
+
+  @Override
+  public void placeVoiceCall(String phoneNumber, int ranking) {
+    placeCall(phoneNumber, ranking, false);
+  }
+
+  @Override
+  public void placeVideoCall(String phoneNumber, int ranking) {
+    placeCall(phoneNumber, ranking, true);
+  }
+
+  private void placeCall(String phoneNumber, int position, boolean isVideoCall) {
+    CallSpecificAppData callSpecificAppData =
+        CallSpecificAppData.newBuilder()
+            .setCallInitiationType(callInitiationType)
+            .setPositionOfSelectedSearchResult(position)
+            .setCharactersInSearchString(query == null ? 0 : query.length())
+            .build();
+    Intent intent =
+        new CallIntentBuilder(phoneNumber, callSpecificAppData).setIsVideoCall(isVideoCall).build();
+    DialerUtils.startActivityWithErrorToast(activity, intent);
+  }
+
+  @Override
+  public void placeDuoCall(String phoneNumber) {
+    Logger.get(activity)
+        .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH);
+    Intent intent =
+        LightbringerComponent.get(activity).getLightbringer().getIntent(activity, phoneNumber);
+    activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_LIGHTBRINGER);
+  }
+
+  @Override
+  public void openCallAndShare(DialerContact contact) {
+    Intent intent = CallComposerActivity.newIntent(activity, contact);
+    DialerUtils.startActivityWithErrorToast(activity, intent);
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
new file mode 100644
index 0000000..a303425
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
@@ -0,0 +1,246 @@
+/*
+ * 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.searchfragment.list;
+
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Manages all of the cursors needed for {@link SearchAdapter}.
+ *
+ * <p>This class accepts three cursors:
+ *
+ * <ul>
+ *   <li>A contacts cursor {@link #setContactsCursor(SearchCursor)}
+ *   <li>A google search results cursor {@link #setNearbyPlacesCursor(SearchCursor)}
+ *   <li>A work directory cursor {@link #setCorpDirectoryCursor(SearchCursor)}
+ * </ul>
+ *
+ * <p>The key purpose of this class is to compose three aforementioned cursors together to function
+ * as one cursor. The key methods needed to utilize this class as a cursor are:
+ *
+ * <ul>
+ *   <li>{@link #getCursor(int)}
+ *   <li>{@link #getCount()}
+ *   <li>{@link #getRowType(int)}
+ * </ul>
+ */
+@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+public final class SearchCursorManager {
+
+  /** IntDef for the different types of rows that can be shown when searching. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    SearchCursorManager.RowType.INVALID,
+    SearchCursorManager.RowType.CONTACT_HEADER,
+    SearchCursorManager.RowType.CONTACT_ROW,
+    SearchCursorManager.RowType.NEARBY_PLACES_HEADER,
+    SearchCursorManager.RowType.NEARBY_PLACES_ROW,
+    SearchCursorManager.RowType.DIRECTORY_HEADER,
+    SearchCursorManager.RowType.DIRECTORY_ROW
+  })
+  @interface RowType {
+    int INVALID = 0;
+    // TODO(calderwoodra) add suggestions header and list
+    /** Header to mark the start of contact rows. */
+    int CONTACT_HEADER = 1;
+    /** A row containing contact information for contacts stored locally on device. */
+    int CONTACT_ROW = 2;
+    /** Header to mark the end of contact rows and start of nearby places rows. */
+    int NEARBY_PLACES_HEADER = 3;
+    /** A row containing nearby places information/search results. */
+    int NEARBY_PLACES_ROW = 4;
+    /** Header to mark the end of the previous row set and start of directory rows. */
+    int DIRECTORY_HEADER = 5;
+    /** A row containing contact information for contacts stored externally in corp directories. */
+    int DIRECTORY_ROW = 6;
+  }
+
+  private SearchCursor contactsCursor = null;
+  private SearchCursor nearbyPlacesCursor = null;
+  private SearchCursor corpDirectoryCursor = null;
+
+  /** Returns true if the cursor changed. */
+  boolean setContactsCursor(@Nullable SearchCursor cursor) {
+    if (cursor == contactsCursor) {
+      return false;
+    }
+
+    if (contactsCursor != null && !contactsCursor.isClosed()) {
+      contactsCursor.close();
+    }
+
+    if (cursor != null && cursor.getCount() > 0) {
+      contactsCursor = cursor;
+    } else {
+      contactsCursor = null;
+    }
+    return true;
+  }
+
+  /** Returns true if the cursor changed. */
+  boolean setNearbyPlacesCursor(@Nullable SearchCursor cursor) {
+    if (cursor == nearbyPlacesCursor) {
+      return false;
+    }
+
+    if (nearbyPlacesCursor != null && !nearbyPlacesCursor.isClosed()) {
+      nearbyPlacesCursor.close();
+    }
+
+    if (cursor != null && cursor.getCount() > 0) {
+      nearbyPlacesCursor = cursor;
+    } else {
+      nearbyPlacesCursor = null;
+    }
+    return true;
+  }
+
+  /** Returns true if a cursor changed. */
+  boolean setCorpDirectoryCursor(@Nullable SearchCursor cursor) {
+    if (cursor == corpDirectoryCursor) {
+      return false;
+    }
+
+    if (corpDirectoryCursor != null && !corpDirectoryCursor.isClosed()) {
+      corpDirectoryCursor.close();
+    }
+
+    if (cursor != null && cursor.getCount() > 0) {
+      corpDirectoryCursor = cursor;
+    } else {
+      corpDirectoryCursor = null;
+    }
+    return true;
+  }
+
+  boolean setQuery(String query) {
+    boolean updated = false;
+    if (contactsCursor != null) {
+      updated = contactsCursor.updateQuery(query);
+    }
+
+    if (nearbyPlacesCursor != null) {
+      updated |= nearbyPlacesCursor.updateQuery(query);
+    }
+
+    if (corpDirectoryCursor != null) {
+      updated |= corpDirectoryCursor.updateQuery(query);
+    }
+    return updated;
+  }
+
+  /** Returns the sum of counts of all cursors, including headers. */
+  int getCount() {
+    int count = 0;
+    if (contactsCursor != null) {
+      count += contactsCursor.getCount();
+    }
+
+    if (nearbyPlacesCursor != null) {
+      count += nearbyPlacesCursor.getCount();
+    }
+
+    if (corpDirectoryCursor != null) {
+      count += corpDirectoryCursor.getCount();
+    }
+
+    return count;
+  }
+
+  @RowType
+  int getRowType(int position) {
+    SearchCursor cursor = getCursor(position);
+    if (cursor == contactsCursor) {
+      return cursor.isHeader() ? RowType.CONTACT_HEADER : RowType.CONTACT_ROW;
+    }
+
+    if (cursor == nearbyPlacesCursor) {
+      return cursor.isHeader() ? RowType.NEARBY_PLACES_HEADER : RowType.NEARBY_PLACES_ROW;
+    }
+
+    if (cursor == corpDirectoryCursor) {
+      return cursor.isHeader() ? RowType.DIRECTORY_HEADER : RowType.DIRECTORY_ROW;
+    }
+    throw Assert.createIllegalStateFailException("No valid row type.");
+  }
+
+  /**
+   * Gets cursor corresponding to position in coalesced list of search cursors. Callers should
+   * ensure that {@link #getRowType(int)} doesn't correspond to header position, otherwise an
+   * exception will be thrown.
+   *
+   * @param position in coalesced list of search cursors
+   * @return Cursor moved to position specific to passed in position.
+   */
+  SearchCursor getCursor(int position) {
+    if (contactsCursor != null) {
+      int count = contactsCursor.getCount();
+
+      if (position - count < 0) {
+        contactsCursor.moveToPosition(position);
+        return contactsCursor;
+      }
+      position -= count;
+    }
+
+    if (nearbyPlacesCursor != null) {
+      int count = nearbyPlacesCursor.getCount();
+
+      if (position - count < 0) {
+        nearbyPlacesCursor.moveToPosition(position);
+        return nearbyPlacesCursor;
+      }
+      position -= count;
+    }
+
+    if (corpDirectoryCursor != null) {
+      int count = corpDirectoryCursor.getCount();
+
+      if (position - count < 0) {
+        corpDirectoryCursor.moveToPosition(position);
+        return corpDirectoryCursor;
+      }
+      position -= count;
+    }
+
+    throw Assert.createIllegalStateFailException("No valid cursor.");
+  }
+
+  /** removes all cursors. */
+  void clear() {
+    if (contactsCursor != null) {
+      contactsCursor.close();
+      contactsCursor = null;
+    }
+
+    if (nearbyPlacesCursor != null) {
+      nearbyPlacesCursor.close();
+      nearbyPlacesCursor = null;
+    }
+
+    if (corpDirectoryCursor != null) {
+      corpDirectoryCursor.close();
+      corpDirectoryCursor = null;
+    }
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
new file mode 100644
index 0000000..cde9cb6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+  <android.support.v7.widget.RecyclerView
+      android:id="@+id/recycler_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:background="@color/background_dialer_light"/>
+
+  <com.android.dialer.widget.EmptyContentView
+      android:id="@+id/empty_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:visibility="gone"
+      android:background="@color/background_dialer_light"/>
+</FrameLayout>
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
new file mode 100644
index 0000000..eef0dee
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/header"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:paddingStart="16dp"
+    style="@style/SecondaryText"/>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml
new file mode 100644
index 0000000..e538aa4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml
new file mode 100644
index 0000000..2d45136
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"እውቂያዎችዎን ለመፈለግ፣ የእውቂያዎች ፈቃዶችን ያብሩ።"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml
new file mode 100644
index 0000000..c5beb3e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"عليك تشغيل أذونات جهات الاتصال للبحث عنا"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml
new file mode 100644
index 0000000..f378bcc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktlarınızı axtarmaq üçün Kontakt icazələrini aktiv edin."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..c296ce6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Da biste pretražili kontakte, uključite dozvole za Kontakte."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml
new file mode 100644
index 0000000..de7b0a7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Каб шукаць свае кантакты, уключыце дазвол для Кантактаў."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml
new file mode 100644
index 0000000..02dc819
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"За да търсите в контактите си, включете разрешенията за тях."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml
new file mode 100644
index 0000000..05ad4bb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"আপনার পরিচিতিগুলি অনুসন্ধান করতে, পরিচিতির অনুমতিগুলি চালু করুন।"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml
new file mode 100644
index 0000000..51a3deb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Da pretražujete kontakte, uključite dozvole za Kontakte."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml
new file mode 100644
index 0000000..0b9c0c0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Activa els permisos de Contactes per cercar els teus contactes."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml
new file mode 100644
index 0000000..316322e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml
new file mode 100644
index 0000000..3287238
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Slå tilladelser til Kontaktpersoner til for at søge i dine kontaktpersoner."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml
new file mode 100644
index 0000000..d39ce3c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml
new file mode 100644
index 0000000..2dd685d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\"."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..9c124ca
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..9c124ca
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..9c124ca
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..f79c63d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar contactos, activa el permiso Contactos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml
new file mode 100644
index 0000000..a48338d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar tus contactos, activa los permisos de Contactos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml
new file mode 100644
index 0000000..992a862
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktide otsimiseks lülitage sisse kontaktiload."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml
new file mode 100644
index 0000000..ac7d7b0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktuak bilatzeko, eman kontaktuak atzitzeko baimena."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml
new file mode 100644
index 0000000..699c796
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml
new file mode 100644
index 0000000..d2fa2a7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..5d4e302
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Pour rechercher vos contacts, activez les autorisations Contacts."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml
new file mode 100644
index 0000000..4f80f87
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Pour effectuer une recherche dans vos contacts, activez les autorisations de l\'application Contacts."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml
new file mode 100644
index 0000000..f8c4c12
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar os teus contactos, activa os permisos de Contactos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml
new file mode 100644
index 0000000..45b719d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml
new file mode 100644
index 0000000..2f8afc7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml
new file mode 100644
index 0000000..35b3f47
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Da biste pretraživali kontakte, uključite dopuštenja za kontakte."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml
new file mode 100644
index 0000000..0b3e39d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"A névjegyek kereséséhez engedélyezze a névjegyhozzáférést."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml
new file mode 100644
index 0000000..a5a80d8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml
new file mode 100644
index 0000000..37cc2e9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Untuk menelusuri kontak, aktifkan izin Kontak."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml
new file mode 100644
index 0000000..0ac960d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml
new file mode 100644
index 0000000..bfa0760
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml
new file mode 100644
index 0000000..e4865c2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"עליך להפעיל את ההרשאה \'אנשי קשר\' כדי לחפש באנשי הקשר שלך."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml
new file mode 100644
index 0000000..65ef729
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"連絡先を検索するには、連絡先の権限を ON にしてください。"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml
new file mode 100644
index 0000000..e15d4c4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml
new file mode 100644
index 0000000..94a30d2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Контактілерді іздеу мүмкін болуы үшін, \"Контактілер\" рұқсаттарын қосыңыз."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml
new file mode 100644
index 0000000..4bee48b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកការអនុញ្ញាតទំនាក់ទំនង។"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml
new file mode 100644
index 0000000..ec560eb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml
new file mode 100644
index 0000000..e51a6dd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"연락처를 검색하려면 연락처 권한을 사용하도록 설정하세요."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml
new file mode 100644
index 0000000..fc138c0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml
new file mode 100644
index 0000000..5608e95
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"ເພື່ອຊອກຫາລາຍຊື່ຂອງທ່ານ, ໃຫ້ອະນຸຍາດສິດການໃຊ້ລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml
new file mode 100644
index 0000000..187d1b9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml
new file mode 100644
index 0000000..add895b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml
new file mode 100644
index 0000000..c3e688f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"За да ги пребарувате контактите, вклучете ги дозволите за контакти."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml
new file mode 100644
index 0000000..cdbd85f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml
new file mode 100644
index 0000000..dffe670
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Харилцагчаа хайхын тулд, Харилцагчийн зөвшөөрлийг идэвхжүүлнэ үү."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml
new file mode 100644
index 0000000..8db24db
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for new_permission_no_search (6107959563874740441) -->
+    <skip />
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml
new file mode 100644
index 0000000..01c2e88
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Untuk mencari kenalan anda, hidupkan kebenaran Kenalan."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml
new file mode 100644
index 0000000..b13ccbd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"သင့်အဆက်အသွယ်များကို ရှာဖွေရန် Contacts ခွင့်ပြုချက်များကို ဖွင့်ပါ။"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml
new file mode 100644
index 0000000..dffccb3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml
new file mode 100644
index 0000000..ced0d02
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"आफ्ना सम्पर्कहरू खोज्न सम्पर्कसम्बन्धी अनुमतिहरूलाई सक्रिय गर्नुहोस्।"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml
new file mode 100644
index 0000000..53b489e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Als je wilt zoeken in je contacten, moet je het recht Contacten inschakelen."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml
new file mode 100644
index 0000000..dffccb3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml
new file mode 100644
index 0000000..6ccac1c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"ਆਪਣੇ ਸੰਪਰਕ ਖੋਜਣ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml
new file mode 100644
index 0000000..73ef358
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Aby wyszukać kontakty, włącz uprawnienia Kontakty."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..dd9365a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar seus contatos, ative as permissões para Contatos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..731d57b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar os seus contactos, ative as autorizações Contactos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml
new file mode 100644
index 0000000..dd9365a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar seus contatos, ative as permissões para Contatos."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml
new file mode 100644
index 0000000..359a1f0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Pentru a căuta în agendă, activați permisiunea pentru Agendă."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml
new file mode 100644
index 0000000..865a57c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Для поиска контактов включите разрешение \"Контакты\"."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml
new file mode 100644
index 0000000..0e6b175
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml
new file mode 100644
index 0000000..75c6950
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Ak chcete hľadať kontakty, zapnite povolenie Kontakty."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml
new file mode 100644
index 0000000..2b79fcf
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Če želite iskati po stikih, vklopite dovoljenje za stike."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml
new file mode 100644
index 0000000..713b7c6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Për të kërkuar te kontaktet, aktivizo lejet e \"Kontakteve\""</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml
new file mode 100644
index 0000000..8084869
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Да бисте претражили контакте, укључите дозволе за Контакте."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml
new file mode 100644
index 0000000..d0acaf7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Aktivera behörigheten till Kontakter om du vill söka bland kontakterna."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml
new file mode 100644
index 0000000..1ec2b52
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Ili utafute anwani zako, washa ruhusa za Anwani."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml
new file mode 100644
index 0000000..a00872c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"தொடர்புகளைத் தேட, தொடர்புகளுக்கான அனுமதிகளை இயக்கவும்."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml
new file mode 100644
index 0000000..4448c40
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml
new file mode 100644
index 0000000..2cb3e06
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml
new file mode 100644
index 0000000..c6a65fb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Upang makapaghanap sa iyong mga contact, i-on ang mga pahintulot sa Mga Contact."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml
new file mode 100644
index 0000000..a68dad3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kişilerinizde arama yapmak için Kişiler izinlerini etkinleştirin."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml
new file mode 100644
index 0000000..be64aac
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Щоб шукати контакти, увімкніть дозвіл \"Контакти\"."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml
new file mode 100644
index 0000000..8cec6c8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"اپنے رابطوں کو تلاش کرنے کے لیے رابطوں کی اجازتیں آن کریں۔"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml
new file mode 100644
index 0000000..60baee2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml
new file mode 100644
index 0000000..aa319e8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..105a5be
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"要搜索您的联系人，请开启“通讯录”权限。"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..9a93a67
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"如要搜尋聯絡人，請開啟「通訊錄」權限。"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..f5720d8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"如要搜尋你的聯絡人，請開啟「聯絡人」存取權限。"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml
new file mode 100644
index 0000000..f6e46dc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2012 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="new_permission_no_search" msgid="6107959563874740441">"Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo."</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values/strings.xml b/java/com/android/dialer/searchfragment/list/res/values/strings.xml
new file mode 100644
index 0000000..0d25b8c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/list/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 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
+  -->
+<resources>
+  <!-- Shown as a prompt to turn on contacts permissions to allow contact search [CHAR LIMIT=NONE]. See 2424710404207193826 for current translation. -->
+  <string name="new_permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
new file mode 100644
index 0000000..52fb086
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.searchfragment.nearbyplaces"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
new file mode 100644
index 0000000..575582e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
@@ -0,0 +1,90 @@
+/*
+ * 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.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.telecom.TelecomUtil;
+
+/** ViewHolder for a nearby place row. */
+public final class NearbyPlaceViewHolder extends RecyclerView.ViewHolder
+    implements View.OnClickListener {
+
+  private final Context context;
+  private final TextView placeName;
+  private final TextView placeAddress;
+  private final QuickContactBadge photo;
+
+  private String number;
+
+  public NearbyPlaceViewHolder(View view) {
+    super(view);
+    view.setOnClickListener(this);
+    photo = view.findViewById(R.id.photo);
+    placeName = view.findViewById(R.id.primary);
+    placeAddress = view.findViewById(R.id.secondary);
+    context = view.getContext();
+  }
+
+  /**
+   * Binds the ViewHolder with a cursor from {@link NearbyPlacesCursorLoader} with the data found at
+   * the cursors set position.
+   */
+  public void bind(Cursor cursor, String query) {
+    number = cursor.getString(Projections.PHONE_NUMBER);
+    String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+    String address = cursor.getString(Projections.PHONE_LABEL);
+
+    placeName.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+    placeAddress.setText(QueryBoldingUtil.getNameWithQueryBolded(query, address));
+
+    String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+    ContactPhotoManager.getInstance(context)
+        .loadDialerThumbnailOrPhoto(
+            photo,
+            getContactUri(cursor),
+            cursor.getLong(Projections.PHONE_PHOTO_ID),
+            photoUri == null ? null : Uri.parse(photoUri),
+            name,
+            LetterTileDrawable.TYPE_DEFAULT);
+  }
+
+  private static Uri getContactUri(Cursor cursor) {
+    long contactId = cursor.getLong(Projections.PHONE_ID);
+    String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    return ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
+  }
+
+  @Override
+  public void onClick(View v) {
+    TelecomUtil.placeCall(
+        context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH).build());
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursor.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursor.java
new file mode 100644
index 0000000..a4142a4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursor.java
@@ -0,0 +1,64 @@
+/*
+ * 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.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
+import android.support.annotation.Nullable;
+import com.android.dialer.searchfragment.common.SearchCursor;
+
+/** {@link SearchCursor} implementation for displaying on nearby places. */
+final class NearbyPlacesCursor extends MergeCursor implements SearchCursor {
+
+  private final Cursor nearbyPlacesCursor;
+
+  public static NearbyPlacesCursor newInstnace(Context context, Cursor nearbyPlacesCursor) {
+    MatrixCursor headerCursor = new MatrixCursor(HEADER_PROJECTION);
+    headerCursor.addRow(new String[] {context.getString(R.string.nearby_places)});
+    return new NearbyPlacesCursor(new Cursor[] {headerCursor, nearbyPlacesCursor});
+  }
+
+  private NearbyPlacesCursor(Cursor[] cursors) {
+    super(cursors);
+    nearbyPlacesCursor = cursors[1];
+  }
+
+  @Override
+  public boolean isHeader() {
+    return isFirst();
+  }
+
+  @Override
+  public boolean updateQuery(@Nullable String query) {
+    // When the query changes, a new network request is made for nearby places. Meaning this cursor
+    // will be closed and another created, so return false.
+    return false;
+  }
+
+  @Override
+  public int getCount() {
+    // If we don't have any contents, we don't want to show the header
+    if (nearbyPlacesCursor == null || nearbyPlacesCursor.isClosed()) {
+      return 0;
+    }
+
+    int count = nearbyPlacesCursor.getCount();
+    return count == 0 ? 0 : count + 1;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
new file mode 100644
index 0000000..6807a6e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
@@ -0,0 +1,49 @@
+/*
+ * 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.searchfragment.nearbyplaces;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.searchfragment.common.Projections;
+
+/** Cursor loader for nearby places search results. */
+public final class NearbyPlacesCursorLoader extends CursorLoader {
+
+  private static final String MAX_RESULTS = "3";
+
+  public NearbyPlacesCursorLoader(Context context, String query) {
+    super(context, getContentUri(context, query), Projections.PHONE_PROJECTION, null, null, null);
+  }
+
+  @Override
+  public Cursor loadInBackground() {
+    return NearbyPlacesCursor.newInstnace(getContext(), super.loadInBackground());
+  }
+
+  private static Uri getContentUri(Context context, String query) {
+    return PhoneDirectoryExtenderAccessor.get(context)
+        .getContentUri()
+        .buildUpon()
+        .appendPath(query)
+        .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, MAX_RESULTS)
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
new file mode 100644
index 0000000..21eb4b1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Nabygeleë plekke"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
new file mode 100644
index 0000000..5eaff6b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"በአቅራቢያ ያሉ ቦታዎች"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
new file mode 100644
index 0000000..d68b4d1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"الأماكن المجاورة"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
new file mode 100644
index 0000000..d085bf7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Yaxınlıqdakı yerlər"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..bb9f06f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Obližnja mesta"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
new file mode 100644
index 0000000..643a583
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Месцы паблізу"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
new file mode 100644
index 0000000..e883953
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Места в района"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
new file mode 100644
index 0000000..4bc3fed
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"আশপাশের জায়গাগুলি"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
new file mode 100644
index 0000000..f3fb921
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Mjesta u blizini"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
new file mode 100644
index 0000000..f73bfba
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Llocs propers"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
new file mode 100644
index 0000000..6ccb90f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Místa v okolí"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
new file mode 100644
index 0000000..eb5f690
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheden"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
new file mode 100644
index 0000000..9e2db4a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Orte in der Nähe"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
new file mode 100644
index 0000000..94769eb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Κοντινά μέρη"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..0778273
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..3f3f712
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lugares cercanos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
new file mode 100644
index 0000000..fada6bc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Sitios cercanos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
new file mode 100644
index 0000000..65f220d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lähedalasuvad kohad"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
new file mode 100644
index 0000000..cb9c52f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Inguruko tokiak"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
new file mode 100644
index 0000000..3665411
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"مکان‌های اطراف"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
new file mode 100644
index 0000000..9d2b1ef
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lähellä olevat paikat"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..d65e7bd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
new file mode 100644
index 0000000..d65e7bd
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
new file mode 100644
index 0000000..5a4cce7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
new file mode 100644
index 0000000..ee32e46
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"નજીકના સ્થળો"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
new file mode 100644
index 0000000..079c03e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"आस-पास के स्थल"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
new file mode 100644
index 0000000..f3fb921
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Mjesta u blizini"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
new file mode 100644
index 0000000..5b99c01
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Közeli helyek"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
new file mode 100644
index 0000000..3a2ba39
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Մոտակա վայրեր"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
new file mode 100644
index 0000000..4cda3c4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Tempat terdekat"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
new file mode 100644
index 0000000..26d68e8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Staðir í nágrenninu"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
new file mode 100644
index 0000000..d55f058
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Luoghi nelle vicinanze"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
new file mode 100644
index 0000000..0f07995
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"מקומות קרובים"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
new file mode 100644
index 0000000..ce32053
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"周辺のスポット"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
new file mode 100644
index 0000000..6eb3b8f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ახლომდებარე ადგილები"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
new file mode 100644
index 0000000..b478b53
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Маңайдағы орындар"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
new file mode 100644
index 0000000..08a4609
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"កន្លែងនៅក្បែរ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
new file mode 100644
index 0000000..0282752
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ಹತ್ತಿರದ ಸ್ಥಳಗಳು"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
new file mode 100644
index 0000000..f05a332
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"주변 장소"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
new file mode 100644
index 0000000..0838bb3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Жакын арадагы жерлер"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
new file mode 100644
index 0000000..2ff0e85
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ສະຖານທີ່ໃກ້ຄຽງ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
new file mode 100644
index 0000000..9baf540
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Netoliese esančios vietos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
new file mode 100644
index 0000000..2b67e5a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Vietas blakus"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
new file mode 100644
index 0000000..27c00d5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Места во близина"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
new file mode 100644
index 0000000..bb89cb2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"സമീപത്തുള്ള സ്ഥലങ്ങൾ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
new file mode 100644
index 0000000..707a6c9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Ойролцоох газрууд"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
new file mode 100644
index 0000000..862cd04
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"जवळपासची ठिकाणे"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
new file mode 100644
index 0000000..aed0bbb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Tempat berdekatan"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
new file mode 100644
index 0000000..74e60a0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"အနီးတဝိုက်ရှိ နေရာများ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
new file mode 100644
index 0000000..af6cd3d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheten"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
new file mode 100644
index 0000000..29b6854
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"नजिकका स्थानहरू"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
new file mode 100644
index 0000000..4a8b11a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Plaatsen in de buurt"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
new file mode 100644
index 0000000..af6cd3d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheten"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
new file mode 100644
index 0000000..1d4d472
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"ਨਜ਼ਦੀਕੀ ਸਥਾਨ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
new file mode 100644
index 0000000..c00b608
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Miejsca w pobliżu"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..5a4cce7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..20429ba
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Locais próximos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
new file mode 100644
index 0000000..5a4cce7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
new file mode 100644
index 0000000..c24e0a9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Locații din apropiere"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
new file mode 100644
index 0000000..dd76f5f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Места рядом"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
new file mode 100644
index 0000000..2c13bc5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"අවට ස්ථාන"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
new file mode 100644
index 0000000..5e25cd8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Miesta v okolí"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
new file mode 100644
index 0000000..6f78bdc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Mesta v bližini"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
new file mode 100644
index 0000000..6d25a6b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Vendet në afërsi"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
new file mode 100644
index 0000000..21af043
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Оближња места"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
new file mode 100644
index 0000000..c309b8d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Platser i närheten"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
new file mode 100644
index 0000000..6cea2f1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Maeneo ya karibu"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
new file mode 100644
index 0000000..ce7496e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"அருகிலுள்ள இடங்கள்"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
new file mode 100644
index 0000000..c8229fb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"సమీప స్థలాలు"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
new file mode 100644
index 0000000..1167d2f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"สถานที่ใกล้เคียง"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
new file mode 100644
index 0000000..49b949b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Mga kalapit na lugar"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
new file mode 100644
index 0000000..0a16119
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Yakındaki yerler"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
new file mode 100644
index 0000000..a3936be
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Місця поблизу"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
new file mode 100644
index 0000000..1a220b3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"قریبی مقامات"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
new file mode 100644
index 0000000..f104483
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Yaqin-atrofdagi joylar"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
new file mode 100644
index 0000000..90cea76
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Địa điểm lân cận"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e060cb5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"附近的地点"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..5cdf5b9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"附近地點"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..5cdf5b9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"附近地點"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
new file mode 100644
index 0000000..e4290f9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="nearby_places" msgid="275117539511113867">"Izindawo eziseduze"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
new file mode 100644
index 0000000..ed80680
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <!-- Label for a list of local search results [CHAR LIMIT=30]-->
+  <string name="nearby_places">Nearby places</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/remote/AndroidManifest.xml b/java/com/android/dialer/searchfragment/remote/AndroidManifest.xml
new file mode 100644
index 0000000..e52f531
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.searchfragment.remote"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/remote/RemoteContactViewHolder.java b/java/com/android/dialer/searchfragment/remote/RemoteContactViewHolder.java
new file mode 100644
index 0000000..5fb12d3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/RemoteContactViewHolder.java
@@ -0,0 +1,133 @@
+/*
+ * 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.searchfragment.remote;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.QuickContactBadge;
+import android.widget.TextView;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.common.QueryBoldingUtil;
+import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import com.android.dialer.telecom.TelecomUtil;
+
+/** ViewHolder for a nearby place row. */
+public final class RemoteContactViewHolder extends RecyclerView.ViewHolder
+    implements View.OnClickListener {
+
+  private final Context context;
+  private final TextView nameView;
+  private final TextView numberView;
+  private final QuickContactBadge photo;
+
+  private String number;
+
+  public RemoteContactViewHolder(View view) {
+    super(view);
+    view.setOnClickListener(this);
+    photo = view.findViewById(R.id.photo);
+    nameView = view.findViewById(R.id.primary);
+    numberView = view.findViewById(R.id.secondary);
+    context = view.getContext();
+  }
+
+  /**
+   * Binds the ViewHolder with a cursor from {@link RemoteContactsCursorLoader} with the data found
+   * at the cursors current position.
+   */
+  public void bind(SearchCursor cursor, String query) {
+    number = cursor.getString(Projections.PHONE_NUMBER);
+    String name = cursor.getString(Projections.PHONE_DISPLAY_NAME);
+    String label = getLabel(context.getResources(), cursor);
+    String secondaryInfo =
+        TextUtils.isEmpty(label)
+            ? number
+            : context.getString(
+                com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
+
+    nameView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name));
+    numberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, secondaryInfo));
+
+    if (shouldShowPhoto(cursor)) {
+      nameView.setVisibility(View.VISIBLE);
+      photo.setVisibility(View.VISIBLE);
+      String photoUri = cursor.getString(Projections.PHONE_PHOTO_URI);
+      ContactPhotoManager.getInstance(context)
+          .loadDialerThumbnailOrPhoto(
+              photo,
+              getContactUri(cursor),
+              cursor.getLong(Projections.PHONE_PHOTO_ID),
+              photoUri == null ? null : Uri.parse(photoUri),
+              name,
+              LetterTileDrawable.TYPE_DEFAULT);
+    } else {
+      nameView.setVisibility(View.GONE);
+      photo.setVisibility(View.INVISIBLE);
+    }
+  }
+
+  // Show the contact photo next to only the first number if a contact has multiple numbers
+  private boolean shouldShowPhoto(SearchCursor cursor) {
+    int currentPosition = cursor.getPosition();
+    String currentLookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    cursor.moveToPosition(currentPosition - 1);
+
+    if (!cursor.isHeader() && !cursor.isBeforeFirst()) {
+      String previousLookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+      cursor.moveToPosition(currentPosition);
+      return !currentLookupKey.equals(previousLookupKey);
+    }
+    cursor.moveToPosition(currentPosition);
+    return true;
+  }
+
+  // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType
+  private static String getLabel(Resources resources, Cursor cursor) {
+    int numberType = cursor.getInt(Projections.PHONE_TYPE);
+    String numberLabel = cursor.getString(Projections.PHONE_LABEL);
+
+    // Returns empty label instead of "custom" if the custom label is empty.
+    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
+      return "";
+    }
+    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
+  }
+
+  private static Uri getContactUri(Cursor cursor) {
+    long contactId = cursor.getLong(Projections.PHONE_ID);
+    String lookupKey = cursor.getString(Projections.PHONE_LOOKUP_KEY);
+    return ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
+  }
+
+  @Override
+  public void onClick(View v) {
+    TelecomUtil.placeCall(
+        context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH).build());
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java
new file mode 100644
index 0000000..d7c4f38
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java
@@ -0,0 +1,105 @@
+/*
+ * 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.searchfragment.remote;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.android.dialer.searchfragment.common.SearchCursor;
+import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader.Directory;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link MergeCursor} used for combining remote directory cursors into one cursor.
+ *
+ * <p>Usually a device with multiple Google accounts will have multiple remote directories returned
+ * by {@link RemoteDirectoriesCursorLoader}, each represented as a {@link Directory}.
+ *
+ * <p>This cursor merges them together with a header at the start of each cursor/list using {@link
+ * Directory#getDisplayName()} as the header text.
+ */
+@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+public final class RemoteContactsCursor extends MergeCursor implements SearchCursor {
+
+  /**
+   * Returns a single cursor with headers inserted between each non-empty cursor. If all cursors are
+   * empty, null or closed, this method returns null.
+   */
+  @Nullable
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public static RemoteContactsCursor newInstance(
+      Context context, Cursor[] cursors, List<Directory> directories) {
+    Assert.checkArgument(
+        cursors.length == directories.size(), "Directories and cursors must be the same size.");
+    Cursor[] cursorsWithHeaders = insertHeaders(context, cursors, directories);
+    if (cursorsWithHeaders.length > 0) {
+      return new RemoteContactsCursor(cursorsWithHeaders);
+    }
+    return null;
+  }
+
+  private RemoteContactsCursor(Cursor[] cursors) {
+    super(cursors);
+  }
+
+  private static Cursor[] insertHeaders(
+      Context context, Cursor[] cursors, List<Directory> directories) {
+    List<Cursor> cursorList = new ArrayList<>();
+    for (int i = 0; i < cursors.length; i++) {
+      Cursor cursor = cursors[i];
+
+      if (cursor == null || cursor.isClosed()) {
+        continue;
+      }
+
+      Directory directory = directories.get(i);
+      if (cursor.getCount() == 0) {
+        // Since the cursor isn't being merged in, we need to close it here.
+        cursor.close();
+        continue;
+      }
+
+      cursorList.add(createHeaderCursor(context, directory.getDisplayName()));
+      cursorList.add(cursor);
+    }
+    return cursorList.toArray(new Cursor[cursorList.size()]);
+  }
+
+  private static MatrixCursor createHeaderCursor(Context context, String name) {
+    MatrixCursor headerCursor = new MatrixCursor(HEADER_PROJECTION, 1);
+    headerCursor.addRow(new String[] {context.getString(R.string.directory, name)});
+    return headerCursor;
+  }
+
+  /** Returns true if the current position is a header row. */
+  @Override
+  public boolean isHeader() {
+    return !isClosed() && getColumnIndex(HEADER_PROJECTION[HEADER_TEXT_POSITION]) != -1;
+  }
+
+  @Override
+  public boolean updateQuery(@Nullable String query) {
+    // When the query changes, a new network request is made for nearby places. Meaning this cursor
+    // will be closed and another created, so return false.
+    return false;
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/remote/RemoteContactsCursorLoader.java b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursorLoader.java
new file mode 100644
index 0000000..771b7f1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursorLoader.java
@@ -0,0 +1,106 @@
+/*
+ * 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.searchfragment.remote;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import com.android.dialer.searchfragment.common.Projections;
+import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader.Directory;
+import java.util.List;
+
+/**
+ * Cursor loader to load extended contacts on device.
+ *
+ * <p>This loader performs several database queries in serial and merges the resulting cursors
+ * together into {@link RemoteContactsCursor}. If there are no results, the loader will return a
+ * null cursor.
+ */
+public final class RemoteContactsCursorLoader extends CursorLoader {
+
+  private static final Uri ENTERPRISE_CONTENT_FILTER_URI =
+      Uri.withAppendedPath(Phone.CONTENT_URI, "filter_enterprise");
+
+  private static final String IGNORE_NUMBER_TOO_LONG_CLAUSE = "length(" + Phone.NUMBER + ") < 1000";
+  private static final String MAX_RESULTS = "20";
+
+  private final String query;
+  private final List<Directory> directories;
+  private final Cursor[] cursors;
+
+  public RemoteContactsCursorLoader(Context context, String query, List<Directory> directories) {
+    super(
+        context,
+        null,
+        Projections.PHONE_PROJECTION,
+        IGNORE_NUMBER_TOO_LONG_CLAUSE,
+        null,
+        Phone.SORT_KEY_PRIMARY);
+    this.query = query;
+    this.directories = directories;
+    cursors = new Cursor[directories.size()];
+  }
+
+  @Override
+  public Cursor loadInBackground() {
+    for (int i = 0; i < directories.size(); i++) {
+      Directory directory = directories.get(i);
+      // Since the on device contacts could be queried as remote directories and we already query
+      // them in SearchContactsCursorLoader, avoid querying them again.
+      // TODO(calderwoodra): It's a happy coincidence that on device contacts don't have directory
+      // names set, leaving this todo to investigate a better way to isolate them from other remote
+      // directories.
+      if (TextUtils.isEmpty(directory.getDisplayName())) {
+        cursors[i] = null;
+        continue;
+      }
+      cursors[i] =
+          getContext()
+              .getContentResolver()
+              .query(
+                  getContentFilterUri(query, directory.getId()),
+                  getProjection(),
+                  getSelection(),
+                  getSelectionArgs(),
+                  getSortOrder());
+    }
+    return RemoteContactsCursor.newInstance(getContext(), cursors, directories);
+  }
+
+  @VisibleForTesting
+  static Uri getContentFilterUri(String query, int directoryId) {
+    Uri baseUri =
+        VERSION.SDK_INT >= VERSION_CODES.N
+            ? ENTERPRISE_CONTENT_FILTER_URI
+            : Phone.CONTENT_FILTER_URI;
+
+    return baseUri
+        .buildUpon()
+        .appendPath(query)
+        .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
+        .appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true")
+        .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, MAX_RESULTS)
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java b/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java
new file mode 100644
index 0000000..327a62c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/RemoteDirectoriesCursorLoader.java
@@ -0,0 +1,77 @@
+/*
+
+* 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.searchfragment.remote;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.provider.ContactsContract;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.google.auto.value.AutoValue;
+
+/** CursorLoader to load the list of remote directories on the device. */
+public final class RemoteDirectoriesCursorLoader extends CursorLoader {
+
+  /** Positions of columns in {@code PROJECTIONS}. */
+  private static final int ID = 0;
+
+  private static final int DISPLAY_NAME = 1;
+  private static final int PHOTO_SUPPORT = 2;
+
+  @VisibleForTesting
+  static final String[] PROJECTION = {
+    ContactsContract.Directory._ID,
+    ContactsContract.Directory.DISPLAY_NAME,
+    ContactsContract.Directory.PHOTO_SUPPORT,
+  };
+
+  public RemoteDirectoriesCursorLoader(Context context) {
+    super(context, getContentUri(), PROJECTION, null, null, ContactsContract.Directory._ID);
+  }
+
+  /** @return current cursor row represented as a {@link Directory}. */
+  public static Directory readDirectory(Cursor cursor) {
+    return Directory.create(
+        cursor.getInt(ID), cursor.getString(DISPLAY_NAME), cursor.getInt(PHOTO_SUPPORT) != 0);
+  }
+
+  private static Uri getContentUri() {
+    return VERSION.SDK_INT >= VERSION_CODES.N
+        ? ContactsContract.Directory.ENTERPRISE_CONTENT_URI
+        : ContactsContract.Directory.CONTENT_URI;
+  }
+
+  /** POJO representing the results returned from {@link RemoteDirectoriesCursorLoader}. */
+  @AutoValue
+  public abstract static class Directory {
+    public static Directory create(int id, @Nullable String displayName, boolean supportsPhotos) {
+      return new AutoValue_RemoteDirectoriesCursorLoader_Directory(id, displayName, supportsPhotos);
+    }
+
+    abstract int getId();
+
+    /** Returns a user facing display name of the directory. Null if none exists. */
+    abstract @Nullable String getDisplayName();
+
+    abstract boolean supportsPhotos();
+  }
+}
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-af/strings.xml
new file mode 100644
index 0000000..9259a90
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Gids <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-am/strings.xml
new file mode 100644
index 0000000..adf2cea
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ማውጫ <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ar/strings.xml
new file mode 100644
index 0000000..545a629
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"دليل <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-az/strings.xml
new file mode 100644
index 0000000..bd7ceda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Kataloq <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..3f23ec9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalog <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-be/strings.xml
new file mode 100644
index 0000000..da911a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Каталог <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-bg/strings.xml
new file mode 100644
index 0000000..6cd9a1c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Директория на <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-bn/strings.xml
new file mode 100644
index 0000000..007ae2f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"সংগ্রহ <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-bs/strings.xml
new file mode 100644
index 0000000..396bc15
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Imenik e-pošte <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ca/strings.xml
new file mode 100644
index 0000000..c08206c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directori <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-cs/strings.xml
new file mode 100644
index 0000000..9a57bb4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Adresář <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-da/strings.xml
new file mode 100644
index 0000000..9cbea4f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Indeks <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-de/strings.xml
new file mode 100644
index 0000000..8e6939d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Verzeichnis \"<xliff:g id="EMAIL">%1$s</xliff:g>\""</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-el/strings.xml
new file mode 100644
index 0000000..e099de2
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Κατάλογος <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..f4feb6c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directorio <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-es/strings.xml
new file mode 100644
index 0000000..5353c10
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directorio de <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-et/strings.xml
new file mode 100644
index 0000000..4a110b0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Kataloog <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-eu/strings.xml
new file mode 100644
index 0000000..ecc8286
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> direktorioa"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-fa/strings.xml
new file mode 100644
index 0000000..e4ec31d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"فهرست <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-fi/strings.xml
new file mode 100644
index 0000000..787c4c9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g>-hakemisto"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..87bfff1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Annuaire <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-fr/strings.xml
new file mode 100644
index 0000000..78fed92
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Dossier <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-gl/strings.xml
new file mode 100644
index 0000000..f4feb6c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directorio <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-gu/strings.xml
new file mode 100644
index 0000000..f4a9e97
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"નિર્દેશિકા <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-hi/strings.xml
new file mode 100644
index 0000000..80f784c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"निर्देशिका <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-hr/strings.xml
new file mode 100644
index 0000000..51b5210
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Direktorij <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-hu/strings.xml
new file mode 100644
index 0000000..7a36911
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Könyvtár: <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-hy/strings.xml
new file mode 100644
index 0000000..59a4e88
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Գրացուցակ «<xliff:g id="EMAIL">%1$s</xliff:g>»"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-in/strings.xml
new file mode 100644
index 0000000..ceabfd1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Direktori <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-is/strings.xml
new file mode 100644
index 0000000..2838a6b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Tengiliðaskrá <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-it/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-iw/strings.xml
new file mode 100644
index 0000000..5e30367
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ספרייה <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ja/strings.xml
new file mode 100644
index 0000000..3f992a8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"「<xliff:g id="EMAIL">%1$s</xliff:g>」ディレクトリ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ka/strings.xml
new file mode 100644
index 0000000..a4c319b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"კატალოგი <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-kk/strings.xml
new file mode 100644
index 0000000..c85d1a8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> каталогы"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-km/strings.xml
new file mode 100644
index 0000000..c59f050
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"បញ្ជី <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-kn/strings.xml
new file mode 100644
index 0000000..a6a7f8d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> ಡೈರೆಕ್ಟರಿ"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ko/strings.xml
new file mode 100644
index 0000000..f7421bf
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"디렉토리 <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ky/strings.xml
new file mode 100644
index 0000000..da911a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Каталог <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-lo/strings.xml
new file mode 100644
index 0000000..81c6c4f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ໄດເຣັກທໍຣີ <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-lt/strings.xml
new file mode 100644
index 0000000..323bd3e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalogas „<xliff:g id="EMAIL">%1$s</xliff:g>“"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-lv/strings.xml
new file mode 100644
index 0000000..248cf9b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Direktorijs: <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-mk/strings.xml
new file mode 100644
index 0000000..1d84aaf
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Адресар <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ml/strings.xml
new file mode 100644
index 0000000..104270b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ഡയറക്റ്ററി <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-mn/strings.xml
new file mode 100644
index 0000000..ba31b9e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Директор <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-mr/strings.xml
new file mode 100644
index 0000000..5b6e3c4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"डिरेक्टरी <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ms/strings.xml
new file mode 100644
index 0000000..ceabfd1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Direktori <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-my/strings.xml
new file mode 100644
index 0000000..de17783
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"လမ်းညွှန် <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-nb/strings.xml
new file mode 100644
index 0000000..2e745ab
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalog – <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ne/strings.xml
new file mode 100644
index 0000000..80f784c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"निर्देशिका <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-nl/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-no/strings.xml
new file mode 100644
index 0000000..2e745ab
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-no/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalog – <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-pa/strings.xml
new file mode 100644
index 0000000..431bc55
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ਡਾਇਰੈਕਟਰੀ <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-pl/strings.xml
new file mode 100644
index 0000000..3f23ec9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalog <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..c03d95f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Diretório <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..c03d95f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Diretório <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-pt/strings.xml
new file mode 100644
index 0000000..c03d95f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Diretório <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ro/strings.xml
new file mode 100644
index 0000000..64baf69
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directorul <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ru/strings.xml
new file mode 100644
index 0000000..da911a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Каталог <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-si/strings.xml
new file mode 100644
index 0000000..d1174b7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"නාමාවලිය <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sk/strings.xml
new file mode 100644
index 0000000..8fe03fc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Adresár <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sl/strings.xml
new file mode 100644
index 0000000..f9cdeca
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Imenik <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sq/strings.xml
new file mode 100644
index 0000000..1bfea60
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Direktoria <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sr/strings.xml
new file mode 100644
index 0000000..da911a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Каталог <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sv/strings.xml
new file mode 100644
index 0000000..c9b7bd1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Katalogen <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-sw/strings.xml
new file mode 100644
index 0000000..fc325bc
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Saraka <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ta/strings.xml
new file mode 100644
index 0000000..fef939a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> கோப்பகம்"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-te/strings.xml
new file mode 100644
index 0000000..83224be
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"డైరెక్టరీ <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-th/strings.xml
new file mode 100644
index 0000000..5243388
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ไดเรกทอรี <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-tl/strings.xml
new file mode 100644
index 0000000..39f8fda
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Directory <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-tr/strings.xml
new file mode 100644
index 0000000..542ac69
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> dizini"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-uk/strings.xml
new file mode 100644
index 0000000..da911a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Каталог <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-ur/strings.xml
new file mode 100644
index 0000000..70d50a3
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"ڈائرکٹری <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-uz/strings.xml
new file mode 100644
index 0000000..8959fbb
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"<xliff:g id="EMAIL">%1$s</xliff:g> katalogi"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-vi/strings.xml
new file mode 100644
index 0000000..9cd702a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Thư mục <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..b7d58df
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"目录 <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..bdfedbe
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"目錄 <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..bdfedbe
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"目錄 <xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values-zu/strings.xml
new file mode 100644
index 0000000..b089b39
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="directory" msgid="4902990525538769658">"Uhla lwemibhalo ye-<xliff:g id="EMAIL">%1$s</xliff:g>"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/remote/res/values/strings.xml b/java/com/android/dialer/searchfragment/remote/res/values/strings.xml
new file mode 100644
index 0000000..beabba1
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/remote/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label for a list of contacts stored in a seperate directory [CHAR LIMIT=30]-->
+  <string name="directory">Directory <xliff:g example="google.com" id="email">%1$s</xliff:g></string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/testing/TestSearchCursor.java b/java/com/android/dialer/searchfragment/testing/TestSearchCursor.java
new file mode 100644
index 0000000..9a0b957
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/testing/TestSearchCursor.java
@@ -0,0 +1,47 @@
+/*
+ * 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.searchfragment.testing;
+
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
+import android.support.annotation.Nullable;
+import com.android.dialer.searchfragment.common.SearchCursor;
+
+/** {@link SearchCursor} implementation useful for testing with a header inserted at position 0. */
+public final class TestSearchCursor extends MergeCursor implements SearchCursor {
+
+  public static TestSearchCursor newInstance(Cursor cursor, String header) {
+    MatrixCursor headerRow = new MatrixCursor(HEADER_PROJECTION);
+    headerRow.addRow(new String[] {header});
+    return new TestSearchCursor(new Cursor[] {headerRow, cursor});
+  }
+
+  private TestSearchCursor(Cursor[] cursors) {
+    super(cursors);
+  }
+
+  @Override
+  public boolean isHeader() {
+    return isFirst();
+  }
+
+  @Override
+  public boolean updateQuery(@Nullable String query) {
+    return false;
+  }
+}
diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml
index 7132051..15f7794 100644
--- a/java/com/android/dialer/shortcuts/AndroidManifest.xml
+++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml
@@ -20,7 +20,7 @@
     android:minSdkVersion="23"
     android:targetSdkVersion="26"/>
 
-  <application>
+  <application android:theme="@style/Theme.AppCompat">
 
     <service
       android:exported="false"
diff --git a/java/com/android/dialer/shortcuts/CallContactActivity.java b/java/com/android/dialer/shortcuts/CallContactActivity.java
index b807979..87f6fce 100644
--- a/java/com/android/dialer/shortcuts/CallContactActivity.java
+++ b/java/com/android/dialer/shortcuts/CallContactActivity.java
@@ -70,6 +70,7 @@
   private void makeCall() {
     CallSpecificAppData callSpecificAppData =
         CallSpecificAppData.newBuilder()
+            .setAllowAssistedDialing(true)
             .setCallInitiationType(CallInitiationType.Type.LAUNCHER_SHORTCUT)
             .build();
     PhoneNumberInteraction.startInteractionForPhoneCall(
diff --git a/java/com/android/dialer/shortcuts/IconFactory.java b/java/com/android/dialer/shortcuts/IconFactory.java
index a8c4ada..7aad112 100644
--- a/java/com/android/dialer/shortcuts/IconFactory.java
+++ b/java/com/android/dialer/shortcuts/IconFactory.java
@@ -20,16 +20,21 @@
 import android.content.pm.ShortcutInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
 import android.support.annotation.WorkerThread;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
 import com.android.dialer.common.Assert;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.util.DrawableConverter;
 import java.io.InputStream;
 
@@ -83,6 +88,38 @@
         ContactsContract.Contacts.openContactPhotoInputStream(
             context.getContentResolver(), lookupUri, false /* preferHighres */);
 
+    return VERSION.SDK_INT >= VERSION_CODES.O
+        ? createAdaptiveIcon(displayName, lookupKey, inputStream)
+        : createFlatIcon(displayName, lookupKey, inputStream);
+  }
+
+  @RequiresApi(VERSION_CODES.O)
+  private Icon createAdaptiveIcon(
+      @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) {
+    if (inputStream == null) {
+      LetterTileDrawable letterTileDrawable = new LetterTileDrawable(context.getResources());
+      // The adaptive icons clip the drawable to a safe area inside the drawable. Scale the letter
+      // so it fits inside the safe area.
+      letterTileDrawable.setScale(1f / (1f + AdaptiveIconDrawable.getExtraInsetFraction()));
+      letterTileDrawable.setCanonicalDialerLetterTileDetails(
+          displayName,
+          lookupKey,
+          LetterTileDrawable.SHAPE_RECTANGLE,
+          LetterTileDrawable.TYPE_DEFAULT);
+
+      int iconSize =
+          context
+              .getResources()
+              .getDimensionPixelSize(R.dimen.launcher_shortcut_adaptive_icon_size);
+      return Icon.createWithAdaptiveBitmap(
+          DrawableConverter.drawableToBitmap(letterTileDrawable, iconSize, iconSize));
+    }
+    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+    return Icon.createWithAdaptiveBitmap(bitmap);
+  }
+
+  private Icon createFlatIcon(
+      @NonNull String displayName, @NonNull String lookupKey, @Nullable InputStream inputStream) {
     Drawable drawable;
     if (inputStream == null) {
       // No photo for contact; use a letter tile.
diff --git a/java/com/android/dialer/shortcuts/ShortcutRefresher.java b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
index 120382d..496f3f0 100644
--- a/java/com/android/dialer/shortcuts/ShortcutRefresher.java
+++ b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
@@ -20,21 +20,17 @@
 import android.os.Build;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.dialer.common.Assert;
 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 com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import java.util.ArrayList;
 import java.util.List;
 
 /** Refreshes launcher shortcuts from UI components using provided list of contacts. */
 public final class ShortcutRefresher {
 
-  private static final AsyncTaskExecutor EXECUTOR = AsyncTaskExecutors.createThreadPoolExecutor();
-
   /** Asynchronously updates launcher shortcuts using the provided list of contacts. */
   @MainThread
   public static void refresh(@NonNull Context context, List<ContactEntry> contacts) {
@@ -49,36 +45,27 @@
       return;
     }
 
-    //noinspection unchecked
-    EXECUTOR.submit(Task.ID, new Task(context), new ArrayList<>(contacts));
+    DialerExecutors.createNonUiTaskBuilder(new RefreshWorker(context))
+        .build()
+        .executeSerial(new ArrayList<>(contacts));
   }
 
-  private static final class Task extends FallibleAsyncTask<List<ContactEntry>, Void, Void> {
-    private static final String ID = "ShortcutRefresher.Task";
-
+  private static final class RefreshWorker implements Worker<List<ContactEntry>, Void> {
     private final Context context;
 
-    Task(Context context) {
+    RefreshWorker(Context context) {
       this.context = context;
     }
 
-    /**
-     * @param params array containing exactly one element, the list of contacts from favorites
-     *     tiles, ordered in tile order.
-     */
-    @SafeVarargs
     @Override
-    @NonNull
-    @WorkerThread
-    protected final Void doInBackgroundFallible(List<ContactEntry>... params) {
-      Assert.isWorkerThread();
+    public Void doInBackground(List<ContactEntry> contacts) {
       LogUtil.enterBlock("ShortcutRefresher.Task.doInBackground");
 
       // Only dynamic shortcuts are maintained from UI components. Pinned shortcuts are maintained
       // by the job scheduler. This is because a pinned contact may not necessarily still be in the
       // favorites tiles, so refreshing it would require an additional database query. We don't want
       // to incur the cost of that extra database query every time the favorites tiles change.
-      new DynamicShortcuts(context, new IconFactory(context)).refresh(params[0]); // Blocking
+      new DynamicShortcuts(context, new IconFactory(context)).refresh(contacts); // Blocking
 
       return null;
     }
diff --git a/java/com/android/dialer/shortcuts/Shortcuts.java b/java/com/android/dialer/shortcuts/Shortcuts.java
index b6a7fa8..c2bbb4d 100644
--- a/java/com/android/dialer/shortcuts/Shortcuts.java
+++ b/java/com/android/dialer/shortcuts/Shortcuts.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 
 /** Checks if dynamic shortcuts should be enabled. */
 public class Shortcuts {
diff --git a/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml
new file mode 100644
index 0000000..07ed172
--- /dev/null
+++ b/java/com/android/dialer/shortcuts/res/drawable-anydpi-v26/ic_shortcut_add_contact.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/shortcut_add_contact_background_color"/>
+
+  <foreground android:drawable="@drawable/ic_add_contact_foreground"/>
+</adaptive-icon>
diff --git a/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml
new file mode 100644
index 0000000..6bc1727
--- /dev/null
+++ b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center"
+    android:src="@drawable/quantum_ic_person_add_white_24"
+    android:tint="@color/shortcut_add_contact_foreground_color">
+
+</bitmap>
diff --git a/java/com/android/dialer/shortcuts/res/values/dimens.xml b/java/com/android/dialer/shortcuts/res/values/dimens.xml
index 2321256..369d38c 100644
--- a/java/com/android/dialer/shortcuts/res/values/dimens.xml
+++ b/java/com/android/dialer/shortcuts/res/values/dimens.xml
@@ -16,4 +16,5 @@
   -->
 <resources>
   <dimen name="launcher_shortcut_icon_size">48dp</dimen>
+  <dimen name="launcher_shortcut_adaptive_icon_size">108dp</dimen>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values/strings.xml b/java/com/android/dialer/shortcuts/res/values/strings.xml
index 5f14a81..b3ff190 100644
--- a/java/com/android/dialer/shortcuts/res/values/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values/strings.xml
@@ -14,12 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!-- Text to display in launcher shortcut for adding a new contact. Short version. [CHAR LIMIT=10] -->
-  <string name="dialer_shortcut_add_contact_short">New contact</string>
+  <string name="dialer_shortcut_add_contact_short" tools:ignore="UnusedResources">New contact</string>
 
   <!-- Text to display in launcher shortcut for adding a new contact. Long version. [CHAR LIMIT=25] -->
-  <string name="dialer_shortcut_add_contact_long">New contact</string>
+  <string name="dialer_shortcut_add_contact_long" tools:ignore="UnusedResources">New contact</string>
 
   <!-- Message to display when the user taps a pinned launcher shortcut (on a
        homescreen) which has been disabled. A shortcut may be disabled if the
diff --git a/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java b/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java
index 8257d98..f095a59 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorActionProvider.java
@@ -30,6 +30,10 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutors;
+import com.android.dialer.databasepopulator.CallLogPopulator;
+import com.android.dialer.databasepopulator.ContactsPopulator;
+import com.android.dialer.databasepopulator.VoicemailPopulator;
+import com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity;
 import com.android.dialer.persistentlog.PersistentLogger;
 
 /** Implements the simulator submenu. */
@@ -73,6 +77,7 @@
     super.onPrepareSubMenu(subMenu);
     LogUtil.enterBlock("SimulatorActionProvider.onPrepareSubMenu");
     subMenu.clear();
+
     subMenu
         .add("Add call")
         .setOnMenuItemClickListener(
@@ -80,6 +85,10 @@
               SimulatorVoiceCall.addNewIncomingCall(context);
               return true;
             });
+
+    subMenu
+        .add("Notifiations")
+        .setActionProvider(SimulatorNotifications.getActionProvider(context));
     subMenu
         .add("Populate database")
         .setOnMenuItemClickListener(
@@ -88,6 +97,13 @@
               return true;
             });
     subMenu
+        .add("Clean database")
+        .setOnMenuItemClickListener(
+            (item) -> {
+              cleanDatabase();
+              return true;
+            });
+    subMenu
         .add("Sync Voicemail")
         .setOnMenuItemClickListener(
             (item) -> {
@@ -114,15 +130,34 @@
                   .executeSerial(null);
               return true;
             });
+    subMenu
+        .add("Enriched call simulator")
+        .setOnMenuItemClickListener(
+            (item) -> {
+              context.startActivity(EnrichedCallSimulatorActivity.newIntent(context));
+              return true;
+            });
   }
 
   private void populateDatabase() {
     new AsyncTask<Void, Void, Void>() {
       @Override
       public Void doInBackground(Void... params) {
-        SimulatorContacts.populateContacts(context);
-        SimulatorCallLog.populateCallLog(context);
-        SimulatorVoicemail.populateVoicemail(context);
+        ContactsPopulator.populateContacts(context);
+        CallLogPopulator.populateCallLog(context);
+        VoicemailPopulator.populateVoicemail(context);
+        return null;
+      }
+    }.execute();
+  }
+
+  private void cleanDatabase() {
+    new AsyncTask<Void, Void, Void>() {
+      @Override
+      public Void doInBackground(Void... params) {
+        ContactsPopulator.deleteAllContacts(context);
+        CallLogPopulator.deleteAllCallLog(context);
+        VoicemailPopulator.deleteAllVoicemail(context);
         return null;
       }
     }.execute();
diff --git a/java/com/android/dialer/simulator/impl/SimulatorCallLog.java b/java/com/android/dialer/simulator/impl/SimulatorCallLog.java
deleted file mode 100644
index f127d56..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorCallLog.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.simulator.impl;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.os.RemoteException;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
-import com.android.dialer.common.Assert;
-import com.google.auto.value.AutoValue;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
-/** Populates the device database with call log entries. */
-final class SimulatorCallLog {
-  // Phone numbers from https://www.google.com/about/company/facts/locations/
-  private static final CallEntry.Builder[] SIMPLE_CALL_LOG = {
-    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+1-302-6365454"),
-    CallEntry.builder()
-        .setType(Calls.MISSED_TYPE)
-        .setNumber("")
-        .setPresentation(Calls.PRESENTATION_UNKNOWN),
-    CallEntry.builder().setType(Calls.REJECTED_TYPE).setNumber("+1-302-6365454"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+1-302-6365454"),
-    CallEntry.builder()
-        .setType(Calls.MISSED_TYPE)
-        .setNumber("1234")
-        .setPresentation(Calls.PRESENTATION_RESTRICTED),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1-302-6365454"),
-    CallEntry.builder().setType(Calls.BLOCKED_TYPE).setNumber("+1-302-6365454"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("(425) 739-5600"),
-    CallEntry.builder().setType(Calls.ANSWERED_EXTERNALLY_TYPE).setNumber("(425) 739-5600"),
-    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+1 (425) 739-5600"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("739-5600"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("711"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("711"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("(425) 739-5600"),
-    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("+44 (0) 20 7031 3000"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1-650-2530000"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 303-245-0086;123,456"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 303-245-0086"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+1-650-2530000"),
-    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("650-2530000"),
-    CallEntry.builder().setType(Calls.REJECTED_TYPE).setNumber("2530000"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+1 404-487-9000"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+61 2 9374 4001"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("+33 (0)1 42 68 53 00"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("972-74-746-6245"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+971 4 4509500"),
-    CallEntry.builder().setType(Calls.INCOMING_TYPE).setNumber("+971 4 4509500"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("55-31-2128-6800"),
-    CallEntry.builder().setType(Calls.MISSED_TYPE).setNumber("611"),
-    CallEntry.builder().setType(Calls.OUTGOING_TYPE).setNumber("*86 512-343-5283"),
-  };
-
-  @WorkerThread
-  public static void populateCallLog(@NonNull Context context) {
-    Assert.isWorkerThread();
-    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
-    // Do this 4 times to make the call log 4 times bigger.
-    long timeMillis = System.currentTimeMillis();
-    for (int i = 0; i < 4; i++) {
-      for (CallEntry.Builder builder : SIMPLE_CALL_LOG) {
-        CallEntry callEntry = builder.setTimeMillis(timeMillis).build();
-        operations.add(
-            ContentProviderOperation.newInsert(Calls.CONTENT_URI)
-                .withValues(callEntry.getAsContentValues())
-                .withYieldAllowed(true)
-                .build());
-        timeMillis -= TimeUnit.HOURS.toMillis(1);
-      }
-    }
-    try {
-      context.getContentResolver().applyBatch(CallLog.AUTHORITY, operations);
-    } catch (RemoteException | OperationApplicationException e) {
-      Assert.fail("error adding call entries: " + e);
-    }
-  }
-
-  @AutoValue
-  abstract static class CallEntry {
-    @NonNull
-    abstract String getNumber();
-
-    abstract int getType();
-
-    abstract int getPresentation();
-
-    abstract long getTimeMillis();
-
-    static Builder builder() {
-      return new AutoValue_SimulatorCallLog_CallEntry.Builder()
-          .setPresentation(Calls.PRESENTATION_ALLOWED);
-    }
-
-    ContentValues getAsContentValues() {
-      ContentValues values = new ContentValues();
-      values.put(Calls.TYPE, getType());
-      values.put(Calls.NUMBER, getNumber());
-      values.put(Calls.NUMBER_PRESENTATION, getPresentation());
-      values.put(Calls.DATE, getTimeMillis());
-      return values;
-    }
-
-    @AutoValue.Builder
-    abstract static class Builder {
-      abstract Builder setNumber(@NonNull String number);
-
-      abstract Builder setType(int type);
-
-      abstract Builder setPresentation(int presentation);
-
-      abstract Builder setTimeMillis(long timeMillis);
-
-      abstract CallEntry build();
-    }
-  }
-
-  private SimulatorCallLog() {}
-}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java b/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
index 3223607..9e107ed 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorConnectionService.java
@@ -19,6 +19,8 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.telecom.Connection;
 import android.telecom.ConnectionRequest;
 import android.telecom.ConnectionService;
@@ -26,20 +28,64 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
+import android.widget.Toast;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import java.util.ArrayList;
 import java.util.List;
 
 /** Simple connection provider to create an incoming call. This is useful for emulators. */
-public final class SimulatorConnectionService extends ConnectionService {
+public class SimulatorConnectionService extends ConnectionService {
 
   private static final String PHONE_ACCOUNT_ID = "SIMULATOR_ACCOUNT_ID";
+  private static final String EXTRA_IS_SIMULATOR_CONNECTION = "is_simulator_connection";
+  private static final List<Listener> listeners = new ArrayList<>();
 
-  public static void register(Context context) {
+  private static void register(@NonNull Context context) {
     LogUtil.enterBlock("SimulatorConnectionService.register");
+    Assert.isNotNull(context);
     context.getSystemService(TelecomManager.class).registerPhoneAccount(buildPhoneAccount(context));
   }
 
+  private static void unregister(@NonNull Context context) {
+    LogUtil.enterBlock("SimulatorConnectionService.unregister");
+    Assert.isNotNull(context);
+    context
+        .getSystemService(TelecomManager.class)
+        .unregisterPhoneAccount(buildPhoneAccount(context).getAccountHandle());
+  }
+
+  public static void addNewIncomingCall(
+      @NonNull Context context, @NonNull Bundle extras, @NonNull String callerId) {
+    LogUtil.enterBlock("SimulatorConnectionService.addNewIncomingCall");
+    Assert.isNotNull(context);
+    Assert.isNotNull(extras);
+    Assert.isNotNull(callerId);
+
+    register(context);
+
+    Bundle bundle = new Bundle(extras);
+    bundle.putString(TelephonyManager.EXTRA_INCOMING_NUMBER, callerId);
+    bundle.putBoolean(EXTRA_IS_SIMULATOR_CONNECTION, true);
+
+    // Use the system's phone account so that these look like regular SIM call.
+    TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+    PhoneAccountHandle systemPhoneAccount =
+        telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    telecomManager.addNewIncomingCall(systemPhoneAccount, bundle);
+  }
+
+  public static void addListener(@NonNull Listener listener) {
+    Assert.isNotNull(listener);
+    listeners.add(listener);
+  }
+
+  public static void removeListener(@NonNull Listener listener) {
+    Assert.isNotNull(listener);
+    listeners.remove(listener);
+  }
+
+  @NonNull
   private static PhoneAccount buildPhoneAccount(Context context) {
     PhoneAccount.Builder builder =
         new PhoneAccount.Builder(
@@ -48,7 +94,8 @@
     uriSchemes.add(PhoneAccount.SCHEME_TEL);
 
     return builder
-        .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
+        .setCapabilities(
+            PhoneAccount.CAPABILITY_CALL_PROVIDER | PhoneAccount.CAPABILITY_CONNECTION_MANAGER)
         .setShortDescription("Simulator Connection Service")
         .setSupportedUriSchemes(uriSchemes)
         .build();
@@ -67,21 +114,68 @@
   @Override
   public Connection onCreateOutgoingConnection(
       PhoneAccountHandle phoneAccount, ConnectionRequest request) {
-    LogUtil.i(
-        "SimulatorConnectionService.onCreateOutgoingConnection",
-        "outgoing calls not supported yet");
-    return null;
+    LogUtil.enterBlock("SimulatorConnectionService.onCreateOutgoingConnection");
+    if (!isSimulatorConnectionRequest(request)) {
+      LogUtil.i(
+          "SimulatorConnectionService.onCreateOutgoingConnection",
+          "outgoing call not from simulator, unregistering");
+      Toast.makeText(
+              this, "Unregistering Dialer simulator, making a real phone call", Toast.LENGTH_LONG)
+          .show();
+      unregister(this);
+      return null;
+    }
+
+    SimulatorConnection connection = new SimulatorConnection();
+    connection.setActive();
+    connection.setAddress(request.getAddress(), TelecomManager.PRESENTATION_ALLOWED);
+    connection.setConnectionCapabilities(
+        Connection.CAPABILITY_MUTE | Connection.CAPABILITY_SUPPORT_HOLD);
+    connection.putExtras(request.getExtras());
+
+    for (Listener listener : listeners) {
+      listener.onNewOutgoingConnection(connection);
+    }
+    return connection;
   }
 
   @Override
   public Connection onCreateIncomingConnection(
       PhoneAccountHandle phoneAccount, ConnectionRequest request) {
     LogUtil.enterBlock("SimulatorConnectionService.onCreateIncomingConnection");
+    if (!isSimulatorConnectionRequest(request)) {
+      LogUtil.i(
+          "SimulatorConnectionService.onCreateIncomingConnection",
+          "incoming call not from simulator, unregistering");
+      Toast.makeText(
+              this, "Unregistering Dialer simulator, got a real incoming call", Toast.LENGTH_LONG)
+          .show();
+      unregister(this);
+      return null;
+    }
+
     SimulatorConnection connection = new SimulatorConnection();
     connection.setRinging();
     connection.setAddress(getPhoneNumber(request), TelecomManager.PRESENTATION_ALLOWED);
     connection.setConnectionCapabilities(
         Connection.CAPABILITY_MUTE | Connection.CAPABILITY_SUPPORT_HOLD);
+    connection.putExtras(request.getExtras());
+
+    for (Listener listener : listeners) {
+      listener.onNewIncomingConnection(connection);
+    }
     return connection;
   }
+
+  private static boolean isSimulatorConnectionRequest(@NonNull ConnectionRequest request) {
+    return request.getExtras() != null
+        && request.getExtras().getBoolean(EXTRA_IS_SIMULATOR_CONNECTION);
+  }
+
+  /** Callback used to notify listeners when a new connection has been added. */
+  public interface Listener {
+    void onNewOutgoingConnection(SimulatorConnection connection);
+
+    void onNewIncomingConnection(SimulatorConnection connection);
+  }
 }
diff --git a/java/com/android/dialer/simulator/impl/SimulatorContacts.java b/java/com/android/dialer/simulator/impl/SimulatorContacts.java
deleted file mode 100644
index c5e25b3..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorContacts.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * 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.simulator.impl;
-
-import android.content.ContentProviderOperation;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.os.RemoteException;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.text.TextUtils;
-import com.android.dialer.common.Assert;
-import com.google.auto.value.AutoValue;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/** Populates the device database with contacts. */
-final class SimulatorContacts {
-  // Phone numbers from https://www.google.com/about/company/facts/locations/
-  private static final Contact[] SIMPLE_CONTACTS = {
-    // US, contact with e164 number.
-    Contact.builder()
-        .setName("Michelangelo")
-        .addPhoneNumber(new PhoneNumber("+1-302-6365454", Phone.TYPE_MOBILE))
-        .addEmail(new Email("m@example.com"))
-        .setIsStarred(true)
-        .setOrangePhoto()
-        .build(),
-    // US, contact with a non-e164 number.
-    Contact.builder()
-        .setName("Leonardo da Vinci")
-        .addPhoneNumber(new PhoneNumber("(425) 739-5600", Phone.TYPE_MOBILE))
-        .addEmail(new Email("l@example.com"))
-        .setIsStarred(true)
-        .setBluePhoto()
-        .build(),
-    // UK, number where the (0) should be dropped.
-    Contact.builder()
-        .setName("Raphael")
-        .addPhoneNumber(new PhoneNumber("+44 (0) 20 7031 3000", Phone.TYPE_MOBILE))
-        .addEmail(new Email("r@example.com"))
-        .setIsStarred(true)
-        .setRedPhoto()
-        .build(),
-    // US and Australia, contact with a long name and multiple phone numbers.
-    Contact.builder()
-        .setName("Donatello di Niccolò di Betto Bardi")
-        .addPhoneNumber(new PhoneNumber("+1-650-2530000", Phone.TYPE_HOME))
-        .addPhoneNumber(new PhoneNumber("+1 404-487-9000", Phone.TYPE_WORK))
-        .addPhoneNumber(new PhoneNumber("+61 2 9374 4001", Phone.TYPE_FAX_HOME))
-        .setIsStarred(true)
-        .setPurplePhoto()
-        .build(),
-    // US, phone number shared with another contact and 2nd phone number with wait and pause.
-    Contact.builder()
-        .setName("Splinter")
-        .addPhoneNumber(new PhoneNumber("+1-650-2530000", Phone.TYPE_HOME))
-        .addPhoneNumber(new PhoneNumber("+1 303-245-0086;123,456", Phone.TYPE_WORK))
-        .build(),
-    // France, number with Japanese name.
-    Contact.builder()
-        .setName("スパイク・スピーゲル")
-        .addPhoneNumber(new PhoneNumber("+33 (0)1 42 68 53 00", Phone.TYPE_MOBILE))
-        .build(),
-    // Israel, RTL name and non-e164 number.
-    Contact.builder()
-        .setName("עקב אריה טברסק")
-        .addPhoneNumber(new PhoneNumber("+33 (0)1 42 68 53 00", Phone.TYPE_MOBILE))
-        .build(),
-    // UAE, RTL name.
-    Contact.builder()
-        .setName("سلام دنیا")
-        .addPhoneNumber(new PhoneNumber("+971 4 4509500", Phone.TYPE_MOBILE))
-        .build(),
-    // Brazil, contact with no name.
-    Contact.builder()
-        .addPhoneNumber(new PhoneNumber("+55-31-2128-6800", Phone.TYPE_MOBILE))
-        .build(),
-    // Short number, contact with no name.
-    Contact.builder().addPhoneNumber(new PhoneNumber("611", Phone.TYPE_MOBILE)).build(),
-    // US, number with an anonymous prefix.
-    Contact.builder()
-        .setName("Anonymous")
-        .addPhoneNumber(new PhoneNumber("*86 512-343-5283", Phone.TYPE_MOBILE))
-        .build(),
-    // None, contact with no phone number.
-    Contact.builder()
-        .setName("No Phone Number")
-        .addEmail(new Email("no@example.com"))
-        .setIsStarred(true)
-        .build(),
-  };
-
-  @WorkerThread
-  static void populateContacts(@NonNull Context context) {
-    Assert.isWorkerThread();
-    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
-    for (Contact contact : SIMPLE_CONTACTS) {
-      addContact(contact, operations);
-    }
-    try {
-      context.getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations);
-    } catch (RemoteException | OperationApplicationException e) {
-      Assert.fail("error adding contacts: " + e);
-    }
-  }
-
-  private static void addContact(Contact contact, List<ContentProviderOperation> operations) {
-    int index = operations.size();
-
-    operations.add(
-        ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
-            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, contact.getAccountType())
-            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, contact.getAccountName())
-            .withValue(ContactsContract.RawContacts.STARRED, contact.getIsStarred())
-            .withYieldAllowed(true)
-            .build());
-
-    if (!TextUtils.isEmpty(contact.getName())) {
-      operations.add(
-          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
-              .withValue(
-                  ContactsContract.Data.MIMETYPE,
-                  ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-              .withValue(
-                  ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, contact.getName())
-              .build());
-    }
-
-    if (contact.getPhotoStream() != null) {
-      operations.add(
-          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
-              .withValue(
-                  ContactsContract.Data.MIMETYPE,
-                  ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE)
-              .withValue(
-                  ContactsContract.CommonDataKinds.Photo.PHOTO,
-                  contact.getPhotoStream().toByteArray())
-              .build());
-    }
-
-    for (PhoneNumber phoneNumber : contact.getPhoneNumbers()) {
-      operations.add(
-          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
-              .withValue(
-                  ContactsContract.Data.MIMETYPE,
-                  ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
-              .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber.value)
-              .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, phoneNumber.type)
-              .withValue(ContactsContract.CommonDataKinds.Phone.LABEL, phoneNumber.label)
-              .build());
-    }
-
-    for (Email email : contact.getEmails()) {
-      operations.add(
-          ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-              .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, index)
-              .withValue(
-                  ContactsContract.Data.MIMETYPE,
-                  ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
-              .withValue(ContactsContract.CommonDataKinds.Email.DATA, email.value)
-              .withValue(ContactsContract.CommonDataKinds.Email.TYPE, email.type)
-              .withValue(ContactsContract.CommonDataKinds.Email.LABEL, email.label)
-              .build());
-    }
-  }
-
-  @AutoValue
-  abstract static class Contact {
-    @NonNull
-    abstract String getAccountType();
-
-    @NonNull
-    abstract String getAccountName();
-
-    @Nullable
-    abstract String getName();
-
-    abstract boolean getIsStarred();
-
-    @Nullable
-    abstract ByteArrayOutputStream getPhotoStream();
-
-    @NonNull
-    abstract List<PhoneNumber> getPhoneNumbers();
-
-    @NonNull
-    abstract List<Email> getEmails();
-
-    static Builder builder() {
-      return new AutoValue_SimulatorContacts_Contact.Builder()
-          .setAccountType("com.google")
-          .setAccountName("foo@example")
-          .setIsStarred(false)
-          .setPhoneNumbers(new ArrayList<>())
-          .setEmails(new ArrayList<>());
-    }
-
-    @AutoValue.Builder
-    abstract static class Builder {
-      @NonNull private final List<PhoneNumber> phoneNumbers = new ArrayList<>();
-      @NonNull private final List<Email> emails = new ArrayList<>();
-
-      abstract Builder setAccountType(@NonNull String accountType);
-
-      abstract Builder setAccountName(@NonNull String accountName);
-
-      abstract Builder setName(@NonNull String name);
-
-      abstract Builder setIsStarred(boolean isStarred);
-
-      abstract Builder setPhotoStream(ByteArrayOutputStream photoStream);
-
-      abstract Builder setPhoneNumbers(@NonNull List<PhoneNumber> phoneNumbers);
-
-      abstract Builder setEmails(@NonNull List<Email> emails);
-
-      abstract Contact build();
-
-      Builder addPhoneNumber(PhoneNumber phoneNumber) {
-        phoneNumbers.add(phoneNumber);
-        return setPhoneNumbers(phoneNumbers);
-      }
-
-      Builder addEmail(Email email) {
-        emails.add(email);
-        return setEmails(emails);
-      }
-
-      Builder setRedPhoto() {
-        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0xe3, 0x33, 0x1c)));
-        return this;
-      }
-
-      Builder setBluePhoto() {
-        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0x00, 0xaa, 0xe6)));
-        return this;
-      }
-
-      Builder setOrangePhoto() {
-        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0xea, 0x95, 0x00)));
-        return this;
-      }
-
-      Builder setPurplePhoto() {
-        setPhotoStream(getPhotoStreamWithColor(Color.rgb(0x99, 0x5a, 0xa0)));
-        return this;
-      }
-
-      /** Creates a contact photo with a green background and a circle of the given color. */
-      private static ByteArrayOutputStream getPhotoStreamWithColor(int color) {
-        int width = 300;
-        int height = 300;
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        canvas.drawColor(Color.argb(0xff, 0x4c, 0x9c, 0x23));
-        Paint paint = new Paint();
-        paint.setColor(color);
-        paint.setStyle(Paint.Style.FILL);
-        canvas.drawCircle(width / 2, height / 2, width / 3, paint);
-
-        ByteArrayOutputStream photoStream = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.PNG, 75, photoStream);
-        return photoStream;
-      }
-    }
-  }
-
-  static class PhoneNumber {
-    public final String value;
-    public final int type;
-    public final String label;
-
-    PhoneNumber(String value, int type) {
-      this.value = value;
-      this.type = type;
-      label = "simulator phone number";
-    }
-  }
-
-  static class Email {
-    public final String value;
-    public final int type;
-    public final String label;
-
-    Email(String simpleEmail) {
-      value = simpleEmail;
-      type = ContactsContract.CommonDataKinds.Email.TYPE_WORK;
-      label = "simulator email";
-    }
-  }
-
-  private SimulatorContacts() {}
-}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorMissedCallCreator.java b/java/com/android/dialer/simulator/impl/SimulatorMissedCallCreator.java
new file mode 100644
index 0000000..22eb967
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorMissedCallCreator.java
@@ -0,0 +1,87 @@
+/*
+ * 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.simulator.impl;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
+
+/**
+ * Shows missed call notifications. Note, we explicilty create fake phone calls to trigger these
+ * notifications instead of writing to the call log directly. This makes the simulator behave more
+ * like the real application.
+ */
+final class SimulatorMissedCallCreator implements SimulatorConnectionService.Listener {
+  private static final String EXTRA_CALL_COUNT = "call_count";
+  private static final String EXTRA_IS_MISSED_CALL_CONNECTION = "is_missed_call_connection";
+  private static final int DISCONNECT_DELAY_MILLIS = 1000;
+
+  private final Context context;
+
+  SimulatorMissedCallCreator(@NonNull Context context) {
+    this.context = Assert.isNotNull(context);
+  }
+
+  public void start(int callCount) {
+    SimulatorConnectionService.addListener(this);
+    addNextIncomingCall(callCount);
+  }
+
+  @Override
+  public void onNewOutgoingConnection(@NonNull SimulatorConnection connection) {}
+
+  @Override
+  public void onNewIncomingConnection(@NonNull SimulatorConnection connection) {
+    if (!isMissedCallConnection(connection)) {
+      return;
+    }
+    ThreadUtil.postDelayedOnUiThread(
+        () -> {
+          connection.setDisconnected(new DisconnectCause(DisconnectCause.MISSED));
+          addNextIncomingCall(getCallCount(connection));
+        },
+        DISCONNECT_DELAY_MILLIS);
+  }
+
+  private void addNextIncomingCall(int callCount) {
+    if (callCount <= 0) {
+      LogUtil.i("SimulatorMissedCallCreator.addNextIncomingCall", "done adding calls");
+      SimulatorConnectionService.removeListener(this);
+      return;
+    }
+
+    String callerId = String.format("+%d", callCount);
+    Bundle extras = new Bundle();
+    extras.putInt(EXTRA_CALL_COUNT, callCount - 1);
+    extras.putBoolean(EXTRA_IS_MISSED_CALL_CONNECTION, true);
+
+    SimulatorConnectionService.addNewIncomingCall(context, extras, callerId);
+  }
+
+  private static boolean isMissedCallConnection(@NonNull Connection connection) {
+    return connection.getExtras().getBoolean(EXTRA_IS_MISSED_CALL_CONNECTION);
+  }
+
+  private static int getCallCount(@NonNull Connection connection) {
+    return connection.getExtras().getInt(EXTRA_CALL_COUNT);
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorNotifications.java b/java/com/android/dialer/simulator/impl/SimulatorNotifications.java
new file mode 100644
index 0000000..ebe8ecd
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorNotifications.java
@@ -0,0 +1,118 @@
+/*
+ * 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.simulator.impl;
+
+import android.content.Context;
+import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.NonNull;
+import android.view.ActionProvider;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.databasepopulator.VoicemailPopulator;
+import java.util.concurrent.TimeUnit;
+
+/** Implements the simulator submenu. */
+final class SimulatorNotifications {
+  private static final int NOTIFICATION_COUNT = 12;
+
+  static ActionProvider getActionProvider(@NonNull Context context) {
+    return new NotificationsActionProvider(context);
+  }
+
+  private static class NotificationsActionProvider extends ActionProvider {
+    @NonNull private final Context context;
+
+    public NotificationsActionProvider(@NonNull Context context) {
+      super(Assert.isNotNull(context));
+      this.context = context;
+    }
+
+    @Override
+    public View onCreateActionView() {
+      return null;
+    }
+
+    @Override
+    public View onCreateActionView(MenuItem forItem) {
+      return null;
+    }
+
+    @Override
+    public boolean hasSubMenu() {
+      return true;
+    }
+
+    @Override
+    public void onPrepareSubMenu(@NonNull SubMenu subMenu) {
+      LogUtil.enterBlock("NotificationsActionProvider.onPrepareSubMenu");
+      Assert.isNotNull(subMenu);
+      super.onPrepareSubMenu(subMenu);
+
+      subMenu.clear();
+      subMenu
+          .add("Missed Calls")
+          .setOnMenuItemClickListener(
+              (item) -> {
+                new SimulatorMissedCallCreator(context).start(NOTIFICATION_COUNT);
+                return true;
+              });
+      subMenu
+          .add("Voicemails")
+          .setOnMenuItemClickListener(
+              (item) -> {
+                addVoicemailNotifications(context);
+                return true;
+              });
+      subMenu
+          .add("Non spam")
+          .setOnMenuItemClickListener(
+              (item) -> {
+                new SimulatorSpamCallCreator(context, false /* isSpam */).start(NOTIFICATION_COUNT);
+                return true;
+              });
+      subMenu
+          .add("Confirm spam")
+          .setOnMenuItemClickListener(
+              (item) -> {
+                new SimulatorSpamCallCreator(context, true /* isSpam */).start(NOTIFICATION_COUNT);
+                return true;
+              });
+    }
+  }
+
+  private static void addVoicemailNotifications(@NonNull Context context) {
+    LogUtil.enterBlock("SimulatorNotifications.addVoicemailNotifications");
+    for (int i = NOTIFICATION_COUNT; i > 0; i--) {
+      VoicemailPopulator.Voicemail voicemail =
+          VoicemailPopulator.Voicemail.builder()
+              .setPhoneNumber(String.format("+%d", i))
+              .setTranscription(String.format("Short transcript %d", i))
+              .setDurationSeconds(60)
+              .setIsRead(false)
+              .setTimeMillis(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(i))
+              .build();
+      context
+          .getContentResolver()
+          .insert(
+              Voicemails.buildSourceUri(context.getPackageName()),
+              voicemail.getAsContentValues(context));
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorSpamCallCreator.java b/java/com/android/dialer/simulator/impl/SimulatorSpamCallCreator.java
new file mode 100644
index 0000000..4b1d7a5
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorSpamCallCreator.java
@@ -0,0 +1,151 @@
+/*
+ * 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.simulator.impl;
+
+import android.content.ContentProviderOperation;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.provider.CallLog;
+import android.support.annotation.NonNull;
+import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.spam.Spam;
+import com.android.dialer.spam.SpamBindingsStub;
+import java.util.ArrayList;
+
+/**
+ * Creates many spam call notifications by adding new incoming calls one at a time and disconnecting
+ * them.
+ */
+final class SimulatorSpamCallCreator implements SimulatorConnectionService.Listener {
+  private static final String EXTRA_CALL_COUNT = "call_count";
+  private static final String EXTRA_IS_SPAM_CALL_CONNECTION = "is_spam_call_connection";
+  private static final int DISCONNECT_DELAY_MILLIS = 1000;
+
+  private final Context context;
+  private final boolean isSpam;
+
+  SimulatorSpamCallCreator(@NonNull Context context, boolean isSpam) {
+    this.context = Assert.isNotNull(context);
+    this.isSpam = isSpam;
+  }
+
+  public void start(int callCount) {
+    Spam.setForTesting(new SimulatorSpamBindings(isSpam));
+    SimulatorConnectionService.addListener(this);
+    addNextIncomingCall(callCount);
+  }
+
+  @Override
+  public void onNewOutgoingConnection(@NonNull SimulatorConnection connection) {}
+
+  @Override
+  public void onNewIncomingConnection(@NonNull SimulatorConnection connection) {
+    if (!isSpamCallConnection(connection)) {
+      return;
+    }
+    ThreadUtil.postDelayedOnUiThread(
+        () -> {
+          LogUtil.i("SimulatorSpamCallCreator.onNewIncomingConnection", "disconnecting");
+          connection.setActive();
+          connection.setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
+          ThreadUtil.postDelayedOnUiThread(
+              () -> addNextIncomingCall(getCallCount(connection)), DISCONNECT_DELAY_MILLIS);
+        },
+        DISCONNECT_DELAY_MILLIS);
+  }
+
+  private void addNextIncomingCall(int callCount) {
+    if (callCount <= 0) {
+      LogUtil.i("SimulatorSpamCallCreator.addNextIncomingCall", "done adding calls");
+      SimulatorConnectionService.removeListener(this);
+      Spam.setForTesting(null);
+      return;
+    }
+
+    // Caller ID must be e.164 formatted and unique.
+    String callerId = String.format("+1-650-234%04d", callCount);
+    Bundle extras = new Bundle();
+    extras.putInt(EXTRA_CALL_COUNT, callCount - 1);
+    extras.putBoolean(EXTRA_IS_SPAM_CALL_CONNECTION, true);
+
+    // We need to clear the call log because spam notifiations are only shown for new calls.
+    clearCallLog(context);
+
+    SimulatorConnectionService.addNewIncomingCall(context, extras, callerId);
+  }
+
+  private static boolean isSpamCallConnection(@NonNull Connection connection) {
+    return connection.getExtras().getBoolean(EXTRA_IS_SPAM_CALL_CONNECTION);
+  }
+
+  private static int getCallCount(@NonNull Connection connection) {
+    return connection.getExtras().getInt(EXTRA_CALL_COUNT);
+  }
+
+  private static void clearCallLog(@NonNull Context context) {
+    try {
+      ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+      operations.add(ContentProviderOperation.newDelete(CallLog.Calls.CONTENT_URI).build());
+      context.getContentResolver().applyBatch(CallLog.AUTHORITY, operations);
+    } catch (RemoteException | OperationApplicationException e) {
+      Assert.fail("failed to clear call log: " + e);
+    }
+  }
+
+  /**
+   * Custom spam bindings that allow us to override which phone numbers are considered to be spam.
+   * Also disables throttling of spam notifications.
+   */
+  private static class SimulatorSpamBindings extends SpamBindingsStub {
+    private final boolean isSpam;
+
+    SimulatorSpamBindings(boolean isSpam) {
+      this.isSpam = isSpam;
+    }
+
+    @Override
+    public boolean isSpamEnabled() {
+      return true;
+    }
+
+    @Override
+    public boolean isSpamNotificationEnabled() {
+      return true;
+    }
+
+    @Override
+    public int percentOfSpamNotificationsToShow() {
+      return 100;
+    }
+
+    @Override
+    public int percentOfNonSpamNotificationsToShow() {
+      return 100;
+    }
+
+    @Override
+    public void checkSpamStatus(String number, String countryIso, Listener listener) {
+      listener.onComplete(isSpam);
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
index 39c1d02..5930dff 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
@@ -19,28 +19,15 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
-import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 
 /** Utilities to simulate phone calls. */
 final class SimulatorVoiceCall {
   public static void addNewIncomingCall(@NonNull Context context) {
     LogUtil.enterBlock("SimulatorVoiceCall.addNewIncomingCall");
-    SimulatorConnectionService.register(context);
-
-    Bundle bundle = new Bundle();
     // Set the caller ID to the Google London office.
-    bundle.putString(TelephonyManager.EXTRA_INCOMING_NUMBER, "+44 (0) 20 7031 3000");
-    try {
-      context
-          .getSystemService(TelecomManager.class)
-          .addNewIncomingCall(
-              SimulatorConnectionService.getConnectionServiceHandle(context), bundle);
-    } catch (SecurityException e) {
-      Assert.fail("unable to add call: " + e);
-    }
+    String callerId = "+44 (0) 20 7031 3000";
+    SimulatorConnectionService.addNewIncomingCall(context, new Bundle(), callerId);
   }
 
   private SimulatorVoiceCall() {}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVoicemail.java b/java/com/android/dialer/simulator/impl/SimulatorVoicemail.java
deleted file mode 100644
index 04de201..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorVoicemail.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.simulator.impl;
-
-import android.content.ComponentName;
-import android.content.ContentValues;
-import android.content.Context;
-import android.provider.VoicemailContract.Status;
-import android.provider.VoicemailContract.Voicemails;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.TelephonyManager;
-import com.android.dialer.common.Assert;
-import com.google.auto.value.AutoValue;
-import java.util.concurrent.TimeUnit;
-
-/** Populates the device database with voicemail entries. */
-final class SimulatorVoicemail {
-  private static final String ACCOUNT_ID = "ACCOUNT_ID";
-
-  private static final Voicemail.Builder[] SIMPLE_VOICEMAILS = {
-    // Long transcription with an embedded phone number.
-    Voicemail.builder()
-        .setPhoneNumber("+1-302-6365454")
-        .setTranscription(
-            "Hi, this is a very long voicemail. Please call me back at 650 253 0000. "
-                + "I hope you listen to all of it. This is very important. "
-                + "Hi, this is a very long voicemail. "
-                + "I hope you listen to all of it. It's very important.")
-        .setDurationSeconds(10)
-        .setIsRead(false),
-    // RTL transcription.
-    Voicemail.builder()
-        .setPhoneNumber("+1-302-6365454")
-        .setTranscription("هزاران دوست کم اند و یک دشمن زیاد")
-        .setDurationSeconds(60)
-        .setIsRead(true),
-    // Empty number.
-    Voicemail.builder()
-        .setPhoneNumber("")
-        .setTranscription("")
-        .setDurationSeconds(60)
-        .setIsRead(true),
-    // No duration.
-    Voicemail.builder()
-        .setPhoneNumber("+1-302-6365454")
-        .setTranscription("")
-        .setDurationSeconds(0)
-        .setIsRead(true),
-    // Short number.
-    Voicemail.builder()
-        .setPhoneNumber("711")
-        .setTranscription("This is a short voicemail.")
-        .setDurationSeconds(12)
-        .setIsRead(true),
-  };
-
-  @WorkerThread
-  public static void populateVoicemail(@NonNull Context context) {
-    Assert.isWorkerThread();
-    enableVoicemail(context);
-
-    // Do this 4 times to make the voicemail database 4 times bigger.
-    long timeMillis = System.currentTimeMillis();
-    for (int i = 0; i < 4; i++) {
-      for (Voicemail.Builder builder : SIMPLE_VOICEMAILS) {
-        Voicemail voicemail = builder.setTimeMillis(timeMillis).build();
-        context
-            .getContentResolver()
-            .insert(
-                Voicemails.buildSourceUri(context.getPackageName()),
-                voicemail.getAsContentValues(context));
-        timeMillis -= TimeUnit.HOURS.toMillis(2);
-      }
-    }
-  }
-
-  private static void enableVoicemail(@NonNull Context context) {
-    PhoneAccountHandle handle =
-        new PhoneAccountHandle(new ComponentName(context, SimulatorVoicemail.class), ACCOUNT_ID);
-
-    ContentValues values = new ContentValues();
-    values.put(Status.SOURCE_PACKAGE, handle.getComponentName().getPackageName());
-    values.put(Status.SOURCE_TYPE, TelephonyManager.VVM_TYPE_OMTP);
-    values.put(Status.PHONE_ACCOUNT_COMPONENT_NAME, handle.getComponentName().flattenToString());
-    values.put(Status.PHONE_ACCOUNT_ID, handle.getId());
-    values.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
-    values.put(Status.DATA_CHANNEL_STATE, Status.DATA_CHANNEL_STATE_OK);
-    values.put(Status.NOTIFICATION_CHANNEL_STATE, Status.NOTIFICATION_CHANNEL_STATE_OK);
-    context.getContentResolver().insert(Status.buildSourceUri(context.getPackageName()), values);
-  }
-
-  @AutoValue
-  abstract static class Voicemail {
-    @NonNull
-    abstract String getPhoneNumber();
-
-    @NonNull
-    abstract String getTranscription();
-
-    abstract long getDurationSeconds();
-
-    abstract long getTimeMillis();
-
-    abstract boolean getIsRead();
-
-    static Builder builder() {
-      return new AutoValue_SimulatorVoicemail_Voicemail.Builder();
-    }
-
-    ContentValues getAsContentValues(Context context) {
-      ContentValues values = new ContentValues();
-      values.put(Voicemails.DATE, getTimeMillis());
-      values.put(Voicemails.NUMBER, getPhoneNumber());
-      values.put(Voicemails.DURATION, getDurationSeconds());
-      values.put(Voicemails.SOURCE_PACKAGE, context.getPackageName());
-      values.put(Voicemails.IS_READ, getIsRead() ? 1 : 0);
-      values.put(Voicemails.TRANSCRIPTION, getTranscription());
-      return values;
-    }
-
-    @AutoValue.Builder
-    abstract static class Builder {
-      abstract Builder setPhoneNumber(@NonNull String phoneNumber);
-
-      abstract Builder setTranscription(@NonNull String transcription);
-
-      abstract Builder setDurationSeconds(long durationSeconds);
-
-      abstract Builder setTimeMillis(long timeMillis);
-
-      abstract Builder setIsRead(boolean isRead);
-
-      abstract Voicemail build();
-    }
-  }
-
-  private SimulatorVoicemail() {}
-}
diff --git a/java/com/android/dialer/smartdial/SmartDialPrefix.java b/java/com/android/dialer/smartdial/SmartDialPrefix.java
index a000e21..36f174b 100644
--- a/java/com/android/dialer/smartdial/SmartDialPrefix.java
+++ b/java/com/android/dialer/smartdial/SmartDialPrefix.java
@@ -73,7 +73,8 @@
       sUserSimCountryCode = manager.getSimCountryIso();
     }
 
-    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    final SharedPreferences prefs =
+        PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
 
     if (sUserSimCountryCode != null) {
       /** Updates shared preferences with the latest country obtained from getSimCountryIso. */
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index 68ee388..c087439 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-/** Favorites fragment. Contents TBD. TODO */
+/** Favorites fragment. Contents TBD. TODO(calderwoodra) */
 public class SpeedDialFragment extends Fragment {
 
   public static SpeedDialFragment newInstance() {
@@ -38,7 +38,7 @@
   }
 
   public boolean hasFrequents() {
-    // TODO
+    // TODO(calderwoodra)
     return false;
   }
 }
diff --git a/java/com/android/dialer/storage/DeviceProtected.java b/java/com/android/dialer/storage/DeviceProtected.java
new file mode 100644
index 0000000..862259a
--- /dev/null
+++ b/java/com/android/dialer/storage/DeviceProtected.java
@@ -0,0 +1,22 @@
+/*
+ * 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.storage;
+
+import javax.inject.Qualifier;
+
+/** Annotation for retrieving device protected storage objects. */
+@Qualifier
+public @interface DeviceProtected {}
diff --git a/java/com/android/dialer/storage/StorageComponent.java b/java/com/android/dialer/storage/StorageComponent.java
new file mode 100644
index 0000000..51afea7
--- /dev/null
+++ b/java/com/android/dialer/storage/StorageComponent.java
@@ -0,0 +1,40 @@
+/*
+ * 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.storage;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component for storage. */
+@Subcomponent
+public abstract class StorageComponent {
+
+  public abstract @DeviceProtected SharedPreferences deviceProtectedSharedPreferences();
+
+  public static StorageComponent get(Context context) {
+    return ((StorageComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .storageComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    StorageComponent storageComponent();
+  }
+}
diff --git a/java/com/android/dialer/storage/StorageModule.java b/java/com/android/dialer/storage/StorageModule.java
new file mode 100644
index 0000000..8c97980
--- /dev/null
+++ b/java/com/android/dialer/storage/StorageModule.java
@@ -0,0 +1,46 @@
+/*
+ * 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.storage;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
+import com.android.dialer.inject.ApplicationContext;
+import dagger.Module;
+import dagger.Provides;
+import javax.inject.Singleton;
+
+/** Module for the storage component. */
+@Module
+public class StorageModule {
+
+  @Provides
+  @Singleton
+  @DeviceProtected
+  static SharedPreferences provideDeviceProtectedSharedPreferences(
+      @ApplicationContext Context appContext) {
+    // #createDeviceProtectedStorageContext returns a new context each time, so we cache the shared
+    // preferences object in order to avoid accessing disk for every operation.
+    Context deviceProtectedContext = ContextCompat.createDeviceProtectedStorageContext(appContext);
+
+    // ContextCompat.createDeviceProtectedStorageContext(context) returns null on pre-N, thus fall
+    // back to regular default shared preference for pre-N devices since devices protected context
+    // is not available.
+    return PreferenceManager.getDefaultSharedPreferences(
+        deviceProtectedContext != null ? deviceProtectedContext : appContext);
+  }
+}
diff --git a/java/com/android/dialer/strictmode/DialerStrictMode.java b/java/com/android/dialer/strictmode/DialerStrictMode.java
new file mode 100644
index 0000000..f895f7c
--- /dev/null
+++ b/java/com/android/dialer/strictmode/DialerStrictMode.java
@@ -0,0 +1,147 @@
+/*
+ * 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.strictmode;
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.StrictMode;
+import android.os.StrictMode.ThreadPolicy;
+import android.os.StrictMode.VmPolicy;
+import android.preference.PreferenceManager;
+import android.support.annotation.AnyThread;
+import android.support.annotation.MainThread;
+import android.support.v4.os.UserManagerCompat;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.function.Supplier;
+import com.android.dialer.util.DialerUtils;
+
+/** Enables strict mode for the application, and provides means of temporarily disabling it. */
+public final class DialerStrictMode {
+
+  private static final VmPolicy VM_DEATH_PENALTY =
+      new StrictMode.VmPolicy.Builder().penaltyLog().penaltyDeath().build();
+
+  private static final ThreadPolicy THREAD_LOG_PENALTY =
+      new StrictMode.ThreadPolicy.Builder().penaltyLog().build();
+  private static final ThreadPolicy THREAD_DEATH_PENALTY =
+      new StrictMode.ThreadPolicy.Builder().penaltyLog().penaltyDeath().build();
+
+  private DialerStrictMode() {}
+
+  /** Initializes strict mode on application start. */
+  @MainThread
+  public static void onApplicationCreate(Application application) {
+    if (isStrictModeAllowed()) {
+      warmupSharedPrefs(application);
+      StrictModeUtils.setRecommendedMainThreadPolicy(THREAD_DEATH_PENALTY);
+      StrictModeUtils.setRecommendedVMPolicy(VM_DEATH_PENALTY);
+
+      // Because Android resets StrictMode policies after Application.onCreate is done, we set it
+      // again right after.
+      // See cl/105932355 for the discussion.
+      // See b/36951662 for the public bug.
+      Handler handler = new Handler(Looper.myLooper());
+      handler.postAtFrontOfQueue(
+          () -> StrictModeUtils.setRecommendedMainThreadPolicy(THREAD_DEATH_PENALTY));
+    }
+  }
+
+  /**
+   * We frequently access shared preferences on the main thread, which causes strict mode
+   * violations. When strict mode is allowed, warm up the shared preferences so that later uses of
+   * shared preferences access the in-memory versions and we don't have to bypass strict mode at
+   * every point in the application where shared preferences are accessed.
+   */
+  private static void warmupSharedPrefs(Application application) {
+    // From credential-encrypted (CE) storage, i.e.:
+    //    /data/data/com.android.dialer/shared_prefs
+
+    if (UserManagerCompat.isUserUnlocked(application)) {
+      // <package_name>_preferences.xml
+      PreferenceManager.getDefaultSharedPreferences(application);
+
+      // <package_name>.xml
+      application.getSharedPreferences(application.getPackageName(), Context.MODE_PRIVATE);
+    }
+
+    // From device-encrypted (DE) storage, i.e.:
+    //   /data/user_de/0/com.android.dialer/shared_prefs/
+
+    // <package_name>_preferences.xml
+    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(application);
+  }
+
+  private static boolean isStrictModeAllowed() {
+    return BuildType.get() == BuildType.BUGFOOD;
+  }
+
+  private static boolean onMainThread() {
+    return Looper.getMainLooper().equals(Looper.myLooper());
+  }
+
+  /**
+   * Convenience method for disabling and enabling the thread policy death penalty using lambdas.
+   *
+   * <p>For example:
+   *
+   * <p><code>
+   *   Value foo = DialerStrictMode.bypass(() -> doDiskAccessOnMainThreadReturningValue());
+   * </code>
+   *
+   * <p>The thread policy is only mutated if this is called from the main thread.
+   */
+  @AnyThread
+  public static <T> T bypass(Supplier<T> supplier) {
+    if (isStrictModeAllowed() && onMainThread()) {
+      ThreadPolicy originalPolicy = StrictMode.getThreadPolicy();
+      StrictModeUtils.setRecommendedMainThreadPolicy(THREAD_LOG_PENALTY);
+      try {
+        return supplier.get();
+      } finally {
+        StrictMode.setThreadPolicy(originalPolicy);
+      }
+    }
+    return supplier.get();
+  }
+
+  /**
+   * Convenience method for disabling and enabling the thread policy death penalty using lambdas.
+   *
+   * <p>For example:
+   *
+   * <p><code>
+   *   DialerStrictMode.bypass(() -> doDiskAccessOnMainThread());
+   * </code>
+   *
+   * <p>The thread policy is only mutated if this is called from the main thread.
+   */
+  @AnyThread
+  public static void bypass(Runnable runnable) {
+    if (isStrictModeAllowed() && onMainThread()) {
+      ThreadPolicy originalPolicy = StrictMode.getThreadPolicy();
+      StrictModeUtils.setRecommendedMainThreadPolicy(THREAD_LOG_PENALTY);
+      try {
+        runnable.run();
+      } finally {
+        StrictMode.setThreadPolicy(originalPolicy);
+      }
+    }
+    runnable.run();
+  }
+}
diff --git a/java/com/android/dialer/strictmode/StrictModeUtils.java b/java/com/android/dialer/strictmode/StrictModeUtils.java
new file mode 100644
index 0000000..6944fd4
--- /dev/null
+++ b/java/com/android/dialer/strictmode/StrictModeUtils.java
@@ -0,0 +1,120 @@
+/*
+ * 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.strictmode;
+
+import android.os.Build;
+import android.os.StrictMode;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.Assert;
+import com.google.auto.value.AutoValue;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/** Utilities for enforcing strict-mode in an app. */
+final class StrictModeUtils {
+
+  /**
+   * Set the recommended policy for the app.
+   *
+   * @param threadPenalties policy with preferred penalties. Detection bits will be ignored.
+   */
+  static void setRecommendedMainThreadPolicy(StrictMode.ThreadPolicy threadPenalties) {
+    StrictMode.ThreadPolicy threadPolicy =
+        new StrictMode.ThreadPolicy.Builder(threadPenalties).detectAll().build();
+    StrictMode.setThreadPolicy(threadPolicy);
+  }
+
+  /**
+   * Set the recommended policy for the app.
+   *
+   * @param vmPenalties policy with preferred penalties. Detection bits should be unset.
+   */
+  static void setRecommendedVMPolicy(StrictMode.VmPolicy vmPenalties) {
+    setRecommendedVMPolicy(vmPenalties, StrictModeVmConfig.empty());
+  }
+
+  /**
+   * Set the recommended policy for the app.
+   *
+   * @param vmPenalties policy with preferred penalties. Detection bits should be unset.
+   */
+  private static void setRecommendedVMPolicy(
+      StrictMode.VmPolicy vmPenalties, StrictModeVmConfig config) {
+    Assert.isNotNull(config);
+    StrictMode.VmPolicy.Builder vmPolicyBuilder =
+        new StrictMode.VmPolicy.Builder(vmPenalties)
+            .detectLeakedClosableObjects()
+            .detectLeakedSqlLiteObjects();
+    if (Build.VERSION.SDK_INT >= 16) {
+      vmPolicyBuilder.detectLeakedRegistrationObjects();
+    }
+    if (Build.VERSION.SDK_INT >= 18) {
+      vmPolicyBuilder.detectFileUriExposure();
+    }
+    if (Build.VERSION.SDK_INT >= 21) {
+      // Even though this API is available earlier, it did not properly run finalizers.
+      // This avoids lots of false positives.
+
+      // TODO(zachh): Use LeakCanary and remove this line.
+      vmPolicyBuilder.detectActivityLeaks();
+
+      if (config.maxInstanceLimits() != null) {
+        for (Entry<Class<?>, Integer> entry : config.maxInstanceLimits().entrySet()) {
+          vmPolicyBuilder.setClassInstanceLimit(entry.getKey(), entry.getValue());
+        }
+      }
+    }
+    if (Build.VERSION.SDK_INT >= 23) {
+      // TODO(azlatin): Enable clear-text check once b/36730713 is fixed.
+      // vmPolicyBuilder.detectCleartextNetwork();
+    }
+    // Once OC Lands:
+    // .detectContentUriWithoutPermission()
+    // .detectUntaggedSockets()
+    StrictMode.setVmPolicy(vmPolicyBuilder.build());
+  }
+
+  /** VmPolicy configuration. */
+  @AutoValue
+  abstract static class StrictModeVmConfig {
+    /** A map of a class to the maximum number of allowed instances of that class. */
+    @Nullable
+    abstract Map<Class<?>, Integer> maxInstanceLimits();
+
+    public static StrictModeVmConfig empty() {
+      return builder().build();
+    }
+
+    public static Builder builder() {
+      return new AutoValue_StrictModeUtils_StrictModeVmConfig.Builder();
+    }
+
+    /** VmPolicy configuration builder. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+      public abstract Builder setMaxInstanceLimits(Map<Class<?>, Integer> limits);
+
+      public abstract StrictModeVmConfig build();
+
+      Builder() {}
+    }
+
+    StrictModeVmConfig() {}
+  }
+
+  private StrictModeUtils() {}
+}
diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index 87ddda5..573bfe2 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -29,21 +29,37 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
+import android.util.Pair;
 import com.android.dialer.common.LogUtil;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Performs permission checks before calling into TelecomManager. Each method is self-explanatory -
  * perform the required check and return the fallback default if the permission is missing,
  * otherwise return the value from TelecomManager.
  */
-public class TelecomUtil {
+public abstract class TelecomUtil {
 
   private static final String TAG = "TelecomUtil";
   private static boolean sWarningLogged = false;
-  private static Boolean isDefaultDialerForTesting;
-  private static Boolean hasPermissionForTesting;
+
+  private static TelecomUtilImpl instance = new TelecomUtilImpl();
+
+  /**
+   * Cache for {@link #isVoicemailNumber(Context, PhoneAccountHandle, String)}. Both
+   * PhoneAccountHandle and number are cached because multiple numbers might be mapped to true, and
+   * comparing with {@link #getVoicemailNumber(Context, PhoneAccountHandle)} will not suffice.
+   */
+  private static final Map<Pair<PhoneAccountHandle, String>, Boolean> isVoicemailNumberCache =
+      new ConcurrentHashMap<>();
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void setInstanceForTesting(TelecomUtilImpl instanceForTesting) {
+    instance = instanceForTesting;
+  }
 
   public static void showInCallScreen(Context context, boolean showDialpad) {
     if (hasReadPhoneStatePermission(context)) {
@@ -125,18 +141,30 @@
   }
 
   public static boolean isInCall(Context context) {
-    if (hasReadPhoneStatePermission(context)) {
-      return getTelecomManager(context).isInCall();
-    }
-    return false;
+    return instance.isInCall(context);
   }
 
+  /**
+   * {@link TelecomManager#isVoiceMailNumber(PhoneAccountHandle, String)} takes about 10ms, which is
+   * way too slow for regular purposes. This method will cache the result for the life time of the
+   * process. The cache will not be invalidated, for example, if the voicemail number is changed by
+   * setting up apps like Google Voicemail, the result will be wrong. These events are rare.
+   */
   public static boolean isVoicemailNumber(
       Context context, PhoneAccountHandle accountHandle, String number) {
-    if (hasReadPhoneStatePermission(context)) {
-      return getTelecomManager(context).isVoiceMailNumber(accountHandle, number);
+    if (TextUtils.isEmpty(number)) {
+      return false;
     }
-    return false;
+    Pair<PhoneAccountHandle, String> cacheKey = new Pair<>(accountHandle, number);
+    if (isVoicemailNumberCache.containsKey(cacheKey)) {
+      return isVoicemailNumberCache.get(cacheKey);
+    }
+    boolean result = false;
+    if (hasReadPhoneStatePermission(context)) {
+      result = getTelecomManager(context).isVoiceMailNumber(accountHandle, number);
+    }
+    isVoicemailNumberCache.put(cacheKey, result);
+    return result;
   }
 
   @Nullable
@@ -189,43 +217,47 @@
   }
 
   private static boolean hasPermission(Context context, String permission) {
-    if (hasPermissionForTesting != null) {
-      return hasPermissionForTesting;
-    }
-    return ContextCompat.checkSelfPermission(context, permission)
-        == PackageManager.PERMISSION_GRANTED;
-  }
-
-  public static boolean isDefaultDialer(Context context) {
-    if (isDefaultDialerForTesting != null) {
-      return isDefaultDialerForTesting;
-    }
-    final boolean result =
-        TextUtils.equals(
-            context.getPackageName(), getTelecomManager(context).getDefaultDialerPackage());
-    if (result) {
-      sWarningLogged = false;
-    } else {
-      if (!sWarningLogged) {
-        // Log only once to prevent spam.
-        LogUtil.w(TAG, "Dialer is not currently set to be default dialer");
-        sWarningLogged = true;
-      }
-    }
-    return result;
+    return instance.hasPermission(context, permission);
   }
 
   private static TelecomManager getTelecomManager(Context context) {
     return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
   }
 
-  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-  public static void setIsDefaultDialerForTesting(Boolean defaultDialer) {
-    isDefaultDialerForTesting = defaultDialer;
+  public static boolean isDefaultDialer(Context context) {
+    return instance.isDefaultDialer(context);
   }
 
-  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-  public static void setHasPermissionForTesting(Boolean hasPermission) {
-    hasPermissionForTesting = hasPermission;
+  /** Contains an implementation for {@link TelecomUtil} methods */
+  @VisibleForTesting()
+  public static class TelecomUtilImpl {
+
+    public boolean isInCall(Context context) {
+      if (hasReadPhoneStatePermission(context)) {
+        return getTelecomManager(context).isInCall();
+      }
+      return false;
+    }
+
+    public boolean hasPermission(Context context, String permission) {
+      return ContextCompat.checkSelfPermission(context, permission)
+          == PackageManager.PERMISSION_GRANTED;
+    }
+
+    public boolean isDefaultDialer(Context context) {
+      final boolean result =
+          TextUtils.equals(
+              context.getPackageName(), getTelecomManager(context).getDefaultDialerPackage());
+      if (result) {
+        sWarningLogged = false;
+      } else {
+        if (!sWarningLogged) {
+          // Log only once to prevent spam.
+          LogUtil.w(TAG, "Dialer is not currently set to be default dialer");
+          sWarningLogged = true;
+        }
+      }
+      return result;
+    }
   }
 }
diff --git a/java/com/android/dialer/theme/res/animator/button_elevation.xml b/java/com/android/dialer/theme/res/animator/button_elevation.xml
deleted file mode 100644
index 8dd019e..0000000
--- a/java/com/android/dialer/theme/res/animator/button_elevation.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_enabled="true"
-    android:state_pressed="true">
-    <objectAnimator
-      android:duration="@android:integer/config_shortAnimTime"
-      android:propertyName="translationZ"
-      android:valueFrom="0dp"
-      android:valueTo="4dp"
-      android:valueType="floatType"/>
-  </item>
-  <item>
-    <objectAnimator
-      android:duration="@android:integer/config_shortAnimTime"
-      android:propertyName="translationZ"
-      android:valueFrom="4dp"
-      android:valueTo="0dp"
-      android:valueType="floatType"/>
-  </item>
-</selector>
diff --git a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png b/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png
deleted file mode 100644
index 2ccc89d..0000000
--- a/java/com/android/dialer/theme/res/drawable-hdpi/ic_block_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/theme/res/values-af/strings.xml b/java/com/android/dialer/theme/res/values-af/strings.xml
index f263a81..9681aee 100644
--- a/java/com/android/dialer/theme/res/values-af/strings.xml
+++ b/java/com/android/dialer/theme/res/values-af/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefoonhokkie"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Foon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video-oproep"</string>
     <string name="call" msgid="3699617769606114168">"Bel"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-am/strings.xml b/java/com/android/dialer/theme/res/values-am/strings.xml
index 4f36244..0bbcc02 100644
--- a/java/com/android/dialer/theme/res/values-am/strings.xml
+++ b/java/com/android/dialer/theme/res/values-am/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"የሕዝብ ስልክ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ስልክ"</string>
+    <string name="video_call" msgid="8914878391104612532">"የቪዲዮ ጥሪ"</string>
     <string name="call" msgid="3699617769606114168">"ደውል"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ar/strings.xml b/java/com/android/dialer/theme/res/values-ar/strings.xml
index 951bde2..c474c6e 100644
--- a/java/com/android/dialer/theme/res/values-ar/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ar/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"هاتف يعمل بالعملة"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"الهاتف"</string>
+    <string name="video_call" msgid="8914878391104612532">"مكالمة فيديو"</string>
     <string name="call" msgid="3699617769606114168">"اتصال"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-az/strings.xml b/java/com/android/dialer/theme/res/values-az/strings.xml
index 08eaf33..f3e7a01 100644
--- a/java/com/android/dialer/theme/res/values-az/strings.xml
+++ b/java/com/android/dialer/theme/res/values-az/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Taksofon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video zəng"</string>
     <string name="call" msgid="3699617769606114168">"Zəng edin"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml
index 01cdb47..e1a26fa 100644
--- a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonska govornica"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Uputi video poziv"</string>
     <string name="call" msgid="3699617769606114168">"Pozovi"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-be/strings.xml b/java/com/android/dialer/theme/res/values-be/strings.xml
index 49be019..305f608 100644
--- a/java/com/android/dialer/theme/res/values-be/strings.xml
+++ b/java/com/android/dialer/theme/res/values-be/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Таксафон"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Тэлефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Відэавыклік"</string>
     <string name="call" msgid="3699617769606114168">"Выклікаць"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-bg/strings.xml b/java/com/android/dialer/theme/res/values-bg/strings.xml
index 87af9f0..77c8086 100644
--- a/java/com/android/dialer/theme/res/values-bg/strings.xml
+++ b/java/com/android/dialer/theme/res/values-bg/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Обществен телефон"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Видеообаждане"</string>
     <string name="call" msgid="3699617769606114168">"Обаждане"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-bn/strings.xml b/java/com/android/dialer/theme/res/values-bn/strings.xml
index ab1c65b..1e13496 100644
--- a/java/com/android/dialer/theme/res/values-bn/strings.xml
+++ b/java/com/android/dialer/theme/res/values-bn/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"পে ফোন"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ফোন"</string>
+    <string name="video_call" msgid="8914878391104612532">"ভিডিও কল"</string>
     <string name="call" msgid="3699617769606114168">"কল করুন"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-bs/strings.xml b/java/com/android/dialer/theme/res/values-bs/strings.xml
index 01cdb47..051e4e9 100644
--- a/java/com/android/dialer/theme/res/values-bs/strings.xml
+++ b/java/com/android/dialer/theme/res/values-bs/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonska govornica"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videopoziv"</string>
     <string name="call" msgid="3699617769606114168">"Pozovi"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ca/strings.xml b/java/com/android/dialer/theme/res/values-ca/strings.xml
index 1e21a1f..ce3bd43 100644
--- a/java/com/android/dialer/theme/res/values-ca/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ca/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telèfon públic"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telèfon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videotrucada"</string>
     <string name="call" msgid="3699617769606114168">"Truca"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-cs/strings.xml b/java/com/android/dialer/theme/res/values-cs/strings.xml
index ca7bad9..235260f 100644
--- a/java/com/android/dialer/theme/res/values-cs/strings.xml
+++ b/java/com/android/dialer/theme/res/values-cs/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonní automat"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Zahájit videohovor"</string>
     <string name="call" msgid="3699617769606114168">"Volat"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-da/strings.xml b/java/com/android/dialer/theme/res/values-da/strings.xml
index c606b28..5525744 100644
--- a/java/com/android/dialer/theme/res/values-da/strings.xml
+++ b/java/com/android/dialer/theme/res/values-da/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Mønttelefon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Opkald"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videoopkald"</string>
     <string name="call" msgid="3699617769606114168">"Ring op"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-de/strings.xml b/java/com/android/dialer/theme/res/values-de/strings.xml
index d214287..b155577 100644
--- a/java/com/android/dialer/theme/res/values-de/strings.xml
+++ b/java/com/android/dialer/theme/res/values-de/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Münztelefon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videoanruf"</string>
     <string name="call" msgid="3699617769606114168">"Anrufen"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-el/strings.xml b/java/com/android/dialer/theme/res/values-el/strings.xml
index abe1d3f..156b7cd 100644
--- a/java/com/android/dialer/theme/res/values-el/strings.xml
+++ b/java/com/android/dialer/theme/res/values-el/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Τηλέφωνο με χρέωση"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Τηλέφωνο"</string>
+    <string name="video_call" msgid="8914878391104612532">"Βιντεοκλήση"</string>
     <string name="call" msgid="3699617769606114168">"Κλήση"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml
index b086b4c..36de9e5 100644
--- a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Payphone"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video call"</string>
     <string name="call" msgid="3699617769606114168">"Call"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml
index b086b4c..36de9e5 100644
--- a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Payphone"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video call"</string>
     <string name="call" msgid="3699617769606114168">"Call"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml
index b086b4c..36de9e5 100644
--- a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Payphone"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video call"</string>
     <string name="call" msgid="3699617769606114168">"Call"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml
index aee2d0a..be2eac8 100644
--- a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videollamada"</string>
     <string name="call" msgid="3699617769606114168">"Llamar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-es/strings.xml b/java/com/android/dialer/theme/res/values-es/strings.xml
index 343ac21..c63374c 100644
--- a/java/com/android/dialer/theme/res/values-es/strings.xml
+++ b/java/com/android/dialer/theme/res/values-es/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videollamada"</string>
     <string name="call" msgid="3699617769606114168">"Llamar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-et/strings.xml b/java/com/android/dialer/theme/res/values-et/strings.xml
index 5b1e6c0..1f76a4b 100644
--- a/java/com/android/dialer/theme/res/values-et/strings.xml
+++ b/java/com/android/dialer/theme/res/values-et/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefoniautomaat"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videokõne"</string>
     <string name="call" msgid="3699617769606114168">"Helista"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-eu/strings.xml b/java/com/android/dialer/theme/res/values-eu/strings.xml
index dbb4f70..8b28467 100644
--- a/java/com/android/dialer/theme/res/values-eu/strings.xml
+++ b/java/com/android/dialer/theme/res/values-eu/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefono publikoa"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefonoa"</string>
+    <string name="video_call" msgid="8914878391104612532">"Bideo-deia"</string>
     <string name="call" msgid="3699617769606114168">"Deitu"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-fa/strings.xml b/java/com/android/dialer/theme/res/values-fa/strings.xml
index 99bed5f..340adb1 100644
--- a/java/com/android/dialer/theme/res/values-fa/strings.xml
+++ b/java/com/android/dialer/theme/res/values-fa/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%d</xliff:g> <xliff:g id="UNKNOWN">%s</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"تلفن عمومی"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"تلفن"</string>
+    <string name="video_call" msgid="8914878391104612532">"تماس ویدیویی"</string>
     <string name="call" msgid="3699617769606114168">"تماس"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-fi/strings.xml b/java/com/android/dialer/theme/res/values-fi/strings.xml
index a180be5..52cab8a 100644
--- a/java/com/android/dialer/theme/res/values-fi/strings.xml
+++ b/java/com/android/dialer/theme/res/values-fi/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Maksupuhelin"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Puhelin"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videopuhelu"</string>
     <string name="call" msgid="3699617769606114168">"Soita"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml
index 18a70bb..b1d0ff1 100644
--- a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Cabine téléphonique"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Téléphone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Appel vidéo"</string>
     <string name="call" msgid="3699617769606114168">"Appeler"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-fr/strings.xml b/java/com/android/dialer/theme/res/values-fr/strings.xml
index 18a70bb..b1d0ff1 100644
--- a/java/com/android/dialer/theme/res/values-fr/strings.xml
+++ b/java/com/android/dialer/theme/res/values-fr/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Cabine téléphonique"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Téléphone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Appel vidéo"</string>
     <string name="call" msgid="3699617769606114168">"Appeler"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-gl/strings.xml b/java/com/android/dialer/theme/res/values-gl/strings.xml
index fbbad6c..1788843 100644
--- a/java/com/android/dialer/theme/res/values-gl/strings.xml
+++ b/java/com/android/dialer/theme/res/values-gl/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videochamada"</string>
     <string name="call" msgid="3699617769606114168">"Chamar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-gu/strings.xml b/java/com/android/dialer/theme/res/values-gu/strings.xml
index 9b38dcd..8de6e2a 100644
--- a/java/com/android/dialer/theme/res/values-gu/strings.xml
+++ b/java/com/android/dialer/theme/res/values-gu/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"પેફોન"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ફોન"</string>
+    <string name="video_call" msgid="8914878391104612532">"વિડિઓ કૉલ"</string>
     <string name="call" msgid="3699617769606114168">"કૉલ કરો"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-hi/strings.xml b/java/com/android/dialer/theme/res/values-hi/strings.xml
index ee360b4..fbc56e9 100644
--- a/java/com/android/dialer/theme/res/values-hi/strings.xml
+++ b/java/com/android/dialer/theme/res/values-hi/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"पे-फ़ोन"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"फ़ोन"</string>
+    <string name="video_call" msgid="8914878391104612532">"वीडियो कॉल"</string>
     <string name="call" msgid="3699617769606114168">"कॉल करें"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-hr/strings.xml b/java/com/android/dialer/theme/res/values-hr/strings.xml
index 92e1956..73c6542 100644
--- a/java/com/android/dialer/theme/res/values-hr/strings.xml
+++ b/java/com/android/dialer/theme/res/values-hr/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Javna telefonska govornica"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videopoziv"</string>
     <string name="call" msgid="3699617769606114168">"Pozovi"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-hu/strings.xml b/java/com/android/dialer/theme/res/values-hu/strings.xml
index dfcc876..d70977d 100644
--- a/java/com/android/dialer/theme/res/values-hu/strings.xml
+++ b/java/com/android/dialer/theme/res/values-hu/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Nyilvános telefon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videohívás"</string>
     <string name="call" msgid="3699617769606114168">"Hívás"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-hy/strings.xml b/java/com/android/dialer/theme/res/values-hy/strings.xml
index 3b4e862..5f53c9f 100644
--- a/java/com/android/dialer/theme/res/values-hy/strings.xml
+++ b/java/com/android/dialer/theme/res/values-hy/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Բջջային տերմինալ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Հեռախոս"</string>
+    <string name="video_call" msgid="8914878391104612532">"Տեսազանգ"</string>
     <string name="call" msgid="3699617769606114168">"Զանգել"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-in/strings.xml b/java/com/android/dialer/theme/res/values-in/strings.xml
index eda15a2..193c6e9 100644
--- a/java/com/android/dialer/theme/res/values-in/strings.xml
+++ b/java/com/android/dialer/theme/res/values-in/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telepon Umum"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telepon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video call"</string>
     <string name="call" msgid="3699617769606114168">"Telepon"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-is/strings.xml b/java/com/android/dialer/theme/res/values-is/strings.xml
index cda7fc8..6a67ad9 100644
--- a/java/com/android/dialer/theme/res/values-is/strings.xml
+++ b/java/com/android/dialer/theme/res/values-is/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Símasjálfsali"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Sími"</string>
+    <string name="video_call" msgid="8914878391104612532">"Hringja myndsímtal"</string>
     <string name="call" msgid="3699617769606114168">"Hringja"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-it/strings.xml b/java/com/android/dialer/theme/res/values-it/strings.xml
index fa2caa6..46c6d56 100644
--- a/java/com/android/dialer/theme/res/values-it/strings.xml
+++ b/java/com/android/dialer/theme/res/values-it/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Cabina telefonica"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefono"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videochiamata"</string>
     <string name="call" msgid="3699617769606114168">"Chiama"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-iw/strings.xml b/java/com/android/dialer/theme/res/values-iw/strings.xml
index 18d87ea..1bc8cbb 100644
--- a/java/com/android/dialer/theme/res/values-iw/strings.xml
+++ b/java/com/android/dialer/theme/res/values-iw/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"טלפון ציבורי"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"טלפון"</string>
+    <string name="video_call" msgid="8914878391104612532">"שיחת וידאו"</string>
     <string name="call" msgid="3699617769606114168">"התקשר"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ja/strings.xml b/java/com/android/dialer/theme/res/values-ja/strings.xml
index 3921559..839495d 100644
--- a/java/com/android/dialer/theme/res/values-ja/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ja/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g>（<xliff:g id="ID">%d</xliff:g>）"</string>
     <string name="payphone" msgid="7106361320283710387">"公衆電話"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string>
+    <string name="video_call" msgid="8914878391104612532">"ビデオハングアウト"</string>
     <string name="call" msgid="3699617769606114168">"発信"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ka/strings.xml b/java/com/android/dialer/theme/res/values-ka/strings.xml
index 18e7cb3..37fdabd 100644
--- a/java/com/android/dialer/theme/res/values-ka/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ka/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"გადახდის ტელეფონი"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ტელეფონი"</string>
+    <string name="video_call" msgid="8914878391104612532">"ვიდეოზარი"</string>
     <string name="call" msgid="3699617769606114168">"დარეკვა"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-kk/strings.xml b/java/com/android/dialer/theme/res/values-kk/strings.xml
index f9c62d3..1b6a516 100644
--- a/java/com/android/dialer/theme/res/values-kk/strings.xml
+++ b/java/com/android/dialer/theme/res/values-kk/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Автомат-телефон"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Бейне қоңырау"</string>
     <string name="call" msgid="3699617769606114168">"Қоңырау шалу"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-km/strings.xml b/java/com/android/dialer/theme/res/values-km/strings.xml
index 7e375cf..cfc2010 100644
--- a/java/com/android/dialer/theme/res/values-km/strings.xml
+++ b/java/com/android/dialer/theme/res/values-km/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"ទូរស័ព្ទសាធារណៈ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ទូរស័ព្ទ"</string>
+    <string name="video_call" msgid="8914878391104612532">"ការ​ហៅវីដេអូ"</string>
     <string name="call" msgid="3699617769606114168">"ហៅ​ទូរសព្ទ"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-kn/strings.xml b/java/com/android/dialer/theme/res/values-kn/strings.xml
index 718fea0..dffa10e0 100644
--- a/java/com/android/dialer/theme/res/values-kn/strings.xml
+++ b/java/com/android/dialer/theme/res/values-kn/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"ಪೇಫೋನ್"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ಫೋನ್"</string>
+    <string name="video_call" msgid="8914878391104612532">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="call" msgid="3699617769606114168">"ಕರೆಮಾಡಿ"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ko/strings.xml b/java/com/android/dialer/theme/res/values-ko/strings.xml
index 29f608c..ff6710c 100644
--- a/java/com/android/dialer/theme/res/values-ko/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ko/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"공중전화"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"휴대전화"</string>
+    <string name="video_call" msgid="8914878391104612532">"화상 통화"</string>
     <string name="call" msgid="3699617769606114168">"전화"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ky/strings.xml b/java/com/android/dialer/theme/res/values-ky/strings.xml
index 905b8c5..036c270 100644
--- a/java/com/android/dialer/theme/res/values-ky/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ky/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Таксофон"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Видео чалуу"</string>
     <string name="call" msgid="3699617769606114168">"Чалуу"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-lo/strings.xml b/java/com/android/dialer/theme/res/values-lo/strings.xml
index 6826a75..9204a02 100644
--- a/java/com/android/dialer/theme/res/values-lo/strings.xml
+++ b/java/com/android/dialer/theme/res/values-lo/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"ຕູ້​ໂທ​ລະ​ສັບ​ສາ​ທາ​ລະ​ນະ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ໂທລະສັບ"</string>
+    <string name="video_call" msgid="8914878391104612532">"ໂທວິດີໂອ"</string>
     <string name="call" msgid="3699617769606114168">"ໂທ"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-lt/strings.xml b/java/com/android/dialer/theme/res/values-lt/strings.xml
index 43469a1..be14536 100644
--- a/java/com/android/dialer/theme/res/values-lt/strings.xml
+++ b/java/com/android/dialer/theme/res/values-lt/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%d</xliff:g> <xliff:g id="UNKNOWN">%s</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Taksofonas"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefonas"</string>
+    <string name="video_call" msgid="8914878391104612532">"Vaizdo skambutis"</string>
     <string name="call" msgid="3699617769606114168">"Skambinti"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-lv/strings.xml b/java/com/android/dialer/theme/res/values-lv/strings.xml
index f9a6dec..35b742f 100644
--- a/java/com/android/dialer/theme/res/values-lv/strings.xml
+++ b/java/com/android/dialer/theme/res/values-lv/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Maksas tālrunis"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Tālrunis"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videozvans"</string>
     <string name="call" msgid="3699617769606114168">"Zvanīt"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-mk/strings.xml b/java/com/android/dialer/theme/res/values-mk/strings.xml
index 1328edb..3975ae5 100644
--- a/java/com/android/dialer/theme/res/values-mk/strings.xml
+++ b/java/com/android/dialer/theme/res/values-mk/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Говорница"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Воспоставете видеоповик"</string>
     <string name="call" msgid="3699617769606114168">"Повикајте"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ml/strings.xml b/java/com/android/dialer/theme/res/values-ml/strings.xml
index 03f9533..146bfdf 100644
--- a/java/com/android/dialer/theme/res/values-ml/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ml/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ഫോണ്‍"</string>
+    <string name="video_call" msgid="8914878391104612532">"വീഡിയോ കോള്‍"</string>
     <string name="call" msgid="3699617769606114168">"വിളിക്കുക"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-mn/strings.xml b/java/com/android/dialer/theme/res/values-mn/strings.xml
index c47f083..0e27e8d 100644
--- a/java/com/android/dialer/theme/res/values-mn/strings.xml
+++ b/java/com/android/dialer/theme/res/values-mn/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Payphone"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Утас"</string>
+    <string name="video_call" msgid="8914878391104612532">"Видео дуудлага"</string>
     <string name="call" msgid="3699617769606114168">"Залгах"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-mr/strings.xml b/java/com/android/dialer/theme/res/values-mr/strings.xml
index 41a9c96..7fa6f26 100644
--- a/java/com/android/dialer/theme/res/values-mr/strings.xml
+++ b/java/com/android/dialer/theme/res/values-mr/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"सार्वजनिक फोन"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"फोन"</string>
+    <string name="video_call" msgid="8914878391104612532">"व्हिडिओ कॉल"</string>
     <string name="call" msgid="3699617769606114168">"कॉल करा"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ms/strings.xml b/java/com/android/dialer/theme/res/values-ms/strings.xml
index b28fe26..18df912 100644
--- a/java/com/android/dialer/theme/res/values-ms/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ms/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefon Awam"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Panggilan video"</string>
     <string name="call" msgid="3699617769606114168">"Panggil"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-my/strings.xml b/java/com/android/dialer/theme/res/values-my/strings.xml
index eb21b6e..67b9b28 100644
--- a/java/com/android/dialer/theme/res/values-my/strings.xml
+++ b/java/com/android/dialer/theme/res/values-my/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"ငွေပေးရသည့်ဖုန်း"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ဖုန်း"</string>
+    <string name="video_call" msgid="8914878391104612532">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
     <string name="call" msgid="3699617769606114168">"ခေါ်ဆိုရန်"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-nb/strings.xml b/java/com/android/dialer/theme/res/values-nb/strings.xml
index dcd9b17..1a6e593 100644
--- a/java/com/android/dialer/theme/res/values-nb/strings.xml
+++ b/java/com/android/dialer/theme/res/values-nb/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonkiosk"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videosamtale"</string>
     <string name="call" msgid="3699617769606114168">"Ring"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ne/strings.xml b/java/com/android/dialer/theme/res/values-ne/strings.xml
index 383ac2c..eb73de9 100644
--- a/java/com/android/dialer/theme/res/values-ne/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ne/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"पेफोन"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"फोन"</string>
+    <string name="video_call" msgid="8914878391104612532">"भिडियो कल"</string>
     <string name="call" msgid="3699617769606114168">"कल गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-nl/strings.xml b/java/com/android/dialer/theme/res/values-nl/strings.xml
index 9635708..36e904c 100644
--- a/java/com/android/dialer/theme/res/values-nl/strings.xml
+++ b/java/com/android/dialer/theme/res/values-nl/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefooncel"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefoon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videogesprek"</string>
     <string name="call" msgid="3699617769606114168">"Bellen"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-no/strings.xml b/java/com/android/dialer/theme/res/values-no/strings.xml
index dcd9b17..1a6e593 100644
--- a/java/com/android/dialer/theme/res/values-no/strings.xml
+++ b/java/com/android/dialer/theme/res/values-no/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonkiosk"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videosamtale"</string>
     <string name="call" msgid="3699617769606114168">"Ring"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-pa/strings.xml b/java/com/android/dialer/theme/res/values-pa/strings.xml
index dc23b7a..af263c8 100644
--- a/java/com/android/dialer/theme/res/values-pa/strings.xml
+++ b/java/com/android/dialer/theme/res/values-pa/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"ਪੇਫੋਨ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ਫੋਨ"</string>
+    <string name="video_call" msgid="8914878391104612532">"ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="call" msgid="3699617769606114168">"ਕਾਲ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-pl/strings.xml b/java/com/android/dialer/theme/res/values-pl/strings.xml
index 1ebaad2..a25df0a 100644
--- a/java/com/android/dialer/theme/res/values-pl/strings.xml
+++ b/java/com/android/dialer/theme/res/values-pl/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Automat telefoniczny"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Rozmowa wideo"</string>
     <string name="call" msgid="3699617769606114168">"Zadzwoń"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml
index 6caf87c..9f44269 100644
--- a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefone público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videochamada"</string>
     <string name="call" msgid="3699617769606114168">"Ligar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml
index ef7c7d6..1b77257 100644
--- a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefone público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videochamada"</string>
     <string name="call" msgid="3699617769606114168">"Telefonar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-pt/strings.xml b/java/com/android/dialer/theme/res/values-pt/strings.xml
index 6caf87c..9f44269 100644
--- a/java/com/android/dialer/theme/res/values-pt/strings.xml
+++ b/java/com/android/dialer/theme/res/values-pt/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefone público"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videochamada"</string>
     <string name="call" msgid="3699617769606114168">"Ligar"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ro/strings.xml b/java/com/android/dialer/theme/res/values-ro/strings.xml
index 4d0c09b..1cf8c8c 100644
--- a/java/com/android/dialer/theme/res/values-ro/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ro/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefon public"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Apel video"</string>
     <string name="call" msgid="3699617769606114168">"Apelați"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ru/strings.xml b/java/com/android/dialer/theme/res/values-ru/strings.xml
index aeab136..8aa6e8f 100644
--- a/java/com/android/dialer/theme/res/values-ru/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ru/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Телефон-автомат"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Видеовызов"</string>
     <string name="call" msgid="3699617769606114168">"Позвонить"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-si/strings.xml b/java/com/android/dialer/theme/res/values-si/strings.xml
index ba3bb05..04d0468 100644
--- a/java/com/android/dialer/theme/res/values-si/strings.xml
+++ b/java/com/android/dialer/theme/res/values-si/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"පේෆෝනය"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"දුරකථනය"</string>
+    <string name="video_call" msgid="8914878391104612532">"වීඩියෝ ඇමතුම"</string>
     <string name="call" msgid="3699617769606114168">"ඇමතුම"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sk/strings.xml b/java/com/android/dialer/theme/res/values-sk/strings.xml
index 6863463..9e56e12 100644
--- a/java/com/android/dialer/theme/res/values-sk/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sk/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefónny automat"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefón"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videohovor"</string>
     <string name="call" msgid="3699617769606114168">"Volať"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sl/strings.xml b/java/com/android/dialer/theme/res/values-sl/strings.xml
index 1b1776a..6236535 100644
--- a/java/com/android/dialer/theme/res/values-sl/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sl/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonska govorilnica"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videoklic"</string>
     <string name="call" msgid="3699617769606114168">"Pokliči"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sq/strings.xml b/java/com/android/dialer/theme/res/values-sq/strings.xml
index 0d7084a..6fecf14 100644
--- a/java/com/android/dialer/theme/res/values-sq/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sq/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefon me pagesë"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefoni"</string>
+    <string name="video_call" msgid="8914878391104612532">"Telefonatë me video"</string>
     <string name="call" msgid="3699617769606114168">"Telefono"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sr/strings.xml b/java/com/android/dialer/theme/res/values-sr/strings.xml
index a744e95..8f91054 100644
--- a/java/com/android/dialer/theme/res/values-sr/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sr/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Телефонска говорница"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Упути видео позив"</string>
     <string name="call" msgid="3699617769606114168">"Позови"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sv/strings.xml b/java/com/android/dialer/theme/res/values-sv/strings.xml
index f409807..f31a378 100644
--- a/java/com/android/dialer/theme/res/values-sv/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sv/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Telefonautomat"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Videosamtal"</string>
     <string name="call" msgid="3699617769606114168">"Ring"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-sw/strings.xml b/java/com/android/dialer/theme/res/values-sw/strings.xml
index a2f9888..c35d560 100644
--- a/java/com/android/dialer/theme/res/values-sw/strings.xml
+++ b/java/com/android/dialer/theme/res/values-sw/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Simu ya kulipia"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Simu"</string>
+    <string name="video_call" msgid="8914878391104612532">"Simu ya video"</string>
     <string name="call" msgid="3699617769606114168">"Piga simu"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ta/strings.xml b/java/com/android/dialer/theme/res/values-ta/strings.xml
index a4f55f5..737e43e 100644
--- a/java/com/android/dialer/theme/res/values-ta/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ta/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"கட்டணத் தொலைபேசி"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"மொபைல்"</string>
+    <string name="video_call" msgid="8914878391104612532">"வீடியோ அழைப்பு"</string>
     <string name="call" msgid="3699617769606114168">"அழை"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-te/strings.xml b/java/com/android/dialer/theme/res/values-te/strings.xml
index 59f00ca..c1a0212 100644
--- a/java/com/android/dialer/theme/res/values-te/strings.xml
+++ b/java/com/android/dialer/theme/res/values-te/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"పే ఫోన్"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"ఫోన్"</string>
+    <string name="video_call" msgid="8914878391104612532">"వీడియో కాల్"</string>
     <string name="call" msgid="3699617769606114168">"కాల్ చేయి"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-th/strings.xml b/java/com/android/dialer/theme/res/values-th/strings.xml
index 3870b4d..0df98d9 100644
--- a/java/com/android/dialer/theme/res/values-th/strings.xml
+++ b/java/com/android/dialer/theme/res/values-th/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"โทรศัพท์สาธารณะ"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"โทรศัพท์"</string>
+    <string name="video_call" msgid="8914878391104612532">"แฮงเอาท์วิดีโอ"</string>
     <string name="call" msgid="3699617769606114168">"โทร"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-tl/strings.xml b/java/com/android/dialer/theme/res/values-tl/strings.xml
index 8169278..573b6b8 100644
--- a/java/com/android/dialer/theme/res/values-tl/strings.xml
+++ b/java/com/android/dialer/theme/res/values-tl/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Payphone"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telepono"</string>
+    <string name="video_call" msgid="8914878391104612532">"Mag-video call"</string>
     <string name="call" msgid="3699617769606114168">"Tawag"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-tr/strings.xml b/java/com/android/dialer/theme/res/values-tr/strings.xml
index c11cd13..21e2889 100644
--- a/java/com/android/dialer/theme/res/values-tr/strings.xml
+++ b/java/com/android/dialer/theme/res/values-tr/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Ankesörlü telefon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Görüntülü görüşme"</string>
     <string name="call" msgid="3699617769606114168">"Telefon et"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-uk/strings.xml b/java/com/android/dialer/theme/res/values-uk/strings.xml
index c87fe89..dab89df 100644
--- a/java/com/android/dialer/theme/res/values-uk/strings.xml
+++ b/java/com/android/dialer/theme/res/values-uk/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Таксофон"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string>
+    <string name="video_call" msgid="8914878391104612532">"Відеодзвінок"</string>
     <string name="call" msgid="3699617769606114168">"Виклик"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-ur/strings.xml b/java/com/android/dialer/theme/res/values-ur/strings.xml
index abc0d6d..187eb22 100644
--- a/java/com/android/dialer/theme/res/values-ur/strings.xml
+++ b/java/com/android/dialer/theme/res/values-ur/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"پے فون"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"فون"</string>
+    <string name="video_call" msgid="8914878391104612532">"ویڈیو کال"</string>
     <string name="call" msgid="3699617769606114168">"کال کریں"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-uz/strings.xml b/java/com/android/dialer/theme/res/values-uz/strings.xml
index 2889f3f..959ca77 100644
--- a/java/com/android/dialer/theme/res/values-uz/strings.xml
+++ b/java/com/android/dialer/theme/res/values-uz/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Taksofon"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string>
+    <string name="video_call" msgid="8914878391104612532">"Video suhbat"</string>
     <string name="call" msgid="3699617769606114168">"Chaqirish"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-vi/strings.xml b/java/com/android/dialer/theme/res/values-vi/strings.xml
index b014516..38bd8ec 100644
--- a/java/com/android/dialer/theme/res/values-vi/strings.xml
+++ b/java/com/android/dialer/theme/res/values-vi/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Điện thoại công cộng"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Điện thoại"</string>
+    <string name="video_call" msgid="8914878391104612532">"Gọi điện video"</string>
     <string name="call" msgid="3699617769606114168">"Gọi"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml
index baff752..c80f197 100644
--- a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"公用电话"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"电话"</string>
+    <string name="video_call" msgid="8914878391104612532">"视频通话"</string>
     <string name="call" msgid="3699617769606114168">"拨打电话"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml
index 8b26663..605089b 100644
--- a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"公共電話"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string>
+    <string name="video_call" msgid="8914878391104612532">"視像通話"</string>
     <string name="call" msgid="3699617769606114168">"通話"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml
index 24a5c10..7a5604c 100644
--- a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"公用電話"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string>
+    <string name="video_call" msgid="8914878391104612532">"視訊通話"</string>
     <string name="call" msgid="3699617769606114168">"撥號"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values-zu/strings.xml b/java/com/android/dialer/theme/res/values-zu/strings.xml
index 96cd798..ae07c45 100644
--- a/java/com/android/dialer/theme/res/values-zu/strings.xml
+++ b/java/com/android/dialer/theme/res/values-zu/strings.xml
@@ -21,5 +21,6 @@
     <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string>
     <string name="payphone" msgid="7106361320283710387">"Ucingo olufakwa imali"</string>
     <string name="launcherActivityLabel" msgid="9034868428899993166">"Ifoni"</string>
+    <string name="video_call" msgid="8914878391104612532">"Ikholi yevidiyo"</string>
     <string name="call" msgid="3699617769606114168">"Shaya"</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
index 52af142..0e6f54f 100644
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ b/java/com/android/dialer/theme/res/values/colors.xml
@@ -55,7 +55,6 @@
   <!-- Colors for the notification actions -->
   <color name="notification_action_accept">#097138</color>
   <color name="notification_action_dismiss">#A52714</color>
-  <color name="notification_action_end_call">#FFFFFF</color>
   <color name="notification_action_answer_video">#097138</color>
 
   <!-- Background color of action bars -->
diff --git a/java/com/android/dialer/theme/res/values/dimens.xml b/java/com/android/dialer/theme/res/values/dimens.xml
index 8b8e61f..ee52c97 100644
--- a/java/com/android/dialer/theme/res/values/dimens.xml
+++ b/java/com/android/dialer/theme/res/values/dimens.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 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
+  -->
 <resources>
   <dimen name="call_log_action_icon_margin_start">16dp</dimen>
   <dimen name="call_log_action_icon_dimen">24dp</dimen>
   <dimen name="call_log_action_horizontal_padding">24dp</dimen>
 
-  <dimen name="call_log_actions_left_padding">64dp</dimen>
-  <dimen name="call_log_actions_top_padding">8dp</dimen>
-  <dimen name="call_log_actions_bottom_padding">8dp</dimen>
   <dimen name="call_log_primary_text_size">16sp</dimen>
   <dimen name="call_log_detail_text_size">12sp</dimen>
   <dimen name="call_log_day_group_heading_size">14sp</dimen>
@@ -23,7 +35,6 @@
   <dimen name="action_bar_elevation">3dp</dimen>
   <dimen name="tab_height">48dp</dimen>
   <!-- actionbar height + tab height -->
-  <dimen name="actionbar_and_tab_height">107dp</dimen>
   <dimen name="actionbar_contentInsetStart">72dp</dimen>
 
   <dimen name="call_log_icon_margin">2dp</dimen>
diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml
index a14693f..74cabad 100644
--- a/java/com/android/dialer/theme/res/values/strings.xml
+++ b/java/com/android/dialer/theme/res/values/strings.xml
@@ -30,6 +30,9 @@
        used in the Launcher icon. -->
   <string name="launcherActivityLabel">Phone</string>
 
+  <!-- text on a button, Video call, as in to place a video call. -->
+  <string name="video_call">Video call</string>
+
   <!-- Label shown on the 'positive' button for the dialog. Indicates that the call will proceed -->
   <string name="call">Call</string>
 </resources>
diff --git a/java/com/android/dialer/theme/res/values/themes.xml b/java/com/android/dialer/theme/res/values/themes.xml
index 0d0c45f..0c07f37 100644
--- a/java/com/android/dialer/theme/res/values/themes.xml
+++ b/java/com/android/dialer/theme/res/values/themes.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
 
   <style name="DialerThemeBase" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -19,6 +34,20 @@
     <item name="actionBarSize">@dimen/action_bar_height</item>
   </style>
 
+  <!-- Should be kept in sync with the theme above (minus anything related to actionbars -->
+  <style name="DialerThemeBase.NoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
+    <!-- This is used for title bar color in recents -->
+    <item name="android:colorPrimary">@color/titlebar_in_recents_background_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:colorControlActivated">@color/dialer_theme_color</item>
+    <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
+    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
+    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
+  </style>
+
   <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/transparent</item>
@@ -26,4 +55,18 @@
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:windowAnimationStyle">@android:style/Animation</item>
   </style>
+
+  <style name="PrimaryText" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">#DE000000</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="SecondaryText" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">#8A000000</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
 </resources>
diff --git a/java/com/android/dialer/time/Clock.java b/java/com/android/dialer/time/Clock.java
new file mode 100644
index 0000000..4b7edc6
--- /dev/null
+++ b/java/com/android/dialer/time/Clock.java
@@ -0,0 +1,23 @@
+/*
+ * 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.time;
+
+/** Functional interface for providing time since epoch. */
+public interface Clock {
+  /** Returns milliseconds since epoch. */
+  long currentTimeMillis();
+}
diff --git a/java/com/android/dialer/util/CallUtil.java b/java/com/android/dialer/util/CallUtil.java
index 81a4bb2..0afe930 100644
--- a/java/com/android/dialer/util/CallUtil.java
+++ b/java/com/android/dialer/util/CallUtil.java
@@ -21,6 +21,7 @@
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import java.util.List;
@@ -40,6 +41,9 @@
    */
   public static final int VIDEO_CALLING_PRESENCE = 2;
 
+  private static boolean hasInitializedIsVideoEnabledState;
+  private static boolean cachedIsVideoEnabledState;
+
   /** Return Uri with an appropriate scheme, accepting both SIP and usual phone call numbers. */
   public static Uri getCallUri(String number) {
     if (PhoneNumberHelper.isUriNumber(number)) {
@@ -102,7 +106,23 @@
    *     false} otherwise.
    */
   public static boolean isVideoEnabled(Context context) {
-    return (getVideoCallingAvailability(context) & VIDEO_CALLING_ENABLED) != 0;
+    boolean isVideoEnabled = (getVideoCallingAvailability(context) & VIDEO_CALLING_ENABLED) != 0;
+
+    // Log everytime the video enabled state changes.
+    if (!hasInitializedIsVideoEnabledState) {
+      LogUtil.i("CallUtil.isVideoEnabled", "isVideoEnabled: " + isVideoEnabled);
+      hasInitializedIsVideoEnabledState = true;
+      cachedIsVideoEnabledState = isVideoEnabled;
+    } else if (cachedIsVideoEnabledState != isVideoEnabled) {
+      LogUtil.i(
+          "CallUtil.isVideoEnabled",
+          "isVideoEnabled changed from %b to %b",
+          cachedIsVideoEnabledState,
+          isVideoEnabled);
+      cachedIsVideoEnabledState = isVideoEnabled;
+    }
+
+    return isVideoEnabled;
   }
 
   /**
diff --git a/java/com/android/dialer/util/DialerUtils.java b/java/com/android/dialer/util/DialerUtils.java
index 63f870e..f38c650 100644
--- a/java/com/android/dialer/util/DialerUtils.java
+++ b/java/com/android/dialer/util/DialerUtils.java
@@ -38,6 +38,7 @@
 import android.widget.Toast;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.telecom.TelecomUtil;
 import java.io.File;
 import java.util.Iterator;
@@ -233,14 +234,9 @@
   public static SharedPreferences getDefaultSharedPreferenceForDeviceProtectedStorageContext(
       @NonNull Context context) {
     Assert.isNotNull(context);
-    Context deviceProtectedContext =
-        ContextCompat.isDeviceProtectedStorage(context)
-            ? context
-            : ContextCompat.createDeviceProtectedStorageContext(context);
-    // ContextCompat.createDeviceProtectedStorageContext(context) returns null on pre-N, thus fall
-    // back to regular default shared preference for pre-N devices since devices protected context
-    // is not available.
-    return PreferenceManager.getDefaultSharedPreferences(
-        deviceProtectedContext != null ? deviceProtectedContext : context);
+    if (ContextCompat.isDeviceProtectedStorage(context)) {
+      return PreferenceManager.getDefaultSharedPreferences(context);
+    }
+    return StorageComponent.get(context.getApplicationContext()).deviceProtectedSharedPreferences();
   }
 }
diff --git a/java/com/android/dialer/util/IntentUtil.java b/java/com/android/dialer/util/IntentUtil.java
index 2f265b5..f453966 100644
--- a/java/com/android/dialer/util/IntentUtil.java
+++ b/java/com/android/dialer/util/IntentUtil.java
@@ -31,7 +31,8 @@
   }
 
   public static Intent getNewContactIntent() {
-    return new Intent(Intent.ACTION_INSERT, ContactsContract.Contacts.CONTENT_URI);
+    return new Intent(Intent.ACTION_INSERT, ContactsContract.Contacts.CONTENT_URI)
+        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
   }
 
   public static Intent getNewContactIntent(CharSequence phoneNumber) {
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 466e862..cb97368 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -16,22 +16,63 @@
 
 package com.android.dialer.util;
 
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.ADD_VOICEMAIL;
+import static android.Manifest.permission.CALL_PHONE;
+import static android.Manifest.permission.MODIFY_PHONE_STATE;
+import static android.Manifest.permission.READ_CALL_LOG;
+import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.READ_PHONE_STATE;
+import static android.Manifest.permission.READ_VOICEMAIL;
+import static android.Manifest.permission.WRITE_CALL_LOG;
+import static android.Manifest.permission.WRITE_CONTACTS;
+import static android.Manifest.permission.WRITE_VOICEMAIL;
+
 import android.Manifest.permission;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
+import android.widget.Toast;
 import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /** Utility class to help with runtime permissions. */
 public class PermissionsUtil {
 
+  private static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user";
   private static final String PERMISSION_PREFERENCE = "dialer_permissions";
   private static final String CEQUINT_PERMISSION = "com.cequint.ecid.CALLER_ID_LOOKUP";
 
+  // Permissions list retrieved from application manifest.
+  // Starting in Android O Permissions must be explicitly enumerated:
+  // https://developer.android.com/preview/behavior-changes.html#rmp
+  public static final List<String> allPhoneGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(
+          Arrays.asList(
+              READ_CALL_LOG,
+              WRITE_CALL_LOG,
+              READ_PHONE_STATE,
+              MODIFY_PHONE_STATE,
+              CALL_PHONE,
+              ADD_VOICEMAIL,
+              WRITE_VOICEMAIL,
+              READ_VOICEMAIL));
+
+  public static final List<String> allContactsGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(Arrays.asList(READ_CONTACTS, WRITE_CONTACTS));
+
+  public static final List<String> allLocationGroupPermissionsUsedInDialer =
+      Collections.unmodifiableList(Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION));
+
   public static boolean hasPhonePermissions(Context context) {
     return hasPermission(context, permission.CALL_PHONE);
   }
@@ -147,4 +188,49 @@
     final Intent intent = new Intent(permission);
     LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
   }
+
+  /**
+   * Returns a list of permissions currently not granted to the application from the supplied list.
+   *
+   * @param context - The Application context.
+   * @param permissionsList - A list of permissions to check if the current application has been
+   *     granted.
+   * @return An array of permissions that are currently DENIED to the application; a subset of
+   *     permissionsList.
+   */
+  @NonNull
+  public static String[] getPermissionsCurrentlyDenied(
+      @NonNull Context context, @NonNull List<String> permissionsList) {
+    List<String> permissionsCurrentlyDenied = new ArrayList<>();
+    for (String permission : permissionsList) {
+      if (!hasPermission(context, permission)) {
+        permissionsCurrentlyDenied.add(permission);
+      }
+    }
+    return permissionsCurrentlyDenied.toArray(new String[permissionsCurrentlyDenied.size()]);
+  }
+
+  /**
+   * Since we are granted the camera permission automatically as a first-party app, we need to show
+   * a toast to let users know the permission was granted for privacy reasons.
+   *
+   * @return true if we've already shown the camera privacy toast.
+   */
+  public static boolean hasCameraPrivacyToastShown(@NonNull Context context) {
+    return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+        .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false);
+  }
+
+  public static void showCameraPermissionToast(@NonNull Context context) {
+    Toast.makeText(context, context.getString(R.string.camera_privacy_text), Toast.LENGTH_LONG)
+        .show();
+    setCameraPrivacyToastShown(context);
+  }
+
+  public static void setCameraPrivacyToastShown(@NonNull Context context) {
+    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+        .edit()
+        .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true)
+        .apply();
+  }
 }
diff --git a/java/com/android/dialer/util/UriUtils.java b/java/com/android/dialer/util/UriUtils.java
new file mode 100644
index 0000000..c4308a8
--- /dev/null
+++ b/java/com/android/dialer/util/UriUtils.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2011 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.util;
+
+import android.net.Uri;
+import android.provider.ContactsContract;
+import java.util.List;
+
+/** Utility methods for dealing with URIs. */
+public class UriUtils {
+
+  private static final String LOOKUP_URI_ENCODED = "encoded";
+
+  /** Static helper, not instantiable. */
+  private UriUtils() {}
+
+  /** Checks whether two URI are equal, taking care of the case where either is null. */
+  public static boolean areEqual(Uri uri1, Uri uri2) {
+    if (uri1 == null && uri2 == null) {
+      return true;
+    }
+    if (uri1 == null || uri2 == null) {
+      return false;
+    }
+    return uri1.equals(uri2);
+  }
+
+  /** Parses a string into a URI and returns null if the given string is null. */
+  public static Uri parseUriOrNull(String uriString) {
+    if (uriString == null) {
+      return null;
+    }
+    return Uri.parse(uriString);
+  }
+
+  /** Converts a URI into a string, returns null if the given URI is null. */
+  public static String uriToString(Uri uri) {
+    return uri == null ? null : uri.toString();
+  }
+
+  public static boolean isEncodedContactUri(Uri uri) {
+    if (uri == null) {
+      return false;
+    }
+    final String lastPathSegment = uri.getLastPathSegment();
+    if (lastPathSegment == null) {
+      return false;
+    }
+    return lastPathSegment.equals(LOOKUP_URI_ENCODED);
+  }
+
+  /**
+   * @return {@code uri} as-is if the authority is of contacts provider. Otherwise or {@code uri} is
+   *     null, return null otherwise
+   */
+  public static Uri nullForNonContactsUri(Uri uri) {
+    if (uri == null) {
+      return null;
+    }
+    return ContactsContract.AUTHORITY.equals(uri.getAuthority()) ? uri : null;
+  }
+
+  /** Parses the given URI to determine the original lookup key of the contact. */
+  public static String getLookupKeyFromUri(Uri lookupUri) {
+    // Would be nice to be able to persist the lookup key somehow to avoid having to parse
+    // the uri entirely just to retrieve the lookup key, but every uri is already parsed
+    // once anyway to check if it is an encoded JSON uri, so this has negligible effect
+    // on performance.
+    if (lookupUri != null && !UriUtils.isEncodedContactUri(lookupUri)) {
+      final List<String> segments = lookupUri.getPathSegments();
+      // This returns the third path segment of the uri, where the lookup key is located.
+      // See {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI}.
+      return (segments.size() < 3) ? null : Uri.encode(segments.get(2));
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/java/com/android/dialer/util/res/values-af/strings.xml b/java/com/android/dialer/util/res/values-af/strings.xml
index 7457e9b..2e4b938 100644
--- a/java/com/android/dialer/util/res/values-af/strings.xml
+++ b/java/com/android/dialer/util/res/values-af/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Geen program daarvoor op hierdie toestel nie"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"As jy \'n WPS-oproep maak, sal dit jou huidige oproep afsny."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Gaan voort"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratoestemming is geaktiveer"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-am/strings.xml b/java/com/android/dialer/util/res/values-am/strings.xml
index 18fcb56..c28ad6d 100644
--- a/java/com/android/dialer/util/res/values-am/strings.xml
+++ b/java/com/android/dialer/util/res/values-am/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ለዚያ የሚሆን መተግበሪያ በዚህ መሣሪያ ላይ የለም"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"የWPS ጥሪ ማድረግ አሁን ያለውን ጥሪዎን ያቋርጠዋል።"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ቀጥል"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"የካሜራ ፈቃድ ነቅቷል"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ar/strings.xml b/java/com/android/dialer/util/res/values-ar/strings.xml
index 8f25fb5..4c2a5ea 100644
--- a/java/com/android/dialer/util/res/values-ar/strings.xml
+++ b/java/com/android/dialer/util/res/values-ar/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"لا يوجد تطبيق لإجراء ذلك على هذا الجهاز"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏سيؤدي إجراء مكالمة WPS إلى قطع اتصال مكالماتك الحالية."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"متابعة"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"تم تمكين إذن الكاميرا"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-az/strings.xml b/java/com/android/dialer/util/res/values-az/strings.xml
index ffe8ec5..726cbd0 100644
--- a/java/com/android/dialer/util/res/values-az/strings.xml
+++ b/java/com/android/dialer/util/res/values-az/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Bu cihazda onun üçün heç bir proqram yoxdur"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS zənginin edilməsi mövcud zənginizi sonlandıracaq."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Davam edin"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera icazəsi aktiv edildi"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
index 8f16f82..f41e7bc 100644
--- a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacija za to"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ako uputite WPS poziv, prekinućete postojeći poziv."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Omogućena je dozvola za kameru"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-be/strings.xml b/java/com/android/dialer/util/res/values-be/strings.xml
index f88ca19..e75686c 100644
--- a/java/com/android/dialer/util/res/values-be/strings.xml
+++ b/java/com/android/dialer/util/res/values-be/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"На прыладзе няма праграмы для гэтага"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Выкананне выкліку WPS прывядзе да раз\'яднання бягучага выкліку."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Працягнуць"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Уключаны дазвол на выкарыстанне камеры"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bg/strings.xml b/java/com/android/dialer/util/res/values-bg/strings.xml
index 44bb00f..177409d 100644
--- a/java/com/android/dialer/util/res/values-bg/strings.xml
+++ b/java/com/android/dialer/util/res/values-bg/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"На устройството няма приложение за това действие"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ако извършите обаждане през WPS, текущото ви обаждане ще бъде прекъснато."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Напред"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Активирано бе разрешението за камерата"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bn/strings.xml b/java/com/android/dialer/util/res/values-bn/strings.xml
index 769c3c2..7090a74 100644
--- a/java/com/android/dialer/util/res/values-bn/strings.xml
+++ b/java/com/android/dialer/util/res/values-bn/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"এর জন্য এই ডিভাইসে কোনো অ্যাপ্লিকেশান নেই"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"একটি WPS কল করা হলে তা আপনার বিদ্যমান কলটি কেটে দেবে৷"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"চালিয়ে যান"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ক্যামেরার অনুমতি সক্ষম করা হয়েছে"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bs/strings.xml b/java/com/android/dialer/util/res/values-bs/strings.xml
index a36bd98..597203a 100644
--- a/java/com/android/dialer/util/res/values-bs/strings.xml
+++ b/java/com/android/dialer/util/res/values-bs/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacije za to"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Upućivanje WPS poziva prekinut će trenutni poziv."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Dozvola za kameru je omogućena"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ca/strings.xml b/java/com/android/dialer/util/res/values-ca/strings.xml
index c2a661f..64b219e 100644
--- a/java/com/android/dialer/util/res/values-ca/strings.xml
+++ b/java/com/android/dialer/util/res/values-ca/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No hi ha cap aplicació per a això en aquest dispositiu."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"En fer una trucada WPS, es desconnectarà la trucada en curs."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continua"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"S\'ha activat el permís d\'accés a la càmera"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-cs/strings.xml b/java/com/android/dialer/util/res/values-cs/strings.xml
index d7de840..015d277 100644
--- a/java/com/android/dialer/util/res/values-cs/strings.xml
+++ b/java/com/android/dialer/util/res/values-cs/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Pro tuto akci v zařízení nemáte žádnou aplikaci."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Zahájením hovoru WPS odpojíte probíhající hovor."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Pokračovat"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Byl povolen přístup k fotoaparátu"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-da/strings.xml b/java/com/android/dialer/util/res/values-da/strings.xml
index 555bb69..9bff5ad 100644
--- a/java/com/android/dialer/util/res/values-da/strings.xml
+++ b/java/com/android/dialer/util/res/values-da/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Der findes Ingen app til det på denne enhed"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Hvis du foretager et WPS-opkald, afsluttes dit nuværende opkald."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Fortsæt"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratilladelse er aktiveret"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-de/strings.xml b/java/com/android/dialer/util/res/values-de/strings.xml
index 7d154b6..363006e 100644
--- a/java/com/android/dialer/util/res/values-de/strings.xml
+++ b/java/com/android/dialer/util/res/values-de/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Keine entsprechende App auf diesem Gerät"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Wenn du jetzt einen Anruf über WPS tätigst, wird deine bestehende Verbindung getrennt."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Weiter"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Berechtigung für Kamera aktiviert"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-el/strings.xml b/java/com/android/dialer/util/res/values-el/strings.xml
index efbdc4e..d62f181 100644
--- a/java/com/android/dialer/util/res/values-el/strings.xml
+++ b/java/com/android/dialer/util/res/values-el/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Δεν υπάρχει εφαρμογή γι\' αυτήν την ενέργεια σε αυτήν τη συσκευή"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Η διενέργεια κλήσης μέσω WPS θα αποσυνδέσει την υφιστάμενη κλήση."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Συνέχεια"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Το δικαίωμα χρήσης της κάμερας έχει ενεργοποιηθεί"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rAU/strings.xml b/java/com/android/dialer/util/res/values-en-rAU/strings.xml
index 545a2a8..34ed26a 100644
--- a/java/com/android/dialer/util/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rAU/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rGB/strings.xml b/java/com/android/dialer/util/res/values-en-rGB/strings.xml
index 545a2a8..34ed26a 100644
--- a/java/com/android/dialer/util/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rGB/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rIN/strings.xml b/java/com/android/dialer/util/res/values-en-rIN/strings.xml
index 545a2a8..34ed26a 100644
--- a/java/com/android/dialer/util/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rIN/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-es-rUS/strings.xml b/java/com/android/dialer/util/res/values-es-rUS/strings.xml
index 4aa0725..c7941f8 100644
--- a/java/com/android/dialer/util/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/util/res/values-es-rUS/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No hay una aplicación para esa acción en este dispositivo."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Realizar una llamada de WPS desconectará tu llamada existente."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Se activó el permiso de la cámara"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-es/strings.xml b/java/com/android/dialer/util/res/values-es/strings.xml
index 6c92947..2246ac2 100644
--- a/java/com/android/dialer/util/res/values-es/strings.xml
+++ b/java/com/android/dialer/util/res/values-es/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"No hay aplicaciones para esa acción en este dispositivo"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Al hacer una llamada WPS, se finalizará tu llamada actual."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Se ha habilitado el acceso a la cámara"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-et/strings.xml b/java/com/android/dialer/util/res/values-et/strings.xml
index 465d2b4..72a25dd 100644
--- a/java/com/android/dialer/util/res/values-et/strings.xml
+++ b/java/com/android/dialer/util/res/values-et/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Seadmes pole selleks sobilikku rakendust"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-kõne tegemisel katkestatakse teie praegune kõne."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Jätka"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kaameraluba on antud"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-eu/strings.xml b/java/com/android/dialer/util/res/values-eu/strings.xml
index ba434ce..395ae2b 100644
--- a/java/com/android/dialer/util/res/values-eu/strings.xml
+++ b/java/com/android/dialer/util/res/values-eu/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Ez dago hori egin dezakeen aplikaziorik gailu honetan"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS dei bat egiten baduzu, eten egingo da uneko deia."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Jarraitu"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera atzitzeko baimena eman da"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fa/strings.xml b/java/com/android/dialer/util/res/values-fa/strings.xml
index c22c386..fd9f71f 100644
--- a/java/com/android/dialer/util/res/values-fa/strings.xml
+++ b/java/com/android/dialer/util/res/values-fa/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"هیچ برنامه‌ای برای انجام این کار در این دستگاه نصب نیست"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏اگر تماس WPS برقرار کنید، تماس فعلی‌تان قطع می‌شود."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ادامه"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"مجوز دوربین فعال شد"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fi/strings.xml b/java/com/android/dialer/util/res/values-fi/strings.xml
index 237232f..570eca5 100644
--- a/java/com/android/dialer/util/res/values-fi/strings.xml
+++ b/java/com/android/dialer/util/res/values-fi/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Laitteessa ei ole kyseiseen toimintoon tarvittavaa sovellusta"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-puhelun soittaminen katkaisee meneillään olevan puhelun."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Jatka"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameran käyttöoikeus myönnettiin."</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
index 1d73fcf..3fddd51 100644
--- a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Cette action ne peut être effectuée par aucune application sur cet appareil."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Si vous faites un appel WPS, vous déconnecterez l\'appel en cours."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuer"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorisation d\'accès à l\'appareil photo activée"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fr/strings.xml b/java/com/android/dialer/util/res/values-fr/strings.xml
index 48f1dbb..b8dd372 100644
--- a/java/com/android/dialer/util/res/values-fr/strings.xml
+++ b/java/com/android/dialer/util/res/values-fr/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Cette action ne peut être effectuée via aucune application sur cet appareil."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"L\'émission d\'un appel WPS mettra fin à l\'appel en cours."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuer"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorisation d\'accès à l\'appareil photo accordée"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-gl/strings.xml b/java/com/android/dialer/util/res/values-gl/strings.xml
index 8cdcffa..7e7dfea 100644
--- a/java/com/android/dialer/util/res/values-gl/strings.xml
+++ b/java/com/android/dialer/util/res/values-gl/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Non hai ningunha aplicación para esa acción neste dispositivo"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Se realizas unha chamada WPS, desconectarase a túa chamada actual."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Activouse o permiso de acceso á cámara"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-gu/strings.xml b/java/com/android/dialer/util/res/values-gu/strings.xml
index ee4b592..38e7882 100644
--- a/java/com/android/dialer/util/res/values-gu/strings.xml
+++ b/java/com/android/dialer/util/res/values-gu/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"આ ઉપકરણ પર તે માટે કોઈ ઍપ્લિકેશન નથી"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS કૉલ કરવાનું તમારા અસ્તિત્વમાંના કૉલને ડિસ્કનેક્ટ કરશે."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ચાલુ રાખો"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"કૅમેરાની પરવાનગી સક્ષમ કરી"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hi/strings.xml b/java/com/android/dialer/util/res/values-hi/strings.xml
index 9a1bc35..5b778d8 100644
--- a/java/com/android/dialer/util/res/values-hi/strings.xml
+++ b/java/com/android/dialer/util/res/values-hi/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"उसके लिए इस डिवाइस पर कोई एेप नहीं है"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कॉल करने से आपका मौजूदा कॉल डिसकनेक्ट हो जाएगा."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"जारी रखें"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"कैमरे की अनुमति सक्षम की गई"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hr/strings.xml b/java/com/android/dialer/util/res/values-hr/strings.xml
index 1fc54da..b8858cb 100644
--- a/java/com/android/dialer/util/res/values-hr/strings.xml
+++ b/java/com/android/dialer/util/res/values-hr/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacije za to"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Uspostavljanje WPS poziva prekinut će postojeći poziv."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Omogućen je pristup kameri"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hu/strings.xml b/java/com/android/dialer/util/res/values-hu/strings.xml
index ad5f29d..fc5ef92 100644
--- a/java/com/android/dialer/util/res/values-hu/strings.xml
+++ b/java/com/android/dialer/util/res/values-hu/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Nincs megfelelő alkalmazás a művelethez ezen az eszközön"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-hívás indításával megszakítja a folyamatban lévő hívást."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Folytatás"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameraengedély megadva"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hy/strings.xml b/java/com/android/dialer/util/res/values-hy/strings.xml
index 18f2001..dd6b132 100644
--- a/java/com/android/dialer/util/res/values-hy/strings.xml
+++ b/java/com/android/dialer/util/res/values-hy/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Սարքի վրա համապատասխան հավելված չկա"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Եթե WPS-ի միջոցով զանգ կատարեք, ձեր ընթացիկ զանգը կընդհատվի:"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Շարունակել"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Տեսախցիկից օգտվելու թույլտվությունը տրամադրված է"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-in/strings.xml b/java/com/android/dialer/util/res/values-in/strings.xml
index 55a5e3e..6732ffb 100644
--- a/java/com/android/dialer/util/res/values-in/strings.xml
+++ b/java/com/android/dialer/util/res/values-in/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Tidak ada aplikasi untuk tindakan tersebut di perangkat ini"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Melakukan panggilan WPS akan mengakhiri panggilan yang ada."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Lanjutkan"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Izin kamera diaktifkan"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-is/strings.xml b/java/com/android/dialer/util/res/values-is/strings.xml
index e6615e3..15f9c6a 100644
--- a/java/com/android/dialer/util/res/values-is/strings.xml
+++ b/java/com/android/dialer/util/res/values-is/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Ekkert forrit fyrir þetta er í tækinu"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ef þú hringir WPS-símtal slitnar núverandi símtal."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Áfram"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Myndavélarheimild virk"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-it/strings.xml b/java/com/android/dialer/util/res/values-it/strings.xml
index 3ed55c6..9288628 100644
--- a/java/com/android/dialer/util/res/values-it/strings.xml
+++ b/java/com/android/dialer/util/res/values-it/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Sul dispositivo non sono presenti app per tale azione"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Se effettui una chiamata WPS, la chiamata esistente verrà disconnessa."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continua"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorizzazioni della fotocamera attivate"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-iw/strings.xml b/java/com/android/dialer/util/res/values-iw/strings.xml
index 5a1062d..362ed53 100644
--- a/java/com/android/dialer/util/res/values-iw/strings.xml
+++ b/java/com/android/dialer/util/res/values-iw/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"אין אפליקציה עבור הפעולה הזו במכשיר הזה"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"התקשרות באמצעות השירות האלחוטי המועדף תנתק את השיחה הנוכחית."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"המשך"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"הרשאת הגישה למצלמה הופעלה"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ja/strings.xml b/java/com/android/dialer/util/res/values-ja/strings.xml
index 78986b1..533caad 100644
--- a/java/com/android/dialer/util/res/values-ja/strings.xml
+++ b/java/com/android/dialer/util/res/values-ja/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"この操作を行うアプリが端末上にありません"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS で通話を発信すると現在の通話が切断されます。"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"次へ"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"カメラへのアクセスを自動で許可しました"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ka/strings.xml b/java/com/android/dialer/util/res/values-ka/strings.xml
index 13e7ad0..baea1c1 100644
--- a/java/com/android/dialer/util/res/values-ka/strings.xml
+++ b/java/com/android/dialer/util/res/values-ka/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ამ მოწყობილობაზე არ არის შესაბამისი აპლიკაცია"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ზარის განხორციელება თქვენს მიმდინარე ზარს გათიშავს."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"გაგრძელება"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"კამერაზე წვდომის ნებართვა ჩართულია"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-kk/strings.xml b/java/com/android/dialer/util/res/values-kk/strings.xml
index 49b6091..e1abe60 100644
--- a/java/com/android/dialer/util/res/values-kk/strings.xml
+++ b/java/com/android/dialer/util/res/values-kk/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Бұл үшін осы құрылғыда қолданба жоқ"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS қоңырауын шалу қазіргі қоңырауды тоқтатады."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Жалғастыру"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Камера рұқсаты қосылды"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-km/strings.xml b/java/com/android/dialer/util/res/values-km/strings.xml
index f55fdf5..dd8c260 100644
--- a/java/com/android/dialer/util/res/values-km/strings.xml
+++ b/java/com/android/dialer/util/res/values-km/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"មិនមានកម្មវិធីសម្រាប់សកម្មភាពនេះនៅលើឧបករណ៍នេះទេ"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"ការ​ហៅ​ចេញ​​ដោយ​ប្រើ​សេវា WPS នឹង​ផ្ដាច់​ការ​ហៅ​ដែល​មាន​​របស់​អ្នក។"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"បន្ត"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"បានបើក​ការអនុញ្ញាត​កាមេរ៉ា"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-kn/strings.xml b/java/com/android/dialer/util/res/values-kn/strings.xml
index d6de0f8..833f696 100644
--- a/java/com/android/dialer/util/res/values-kn/strings.xml
+++ b/java/com/android/dialer/util/res/values-kn/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ಈ ಸಾಧನದಲ್ಲಿ ಅದಕ್ಕಾಗಿ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ಕರೆ ಅನ್ನು ಮಾಡುವುದರಿಂದ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ನಿಮ್ಮ ಕರೆ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ಮುಂದುವರಿಸಿ"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ಕ್ಯಾಮರಾ ಅನುಮತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ko/strings.xml b/java/com/android/dialer/util/res/values-ko/strings.xml
index f7a0679..0e08dd3 100644
--- a/java/com/android/dialer/util/res/values-ko/strings.xml
+++ b/java/com/android/dialer/util/res/values-ko/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"이 기기에 작업을 처리할 수 있는 앱이 없습니다."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS 전화를 걸면 기존 전화 연결이 해제됩니다."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"계속"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"카메라 권한 사용 설정됨"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ky/strings.xml b/java/com/android/dialer/util/res/values-ky/strings.xml
index e37ace8..98090eb 100644
--- a/java/com/android/dialer/util/res/values-ky/strings.xml
+++ b/java/com/android/dialer/util/res/values-ky/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Бул түзмөктө ал үчүн колдонмо жок"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Азыр WPS аркылуу чалсаңыз, учурдагы чалуу үзүлүп калат."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Улантуу"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Камеранын уруксаты иштетилди"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lo/strings.xml b/java/com/android/dialer/util/res/values-lo/strings.xml
index d7c6764..b0bbb90 100644
--- a/java/com/android/dialer/util/res/values-lo/strings.xml
+++ b/java/com/android/dialer/util/res/values-lo/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ບໍ່​ມີ​ແອັ​ບຯ​ສຳ​ລັບ​ສິ່ງນັ້ນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"ການໂທ WPS ຈະຕັດສາຍທີ່ມີຢູ່ແລ້ວຂອງທ່ານ."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ດຳເນີນການຕໍ່"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ເປີດໃຊ້ສິດອະນຸຍາດກ້ອງຖ່າຍຮູບແລ້ວ"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lt/strings.xml b/java/com/android/dialer/util/res/values-lt/strings.xml
index bf77d5c..ab4443a 100644
--- a/java/com/android/dialer/util/res/values-lt/strings.xml
+++ b/java/com/android/dialer/util/res/values-lt/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Šiame įrenginyje nėra tam skirtos programos"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Pradėjus WPS skambutį bus atjungtas dabartinis skambutis."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Tęsti"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Fotoaparato leidimas įgalintas"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lv/strings.xml b/java/com/android/dialer/util/res/values-lv/strings.xml
index 7b46264..3df9cf0 100644
--- a/java/com/android/dialer/util/res/values-lv/strings.xml
+++ b/java/com/android/dialer/util/res/values-lv/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Šajā ierīcē nav nevienas šai darbībai piemērotas lietotnes."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Veicot WPS zvanu, tiks pārtraukts esošais zvans."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Turpināt"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameras atļauja iespējota"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mk/strings.xml b/java/com/android/dialer/util/res/values-mk/strings.xml
index 4451d70..3c7a95c 100644
--- a/java/com/android/dialer/util/res/values-mk/strings.xml
+++ b/java/com/android/dialer/util/res/values-mk/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Нема апликација за тоа на уредот"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Воспоставувањето повик преку WPS ќе го исклучи вашиот тековен повик."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Продолжи"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Дозволата за камера е овозможена"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ml/strings.xml b/java/com/android/dialer/util/res/values-ml/strings.xml
index d861641..cc3fe4f 100644
--- a/java/com/android/dialer/util/res/values-ml/strings.xml
+++ b/java/com/android/dialer/util/res/values-ml/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"അതിനായി ഈ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകളൊന്നുമില്ല"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"ഒരു WPS കോൾ ചെയ്യുന്നത് നിങ്ങളുടെ നിലവിലെ കോൾ വിച്ഛേദിക്കാനിടയാക്കും."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"തുടരുക"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ക്യാമറ അനുമതി നൽകി"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mn/strings.xml b/java/com/android/dialer/util/res/values-mn/strings.xml
index 51fe7ca..ed42c80 100644
--- a/java/com/android/dialer/util/res/values-mn/strings.xml
+++ b/java/com/android/dialer/util/res/values-mn/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Энэхүү төхөөрөмж дээр тухайн үйлдлийг гүйцэтгэх апликейшн байхгүй байна."</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS дуудлага хийвэл одоо байгаа дуудлагыг таслах болно."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Үргэлжлүүлэх"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Камерын зөвшөөрлийг идэвхжүүлсэн"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mr/strings.xml b/java/com/android/dialer/util/res/values-mr/strings.xml
index 4cb8230..6535514 100644
--- a/java/com/android/dialer/util/res/values-mr/strings.xml
+++ b/java/com/android/dialer/util/res/values-mr/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"या डिव्हाइसवर त्यासाठी कोणताही अॅप नाही"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कॉल केल्याने आपला विद्यमान कॉल डिस्कनेक्ट केला जाईल."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"सुरु ठेवा"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"कॅमेरा परवानगी चालू केली"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ms/strings.xml b/java/com/android/dialer/util/res/values-ms/strings.xml
index d149cc5..5f9d36b 100644
--- a/java/com/android/dialer/util/res/values-ms/strings.xml
+++ b/java/com/android/dialer/util/res/values-ms/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Tiada apl untuk tindakan itu pada peranti ini"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Membuat panggilan WPS akan memutuskan panggilan anda yang sedia ada."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Teruskan"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kebenaran kamera didayakan"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-my/strings.xml b/java/com/android/dialer/util/res/values-my/strings.xml
index 7ec6501..0bb39c4 100644
--- a/java/com/android/dialer/util/res/values-my/strings.xml
+++ b/java/com/android/dialer/util/res/values-my/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ဒီကိရိယာထဲမှာ အဲဒါ့အတွက် app မရှိပါ"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ခေါ်ဆိုပါက သင့်လက်ရှိခေါ်ဆိုမှု ပြတ်တောက်သွားပါမည်။"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ဆက်လုပ်ရန်"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ကင်မရာအသုံးပြုခွင့် ဖွင့်ထားပါသည်"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-nb/strings.xml b/java/com/android/dialer/util/res/values-nb/strings.xml
index 52ae935..de2f405 100644
--- a/java/com/android/dialer/util/res/values-nb/strings.xml
+++ b/java/com/android/dialer/util/res/values-nb/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Det finnes ingen apper for det på denne enheten"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Fortsett"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratillatelsen er slått på"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ne/strings.xml b/java/com/android/dialer/util/res/values-ne/strings.xml
index aedc538..a6da88f 100644
--- a/java/com/android/dialer/util/res/values-ne/strings.xml
+++ b/java/com/android/dialer/util/res/values-ne/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"यस यन्त्रमा त्यसका लागि कुनै पनि अनुप्रयोग छैन"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कल गर्नुले तपाईंको जारी कललाई विच्छेद गर्ने छ।"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"जारी राख्नुहोस्"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"क्यामेरासम्बन्धी अनुमतिलाई सक्षम पारियो"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-nl/strings.xml b/java/com/android/dialer/util/res/values-nl/strings.xml
index a9fc32e..710f853 100644
--- a/java/com/android/dialer/util/res/values-nl/strings.xml
+++ b/java/com/android/dialer/util/res/values-nl/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Daarvoor is geen app beschikbaar op dit apparaat"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Als je een WPS-oproep plaatst, wordt je huidige gesprek afgebroken."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Doorgaan"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Cameramachtiging ingeschakeld"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-no/strings.xml b/java/com/android/dialer/util/res/values-no/strings.xml
index 52ae935..de2f405 100644
--- a/java/com/android/dialer/util/res/values-no/strings.xml
+++ b/java/com/android/dialer/util/res/values-no/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Det finnes ingen apper for det på denne enheten"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Fortsett"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratillatelsen er slått på"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pa/strings.xml b/java/com/android/dialer/util/res/values-pa/strings.xml
index 4ad601f..14d3bee 100644
--- a/java/com/android/dialer/util/res/values-pa/strings.xml
+++ b/java/com/android/dialer/util/res/values-pa/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ਉਸ ਲਈ ਇਸ ਡੀਵਾਈਸ ਤੇ ਕੋਈ ਐਪ ਨਹੀਂ"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"ਇੱਕ WPS ਕਾਲ ਕਰਨਾ ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰ ਦੇਵੇਗਾ।"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pl/strings.xml b/java/com/android/dialer/util/res/values-pl/strings.xml
index c49c55a..45cd546 100644
--- a/java/com/android/dialer/util/res/values-pl/strings.xml
+++ b/java/com/android/dialer/util/res/values-pl/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Na urządzeniu nie ma aplikacji, która mogłaby wykonać tę czynność"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Jeśli nawiążesz połączenie WPS, bieżące połączenie zostanie przerwane."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Dalej"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Uprawnienia do korzystania z aparatu zostały włączone"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
index 04eb8c6..113fc5d 100644
--- a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Nenhum app está disponível para essa ação neste dispositivo"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Fazer uma chamada usando o WPS desconectará a chamada atual."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Permissão de câmera ativada"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
index b902302..9ebb5e1 100644
--- a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Não existe nenhuma aplicação para isso neste dispositivo"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Efetuar uma chamada WPS irá desligar a sua chamada atual."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorização da câmara ativada"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt/strings.xml b/java/com/android/dialer/util/res/values-pt/strings.xml
index 04eb8c6..113fc5d 100644
--- a/java/com/android/dialer/util/res/values-pt/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Nenhum app está disponível para essa ação neste dispositivo"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Fazer uma chamada usando o WPS desconectará a chamada atual."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Permissão de câmera ativada"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ro/strings.xml b/java/com/android/dialer/util/res/values-ro/strings.xml
index 40cbc36..a311fea 100644
--- a/java/com/android/dialer/util/res/values-ro/strings.xml
+++ b/java/com/android/dialer/util/res/values-ro/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Pe dispozitiv nu există nicio aplicație pentru această acțiune"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Dacă inițiați un apel WPS, apelul existent va fi deconectat."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Continuați"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Permisiunea pentru cameră a fost activată."</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ru/strings.xml b/java/com/android/dialer/util/res/values-ru/strings.xml
index c2908f9..de02ccf 100644
--- a/java/com/android/dialer/util/res/values-ru/strings.xml
+++ b/java/com/android/dialer/util/res/values-ru/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"На устройстве нет подходящего приложения"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Если вы начнете WPS-вызов, текущий вызов будет прекращен."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Продолжить"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Доступ к камере разрешен"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-si/strings.xml b/java/com/android/dialer/util/res/values-si/strings.xml
index f7404d7..86ec845 100644
--- a/java/com/android/dialer/util/res/values-si/strings.xml
+++ b/java/com/android/dialer/util/res/values-si/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"මෙම උපාංගයෙහි ඒ සඳහා යෙදුමක් නැත"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ඇමතුමක් කිරීමෙන් ඔබේ දැනට පවතින ඇමතුම විසන්ධි කරනු ඇත."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"දිගටම කරගෙන යන්න"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"කැමරා අවසර සබල කර ඇත"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sk/strings.xml b/java/com/android/dialer/util/res/values-sk/strings.xml
index 4a1ed02..a666950 100644
--- a/java/com/android/dialer/util/res/values-sk/strings.xml
+++ b/java/com/android/dialer/util/res/values-sk/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Na tomto zariadení nie je aplikácia na vykonanie danej akcie"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Uskutočnením hovoru cez WPS prerušíte existujúci hovor."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Pokračovať"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Povolenie pre fotoaparát je aktivované"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sl/strings.xml b/java/com/android/dialer/util/res/values-sl/strings.xml
index e18514d..594cd47 100644
--- a/java/com/android/dialer/util/res/values-sl/strings.xml
+++ b/java/com/android/dialer/util/res/values-sl/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"V tej napravi ni aplikacije za to"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Če začnete klic WPS, bo obstoječi klic prekinjen."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Nadaljuj"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Dovoljenje za dostop do fotoaparata je omogočeno"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sq/strings.xml b/java/com/android/dialer/util/res/values-sq/strings.xml
index 8046d92..ee07161 100644
--- a/java/com/android/dialer/util/res/values-sq/strings.xml
+++ b/java/com/android/dialer/util/res/values-sq/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Nuk ka aplikacion për atë në këtë pajisje"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Kryerja e një telefonate WPS do të shkëputë telefonatën tënde ekzistuese."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Vazhdo"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Leja e kamerës është aktivizuar"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sr/strings.xml b/java/com/android/dialer/util/res/values-sr/strings.xml
index d7de552..7f20ba2 100644
--- a/java/com/android/dialer/util/res/values-sr/strings.xml
+++ b/java/com/android/dialer/util/res/values-sr/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"На овом уређају нема апликација за то"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ако упутите WPS позив, прекинућете постојећи позив."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Настави"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Омогућена је дозвола за камеру"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sv/strings.xml b/java/com/android/dialer/util/res/values-sv/strings.xml
index 5b17b06..e0d2566 100644
--- a/java/com/android/dialer/util/res/values-sv/strings.xml
+++ b/java/com/android/dialer/util/res/values-sv/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Det finns ingen app för detta på enheten"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ringer du ett WPS-samtal kopplas det nuvarande samtalet bort."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Fortsätt"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamerabehörighet har aktiverats"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sw/strings.xml b/java/com/android/dialer/util/res/values-sw/strings.xml
index 8ee6843..5eefb42 100644
--- a/java/com/android/dialer/util/res/values-sw/strings.xml
+++ b/java/com/android/dialer/util/res/values-sw/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Hakuna programu kwa ajili ya hiyo kwenye kifaa hiki"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ukipiga simu ya WPS, simu inayoendelea sasa itakatwa."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Endelea"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Ruhusa ya kufikia kamera imetolewa kiotomatiki"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ta/strings.xml b/java/com/android/dialer/util/res/values-ta/strings.xml
index ed63669..c521eac 100644
--- a/java/com/android/dialer/util/res/values-ta/strings.xml
+++ b/java/com/android/dialer/util/res/values-ta/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"சாதனத்தில் இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவும் இல்லை"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS அழைப்பை மேற்கொண்டால், தற்போது செயலில் உள்ள அழைப்புத் துண்டிக்கப்படும்."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"தொடர்க"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"கேமராவிற்கான அனுமதி இயக்கப்பட்டது"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-te/strings.xml b/java/com/android/dialer/util/res/values-te/strings.xml
index 44c84f5..cb21a9a 100644
--- a/java/com/android/dialer/util/res/values-te/strings.xml
+++ b/java/com/android/dialer/util/res/values-te/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ఈ పరికరంలో దాని కోసం అనువర్తనం ఏదీ లేదు"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS కాల్ చేయడం వలన మీరు ప్రస్తుతం మాట్లాడుతున్న కాల్ డిస్‌కనెక్ట్ అవుతుంది."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"కొనసాగించు"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"కెమెరా అనుమతిని ప్రారంభించాము"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-th/strings.xml b/java/com/android/dialer/util/res/values-th/strings.xml
index f005573..0ed77ad 100644
--- a/java/com/android/dialer/util/res/values-th/strings.xml
+++ b/java/com/android/dialer/util/res/values-th/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"ไม่มีแอปสำหรับการทำงานนั้นบนอุปกรณ์นี้"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"หากคุณโทรผ่านบริการ WPS ตอนนี้ สายที่โทรอยู่จะตัดการเชื่อมต่อ"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"ต่อไป"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"ให้สิทธิ์เข้าถึงกล้องถ่ายรูปแล้ว"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-tl/strings.xml b/java/com/android/dialer/util/res/values-tl/strings.xml
index 73de8b5..6d93b6f 100644
--- a/java/com/android/dialer/util/res/values-tl/strings.xml
+++ b/java/com/android/dialer/util/res/values-tl/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Walang app para doon sa device na ito"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ang paggawa ng WPS na tawag ay puputulin sa koneksyon ang dati mo nang tawag."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Magpatuloy"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Na-enable ang pahintulot sa camera"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-tr/strings.xml b/java/com/android/dialer/util/res/values-tr/strings.xml
index 108b20a..94bfd65 100644
--- a/java/com/android/dialer/util/res/values-tr/strings.xml
+++ b/java/com/android/dialer/util/res/values-tr/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Bu cihazda bu işlem için uygun uygulama yok"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS çağrısı yaparsanız, devam eden çağrı sonlandırılır."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Devam"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera izni etkinleştirildi"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-uk/strings.xml b/java/com/android/dialer/util/res/values-uk/strings.xml
index d57b1de..683a8fb 100644
--- a/java/com/android/dialer/util/res/values-uk/strings.xml
+++ b/java/com/android/dialer/util/res/values-uk/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"На цьому пристрої немає додатка, який може виконати цю дію"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Якщо здійснити виклик WPS, буде роз’єднано поточний виклик."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Продовжити"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Надано доступ до камери"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ur/strings.xml b/java/com/android/dialer/util/res/values-ur/strings.xml
index 7c036d0..bc5ed8c 100644
--- a/java/com/android/dialer/util/res/values-ur/strings.xml
+++ b/java/com/android/dialer/util/res/values-ur/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"اس آلہ پر اس کیلئے کوئی ایپ نہیں ہے"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏WPS کال کرنے سے آپ کی موجودہ کال غیر منسلک ہو جائے گی۔"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"جاری رکھیں"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"کیمرا کی اجازت فعال کر دی گئی"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-uz/strings.xml b/java/com/android/dialer/util/res/values-uz/strings.xml
index 0e28bf7..ba27c3b 100644
--- a/java/com/android/dialer/util/res/values-uz/strings.xml
+++ b/java/com/android/dialer/util/res/values-uz/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Qurilmada buni bajaradigan ilova yo‘q"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-chaqiruv boshlab yuborilsa, hozirgi qo‘ng‘iroq tugatiladi."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Davom ettirish"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameraga kirishga ruxsat berildi"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-vi/strings.xml b/java/com/android/dialer/util/res/values-vi/strings.xml
index 925b91e..880bb2a 100644
--- a/java/com/android/dialer/util/res/values-vi/strings.xml
+++ b/java/com/android/dialer/util/res/values-vi/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Không có ứng dụng nào cho thao tác đó trên thiết bị này"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Việc thực hiện cuộc gọi WPS sẽ ngắt kết nối cuộc gọi hiện có của bạn."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Tiếp tục"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Đã bật quyền sử dụng máy ảnh"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
index 6d3e821..f69981a 100644
--- a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"此设备上没有可执行此操作的应用"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"拨打 WPS 电话会中断现有通话。"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"继续"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"已启用相机使用权限"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
index 2193cfa..a9564f0 100644
--- a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"這部裝置上沒有可用的應用程式"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"撥打 WPS 電話會掛斷現有通話。"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"繼續"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"已啟用相機權限"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
index 1926318..f20779e 100644
--- a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"這個裝置未安裝可執行該操作的應用程式"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"撥打 WPS 電話會中斷你正在進行的通話。"</string>
     <string name="dialog_continue" msgid="4070630558441163574">"繼續"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"已啟用相機權限"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zu/strings.xml b/java/com/android/dialer/util/res/values-zu/strings.xml
index cdc7f89..59a9fd6 100644
--- a/java/com/android/dialer/util/res/values-zu/strings.xml
+++ b/java/com/android/dialer/util/res/values-zu/strings.xml
@@ -23,4 +23,5 @@
     <string name="activity_not_available" msgid="8360067109103762211">"Alukho uhlelo lokusebenza lalokho kule divayisi"</string>
     <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ukwenza ikholi ye-WPS kuzonqamula ikholi yakho ekhona."</string>
     <string name="dialog_continue" msgid="4070630558441163574">"Qhubeka"</string>
+    <string name="camera_privacy_text" msgid="4268584469444688293">"Imvume yekhamera inikwe amandla"</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values/strings.xml b/java/com/android/dialer/util/res/values/strings.xml
index 43ea6e3..a4d944c 100644
--- a/java/com/android/dialer/util/res/values/strings.xml
+++ b/java/com/android/dialer/util/res/values/strings.xml
@@ -39,4 +39,6 @@
   <!-- Text for button which indicates that the user wants to proceed with an action. -->
   <string name="dialog_continue">Continue</string>
 
+  <!-- Text presented to the user explaining that we have enabled the camera permission automatically [CHAR LIMIT=NONE] -->
+  <string name="camera_privacy_text">Camera permission enabled</string>
 </resources>
diff --git a/java/com/android/dialer/voicemail/listui/AndroidManifest.xml b/java/com/android/dialer/voicemail/listui/AndroidManifest.xml
new file mode 100644
index 0000000..ae807bb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ 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.voicemail.listui"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/voicemail/listui/VoicemailFragment.java b/java/com/android/dialer/voicemail/listui/VoicemailFragment.java
new file mode 100644
index 0000000..e2b87a8
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/VoicemailFragment.java
@@ -0,0 +1,35 @@
+/*
+ * 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.voicemail.listui;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/** Fragment for Dialer Voicemail Tab. */
+public final class VoicemailFragment extends Fragment {
+
+  @Nullable
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.voicemail_fragment, container, false);
+  }
+}
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml
new file mode 100644
index 0000000..3b566da
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_fragment.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/voicemail_fragment_text_view"
+      android:text="@string/welcome_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/voicemail/listui/res/values-af/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-af/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-am/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-am/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ar/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ar/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-az/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-az/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-be/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-be/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-be/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-bg/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-bg/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-bn/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-bn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-bs/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-bs/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-bs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ca/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ca/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-cs/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-cs/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-da/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-da/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-de/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-de/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-el/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-el/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-en-rAU/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-en-rGB/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-en-rIN/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-es-rUS/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-es/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-es/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-et/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-et/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-eu/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-eu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-fa/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-fa/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-fi/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-fi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-fr/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-fr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-gl/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-gl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-gu/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-gu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-hi/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-hi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-hr/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-hr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-hu/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-hu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-hy/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-hy/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-in/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-in/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-is/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-is/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-it/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-it/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-iw/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-iw/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ja/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ja/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ka/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ka/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-kk/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-kk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-km/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-km/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-kn/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-kn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ko/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ko/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ky/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ky/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-lo/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-lo/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-lt/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-lt/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-lv/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-lv/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-mk/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-mk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ml/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ml/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-mn/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-mn/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-mr/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-mr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ms/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ms/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-my/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-my/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-nb/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-nb/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ne/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ne/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-nl/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-nl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-no/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-no/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-no/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-pa/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-pa/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-pl/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-pl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-pt/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-pt/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ro/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ro/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ru/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ru/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-si/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-si/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sk/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sl/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sq/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sq/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sr/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sv/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sv/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-sw/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-sw/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ta/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ta/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-te/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-te/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-th/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-th/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-tl/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-tl/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-tr/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-tr/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-uk/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-uk/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-ur/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-ur/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-uz/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-uz/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-vi/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-vi/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values-zu/strings.xml b/java/com/android/dialer/voicemail/listui/res/values-zu/strings.xml
new file mode 100644
index 0000000..b0c27bc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
new file mode 100644
index 0000000..85d4190
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+<resources>
+  <string name="welcome_text" translatable="false">hello world! Welcome to the Voicemail Tab!</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
index a1fc29e..3f519ad 100644
--- a/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
+++ b/java/com/android/dialer/voicemailstatus/VisualVoicemailEnabledChecker.java
@@ -45,7 +45,6 @@
   private SharedPreferences mPrefs;
   private boolean mHasActiveVoicemailProvider;
   private CallLogQueryHandler mCallLogQueryHandler;
-  private VoicemailStatusHelper mVoicemailStatusHelper;
   private Context mContext;
   private Callback mCallback;
 
@@ -53,7 +52,6 @@
     mContext = context;
     mCallback = callback;
     mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-    mVoicemailStatusHelper = new VoicemailStatusHelper();
     mHasActiveVoicemailProvider = mPrefs.getBoolean(PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER, false);
   }
 
@@ -77,7 +75,7 @@
   @Override
   public void onVoicemailStatusFetched(Cursor statusCursor) {
     boolean hasActiveVoicemailProvider =
-        mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0;
+        VoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) > 0;
     if (hasActiveVoicemailProvider != mHasActiveVoicemailProvider) {
       mHasActiveVoicemailProvider = hasActiveVoicemailProvider;
       mPrefs
diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
index 9df45c2..313fc1b 100644
--- a/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
+++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusHelper.java
@@ -21,15 +21,17 @@
 import com.android.dialer.database.VoicemailStatusQuery;
 
 /**
- * Interface used by the call log UI to determine what user message, if any, related to voicemail
+ * Utility used by the call log UI to determine what user message, if any, related to voicemail
  * source status needs to be shown. The messages are returned in the order of importance.
  *
- * <p>The implementation of this interface interacts with the voicemail content provider to fetch
- * statuses of all the registered voicemail sources and determines if any status message needs to be
- * shown. The user of this interface must observe/listen to provider changes and invoke this class
- * to check if any message needs to be shown.
+ * <p>This class interacts with the voicemail content provider to fetch statuses of all the
+ * registered voicemail sources and determines if any status message needs to be shown. The user of
+ * this class must observe/listen to provider changes and invoke this class to check if any message
+ * needs to be shown.
  */
-public class VoicemailStatusHelper {
+public final class VoicemailStatusHelper {
+
+  private VoicemailStatusHelper() {}
 
   /**
    * Returns the number of active voicemail sources installed.
@@ -39,7 +41,7 @@
    * @param cursor The caller is responsible for the life cycle of the cursor and resetting the
    *     position
    */
-  public int getNumberActivityVoicemailSources(Cursor cursor) {
+  public static int getNumberActivityVoicemailSources(Cursor cursor) {
     int count = 0;
     if (!cursor.moveToFirst()) {
       return 0;
@@ -60,8 +62,10 @@
    * activation is attempted, it will transition into CONFIGURING then into OK or other error state,
    * NOT_CONFIGURED is never set through an error.
    */
-  private boolean isVoicemailSourceActive(Cursor cursor) {
+  private static boolean isVoicemailSourceActive(Cursor cursor) {
     return cursor.getString(VoicemailStatusQuery.SOURCE_PACKAGE_INDEX) != null
+        // getInt() returns 0 when null
+        && !cursor.isNull(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX)
         && cursor.getInt(VoicemailStatusQuery.CONFIGURATION_STATE_INDEX)
             != Status.CONFIGURATION_STATE_NOT_CONFIGURED;
   }
diff --git a/java/com/android/dialer/voicemailstatus/res/values-af/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-af/strings.xml
deleted file mode 100644
index 6ef12a4..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-af/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Stemboodskapopdaterings is nie beskikbaar nie"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nuwe stemboodskap wag. Kan nie nou laai nie."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Stel jou stemboodskapdiens op"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Oudio is nie beskikbaar nie"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Stel op"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Bel stemboodskap"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-am/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-am/strings.xml
deleted file mode 100644
index eaae413..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-am/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"የድምጽ መልዕክት ዝማኔ አይገኝም"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"አዲስ የድምጽ መልዕክት በመጠበቅ ላይ። አሁን መጫን አይቻልም።"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"የእርስዎን ድምጽ መልዕክት ያዋቅሩ"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ተሰሚ አይገኝም"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"አዘጋጅ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"የድምፅመልዕክት ደውል"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ar/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ar/strings.xml
deleted file mode 100644
index bfd0779..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ar/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"تحديثات البريد الصوتي غير متاحة"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"ليس هناك بريد صوتي قيد الانتظار. لا يمكن التحميل في الوقت الحالي."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"إعداد البريد الصوتي"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"الصوت غير متاح"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"إعداد"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"اتصال ببريد صوتي..."</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-az/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-az/strings.xml
deleted file mode 100644
index bc62b1c..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-az/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Səsli poçt yeniləmələri mövcud deyil"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Yeni səsli poçt gözləyir. İndi yükləmək mümkün deyil."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Səsli poçtunuzu qurun"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio mövcud deyil"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Quraşdırın"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Səsli poçta zəng edin"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 37aa773..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ažuriranja govorne pošte nisu dostupna"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Imate novu govornu poštu. Trenutno ne može da se učita."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Podesite govornu poštu"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio nije dostupan"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Podesi"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Zovi govornu poštu"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-be/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-be/strings.xml
deleted file mode 100644
index d591887..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-be/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Абнаўленні галасавой пошты недаступныя"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Чакаецца новае галас.паведамленне. Немагчыма загрузіць яго зараз"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Наладзьце сваю галасавую пошту"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аўдыя недаступнае"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Стварыць"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Выкл. гал. пошту"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-bg/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-bg/strings.xml
deleted file mode 100644
index 7b61fa1..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-bg/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Няма налични актуализации на гласовата поща"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Има нова гласова поща, която не може да се зареди в момента."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Настройте гласовата си поща"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Няма звук"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Настройка"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Чуйте гл. си поща"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-bn/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-bn/strings.xml
deleted file mode 100644
index c3378e8..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-bn/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"ভয়েসমেলের আপডেটগুলি অনুপলব্ধ"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"নতুন ভয়েসমেল অপেক্ষা করছে৷ এখনই লোড করা যাবে না৷"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"আপনার ভয়েসমেল সেট আপ করুন"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"অডিও অনুপলব্ধ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"সেট আপ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ভয়েসমেলে কল করুন"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-bs/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-bs/strings.xml
deleted file mode 100644
index 47f002e..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-bs/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ažuriranja govorne pošte nisu dostupna"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nova govorna pošta čeka. Trenutno nije moguće učitati."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Postavite govornu poštu"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Zvuk nije dostupan"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Postavljanje"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Pozovi govornu poštu"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ca/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ca/strings.xml
deleted file mode 100644
index b0c35de..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ca/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"No hi ha cap actualització de correu de veu disponible."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Hi ha un correu de veu nou en espera. Ara no es pot carregar."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configura la bústia de veu."</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"L\'àudio no està disponible."</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configura"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Truca a bústia veu"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-cs/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-cs/strings.xml
deleted file mode 100644
index c9189fb..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-cs/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Aktualizace hlasové schránky nejsou k dispozici."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Máte novou hlasovou zprávu. Aktuálně ji však nelze načíst."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Nastavte si hlasovou schránku."</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Zvuk není k dispozici."</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Nastavit"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Volat hlas. schránku"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-da/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-da/strings.xml
deleted file mode 100644
index aba9070..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-da/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Nye telefonsvarerbeskeder er ikke tilgængelige"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ny telefonsvarerbesked venter. Den kan ikke indlæses lige nu."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfigurer din telefonsvarer"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Lyd er ikke tilgængelig"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfigurer"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ring til tlfsvarer"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-de/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-de/strings.xml
deleted file mode 100644
index 1c1ede1..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-de/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Keine Mailbox-Aktualisierungen verfügbar"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Neue Mailboxnachricht wartet. Laden momentan nicht möglich."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Richte deine Mailbox ein."</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio nicht verfügbar"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Einrichten"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Mailbox anrufen"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-el/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-el/strings.xml
deleted file mode 100644
index 53cdae1..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-el/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Μη διαθέσιμες ενημερώσεις αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Νέο φωνητικό μήνυμα σε αναμονή. Δεν είναι δυνατή η φόρτωση τώρα."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Ρύθμιση του αυτόματου τηλεφωνητή σας"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Δεν υπάρχει διαθέσιμος ήχος"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Ρύθμιση"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Κλήση αυτόμ. τηλεφ."</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-en-rAU/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-en-rAU/strings.xml
deleted file mode 100644
index 53c5701..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Voicemail updates not available"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"New voicemail waiting. Can\'t load right now."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Set up your voicemail"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio not available"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Set up"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Call voicemail"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-en-rGB/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-en-rGB/strings.xml
deleted file mode 100644
index 53c5701..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Voicemail updates not available"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"New voicemail waiting. Can\'t load right now."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Set up your voicemail"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio not available"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Set up"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Call voicemail"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-en-rIN/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-en-rIN/strings.xml
deleted file mode 100644
index 53c5701..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Voicemail updates not available"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"New voicemail waiting. Can\'t load right now."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Set up your voicemail"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio not available"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Set up"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Call voicemail"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-es-rUS/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-es-rUS/strings.xml
deleted file mode 100644
index 5a0718c..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"No hay notificaciones disponibles del buzón de voz."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nuevo mensaje de buzón de voz en espera; no se puede cargar."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurar el buzón de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio no disponible"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Llamar buzón de voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-es/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-es/strings.xml
deleted file mode 100644
index df7e7d5..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-es/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Actualizaciones de buzón de voz no disponibles"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nuevo mensaje de voz en espera. No se puede cargar ahora."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurar tu buzón de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio no disponible"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Llamar a buzón de voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-et/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-et/strings.xml
deleted file mode 100644
index 61a7024..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-et/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Kõneposti värskendused ei ole saadaval"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Uus kõnepostiteade. Praegu ei saa seda laadida."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Kõneposti seadistamine"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Heli ei ole saadaval"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Seadistamine"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Helista kõneposti"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-eu/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-eu/strings.xml
deleted file mode 100644
index 21525c8..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-eu/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ez dago erantzungailuaren berririk"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ahots-mezu berri bat duzu zain. Une honetan ezin da kargatu."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfiguratu erantzungailua"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audioa ez dago erabilgarri"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfiguratu"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Deitu erantzungail."</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-fa/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-fa/strings.xml
deleted file mode 100644
index 967a18e..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-fa/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"به‌روزرسانی‌های پست صوتی در دسترس نیستند"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"پست صوتی جدید در انتظار است. در حال حاضر نمی‌تواند بارگیری شود."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"پست صوتی‌تان را تنظیم کنید"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"صوت در دسترس نیست"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"راه‌اندازی"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"تماس با پست صوتی"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-fi/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-fi/strings.xml
deleted file mode 100644
index c4a5c82..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-fi/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Puhelinvastaajan tiedot eivät ole käytettävissä"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Uusia viestejä vastaajassa. Lataus ei onnistu tällä hetkellä."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Määritä puhelinvastaajan asetukset"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Ääni ei ole käytettävissä"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Asetusten määritys"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Soita vastaajaan"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-fr-rCA/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-fr-rCA/strings.xml
deleted file mode 100644
index a243936..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Impossible de mettre à jour la messagerie vocale"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nouveau message vocal. Impossible de le charger pour le moment."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurez votre messagerie vocale"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio non disponible"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurer"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Appeler mess. vocale"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-fr/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-fr/strings.xml
deleted file mode 100644
index 89c3b39..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-fr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Impossible de mettre à jour la messagerie vocale."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nouveau message vocal. Impossible de le charger pour le moment."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurer votre messagerie vocale"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio non disponible"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configuration"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Appeler mess. vocale"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-gl/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-gl/strings.xml
deleted file mode 100644
index ff6036c..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-gl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Actualizacións de correo de voz non dispoñibles"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Novo correo de voz en espera. Non se pode cargar neste momento."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configura o teu correo de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio non dispoñible"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Chamar correo de voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-gu/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-gu/strings.xml
deleted file mode 100644
index 758daa2..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-gu/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"વૉઇસમેઇલ અપડેટ્સ ઉપલબ્ધ નથી"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"નવી વૉઇસમેઇલ રાહ જુએ છે. અત્યારે લોડ કરી શકતાં નથી."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"તમારા વૉઇસમેઇલને સેટ કરો"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ઑડિઓ ઉપલબ્ધ નથી"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"સેટ અપ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"વૉઇસમેઇલ પર કૉલ કરો"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-hi/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-hi/strings.xml
deleted file mode 100644
index 3cfc475..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-hi/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"वॉइसमेल अपडेट उपलब्‍ध नहीं हैं"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"नया वॉइसमेल प्रतीक्षा में है. इस समय लोड नहीं किया जा सकता."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"अपना वॉइसमेल सेट करें"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ऑडियो उपलब्‍ध नहीं है"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"सेट करें"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"वॉयस मेल कॉल करें"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-hr/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-hr/strings.xml
deleted file mode 100644
index be041d6..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-hr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ažuriranja govorne pošte nisu dostupna"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nova govorna pošta na čekanju. Učitavanje zasad nije moguće."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Postavite govornu poštu"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Zvuk nije dostupan"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Postavljanje"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Zovi govornu poštu"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-hu/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-hu/strings.xml
deleted file mode 100644
index eb6df81..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-hu/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Nem érhetők el hangpostafrissítések"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Új hangpostaüzenet várakozik; jelenleg nem lehet betölteni."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Állítsa be hangpostáját"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Nem áll rendelkezésre hang"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Beállítás"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Hangposta hívása"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-hy/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-hy/strings.xml
deleted file mode 100644
index 5998573..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-hy/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ձայնային փոստի տվյալները չի հաջողվում բեռնել"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Նոր ձայնային հաղորդագրություն կա: Այս պահին հնարավոր չէ բեռնել:"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Կարգավորեք ձայնային փոստը"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Ձայնային տարբերակը հասանելի չէ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Կարգավորել"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Միանալ ձայնային փոստին"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-in/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-in/strings.xml
deleted file mode 100644
index a0da219..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-in/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Pembaruan pesan suara tidak tersedia"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Pesan suara baru sedang menunggu. Tidak dapat memuat sekarang."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Siapkan pesan suara"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio tidak tersedia"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Siapkan"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Telepon pesan suara"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-is/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-is/strings.xml
deleted file mode 100644
index 6200c2a..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-is/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Talhólfsuppfærslur ekki í boði"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ný talhólfsskilaboð bíða. Ekki er hægt að hlaða þau eins og er."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Settu upp talhólfið þitt"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Hljóð er ekki í boði"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Uppsetning"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Hringja í talhólf"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-it/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-it/strings.xml
deleted file mode 100644
index 93fa42d..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-it/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Aggiornamenti della segreteria non disponibili"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nuovo messaggio vocale in attesa. Impossibile caricare al momento."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configura la segreteria"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio non disponibile"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Imposta"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Chiama segreteria"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-iw/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-iw/strings.xml
deleted file mode 100644
index 8906ed3..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-iw/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"עדכוני דואר קולי אינם זמינים"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"יש דואר קולי חדש בהמתנה. לא ניתן לטעון כעת."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"הגדר את הדואר הקולי שלך"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"אודיו אינו זמין"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"הגדר"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"התקשר לדואר קולי"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ja/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ja/strings.xml
deleted file mode 100644
index 1143ac7..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ja/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"新着ボイスメールは現在利用できません"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"新着ボイスメールがあります。現在は読み込めません。"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ボイスメールを設定してください"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"音声を利用できません"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"セットアップ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ボイスメール呼び出し"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ka/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ka/strings.xml
deleted file mode 100644
index 2ceb1df..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ka/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"არ არის შესაძლებელი ხმოვანი ფოსტის განახლებები"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"გელოდებათ ახალი ხმოვანი ფოსტა. ახლავე ჩატვირთვა ვერ ხორციელდება."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"დააყენეთ თქვენი ხმოვანი ფოსტა"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"აუდიო არ არის ხელმისაწვდომი"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"კონფიგურაცია"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ხმოვან ფოსტასთან დაკავშირება"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-kk/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-kk/strings.xml
deleted file mode 100644
index 6d6a6d3..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-kk/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Дауыстық пошта жаңартулары қол жетімді емес"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Жаңа дауыстық хабар күтуде. Дәл қазір жүктеу мүмкін емес."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Дауыс-хабарды реттеу"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудио қол жетімді емес"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Орнату"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Дауыс-хабарға қоңырау шалу"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-km/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-km/strings.xml
deleted file mode 100644
index 6016518..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-km/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"មិនមានការអាប់ដេតសារជាសម្លេងទេ"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"សារជាសម្លេងថ្មីកំពុងរង់ចាំ។ មិនអាចផ្ទុកឥឡូវនេះបានទេ។"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ដំឡើងសារជាសម្លេងរបស់អ្នក"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"មិនមានសម្លេងទេ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"រៀបចំ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ហៅ​ជា​សារ​សំឡេង"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-kn/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-kn/strings.xml
deleted file mode 100644
index d2ea2a0..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-kn/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"ಧ್ವನಿಮೇಲ್‌ ಅಪ್‌ಡೇಟ್‌ಗಳು ಇದೀಗ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"ಹೊಸ ಧ್ವನಿಮೇಲ್ ಕಾಯುತ್ತಿದೆ. ಇದೀಗ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಿ"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ಆಡಿಯೋ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ಹೊಂದಿಸು"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ಧ್ವನಿಮೇಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ko/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ko/strings.xml
deleted file mode 100644
index 0a552ae..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ko/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"음성사서함 업데이트를 사용할 수 없습니다."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"새로운 음성사서함이 대기 중이지만 현재 로드할 수 없습니다."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"음성사서함 설정"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"오디오가 지원되지 않습니다."</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"설정"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"음성사서함 연결"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ky/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ky/strings.xml
deleted file mode 100644
index 5705404..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ky/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Үн почтасынын жаңыртуулары жеткиликтүү эмес"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Жаңы үн почтасы күтүүдө. Учурда жүктөлбөй жатат."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Үн почтаңызды орнотуңуз"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудио жеткиликтүү эмес"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Тууралоо"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Үнкатка чалуу"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-lo/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-lo/strings.xml
deleted file mode 100644
index fd112b7..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-lo/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"ບໍ່​ມີ​ການ​ອັບ​ເດດ​ຂໍ້​ຄວາມ​ສຽງ​ຢູ່"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"ຂໍ້​ຄວາມ​ສຽງ​ໃໝ່​ລໍ​ຖ້າ​ຢູ່. ບໍ່​ສາ​ມາດ​ໂຫຼດ​ໄດ້​ໃນ​ເວ​ລາ​ນີ້."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ຕັ້ງ​ຂໍ້​ຄວາມ​ສຽງ​ຂອງ​ທ່ານ"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ບໍ່​ມີ​ສຽງ​ຢູ່"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ຕັ້ງຄ່າ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ໂທຫາເບີຂໍ້ຄວາມສຽງ"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-lt/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-lt/strings.xml
deleted file mode 100644
index 9c589f4..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-lt/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Balso pašto naujiniai nepasiekiami"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Laukiantis naujas balso pašto pranešimas. Negalima dabar įkelti."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Nustatykite balso paštą"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Garso įrašas nepasiekiamas"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Nustatyti"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Skamb. į balso pšt."</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-lv/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-lv/strings.xml
deleted file mode 100644
index a57a956..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-lv/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Balss pasta atjauninājumi nav pieejami."</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Saņemti jauni balss pasta ziņojumi. Pašlaik tos nevar ielādēt."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Iestatiet balss pastu."</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio nav pieejams."</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Iestatīt"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Zvanīt balss pastam"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-mk/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-mk/strings.xml
deleted file mode 100644
index a55476f..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-mk/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Не се достапни ажурирања на говорната пошта"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Чека нова говорна пошта. Не може да се вчита во моментов."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Поставете ја говорната пошта"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудио не е достапно"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Постави"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Повикај говорна пошта"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ml/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ml/strings.xml
deleted file mode 100644
index 63e3211..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ml/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റുകൾ ലഭ്യമല്ല"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"പുതിയ വോയ്‌സ്‌മെയിൽ കാത്തിരിക്കുന്നു. ഇപ്പോൾ ലോഡുചെയ്യാനാവില്ല."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുക"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ഓഡിയോ ലഭ്യമല്ല"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"സജ്ജമാക്കുക"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"വോയ്‌സ്‌മെയിൽ വിളിക്കുക"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-mn/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-mn/strings.xml
deleted file mode 100644
index 9458dd6..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-mn/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Дуут шуудангийн шинэчлэлтүүд байхгүй байна"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Шинэ дуут шуудан ирсэн байна. Гэвч одоохондоо ачаалах боломжгүй байна."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Дуут шуудангаа тохируулах"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Дуу байхгүй байна"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Тохируулах"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Дуут шуудан руу залгах"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-mr/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-mr/strings.xml
deleted file mode 100644
index f51905e..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-mr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"व्हॉइसमेल अद्यतने उपलब्ध नाहीत"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"नवीन व्हॉइसमेल प्रतीक्षा करत आहे. आत्ता लोड करू शकत नाही."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"आपला व्हॉइसमेल सेट करा"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ऑडिओ उपलब्ध नाही"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"सेट अप"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"व्हॉइसमेलवर कॉल करा"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ms/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ms/strings.xml
deleted file mode 100644
index d873447..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ms/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Kemas kini mel suara tidak tersedia"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Mel suara baharu sedang menunggu. Tidak dapat memuat sekarang."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Sediakan mel suara anda"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio tidak tersedia"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Menyediakan"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Panggil mel suara"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-my/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-my/strings.xml
deleted file mode 100644
index add88b9..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-my/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"အသံမေးလ် မွမ်းမံမှုများ မရှိ"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"အသံမေးလ် အသစ် စောင့်နေသည်။ ယခုချက်ချင်း တင်မပေးနိုင်ပါ။"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"သင်၏ အသံမေးလ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"အသံ မရှိ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"အစီအမံလုပ်ပါ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"အသံပို့စာစနစ်ခေါ်ရန်"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-nb/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-nb/strings.xml
deleted file mode 100644
index 4665602..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-nb/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Talepostoppdateringer er ikke tilgjengelige"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ny talemelding venter. Kan ikke laste inn akkurat nå."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfigurer taleposten din"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Lyd er ikke tilgjengelig"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfigurer"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ring talepostkasse"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ne/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ne/strings.xml
deleted file mode 100644
index 832a927..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ne/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"भ्वाइस मेल अद्यावधिक उपलब्ध छैन"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"नयाँ भ्वाइस मेल पर्खदै। अहिले नै लोड गर्न सक्दैन।"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"तपाईँको भ्वाइसमेल सेटअप गर्नुहोस्"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"अडियो उपलब्ध  छैन"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"मिलाउनुहोस्"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"भ्वाइसमेल कल गर्नुहोस्"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-nl/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-nl/strings.xml
deleted file mode 100644
index eecdca5..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-nl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Voicemailupdates niet beschikbaar"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Je hebt nieuwe voicemail. Kan nu niet laden."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Je voicemail instellen"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio niet beschikbaar"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Instellen"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Bellen met voicemail"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-no/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-no/strings.xml
deleted file mode 100644
index 4665602..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-no/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Talepostoppdateringer er ikke tilgjengelige"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ny talemelding venter. Kan ikke laste inn akkurat nå."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfigurer taleposten din"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Lyd er ikke tilgjengelig"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfigurer"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ring talepostkasse"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-pa/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-pa/strings.xml
deleted file mode 100644
index d80c32f..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-pa/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"ਵੌਇਸਮੇਲ ਅਪਡੇਟਾਂ ਉਪਲਬਧ ਨਹੀਂ"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"ਨਵੀਂ ਵੌਇਸਮੇਲ ਉਡੀਕ ਰਹੀ ਹੈ। ਹੁਣ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ਆਪਣੀ ਵੌਇਸਮੇਲ ਸੈਟ ਅਪ ਕਰੋ"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ਔਡੀਓ ਉਪਲਬਧ ਨਹੀਂ"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"ਵੌਇਸਮੇਲ ਤੇ ਕਾਲ ਕਰੋ"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-pl/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-pl/strings.xml
deleted file mode 100644
index 1e6bed8..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-pl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Brak aktualizacji o wiadomościach głosowych"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Oczekują nowe wiadomości głosowe. Obecnie nie można ich wczytać."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Skonfiguruj swoją pocztę głosową"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Dźwięk jest niedostępny"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfiguracja"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Połącz z pocztą"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-pt-rBR/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 808cf81..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"As atualizações do correio de voz não estão disponíveis"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Novo correio de voz na espera. Não é possível carregá-lo agora."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configure seu correio de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"O áudio não está disponível"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ligar p/ correio voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-pt-rPT/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-pt-rPT/strings.xml
deleted file mode 100644
index d1d2d21..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Atualizações do correio de voz não disponíveis"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nova mensag. corr. voz a aguardar. Não é poss. carregar agora."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurar o correio de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Áudio não disponível"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Chamar correio de voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-pt/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-pt/strings.xml
deleted file mode 100644
index 808cf81..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-pt/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"As atualizações do correio de voz não estão disponíveis"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Novo correio de voz na espera. Não é possível carregá-lo agora."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configure seu correio de voz"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"O áudio não está disponível"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurar"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ligar p/ correio voz"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ro/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ro/strings.xml
deleted file mode 100644
index 5066b41..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ro/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Nu sunt disponibile actualizări ale mesageriei vocale"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Mesaj vocal nou în așteptare. Nu poate fi încărcat acum."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Configurați mesageria vocală"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Conținutul audio nu este disponibil"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Configurați"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Apel. mesag. vocală"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ru/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ru/strings.xml
deleted file mode 100644
index 00cdb90..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ru/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Не удается загрузить данные голосовой почты"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Не удается загрузить новое голосовое сообщение"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Настройте голосовую почту"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудио недоступно"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Настройка"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Получить почту"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-si/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-si/strings.xml
deleted file mode 100644
index 86e0787..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-si/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"හඬ තැපැල් යාවත්කාලීන ලබාගත නොහැකිය"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"නව හඬ තැපෑලක් පොරොත්තු වෙමින්. මේ දැන් ප්‍රවේශනය කිරීමට නොහැකිය."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ඔබේ හඬ තැපෑල පිහිටුවන්න"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ශ්‍රව්‍ය ලබාගත නොහැකිය"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ස්ථාපනය කරන්න"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"හඬ තැපැල් අමතන්න"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sk/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sk/strings.xml
deleted file mode 100644
index 12b4dc9..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sk/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Aktualizácie hlasovej schránky nie sú k dispozícii"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Nevypočuté hlasové schránky. Momentálne ich nemožno načítať."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Nastavte si hlasovú schránku"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Zvuk nie je k dispozícii"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Nastavenie"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Volať hlas. schránku"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sl/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sl/strings.xml
deleted file mode 100644
index 12a2aef..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Obvestila odzivnika niso na voljo"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"V odzivniku čaka novo sporočilo. Trenutno ga ni mogoče naložiti."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Nastavite odzivnik"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Zvok ni na voljo"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Nastavite odzivnik"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Klicanje glasovne pošte"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sq/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sq/strings.xml
deleted file mode 100644
index 55b7da0..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sq/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Përditësimet e postës zanore nuk mundësohen"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Posta të reja zanore janë në pritje. Nuk mund të ngarkohen tani."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfiguro postën zanore"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audioja nuk mundësohet"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfiguro"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Telefono postën zanore"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sr/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sr/strings.xml
deleted file mode 100644
index 3fff524..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Ажурирања говорне поште нису доступна"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Имате нову говорну пошту. Тренутно не може да се учита."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Подесите говорну пошту"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудио није доступан"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Подеси"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Зови говорну пошту"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sv/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sv/strings.xml
deleted file mode 100644
index 20d7a92..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sv/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Uppdateringar för röstbrevlådan är inte tillgängliga"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ett nytt röstmeddelande väntar. Det går inte att läsa in det för tillfället."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Konfigurera röstbrevlådan"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Ljud är inte tillgängligt"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Konfigurera"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ring röstbrevlådan"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-sw/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-sw/strings.xml
deleted file mode 100644
index defa587..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-sw/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Masasisho ya ujumbe wa sauti hayapatikani"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ujumbe mpya wa sauti unasubiri. Haiwezi kupakia sasa hivi."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Sanidi ujumbe wako wa sauti"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Sauti haipatikana"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Sanidi"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Pigia barua sauti"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ta/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ta/strings.xml
deleted file mode 100644
index 273e1ff..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ta/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"குரலஞ்சல் புதுப்பிப்புகள் இல்லை"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"புதிய குரலஞ்சல் காத்திருக்கிறது. தற்போது ஏற்ற முடியாது."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"குரலஞ்சலை அமைக்கவும்"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ஆடியோ இல்லை"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"அமைப்பு"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"குரலஞ்சலில் அழை"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-te/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-te/strings.xml
deleted file mode 100644
index c69d2a6..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-te/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"వాయిస్ మెయిల్ నవీకరణలు అందుబాటులో లేవు"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"కొత్త వాయిస్ మెయిల్ వేచి ఉంది. ప్రస్తుతం లోడ్ చేయడం సాధ్యపడదు."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"మీ వాయిస్ మెయిల్‌ను సెటప్ చేయండి"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ఆడియో అందుబాటులో లేదు"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"సెటప్ చేయండి"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"వాయిస్ మెయిల్‌కు కాల్ చేయండి"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-th/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-th/strings.xml
deleted file mode 100644
index dac7fbd..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-th/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"ไม่มีการอัปเดตข้อความเสียง"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"มีข้อความเสียงใหม่รออยู่ ไม่สามารถโหลดได้ในขณะนี้"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"ตั้งค่าข้อความเสียง"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"ไม่สามารถใช้เสียงได้"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ตั้งค่า"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"เรียกข้อความเสียง"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-tl/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-tl/strings.xml
deleted file mode 100644
index 1a30c39..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-tl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Walang available na mga update sa voicemail"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"May naghihintay na bagong voicemail. Hindi ma-load sa ngayon."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"I-set up ang iyong voicemail"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Hindi available ang audio"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"I-set up"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Tawagan ang voicemail"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-tr/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-tr/strings.xml
deleted file mode 100644
index dd767e1..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-tr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Sesli mesaj güncellemesi yok"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Yeni sesli mesaj bekliyor. Şu anda yüklenemiyor."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Sesli mesajınızı yapılandırın"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Ses kullanılamıyor"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Yapılandır"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Sesli mesaj ara"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-uk/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-uk/strings.xml
deleted file mode 100644
index b76660e..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-uk/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Нові повідомлення голосової пошти недоступні"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Є нове повідомлення голосової пошти. Помилка завантаження."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Налаштуйте голосову пошту"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Аудіо недоступне"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Налаштувати"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Дзвон.на голос.пошту"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-ur/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-ur/strings.xml
deleted file mode 100644
index 61b3d1d..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-ur/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"صوتی میل کی اپ ڈیٹس دستیاب نہیں ہیں"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"نئے صوتی میل کے منتظر۔ ابھی لوڈ نہیں کیا جا سکتا۔"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"اپنے صوتی میل کو ترتیب دیں"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"آڈیو دستیاب نہیں ہے"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"ترتیب دیں"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"صوتی میل کو کال کریں"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-uz/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-uz/strings.xml
deleted file mode 100644
index 965c923..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-uz/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Yangi ovozli xabarlar yo‘q"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Yangi ovozli xabar kutib turibdi. Uni hozir yuklab bo‘lmaydi."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Ovozli pochtangizni sozlang"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Audio mavjud emas"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Sozlash"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Ovoz xabarga qo‘ng‘."</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-vi/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-vi/strings.xml
deleted file mode 100644
index 1fd8ff3..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-vi/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Không có cập nhật thư thoại"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Đang chờ thư thoại mới. Không thể tải ngay bây giờ."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Thiết lập thư thoại của bạn"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Không có âm thanh"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Thiết lập"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Gọi thư thoại"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-zh-rCN/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-zh-rCN/strings.xml
deleted file mode 100644
index dd8eb2d..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"无法更新语音信箱"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"您有新的语音邮件，但目前无法加载。"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"设置您的语音信箱"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"无法播放音频"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"设置"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"呼叫语音信箱"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-zh-rHK/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-zh-rHK/strings.xml
deleted file mode 100644
index a8dd28d..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"無法更新留言"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"有新留言，但目前無法載入。"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"設定您的留言信箱"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"無法使用音效"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"設定"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"致電留言信箱號碼"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-zh-rTW/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-zh-rTW/strings.xml
deleted file mode 100644
index fc75d87..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"沒有新的語音留言"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"您有新的語音留言，但目前無法載入。"</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"設定您的語音留言"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"無法存取音訊"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"設定"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"撥打語音信箱號碼"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values-zu/strings.xml b/java/com/android/dialer/voicemailstatus/res/values-zu/strings.xml
deleted file mode 100644
index 3d1e876..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values-zu/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 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
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_status_voicemail_not_available" msgid="5853033558114540057">"Izibuyekezo zevoyisimeyili azitholakali"</string>
-    <string name="voicemail_status_messages_waiting" msgid="8900895357460505877">"Ivoyisimeyili entsha ilindile. Ayikwazi ukulayisha khona manje."</string>
-    <string name="voicemail_status_configure_voicemail" msgid="8642831215097798709">"Setha ivoyisimeyili yakho"</string>
-    <string name="voicemail_status_audio_not_available" msgid="2341871147130931237">"Umsindo awutholakali"</string>
-    <string name="voicemail_status_action_configure" msgid="4445818528232235329">"Setha"</string>
-    <string name="voicemail_status_action_call_server" msgid="3189606267631644507">"Shayela ivoyisimeyili"</string>
-</resources>
diff --git a/java/com/android/dialer/voicemailstatus/res/values/strings.xml b/java/com/android/dialer/voicemailstatus/res/values/strings.xml
deleted file mode 100644
index 495ddf2..0000000
--- a/java/com/android/dialer/voicemailstatus/res/values/strings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 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
-  -->
-
-<resources>
-
-  <!--  Voicemail status message shown at the top of call log to notify the user that no new
-  voicemails are currently available. This can happen when both notification as well as data
-  connection to the voicemail server is lost. [CHAR LIMIT=64] -->
-  <string name="voicemail_status_voicemail_not_available">Voicemail updates not available</string>
-  <!--  Voicemail status message shown at the top of call log to notify the user that there is no
-    data connection to the voicemail server, but there are new voicemails waiting on the server.
-    [CHAR LIMIT=64] -->
-  <string name="voicemail_status_messages_waiting">New voicemail waiting. Can\'t load right now.</string>
-  <!--  Voicemail status message shown at the top of call log to invite the user to configure
-  visual voicemail. [CHAR LIMIT=64] -->
-  <string name="voicemail_status_configure_voicemail">Set up your voicemail</string>
-  <!--  Voicemail status message shown at the top of call details screen to notify the user that
-  the audio of this voicemail is not available. [CHAR LIMIT=64] -->
-  <string name="voicemail_status_audio_not_available">Audio not available</string>
-
-  <!--  User action prompt shown next to a voicemail status message to let the user configure
-  visual voicemail. [CHAR LIMIT=20] -->
-  <string name="voicemail_status_action_configure">Set up</string>
-  <!--  User action prompt shown next to a voicemail status message to let the user call voicemail
-  server directly to listen to the voicemails. [CHAR LIMIT=20] -->
-  <string name="voicemail_status_action_call_server">Call voicemail</string>
-
-</resources>
diff --git a/java/com/android/dialer/widget/DialerToolbar.java b/java/com/android/dialer/widget/DialerToolbar.java
index 9e10583..fe0e861 100644
--- a/java/com/android/dialer/widget/DialerToolbar.java
+++ b/java/com/android/dialer/widget/DialerToolbar.java
@@ -41,6 +41,11 @@
     setNavigationIcon(R.drawable.quantum_ic_close_white_24);
     setNavigationContentDescription(R.string.toolbar_close);
     setNavigationOnClickListener(v -> ((Activity) context).finish());
+    setPaddingRelative(
+        getPaddingStart(),
+        getPaddingTop(),
+        getResources().getDimensionPixelSize(R.dimen.toolbar_end_padding),
+        getPaddingBottom());
   }
 
   @Override
diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java
new file mode 100644
index 0000000..a76ab98
--- /dev/null
+++ b/java/com/android/dialer/widget/EmptyContentView.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2015 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.widget;
+
+import android.content.Context;
+import android.support.annotation.StringRes;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class EmptyContentView extends LinearLayout implements View.OnClickListener {
+
+  /** Listener to call when action button is clicked. */
+  public interface OnEmptyViewActionButtonClickedListener {
+    void onEmptyViewActionButtonClicked();
+  }
+
+  public static final int NO_LABEL = 0;
+  public static final int NO_IMAGE = 0;
+
+  private ImageView mImageView;
+  private TextView mDescriptionView;
+  private TextView mActionView;
+  private OnEmptyViewActionButtonClickedListener mOnActionButtonClickedListener;
+
+  private @StringRes int actionLabel;
+
+  public EmptyContentView(Context context) {
+    this(context, null);
+  }
+
+  public EmptyContentView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public EmptyContentView(Context context, AttributeSet attrs, int defStyleAttr) {
+    this(context, attrs, defStyleAttr, 0);
+  }
+
+  public EmptyContentView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    inflateLayout();
+
+    // Don't let touches fall through the empty view.
+    setClickable(true);
+    mImageView = (ImageView) findViewById(R.id.empty_list_view_image);
+    mDescriptionView = (TextView) findViewById(R.id.empty_list_view_message);
+    mActionView = (TextView) findViewById(R.id.empty_list_view_action);
+    mActionView.setOnClickListener(this);
+  }
+
+  public void setDescription(int resourceId) {
+    if (resourceId == NO_LABEL) {
+      mDescriptionView.setText(null);
+      mDescriptionView.setVisibility(View.GONE);
+    } else {
+      mDescriptionView.setText(resourceId);
+      mDescriptionView.setVisibility(View.VISIBLE);
+    }
+  }
+
+  public void setImage(int resourceId) {
+    if (resourceId == NO_LABEL) {
+      mImageView.setImageDrawable(null);
+      mImageView.setVisibility(View.GONE);
+    } else {
+      mImageView.setImageResource(resourceId);
+      mImageView.setVisibility(View.VISIBLE);
+    }
+  }
+
+  public void setActionLabel(@StringRes int resourceId) {
+    actionLabel = resourceId;
+    if (resourceId == NO_LABEL) {
+      mActionView.setText(null);
+      mActionView.setVisibility(View.GONE);
+    } else {
+      mActionView.setText(resourceId);
+      mActionView.setVisibility(View.VISIBLE);
+    }
+  }
+
+  public @StringRes int getActionLabel() {
+    return actionLabel;
+  }
+
+  public boolean isShowingContent() {
+    return mImageView.getVisibility() == View.VISIBLE
+        || mDescriptionView.getVisibility() == View.VISIBLE
+        || mActionView.getVisibility() == View.VISIBLE;
+  }
+
+  public void setActionClickedListener(OnEmptyViewActionButtonClickedListener listener) {
+    mOnActionButtonClickedListener = listener;
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (mOnActionButtonClickedListener != null) {
+      mOnActionButtonClickedListener.onEmptyViewActionButtonClicked();
+    }
+  }
+
+  protected void inflateLayout() {
+    setOrientation(LinearLayout.VERTICAL);
+    final LayoutInflater inflater =
+        (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    inflater.inflate(R.layout.empty_content_view, this);
+  }
+}
diff --git a/java/com/android/dialer/widget/LockableViewPager.java b/java/com/android/dialer/widget/LockableViewPager.java
new file mode 100644
index 0000000..b5d4022
--- /dev/null
+++ b/java/com/android/dialer/widget/LockableViewPager.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 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.widget;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/** {@link ViewPager} useful for disabled swiping between pages. */
+public class LockableViewPager extends ViewPager {
+
+  private boolean swipingLocked;
+
+  public LockableViewPager(Context context, AttributeSet attributeSet) {
+    super(context, attributeSet);
+  }
+
+  public void setSwipingLocked(boolean swipingLocked) {
+    this.swipingLocked = swipingLocked;
+  }
+
+  public boolean isSwipingLocked() {
+    return swipingLocked;
+  }
+
+  @Override
+  public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
+    return !swipingLocked && super.onInterceptTouchEvent(motionEvent);
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent motionEvent) {
+    return !swipingLocked && super.onTouchEvent(motionEvent);
+  }
+}
diff --git a/java/com/android/dialer/widget/MessageFragment.java b/java/com/android/dialer/widget/MessageFragment.java
index b136f47..7a0fcfd 100644
--- a/java/com/android/dialer/widget/MessageFragment.java
+++ b/java/com/android/dialer/widget/MessageFragment.java
@@ -23,6 +23,7 @@
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -31,11 +32,13 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 
 /** Fragment used to compose call with message fragment. */
-public class MessageFragment extends Fragment implements OnClickListener, TextWatcher {
+public class MessageFragment extends Fragment
+    implements OnClickListener, TextWatcher, OnEditorActionListener {
   private static final String CHAR_LIMIT_KEY = "char_limit";
   private static final String SHOW_SEND_ICON_KEY = "show_send_icon";
   private static final String MESSAGE_LIST_KEY = "message_list";
@@ -69,7 +72,7 @@
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.fragment_message, container, false);
 
-    sendMessage = (ImageView) view.findViewById(R.id.send_message);
+    sendMessage = view.findViewById(R.id.send_message);
     sendMessageContainer = view.findViewById(R.id.count_and_send_container);
     if (getArguments().getBoolean(SHOW_SEND_ICON_KEY, false)) {
       sendMessage.setVisibility(View.VISIBLE);
@@ -77,18 +80,19 @@
       sendMessageContainer.setOnClickListener(this);
     }
 
-    customMessage = (EditText) view.findViewById(R.id.custom_message);
+    customMessage = view.findViewById(R.id.custom_message);
     customMessage.addTextChangedListener(this);
+    customMessage.setOnEditorActionListener(this);
     charLimit = getArguments().getInt(CHAR_LIMIT_KEY, NO_CHAR_LIMIT);
     if (charLimit != NO_CHAR_LIMIT) {
-      remainingChar = (TextView) view.findViewById(R.id.remaining_characters);
+      remainingChar = view.findViewById(R.id.remaining_characters);
       remainingChar.setVisibility(View.VISIBLE);
-      remainingChar = (TextView) view.findViewById(R.id.remaining_characters);
-      remainingChar.setText("" + charLimit);
+      remainingChar = view.findViewById(R.id.remaining_characters);
+      remainingChar.setText(Integer.toString(charLimit));
       customMessage.setFilters(new InputFilter[] {new InputFilter.LengthFilter(charLimit)});
     }
 
-    LinearLayout messageContainer = (LinearLayout) view.findViewById(R.id.message_container);
+    LinearLayout messageContainer = view.findViewById(R.id.message_container);
     for (String message : getArguments().getStringArray(MESSAGE_LIST_KEY)) {
       TextView textView = (TextView) inflater.inflate(R.layout.selectable_text_view, null);
       textView.setOnClickListener(this);
@@ -123,11 +127,19 @@
   @Override
   public void afterTextChanged(Editable s) {
     if (charLimit != NO_CHAR_LIMIT) {
-      remainingChar.setText("" + (charLimit - s.length()));
+      remainingChar.setText(Integer.toString(charLimit - s.length()));
     }
     getListener().onMessageFragmentAfterTextChange(s.toString());
   }
 
+  @Override
+  public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+    if (!TextUtils.isEmpty(getMessage())) {
+      getListener().onMessageFragmentSendMessage(getMessage());
+    }
+    return true;
+  }
+
   private Listener getListener() {
     return FragmentUtils.getParentUnsafe(this, Listener.class);
   }
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-hdpi/empty_contacts.png
rename to java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-mdpi/empty_contacts.png
rename to java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xhdpi/empty_contacts.png
rename to java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xxhdpi/empty_contacts.png
rename to java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png
similarity index 100%
rename from java/com/android/dialer/app/res/drawable-xxxhdpi/empty_contacts.png
rename to java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
new file mode 100644
index 0000000..00344bf
--- /dev/null
+++ b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+  <ImageView
+      android:id="@+id/empty_list_view_image"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1"
+      android:maxHeight="126dp"
+      android:gravity="center_horizontal"/>
+
+  <TextView
+      android:id="@+id/empty_list_view_message"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="8dp"
+      android:paddingBottom="8dp"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp"
+      android:gravity="center_horizontal|top"
+      android:textColor="@color/empty_list_text_color"
+      android:textSize="@dimen/empty_list_message_text_size"/>
+
+  <TextView
+      android:id="@+id/empty_list_view_action"
+      style="@style/TextActionStyle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:paddingTop="8dp"
+      android:paddingBottom="8dp"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp"
+      android:background="?android:attr/selectableItemBackground"
+      android:clickable="true"
+      android:gravity="center_horizontal"/>
+
+  <Space
+      android:layout_width="match_parent"
+      android:layout_height="40dp"/>
+
+</merge>
diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
index c4aac65..023b0ff 100644
--- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
+++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
@@ -29,7 +29,9 @@
         android:gravity="top"
         android:textSize="@dimen/toolbar_title_text_size"
         android:textColor="@color/background_dialer_white"
-        android:fontFamily="sans-serif-medium"/>
+        android:fontFamily="sans-serif-medium"
+        android:maxLines="1"
+        android:ellipsize="end"/>
 
     <TextView
         android:id="@+id/subtitle"
@@ -37,6 +39,8 @@
         android:layout_height="wrap_content"
         android:textSize="@dimen/toolbar_subtitle_text_size"
         android:textColor="@color/background_dialer_white"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        android:maxLines="1"
+        android:ellipsize="end"/>
   </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
new file mode 100644
index 0000000..1777443
--- /dev/null
+++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+  <ImageView
+    android:id="@+id/empty_list_view_image"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"/>
+
+  <TextView
+    android:id="@+id/empty_list_view_message"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:gravity="center_horizontal|top"
+    android:textColor="@color/empty_list_text_color"
+    android:textSize="@dimen/empty_list_message_text_size"/>
+
+  <TextView
+    android:id="@+id/empty_list_view_action"
+    style="@style/TextActionStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:gravity="center_horizontal"/>
+
+  <Space
+    android:layout_width="match_parent"
+    android:layout_height="40dp"/>
+
+</merge>
diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml
index e39e03a..bdb85fa 100644
--- a/java/com/android/dialer/widget/res/layout/fragment_message.xml
+++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml
@@ -14,28 +14,36 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<LinearLayout
+<RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:gravity="bottom"
   android:background="@color/background_dialer_white">
 
-  <LinearLayout
-    android:id="@+id/message_container"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+  <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_above="@+id/divider">
+
+    <LinearLayout
+      android:id="@+id/message_container"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+  </ScrollView>
 
   <View
+    android:id="@+id/divider"
     android:layout_width="match_parent"
     android:layout_height="@dimen/message_divider_height"
-    android:background="#12000000"/>
+    android:background="#12000000"
+    android:layout_above="@+id/edittext_container"/>
 
   <RelativeLayout
+    android:id="@+id/edittext_container"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true">
 
     <EditText
       android:id="@+id/custom_message"
@@ -48,7 +56,9 @@
       android:textColorHint="@color/dialer_edit_text_hint_color"
       android:background="@color/background_dialer_white"
       android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
-      android:layout_toStartOf="@+id/count_and_send_container"/>
+      android:layout_toStartOf="@+id/count_and_send_container"
+      android:inputType="textShortMessage|textCapSentences"
+      android:imeOptions="flagNoExtractUi|actionSend"/>
 
     <LinearLayout
       android:id="@+id/count_and_send_container"
@@ -78,4 +88,4 @@
         android:textColor="@color/dialer_edit_text_hint_color"/>
     </LinearLayout>
   </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values-af/strings.xml b/java/com/android/dialer/widget/res/values-af/strings.xml
index 7c5e83a..0c21ae9 100644
--- a/java/com/android/dialer/widget/res/values-af/strings.xml
+++ b/java/com/android/dialer/widget/res/values-af/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skryf \'n gepasmaakte boodskap"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Maak toe"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Jy het nog nie enige kontakte nie"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skep nuwe kontak"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Skakel aan"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Skakel die kontaktetoestemming aan om jou kontakte te sien."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Geen kontakte-program beskikbaar nie"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-am/strings.xml b/java/com/android/dialer/widget/res/values-am/strings.xml
index f11b468..8c2ae43 100644
--- a/java/com/android/dialer/widget/res/values-am/strings.xml
+++ b/java/com/android/dialer/widget/res/values-am/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ብጁ መልዕክት ይጻፉ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ዝጋ"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ገና ምንም እውቂያዎች የሉዎትም"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"አዲስ እውቂያ ይፍጠሩ"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"አብራ"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"የእርስዎን እውቂያዎች ለማየት፣ የእውቂያዎች ፍቃዱን ያብሩ።"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"ምንም የእውቂያዎች መተግበሪያ አይገኝም"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ar/strings.xml b/java/com/android/dialer/widget/res/values-ar/strings.xml
index cb2e733..26ed748 100644
--- a/java/com/android/dialer/widget/res/values-ar/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ar/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"كتابة رسالة مخصصة"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"إغلاق"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ليست لديك أية جهات اتصال حتى الآن"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"إنشاء جهة اتصال"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"تشغيل"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"للاطلاع على جهات الاتصال، شغِّل إذن جهات الاتصال."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"لا يتوفر تطبيق لجهات الاتصال"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-az/strings.xml b/java/com/android/dialer/widget/res/values-az/strings.xml
index 3860a58..aa3344d 100644
--- a/java/com/android/dialer/widget/res/values-az/strings.xml
+++ b/java/com/android/dialer/widget/res/values-az/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Fərdi mesaj yazın"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Bağlayın"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Hələ heç bir kontakt yoxdur"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yeni kontakt yaradın"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktiv edin"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktları görmək üçün Kontakt icazəsini aktiv edin."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontakt tətbiqi əlçatan deyil"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
index daefd90..fea3cb0 100644
--- a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvorite"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Još uvek nemate nijedan kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Napravi novi kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste videli kontakte, uključite dozvolu za Kontakte."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nema dostupne aplikacije za kontakte"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-be/strings.xml b/java/com/android/dialer/widget/res/values-be/strings.xml
index 8786132..3e3b370 100644
--- a/java/com/android/dialer/widget/res/values-be/strings.xml
+++ b/java/com/android/dialer/widget/res/values-be/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напісаць карыстальніцкае паведамленне"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрыць"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"У вас пакуль няма ніякіх кантактаў"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Новы кантакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Уключыць"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Каб бачыць свае кантакты, уключыце дазвол для Кантактаў."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Праграмы для аперацый з кантактамі няма"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bg/strings.xml b/java/com/android/dialer/widget/res/values-bg/strings.xml
index 35e980c..fbb87d0 100644
--- a/java/com/android/dialer/widget/res/values-bg/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bg/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напишете свое съобщение"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затваряне"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Още нямате контакти"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Създаване на нов контакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Включване"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"За да видите контактите си, включете разрешението за Контакти."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Няма налично приложение за контакти"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bn/strings.xml b/java/com/android/dialer/widget/res/values-bn/strings.xml
index 9e17071..58bf44c 100644
--- a/java/com/android/dialer/widget/res/values-bn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bn/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"একটি কাস্টম বার্তা লিখুন"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"বন্ধ করুন"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"আপনার এখনও পর্যন্ত কোনো পরিচিতি নেই"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"নতুন পরিচিতি তৈরি করুন"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"চালু করুন"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"আপনার পরিচিতিগুলি দেখতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"কোনো পরিচিতি অ্যাপ্লিকেশান উপলব্ধ নয়"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bs/strings.xml b/java/com/android/dialer/widget/res/values-bs/strings.xml
index 0bc1a9c..539d5b4 100644
--- a/java/com/android/dialer/widget/res/values-bs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bs/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvori"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Kreiraj novi kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Da vidite kontakte, uključite dozvolu za Kontakte."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ca/strings.xml b/java/com/android/dialer/widget/res/values-ca/strings.xml
index 8639300..3b24947 100644
--- a/java/com/android/dialer/widget/res/values-ca/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ca/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escriu un miss. personalitzat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tanca"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Encara no tens cap contacte"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crea un contacte"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activa"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Activa el permís Contactes per veure els teus contactes."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No hi ha cap contacte disponible"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-cs/strings.xml b/java/com/android/dialer/widget/res/values-cs/strings.xml
index 829aab8..b2cbd5b 100644
--- a/java/com/android/dialer/widget/res/values-cs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-cs/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napište vlastní zprávu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zavřít"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Zatím nemáte žádné kontakty"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Vytvořit nový kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Povolit"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Pokud chcete zobrazit kontakty, povolte aplikaci přístup ke Kontaktům."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Není k dispozici žádná aplikace pro práci s kontakty"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-da/strings.xml b/java/com/android/dialer/widget/res/values-da/strings.xml
index 9381f36..3f2e844 100644
--- a/java/com/android/dialer/widget/res/values-da/strings.xml
+++ b/java/com/android/dialer/widget/res/values-da/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv en tilpasset besked"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Luk"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har endnu ikke nogen kontaktpersoner"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opret ny kontaktperson"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå til"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Slå tilladelsen Kontaktpersoner til for at se dine kontaktpersoner."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Der er ingen tilgængelig app til kontaktpersoner"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-de/strings.xml b/java/com/android/dialer/widget/res/values-de/strings.xml
index 949fe9e..f650df9 100644
--- a/java/com/android/dialer/widget/res/values-de/strings.xml
+++ b/java/com/android/dialer/widget/res/values-de/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Eigene Nachricht schreiben"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Schließen"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Du hast noch keine Kontakte"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Neuen Kontakt erstellen"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivieren"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Aktiviere die Berechtigung \"Kontakte\", um deine Kontakte abzurufen."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Keine Kontakte-App verfügbar"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-el/strings.xml b/java/com/android/dialer/widget/res/values-el/strings.xml
index 21e049b..b095c85 100644
--- a/java/com/android/dialer/widget/res/values-el/strings.xml
+++ b/java/com/android/dialer/widget/res/values-el/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Γράψτε ένα προσαρμ. μήνυμα"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Κλείσιμο"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Δεν έχετε επαφές ακόμη"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Δημιουργία νέας επαφής"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ενεργοποίηση"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Για να δείτε τις επαφές σας, ενεργοποιήστε την άδεια πρόσβασης στις Επαφές."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Δεν υπάρχει διαθέσιμη εφαρμογή επαφών"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
index 7f22b46..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
index 7f22b46..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
index 7f22b46..33cba33 100644
--- a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
index c7fbdaa..2d60728 100644
--- a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escribe tu propio mensaje"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear contacto nuevo"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver los contactos, activa el permiso Contactos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No hay ninguna app de contactos disponible"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-es/strings.xml b/java/com/android/dialer/widget/res/values-es/strings.xml
index 507e8af..dcb695e 100644
--- a/java/com/android/dialer/widget/res/values-es/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Mensaje personalizado"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear un contacto"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver tus contactos, activa el permiso de Contactos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"No hay aplicaciones de contactos disponibles"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-et/strings.xml b/java/com/android/dialer/widget/res/values-et/strings.xml
index 71dab42..c67e53e 100644
--- a/java/com/android/dialer/widget/res/values-et/strings.xml
+++ b/java/com/android/dialer/widget/res/values-et/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Kirjutage kohandatud sõnum"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sule"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Teil pole veel kontakte"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Looge uus kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Lülita sisse"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktide vaatamiseks lülitage sisse kontaktide luba."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktide rakendus pole saadaval"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-eu/strings.xml b/java/com/android/dialer/widget/res/values-eu/strings.xml
index b8e4085..2d81cc6 100644
--- a/java/com/android/dialer/widget/res/values-eu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-eu/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Idatzi mezu bat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Itxi"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Oraindik ez duzu kontakturik"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Sortu kontaktu bat"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktibatu"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktuak ikusteko, aktibatu Kontaktuak atzitzeko baimena."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Ez dago kontaktu-aplikaziorik erabilgarri"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fa/strings.xml b/java/com/android/dialer/widget/res/values-fa/strings.xml
index 0c3b1d4..24f78af 100644
--- a/java/com/android/dialer/widget/res/values-fa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fa/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"پیام سفارشی بنویسید"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"بستن"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"هنوز هیچ مخاطبی ندارید"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ایجاد مخاطب جدید"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"فعال‌سازی"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"برای دیدن مخاطبینتان، مجوز «مخاطبین» را روشن کنید."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"هیچ برنامه مخاطبی در دسترس نیست"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fi/strings.xml b/java/com/android/dialer/widget/res/values-fi/strings.xml
index e0e971c..a754079 100644
--- a/java/com/android/dialer/widget/res/values-fi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fi/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Kirjoita oma viesti"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sulje"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Sinulla ei ole vielä yhteystietoja."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Luo uusi yhteystieto"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ota käyttöön"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Jos haluat katsella yhteystietojasi, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Yhteystietosovellusta ei ole käytettävissä."</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
index 9776385..7785509 100644
--- a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Rédiger message personnalisé"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application Contacts n\'est disponible"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fr/strings.xml b/java/com/android/dialer/widget/res/values-fr/strings.xml
index fececd8..be8810f 100644
--- a/java/com/android/dialer/widget/res/values-fr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Écrire mon propre message"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application de gestion des contacts n\'est disponible"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-gl/strings.xml b/java/com/android/dialer/widget/res/values-gl/strings.xml
index 6a75681..a519e68 100644
--- a/java/com/android/dialer/widget/res/values-gl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gl/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escribe unha mensaxe personalizada"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Pechar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Aínda non tes ningún contacto"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear novo contacto"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os teus contactos, activa o permiso de Contactos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Non hai ningunha aplicación de contactos dispoñible"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-gu/strings.xml b/java/com/android/dialer/widget/res/values-gu/strings.xml
index c2f8cf0..81e6f10 100644
--- a/java/com/android/dialer/widget/res/values-gu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gu/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"એક કસ્ટમ સંદેશ લખો"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"બંધ કરો"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"તમે હજી સુધી કોઇપણ સંપર્કો ધરાવતાં નથી"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"નવો સંપર્ક બનાવો"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ચાલુ કરો"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"તમારા સંપર્કો જોવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"કોઈ સંપર્કો ઍપ્લિકેશન ઉપલબ્ધ નથી"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hi/strings.xml b/java/com/android/dialer/widget/res/values-hi/strings.xml
index 63c94e7..622cdca 100644
--- a/java/com/android/dialer/widget/res/values-hi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hi/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"कोई कस्टम संदेश लिखें"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बंद करें"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"आपके पास अभी कोई भी संपर्क नहीं है"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नया संपर्क बनाएं"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करें"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"अपने संपर्क देखने के लिए, संपर्क अनुमति चालू करें."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"कोई भी संपर्क ऐप उपलब्‍ध नहीं है"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hr/strings.xml b/java/com/android/dialer/widget/res/values-hr/strings.xml
index 28a58d4..92fc688 100644
--- a/java/com/android/dialer/widget/res/values-hr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hr/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zatvaranje"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Izradi novi kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste vidjeli svoje kontakte, uključite dopuštenje za kontakte."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hu/strings.xml b/java/com/android/dialer/widget/res/values-hu/strings.xml
index dcd2b36..62d74fb 100644
--- a/java/com/android/dialer/widget/res/values-hu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hu/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Egyéni üzenet írása"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Bezárás"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Még nem rendelkezik egyetlen névjeggyel sem"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Új névjegy"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Bekapcsolás"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"A névjegyek megtekintéséhez kapcsolja be a Névjegyek engedélyt."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nincs elérhető névjegykezelő alkalmazás"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hy/strings.xml b/java/com/android/dialer/widget/res/values-hy/strings.xml
index 7b78bb2..95d0b73 100644
--- a/java/com/android/dialer/widget/res/values-hy/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hy/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Գրել տեքստն ինքնուրույն"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Փակել"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Դեռ կոնտակտներ չունեք"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ստեղծել նոր կոնտակտ"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Միացնել"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Ձեր կոնտակտները տեսնելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Կոնտակտների հավելված չկա"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-in/strings.xml b/java/com/android/dialer/widget/res/values-in/strings.xml
index b4b6550..90017b0 100644
--- a/java/com/android/dialer/widget/res/values-in/strings.xml
+++ b/java/com/android/dialer/widget/res/values-in/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Tulis pesan khusus"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum memiliki kontak"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Buat kontak baru"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktifkan"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kontak, aktifkan izin Kontak."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Aplikasi kontak tidak tersedia"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-is/strings.xml b/java/com/android/dialer/widget/res/values-is/strings.xml
index fd84419..de7664d 100644
--- a/java/com/android/dialer/widget/res/values-is/strings.xml
+++ b/java/com/android/dialer/widget/res/values-is/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skrifa sérsniðin skilaboð"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Loka"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Þú ert ekki með neina tengiliði enn sem komið er"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Búa til nýjan tengilið"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Kveikja"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kveiktu á tengiliðaheimildinni til að sjá tengiliðina þína."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Ekkert tengiliðaforrit í boði"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-it/strings.xml b/java/com/android/dialer/widget/res/values-it/strings.xml
index 0af3fd2..36022ce 100644
--- a/java/com/android/dialer/widget/res/values-it/strings.xml
+++ b/java/com/android/dialer/widget/res/values-it/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Scrivi un messaggio personalizzato"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Chiudi"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Nessun contatto disponibile"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crea nuovo contatto"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Attiva"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Per accedere ai tuoi contatti, attiva l\'autorizzazione Contatti."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nessuna app di contatti disponibile"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-iw/strings.xml b/java/com/android/dialer/widget/res/values-iw/strings.xml
index a485888..48bf219 100644
--- a/java/com/android/dialer/widget/res/values-iw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-iw/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"כתוב הודעה מותאמת אישית"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"סגירה"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"עדיין אין לך אנשי קשר"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"איש קשר חדש"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"הפעלה"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"עליך להפעיל את ההרשאה \'אנשי קשר\' כדי להציג את אנשי הקשר שלך."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"אין אף אפליקציה לניהול אנשי קשר"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ja/strings.xml b/java/com/android/dialer/widget/res/values-ja/strings.xml
index 9fd65a8..99eb93b 100644
--- a/java/com/android/dialer/widget/res/values-ja/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ja/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"カスタム メッセージを入力"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"閉じる"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"連絡先はまだありません"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"新しい連絡先を作成"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ON にする"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"連絡先を表示するには、連絡先へのアクセスを許可する設定を ON にしてください。"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"利用できる連絡先アプリがありません"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ka/strings.xml b/java/com/android/dialer/widget/res/values-ka/strings.xml
index 6dde044..6645a38 100644
--- a/java/com/android/dialer/widget/res/values-ka/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ka/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"დაწერეთ მორგებ. შეტყობინება"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"დახურვა"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"კონტაქტები ჯერ არ გაქვთ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ახალი კონტაქტის შექმნა"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ჩართვა"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"კონტაქტების სანახავად ჩართეთ კონტაქტების ნებართვა."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"კონტაქტების აპი მიუწვდომელია"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-kk/strings.xml b/java/com/android/dialer/widget/res/values-kk/strings.xml
index 334d915..e3793ae 100644
--- a/java/com/android/dialer/widget/res/values-kk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kk/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Арнаулы хабар жазу"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Жабу"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Әлі ешқандай контактілер жоқ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Жаңа контакт қосу"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Қосу"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Контактілерді көру үшін \"Контактілер\" рұқсатын қосыңыз."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Контактілер қолданбасы қолжетімді емес"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-km/strings.xml b/java/com/android/dialer/widget/res/values-km/strings.xml
index d0f5633..6739f0d 100644
--- a/java/com/android/dialer/widget/res/values-km/strings.xml
+++ b/java/com/android/dialer/widget/res/values-km/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"សរសេរ​សារ​ផ្ទាល់ខ្លួន"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"បិទ"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"អ្នកមិនទាន់មានទំនាក់ទំនងនៅឡើយទេ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"បង្កើត​ទំនាក់ទំនង​ថ្មី"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"បើក"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"ដើម្បីមើលទំនាក់ទំនងរបស់អ្នក សូមបើកការ​អនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"មិនមានកម្មវិធីទំនាក់ទំនងទេ"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-kn/strings.xml b/java/com/android/dialer/widget/res/values-kn/strings.xml
index 3535bfc..45f879a 100644
--- a/java/com/android/dialer/widget/res/values-kn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kn/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ಮುಚ್ಚಿ"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ನಿಮ್ಮ ಬಳಿ ಇನ್ನೂ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ಆನ್ ಮಾಡಿ"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ko/strings.xml b/java/com/android/dialer/widget/res/values-ko/strings.xml
index 8c00cea..0827d36 100644
--- a/java/com/android/dialer/widget/res/values-ko/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ko/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"맞춤 메시지를 작성하세요."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"닫기"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"아직 연락처가 없습니다."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"새 연락처 만들기"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"사용"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"연락처를 보려면 연락처에 액세스할 권한을 부여하세요."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"사용할 수 있는 연락처 앱이 없습니다."</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ky/strings.xml b/java/com/android/dialer/widget/res/values-ky/strings.xml
index 46ea851..3413b57 100644
--- a/java/com/android/dialer/widget/res/values-ky/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ky/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Башка билдирүүнү жазыңыз"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Жабуу"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Азырынча эч байланышыңыз жок"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Жаңы байланыш түзүү"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Күйгүзүү"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Байланыштарыңызды көрүү үчүн, \"Байланыштар\" уруксатын күйгүзүңүз."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Жеткиликтүү байланыштар колдонмосу жок"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lo/strings.xml b/java/com/android/dialer/widget/res/values-lo/strings.xml
index 0db64a7..8b7e476 100644
--- a/java/com/android/dialer/widget/res/values-lo/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lo/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ປິດ"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ທ່ານຍັງບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ເທື່ອ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ເປີດໃຊ້"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"ເພື່ອເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"ບໍ່ມີແອັບລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດໃຊ້ໄດ້"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lt/strings.xml b/java/com/android/dialer/widget/res/values-lt/strings.xml
index a10b91e..30cc0ad 100644
--- a/java/com/android/dialer/widget/res/values-lt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lt/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Parašykite tinkintą praneš."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Uždaryti"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Dar neturite jokių kontaktų"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Sukurti naują kontaktą"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Įjungti"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Jei norite peržiūrėti kontaktus, įjunkite Kontaktų leidimą."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nepasiekiama jokia kontaktų programa"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lv/strings.xml b/java/com/android/dialer/widget/res/values-lv/strings.xml
index 8ff0793..6245835 100644
--- a/java/com/android/dialer/widget/res/values-lv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lv/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Rakstīt pielāgotu ziņojumu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Aizvērt"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Jums vēl nav nevienas kontaktpersonas."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Izveidot jaunu kontaktpersonu"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ieslēgt"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Lai skatītu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nav pieejama neviena kontaktpersonu lietotne."</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mk/strings.xml b/java/com/android/dialer/widget/res/values-mk/strings.xml
index aa9be30..108cf7a 100644
--- a/java/com/android/dialer/widget/res/values-mk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mk/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напиши приспособена порака"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затвори"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Сè уште немате контакти"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Создајте нов контакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Вклучи"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"За да ги видите контактите, вклучете ја дозволата за контакти."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Нема достапна апликација за контакти"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ml/strings.xml b/java/com/android/dialer/widget/res/values-ml/strings.xml
index b52ee40..1cbb3f4 100644
--- a/java/com/android/dialer/widget/res/values-ml/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ml/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"അടയ്‌ക്കുക"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"നിങ്ങൾക്ക് ഇതുവരെയും കോൺടാക്റ്റുകൾ ഒന്നുമില്ല."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"പുതിയ കോൺടാക്‌റ്റ് സൃഷ്‌ടിക്കൂ"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ഓൺ ചെയ്യുക"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ കാണുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"കോൺടാക്റ്റ് അപ്ലിക്കേഷനൊന്നും ലഭ്യമല്ല"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mn/strings.xml b/java/com/android/dialer/widget/res/values-mn/strings.xml
index 6bdad89..e5f5c21 100644
--- a/java/com/android/dialer/widget/res/values-mn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mn/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Тусгай зурвас бичих"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Хаах"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Танд одоогоор харилцагч байхгүй байна"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Шинэ харилцагч үүсгэх"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Асаах"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Харилцагчдаа харахын тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Ямар ч харилцагчдын апликейшн байхгүй байна"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mr/strings.xml b/java/com/android/dialer/widget/res/values-mr/strings.xml
index 5661fa8..63239d2 100644
--- a/java/com/android/dialer/widget/res/values-mr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mr/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"एक सानुकूल संदेश लिहा"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बंद करा"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"आपल्‍याकडे अद्याप कोणतेही संपर्क नाहीत"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नवीन संपर्क तयार करा"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करा"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"आपले संपर्क पाहण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"कोणताही संपर्क अॅप उपलब्ध नाही"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ms/strings.xml b/java/com/android/dialer/widget/res/values-ms/strings.xml
index 8889ccc..cf61fc1 100644
--- a/java/com/android/dialer/widget/res/values-ms/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ms/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Tulis mesej tersuai"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum mempunyai sebarang kenalan"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Buat kenalan baharu"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Hidupkan"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kenalan anda, hidupkan kebenaran Kenalan."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Tiada apl kenalan yang tersedia"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-my/strings.xml b/java/com/android/dialer/widget/res/values-my/strings.xml
index 9a69f29..5d3d9eb 100644
--- a/java/com/android/dialer/widget/res/values-my/strings.xml
+++ b/java/com/android/dialer/widget/res/values-my/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ပိတ်ရန်"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"သင့်တွင် မည်သည့်အဆက်အသွယ်မျှ မရှိသေးပါ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"အဆက်အသွယ်အသစ် ပြုလုပ်ရန်"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ဖွင့်ရန်"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"အဆက်အသွယ်များကိုကြည့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"အဆက်အသွယ်များ app မရှိပါ"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-nb/strings.xml b/java/com/android/dialer/widget/res/values-nb/strings.xml
index 100156b..6665efe 100644
--- a/java/com/android/dialer/widget/res/values-nb/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nb/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opprett en ny kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ne/strings.xml b/java/com/android/dialer/widget/res/values-ne/strings.xml
index abb8bb0..e1f6e95 100644
--- a/java/com/android/dialer/widget/res/values-ne/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ne/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"आफू अनुकूल सन्देश लेख्‍ने"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"बन्द गर्नुहोस्"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"अहिलेसम्म तपाईंसँग कुनै सम्पर्कहरू छैनन्"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"सक्रिय गर्नुहोस्"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"आफ्ना सम्पर्कहरू हेर्न सम्पर्क सम्बन्धी अनुमतिलाई सक्रिय गर्नुहोस्।"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"सम्पर्क सम्बन्धी कुनै अनुप्रयोग उपलब्ध छैन"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-nl/strings.xml b/java/com/android/dialer/widget/res/values-nl/strings.xml
index 5560288..036be47 100644
--- a/java/com/android/dialer/widget/res/values-nl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nl/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Schrijf zelf een bericht"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Sluiten"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Je hebt nog geen contacten"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Nieuw contact maken"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Inschakelen"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Als je je contacten wilt bekijken, schakel je de machtiging voor Contacten in."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Geen app voor contacten beschikbaar"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-no/strings.xml b/java/com/android/dialer/widget/res/values-no/strings.xml
index 100156b..6665efe 100644
--- a/java/com/android/dialer/widget/res/values-no/strings.xml
+++ b/java/com/android/dialer/widget/res/values-no/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opprett en ny kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pa/strings.xml b/java/com/android/dialer/widget/res/values-pa/strings.xml
index 4c69c2c..14b7b41 100644
--- a/java/com/android/dialer/widget/res/values-pa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pa/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੰਦੇਸ਼ ਲਿਖੋ"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ਬੰਦ ਕਰੋ"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ਚਾਲੂ ਕਰੋ"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"ਕੋਈ ਸੰਪਰਕ ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pl/strings.xml b/java/com/android/dialer/widget/res/values-pl/strings.xml
index cec7a40..3f0668c 100644
--- a/java/com/android/dialer/widget/res/values-pl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pl/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Wpisz wiadomość"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zamknij"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Nie masz jeszcze żadnych kontaktów"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Utwórz nowy kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Włącz"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Aby zobaczyć swoje kontakty, włącz uprawnienia Kontakty."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nie jest dostępna żadna aplikacja do obsługi kontaktów"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
index b15bfac..a6371a7 100644
--- a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contato"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
index ece2ef2..fa206fb 100644
--- a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva uma mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Ainda não tem nenhum contacto"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contacto"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os seus contactos, ative a autorização Contactos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Não existe nenhuma aplicação de contactos disponível"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt/strings.xml b/java/com/android/dialer/widget/res/values-pt/strings.xml
index b15bfac..a6371a7 100644
--- a/java/com/android/dialer/widget/res/values-pt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contato"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ro/strings.xml b/java/com/android/dialer/widget/res/values-ro/strings.xml
index 753b920..bc15805 100644
--- a/java/com/android/dialer/widget/res/values-ro/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ro/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Scrieți mesaj personalizat"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Închideți"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Nu aveți încă persoane de contact."</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Creați o intrare nouă"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activați"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Pentru a vedea persoanele de contact, activați permisiunea pentru Agendă."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nu este disponibilă nicio aplicație pentru agendă"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ru/strings.xml b/java/com/android/dialer/widget/res/values-ru/strings.xml
index bdebd3c..12b8257 100644
--- a/java/com/android/dialer/widget/res/values-ru/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ru/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Добавьте свой текст"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрыть"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Контактов нет"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Создать контакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Предоставить разрешение"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Чтобы открыть список контактов, предоставьте приложению разрешение \"Контакты\"."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Нет приложения для работы с контактами"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-si/strings.xml b/java/com/android/dialer/widget/res/values-si/strings.xml
index 4988259..9870a76 100644
--- a/java/com/android/dialer/widget/res/values-si/strings.xml
+++ b/java/com/android/dialer/widget/res/values-si/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"අභිරුචි පණිවිඩයක් ලියන්න"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"වසන්න"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"ඔබට තවම කිසිදු සම්බන්ධතාවක් නැත"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"නව සම්බන්ධතාවක් තනන්න"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"ඔබේ සම්බන්ධතා බැලීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"සබඳතා යෙදුම ලබා ගැනීමට නොහැකිය"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sk/strings.xml b/java/com/android/dialer/widget/res/values-sk/strings.xml
index 5dc1bd5..5b8596c 100644
--- a/java/com/android/dialer/widget/res/values-sk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sk/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napíšte vlastnú správu"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zavrieť"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Zatiaľ nemáte žiadne kontakty"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Vytvoriť nový kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Zapnúť"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Ak si chcete zobraziť kontakty, zapnite povolenie Kontakty."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nie je k dispozícii žiadna aplikácia na prácu s kontaktmi"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sl/strings.xml b/java/com/android/dialer/widget/res/values-sl/strings.xml
index 0ba965b..1d50619 100644
--- a/java/com/android/dialer/widget/res/values-sl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sl/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Napišite sporočilo po meri"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Zapri"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Nimate še nobenega stika"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ustvari nov stik"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Vklopi"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Če si želite ogledati stike, vklopite dovoljenje za stike."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Na voljo ni nobene aplikacije za stike"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sq/strings.xml b/java/com/android/dialer/widget/res/values-sq/strings.xml
index 7f5e0f2..2666415 100644
--- a/java/com/android/dialer/widget/res/values-sq/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sq/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Shkruaj mesazh të person."</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Mbyll"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Nuk ke ende kontakte"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Krijo një kontakt të ri"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivizo"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Për të parë kontaktet, aktivizo lejen e Kontakteve."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Nuk ka asnjë aplikacion për kontaktet"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sr/strings.xml b/java/com/android/dialer/widget/res/values-sr/strings.xml
index 446c273..c2f269d 100644
--- a/java/com/android/dialer/widget/res/values-sr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sr/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Напишите прилагођену поруку"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Затворите"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Још увек немате ниједан контакт"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Направи нови контакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Укључи"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Да бисте видели контакте, укључите дозволу за Контакте."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Нема доступне апликације за контакте"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sv/strings.xml b/java/com/android/dialer/widget/res/values-sv/strings.xml
index 7d2f44c..75add78 100644
--- a/java/com/android/dialer/widget/res/values-sv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sv/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Skriv anpassat meddelande"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Stäng"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har inga kontakter ännu"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skapa ny kontakt"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivera"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Du måste aktivera behörigheten Kontakter för att visa kontakterna."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Det finns inga appar för kontakter"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sw/strings.xml b/java/com/android/dialer/widget/res/values-sw/strings.xml
index d2c2a97..31539fa 100644
--- a/java/com/android/dialer/widget/res/values-sw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sw/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Andika ujumbe maalum"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Funga"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Bado huna anwani zozote"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ongeza anwani mpya"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Washa"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Ili uone anwani zako, washa ruhusa ya Anwani."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Hakuna programu ya anwani iliyopatikana"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ta/strings.xml b/java/com/android/dialer/widget/res/values-ta/strings.xml
index 4061c16..1733330 100644
--- a/java/com/android/dialer/widget/res/values-ta/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ta/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"தனிப்பயன் செய்தியை எழுதவும்"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"மூடு"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"இதுவரை தொடர்புகள் எதுவுமில்லை"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"புதிய தொடர்பை உருவாக்கு"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"இயக்கு"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"தொடர்புகளைப் பார்க்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"தொடர்புகள் பயன்பாடு எதுவுமில்லை"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-te/strings.xml b/java/com/android/dialer/widget/res/values-te/strings.xml
index c2474b7..27e6b05 100644
--- a/java/com/android/dialer/widget/res/values-te/strings.xml
+++ b/java/com/android/dialer/widget/res/values-te/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"అనుకూల సందేశాన్ని వ్రాయండి"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"మూసివేయి"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"మీకు ఇప్పటికీ పరిచయాలేవీ లేవు"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"కొత్త పరిచయాన్ని సృష్టించండి"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"ఆన్ చేయి"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"మీ పరిచయాలను చూడటానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"పరిచయాల అనువర్తనం ఏదీ అందుబాటులో లేదు"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-th/strings.xml b/java/com/android/dialer/widget/res/values-th/strings.xml
index d450b4b..40134c8 100644
--- a/java/com/android/dialer/widget/res/values-th/strings.xml
+++ b/java/com/android/dialer/widget/res/values-th/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"เขียนข้อความที่กำหนดเอง"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"ปิด"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"คุณยังไม่มีรายชื่อติดต่อ"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"สร้างรายชื่อติดต่อใหม่"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"เปิด"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"หากต้องการดูรายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"ไม่มีแอปรายชื่อติดต่อที่พร้อมใช้งาน"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-tl/strings.xml b/java/com/android/dialer/widget/res/values-tl/strings.xml
index ee7c52f..b114d38 100644
--- a/java/com/android/dialer/widget/res/values-tl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tl/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Sumulat ng custom na mensahe"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Isara"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Wala ka pang sinumang contact"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Gumawa ng bagong contact"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"I-on"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Upang makita ang iyong mga contact, i-on ang pahintulot ng Mga Contact."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Walang available na app ng mga contact"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-tr/strings.xml b/java/com/android/dialer/widget/res/values-tr/strings.xml
index 64e2ea5..6046e17 100644
--- a/java/com/android/dialer/widget/res/values-tr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tr/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Özel bir mesaj yazın"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Kapat"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Henüz hiç kişiniz yok"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yeni kişi oluştur"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Etkinleştir"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kişilerinizi görmek için Kişiler iznini etkinleştirin."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Kullanılabilir kişi uygulaması yok"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-uk/strings.xml b/java/com/android/dialer/widget/res/values-uk/strings.xml
index f8d9bb8..d1a281c 100644
--- a/java/com/android/dialer/widget/res/values-uk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uk/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Ваше власне повідомлення"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Закрити"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Ще немає контактів"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Створити контакт"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Увімкнути"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Щоб переглянути контакти, увімкніть дозвіл \"Контакти\"."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Немає додатка з контактами"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ur/strings.xml b/java/com/android/dialer/widget/res/values-ur/strings.xml
index 6edeb5c..d5dcad0 100644
--- a/java/com/android/dialer/widget/res/values-ur/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ur/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"ایک حسب ضرورت پیغام لکھیں"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"بند کریں"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"آپ کے پاس ابھی تک کوئی رابطے نہیں ہیں"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"نیا رابطہ بنائیں"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"آن کریں"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"اپنے رابطے دیکھنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"رابطوں کی کوئی ایپ دستیاب نہیں ہے"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-uz/strings.xml b/java/com/android/dialer/widget/res/values-uz/strings.xml
index 434464a..d4a11d6 100644
--- a/java/com/android/dialer/widget/res/values-uz/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uz/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Boshqa xabar yozing"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Yopish"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Kontaktlar yo‘q"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yangi kontakt qo‘shish"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ruxsat berish"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktlar ro‘yxatini ko‘rish uchun ilovaga Kontaktlarga kirishga ruxsat bering."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktlarni ochadigan ilova yo‘q"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-vi/strings.xml b/java/com/android/dialer/widget/res/values-vi/strings.xml
index 1a30f7c..18b7091 100644
--- a/java/com/android/dialer/widget/res/values-vi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-vi/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Viết tin nhắn tùy chỉnh"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Đóng"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Bạn chưa có bất kỳ liên hệ nào"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Tạo liên hệ mới"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Bật"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Để xem danh bạ của bạn, bật quyền đối với Danh bạ."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Không có ứng dụng danh bạ"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
index 7999723..4a5e458 100644
--- a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"自行撰写信息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"关闭"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"您还没有任何联系人"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"创建新联系人"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"开启"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"要查看您的联系人，请开启“通讯录”权限。"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"没有可用的通讯录应用"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
index b0bfcc8..3d5fe6e 100644
--- a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"您尚無任何聯絡人"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"建立新聯絡人"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"開放"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看聯絡人，請開放「通訊錄」權限。"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
index b0bfcc8..4bc68f2 100644
--- a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"你還沒有任何聯絡人"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"建立新聯絡人"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"開啟"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看你的聯絡人，請開啟「聯絡人」存取權限。"</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zu/strings.xml b/java/com/android/dialer/widget/res/values-zu/strings.xml
index 074aa58..718bbbd 100644
--- a/java/com/android/dialer/widget/res/values-zu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zu/strings.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="custom_message_hint" msgid="2179012696339457461">"Bhala umlayezo wangokwezifiso"</string>
     <string name="toolbar_close" msgid="1081308076149879833">"Vala"</string>
+    <string name="all_contacts_empty" msgid="4260556610403994011">"Awunabo oxhumana nabo okwamanje"</string>
+    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Dala othintana naye omusha"</string>
+    <string name="permission_single_turn_on" msgid="1306416016676232584">"Vula"</string>
+    <string name="permission_no_contacts" msgid="2388204904477299207">"Ukuze ubone oxhumana nabo, vula imvume yoxhumana nabo."</string>
+    <string name="add_contact_not_available" msgid="3083256438899321502">"Alukho uhlelo lokusebenza loxhumana nabo olutholakalayo"</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values/colors.xml b/java/com/android/dialer/widget/res/values/colors.xml
new file mode 100644
index 0000000..c974609
--- /dev/null
+++ b/java/com/android/dialer/widget/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="empty_list_text_color">#b2b2b2</color>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values/dimens.xml b/java/com/android/dialer/widget/res/values/dimens.xml
index 20393a8..65963a6 100644
--- a/java/com/android/dialer/widget/res/values/dimens.xml
+++ b/java/com/android/dialer/widget/res/values/dimens.xml
@@ -23,7 +23,10 @@
   <dimen name="send_container_width">48dp</dimen>
 
   <dimen name="toolbar_title_text_size">20sp</dimen>
-  <dimen name="toolbar_title_small_text_size">14sp</dimen>
   <dimen name="toolbar_subtitle_text_size">12sp</dimen>
   <dimen name="toolbar_elevation">4dp</dimen>
+  <dimen name="toolbar_end_padding">4dp</dimen>
+
+  <!-- Empty List -->
+  <dimen name="empty_list_message_text_size">16sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values/strings.xml b/java/com/android/dialer/widget/res/values/strings.xml
index a5829bb..74a5f0f 100644
--- a/java/com/android/dialer/widget/res/values/strings.xml
+++ b/java/com/android/dialer/widget/res/values/strings.xml
@@ -1,8 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
 <resources>
   <!-- Hint in a text field to compose a custom message to send with a phone call [CHAR LIMIT=27] -->
   <string name="custom_message_hint">Write a custom message</string>
 
   <!-- Accessibility string for close/navigation icon in DialerToolbar -->
   <string name="toolbar_close">Close</string>
+
+  <!-- [CHAR LIMIT=NONE] Shown when there are no contacts in the all contacts list. -->
+  <string name="all_contacts_empty">You don\'t have any contacts yet</string>
+
+  <!-- [CHAR LIMIT=NONE] Shown as an action when the all contacts list is empty -->
+  <string name="all_contacts_empty_add_contact_action">Create new contact</string>
+
+  <!-- The label of the button used to turn on a single permission [CHAR LIMIT=30]-->
+  <string name="permission_single_turn_on">Turn on</string>
+
+  <!-- Shown as a prompt to turn on the contacts permission to show all contacts [CHAR LIMIT=NONE]-->
+  <string name="permission_no_contacts">To see your contacts, turn on the Contacts permission.</string>
+
+  <!-- Message displayed when there is no application available to handle the add contact menu option. [CHAR LIMIT=NONE] -->
+  <string name="add_contact_not_available">No contacts app available</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialershared/bubble/AndroidManifest.xml b/java/com/android/dialershared/bubble/AndroidManifest.xml
new file mode 100644
index 0000000..1a94aaf
--- /dev/null
+++ b/java/com/android/dialershared/bubble/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialershared.bubble">
+
+  <uses-sdk android:minSdkVersion="21"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+</manifest>
diff --git a/java/com/android/dialershared/bubble/Bubble.java b/java/com/android/dialershared/bubble/Bubble.java
new file mode 100644
index 0000000..cd2c9fc
--- /dev/null
+++ b/java/com/android/dialershared/bubble/Bubble.java
@@ -0,0 +1,879 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.app.PendingIntent.CanceledException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RippleDrawable;
+import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Handler;
+import android.provider.Settings;
+import android.support.annotation.ColorInt;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.graphics.ColorUtils;
+import android.support.v4.os.BuildCompat;
+import android.support.v4.view.animation.FastOutLinearInInterpolator;
+import android.support.v4.view.animation.LinearOutSlowInInterpolator;
+import android.transition.TransitionManager;
+import android.transition.TransitionValues;
+import android.view.ContextThemeWrapper;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.view.ViewPropertyAnimator;
+import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
+import android.view.animation.AnticipateInterpolator;
+import android.view.animation.OvershootInterpolator;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.ViewAnimator;
+import com.android.dialershared.bubble.BubbleInfo.Action;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
+/**
+ * Creates and manages a bubble window from information in a {@link BubbleInfo}. Before creating, be
+ * sure to check whether bubbles may be shown using {@link #canShowBubbles(Context)} and request
+ * permission if necessary ({@link #getRequestPermissionIntent(Context)} is provided for
+ * convenience)
+ */
+public class Bubble {
+  // This class has some odd behavior that is not immediately obvious in order to avoid jank when
+  // resizing. See http://go/bubble-resize for details.
+
+  // How long text should show after showText(CharSequence) is called
+  private static final int SHOW_TEXT_DURATION_MILLIS = 3000;
+  // How long the new window should show before destroying the old one during resize operations.
+  // This ensures the new window has had time to draw first.
+  private static final int WINDOW_REDRAW_DELAY_MILLIS = 50;
+
+  private static Boolean canShowBubblesForTesting = null;
+
+  private final Context context;
+  private final WindowManager windowManager;
+
+  private final Handler handler = new Handler();
+
+  private LayoutParams windowParams;
+
+  // Initialized in factory method
+  @SuppressWarnings("NullableProblems")
+  @NonNull
+  private BubbleInfo currentInfo;
+
+  @Visibility private int visibility;
+  private boolean expanded;
+  private boolean textShowing;
+  private boolean hideAfterText;
+  private int collapseEndAction;
+
+  @VisibleForTesting ViewHolder viewHolder;
+  private ViewPropertyAnimator collapseAnimation;
+  private Integer overrideGravity;
+  private ViewPropertyAnimator exitAnimator;
+
+  private BubbleExpansionStateListener bubbleExpansionStateListener;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({CollapseEnd.NOTHING, CollapseEnd.HIDE})
+  private @interface CollapseEnd {
+    int NOTHING = 0;
+    int HIDE = 1;
+  }
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({Visibility.ENTERING, Visibility.SHOWING, Visibility.EXITING, Visibility.HIDDEN})
+  private @interface Visibility {
+    int HIDDEN = 0;
+    int ENTERING = 1;
+    int SHOWING = 2;
+    int EXITING = 3;
+  }
+
+  /** Indicate bubble expansion state. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ExpansionState.START_EXPANDING, ExpansionState.START_COLLAPSING})
+  public @interface ExpansionState {
+    // TODO(yueg): add more states when needed
+    int START_EXPANDING = 0;
+    int START_COLLAPSING = 1;
+  }
+
+  /**
+   * Determines whether bubbles can be shown based on permissions obtained. This should be checked
+   * before attempting to create a Bubble.
+   *
+   * @return true iff bubbles are able to be shown.
+   * @see Settings#canDrawOverlays(Context)
+   */
+  public static boolean canShowBubbles(@NonNull Context context) {
+    return canShowBubblesForTesting != null
+        ? canShowBubblesForTesting
+        : VERSION.SDK_INT < VERSION_CODES.M || Settings.canDrawOverlays(context);
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void setCanShowBubblesForTesting(boolean canShowBubbles) {
+    canShowBubblesForTesting = canShowBubbles;
+  }
+
+  /** Returns an Intent to request permission to show overlays */
+  @NonNull
+  public static Intent getRequestPermissionIntent(@NonNull Context context) {
+    return new Intent(
+        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+        Uri.fromParts("package", context.getPackageName(), null));
+  }
+
+  /** Creates instances of Bubble. The default implementation just calls the constructor. */
+  @VisibleForTesting
+  public interface BubbleFactory {
+    Bubble createBubble(@NonNull Context context);
+  }
+
+  private static BubbleFactory bubbleFactory = Bubble::new;
+
+  public static Bubble createBubble(@NonNull Context context, @NonNull BubbleInfo info) {
+    Bubble bubble = bubbleFactory.createBubble(context);
+    bubble.setBubbleInfo(info);
+    return bubble;
+  }
+
+  @VisibleForTesting
+  public static void setBubbleFactory(@NonNull BubbleFactory bubbleFactory) {
+    Bubble.bubbleFactory = bubbleFactory;
+  }
+
+  @VisibleForTesting
+  public static void resetBubbleFactory() {
+    Bubble.bubbleFactory = Bubble::new;
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  Bubble(@NonNull Context context) {
+    context = new ContextThemeWrapper(context, R.style.Theme_AppCompat);
+    this.context = context;
+    windowManager = context.getSystemService(WindowManager.class);
+
+    viewHolder = new ViewHolder(context);
+  }
+
+  /**
+   * Make the bubble visible. Will show a short entrance animation as it enters. If the bubble is
+   * already showing this method does nothing.
+   */
+  public void show() {
+    if (collapseEndAction == CollapseEnd.HIDE) {
+      // If show() was called while collapsing, make sure we don't hide after.
+      collapseEndAction = CollapseEnd.NOTHING;
+    }
+    if (visibility == Visibility.SHOWING || visibility == Visibility.ENTERING) {
+      return;
+    }
+
+    hideAfterText = false;
+
+    if (windowParams == null) {
+      // Apps targeting O+ must use TYPE_APPLICATION_OVERLAY, which is not available prior to O.
+      @SuppressWarnings("deprecation")
+      @SuppressLint("InlinedApi")
+      int type =
+          BuildCompat.isAtLeastO()
+              ? LayoutParams.TYPE_APPLICATION_OVERLAY
+              : LayoutParams.TYPE_PHONE;
+
+      windowParams =
+          new LayoutParams(
+              type,
+              LayoutParams.FLAG_NOT_TOUCH_MODAL
+                  | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
+                  | LayoutParams.FLAG_NOT_FOCUSABLE
+                  | LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+              PixelFormat.TRANSLUCENT);
+      windowParams.gravity = Gravity.TOP | Gravity.LEFT;
+      windowParams.x = context.getResources().getDimensionPixelOffset(R.dimen.bubble_safe_margin_x);
+      windowParams.y = currentInfo.getStartingYPosition();
+      windowParams.height = LayoutParams.WRAP_CONTENT;
+      windowParams.width = LayoutParams.WRAP_CONTENT;
+    }
+
+    if (exitAnimator != null) {
+      exitAnimator.cancel();
+      exitAnimator = null;
+    } else {
+      windowManager.addView(viewHolder.getRoot(), windowParams);
+      viewHolder.getPrimaryButton().setScaleX(0);
+      viewHolder.getPrimaryButton().setScaleY(0);
+    }
+
+    visibility = Visibility.ENTERING;
+    viewHolder
+        .getPrimaryButton()
+        .animate()
+        .setInterpolator(new OvershootInterpolator())
+        .scaleX(1)
+        .scaleY(1)
+        .withEndAction(() -> visibility = Visibility.SHOWING)
+        .start();
+
+    updatePrimaryIconAnimation();
+  }
+
+  /** Hide the bubble. */
+  public void hide() {
+    if (hideAfterText) {
+      // hideAndReset() will be called after showing text, do nothing here.
+      return;
+    }
+    hideHelper(this::defaultAfterHidingAnimation);
+  }
+
+  /** Hide the bubble and reset {@viewHolder} to initial state */
+  public void hideAndReset() {
+    hideHelper(
+        () -> {
+          defaultAfterHidingAnimation();
+          reset();
+        });
+  }
+
+  /** Returns whether the bubble is currently visible */
+  public boolean isVisible() {
+    return visibility == Visibility.SHOWING
+        || visibility == Visibility.ENTERING
+        || visibility == Visibility.EXITING;
+  }
+
+  /**
+   * Set the info for this Bubble to display
+   *
+   * @param bubbleInfo the BubbleInfo to display in this Bubble.
+   */
+  public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {
+    currentInfo = bubbleInfo;
+    update();
+  }
+
+  /**
+   * Update the state and behavior of actions.
+   *
+   * @param actions the new state of the bubble's actions
+   */
+  public void updateActions(@NonNull List<Action> actions) {
+    currentInfo = BubbleInfo.from(currentInfo).setActions(actions).build();
+    updateButtonStates();
+  }
+
+  /** Returns the currently displayed BubbleInfo */
+  public BubbleInfo getBubbleInfo() {
+    return currentInfo;
+  }
+
+  /**
+   * Display text in the main bubble. The bubble's drawer is not expandable while text is showing,
+   * and the drawer will be closed if already open.
+   *
+   * @param text the text to display to the user
+   */
+  public void showText(@NonNull CharSequence text) {
+    textShowing = true;
+    if (expanded) {
+      startCollapse(CollapseEnd.NOTHING);
+      doShowText(text);
+    } else {
+      // Need to transition from old bounds to new bounds manually
+      ChangeOnScreenBounds transition = new ChangeOnScreenBounds();
+      // Prepare and capture start values
+      TransitionValues startValues = new TransitionValues();
+      startValues.view = viewHolder.getPrimaryButton();
+      transition.addTarget(startValues.view);
+      transition.captureStartValues(startValues);
+
+      doResize(
+          () -> {
+            doShowText(text);
+            // Hide the text so we can animate it in
+            viewHolder.getPrimaryText().setAlpha(0);
+
+            ViewAnimator primaryButton = viewHolder.getPrimaryButton();
+            // Cancel the automatic transition scheduled in doShowText
+            TransitionManager.endTransitions((ViewGroup) primaryButton.getParent());
+            primaryButton
+                .getViewTreeObserver()
+                .addOnPreDrawListener(
+                    new OnPreDrawListener() {
+                      @Override
+                      public boolean onPreDraw() {
+                        primaryButton.getViewTreeObserver().removeOnPreDrawListener(this);
+
+                        // Prepare and capture end values, always use the size of primaryText since
+                        // its invisibility makes primaryButton smaller than expected
+                        TransitionValues endValues = new TransitionValues();
+                        endValues.values.put(
+                            ChangeOnScreenBounds.PROPNAME_WIDTH,
+                            viewHolder.getPrimaryText().getWidth());
+                        endValues.values.put(
+                            ChangeOnScreenBounds.PROPNAME_HEIGHT,
+                            viewHolder.getPrimaryText().getHeight());
+                        endValues.view = primaryButton;
+                        transition.addTarget(endValues.view);
+                        transition.captureEndValues(endValues);
+
+                        // animate the primary button bounds change
+                        Animator bounds =
+                            transition.createAnimator(primaryButton, startValues, endValues);
+
+                        // Animate the text in
+                        Animator alpha =
+                            ObjectAnimator.ofFloat(viewHolder.getPrimaryText(), View.ALPHA, 1f);
+
+                        AnimatorSet set = new AnimatorSet();
+                        set.play(bounds).before(alpha);
+                        set.start();
+                        return false;
+                      }
+                    });
+          });
+    }
+    handler.removeCallbacks(null);
+    handler.postDelayed(
+        () -> {
+          textShowing = false;
+          if (hideAfterText) {
+            // Always reset here since text shouldn't keep showing.
+            hideAndReset();
+          } else {
+            doResize(
+                () -> viewHolder.getPrimaryButton().setDisplayedChild(ViewHolder.CHILD_INDEX_ICON));
+          }
+        },
+        SHOW_TEXT_DURATION_MILLIS);
+  }
+
+  public void setBubbleExpansionStateListener(
+      BubbleExpansionStateListener bubbleExpansionStateListener) {
+    this.bubbleExpansionStateListener = bubbleExpansionStateListener;
+  }
+
+  @Nullable
+  Integer getGravityOverride() {
+    return overrideGravity;
+  }
+
+  void onMoveStart() {
+    startCollapse(CollapseEnd.NOTHING);
+    viewHolder
+        .getPrimaryButton()
+        .animate()
+        .translationZ(
+            context.getResources().getDimensionPixelOffset(R.dimen.bubble_move_elevation_change));
+  }
+
+  void onMoveFinish() {
+    viewHolder.getPrimaryButton().animate().translationZ(0);
+    // If it's GONE, no resize is necessary. If it's VISIBLE, it will get cleaned up when the
+    // collapse animation finishes
+    if (viewHolder.getExpandedView().getVisibility() == View.INVISIBLE) {
+      doResize(null);
+    }
+  }
+
+  void primaryButtonClick() {
+    if (expanded || textShowing || currentInfo.getActions().isEmpty()) {
+      try {
+        currentInfo.getPrimaryIntent().send();
+      } catch (CanceledException e) {
+        throw new RuntimeException(e);
+      }
+      return;
+    }
+
+    if (bubbleExpansionStateListener != null) {
+      bubbleExpansionStateListener.onBubbleExpansionStateChanged(ExpansionState.START_EXPANDING);
+    }
+    doResize(
+        () -> {
+          onLeftRightSwitch(isDrawingFromRight());
+          viewHolder.setDrawerVisibility(View.VISIBLE);
+        });
+    View expandedView = viewHolder.getExpandedView();
+    expandedView
+        .getViewTreeObserver()
+        .addOnPreDrawListener(
+            new OnPreDrawListener() {
+              @Override
+              public boolean onPreDraw() {
+                expandedView.getViewTreeObserver().removeOnPreDrawListener(this);
+                expandedView.setTranslationX(
+                    isDrawingFromRight() ? expandedView.getWidth() : -expandedView.getWidth());
+                expandedView
+                    .animate()
+                    .setInterpolator(new LinearOutSlowInInterpolator())
+                    .translationX(0);
+                return false;
+              }
+            });
+    setFocused(true);
+    expanded = true;
+  }
+
+  void onLeftRightSwitch(boolean onRight) {
+    if (viewHolder.isMoving()) {
+      if (viewHolder.getExpandedView().getVisibility() == View.GONE) {
+        // If the drawer is not part of the layout we don't need to do anything. Layout flips will
+        // happen if necessary when opening the drawer.
+        return;
+      }
+    }
+
+    viewHolder
+        .getRoot()
+        .setLayoutDirection(onRight ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);
+    View primaryContainer = viewHolder.getRoot().findViewById(R.id.bubble_primary_container);
+    ViewGroup.LayoutParams layoutParams = primaryContainer.getLayoutParams();
+    ((FrameLayout.LayoutParams) layoutParams).gravity = onRight ? Gravity.RIGHT : Gravity.LEFT;
+    primaryContainer.setLayoutParams(layoutParams);
+
+    viewHolder
+        .getExpandedView()
+        .setBackgroundResource(
+            onRight
+                ? R.drawable.bubble_background_pill_rtl
+                : R.drawable.bubble_background_pill_ltr);
+  }
+
+  LayoutParams getWindowParams() {
+    return windowParams;
+  }
+
+  View getRootView() {
+    return viewHolder.getRoot();
+  }
+
+  /**
+   * Hide the bubble if visible. Will run a short exit animation and before hiding, and {@code
+   * afterHiding} after hiding. If the bubble is currently showing text, will hide after the text is
+   * done displaying. If the bubble is not visible this method does nothing.
+   */
+  private void hideHelper(Runnable afterHiding) {
+    if (visibility == Visibility.HIDDEN || visibility == Visibility.EXITING) {
+      return;
+    }
+
+    if (textShowing) {
+      hideAfterText = true;
+      return;
+    }
+
+    if (collapseAnimation != null) {
+      collapseEndAction = CollapseEnd.HIDE;
+      return;
+    }
+
+    if (expanded) {
+      startCollapse(CollapseEnd.HIDE);
+      return;
+    }
+
+    visibility = Visibility.EXITING;
+    exitAnimator =
+        viewHolder
+            .getPrimaryButton()
+            .animate()
+            .setInterpolator(new AnticipateInterpolator())
+            .scaleX(0)
+            .scaleY(0)
+            .withEndAction(afterHiding);
+    exitAnimator.start();
+  }
+
+  private void reset() {
+    viewHolder = new ViewHolder(viewHolder.getRoot().getContext());
+    update();
+  }
+
+  private void update() {
+    RippleDrawable backgroundRipple =
+        (RippleDrawable)
+            context.getResources().getDrawable(R.drawable.bubble_ripple_circle, context.getTheme());
+    int primaryTint =
+        ColorUtils.compositeColors(
+            context.getColor(R.color.bubble_primary_background_darken),
+            currentInfo.getPrimaryColor());
+    backgroundRipple.getDrawable(0).setTint(primaryTint);
+    viewHolder.getPrimaryButton().setBackground(backgroundRipple);
+
+    setBackgroundDrawable(viewHolder.getFirstButton(), primaryTint);
+    setBackgroundDrawable(viewHolder.getSecondButton(), primaryTint);
+    setBackgroundDrawable(viewHolder.getThirdButton(), primaryTint);
+
+    int numButtons = currentInfo.getActions().size();
+    viewHolder.getThirdButton().setVisibility(numButtons < 3 ? View.GONE : View.VISIBLE);
+    viewHolder.getSecondButton().setVisibility(numButtons < 2 ? View.GONE : View.VISIBLE);
+
+    viewHolder.getPrimaryIcon().setImageIcon(currentInfo.getPrimaryIcon());
+    updatePrimaryIconAnimation();
+
+    viewHolder
+        .getExpandedView()
+        .setBackgroundTintList(ColorStateList.valueOf(currentInfo.getPrimaryColor()));
+
+    updateButtonStates();
+  }
+
+  private void updatePrimaryIconAnimation() {
+    Drawable drawable = viewHolder.getPrimaryIcon().getDrawable();
+    if (drawable instanceof Animatable) {
+      if (isVisible()) {
+        ((Animatable) drawable).start();
+      } else {
+        ((Animatable) drawable).stop();
+      }
+    }
+  }
+
+  private void setBackgroundDrawable(CheckableImageButton view, @ColorInt int color) {
+    RippleDrawable itemRipple =
+        (RippleDrawable)
+            context
+                .getResources()
+                .getDrawable(R.drawable.bubble_ripple_checkable_circle, context.getTheme());
+    itemRipple.getDrawable(0).setTint(color);
+    view.setBackground(itemRipple);
+  }
+
+  private void updateButtonStates() {
+    int numButtons = currentInfo.getActions().size();
+
+    if (numButtons >= 1) {
+      configureButton(currentInfo.getActions().get(0), viewHolder.getFirstButton());
+      if (numButtons >= 2) {
+        configureButton(currentInfo.getActions().get(1), viewHolder.getSecondButton());
+        if (numButtons >= 3) {
+          configureButton(currentInfo.getActions().get(2), viewHolder.getThirdButton());
+        }
+      }
+    }
+  }
+
+  private void doShowText(@NonNull CharSequence text) {
+    TransitionManager.beginDelayedTransition((ViewGroup) viewHolder.getPrimaryButton().getParent());
+    viewHolder.getPrimaryText().setText(text);
+    viewHolder.getPrimaryButton().setDisplayedChild(ViewHolder.CHILD_INDEX_TEXT);
+  }
+
+  private void configureButton(Action action, CheckableImageButton button) {
+    action
+        .getIcon()
+        .loadDrawableAsync(
+            context,
+            d -> {
+              button.setImageIcon(action.getIcon());
+              button.setContentDescription(action.getName());
+              button.setChecked(action.isChecked());
+              button.setEnabled(action.isEnabled());
+            },
+            handler);
+    button.setOnClickListener(v -> doAction(action));
+  }
+
+  private void doAction(Action action) {
+    try {
+      action.getIntent().send();
+    } catch (CanceledException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void doResize(@Nullable Runnable operation) {
+    // If we're resizing on the right side of the screen, there is an implicit move operation
+    // necessary. The WindowManager does not sync the move and resize operations, so serious jank
+    // would occur. To fix this, instead of resizing the window, we create a new one and destroy
+    // the old one. There is a short delay before destroying the old view to ensure the new one has
+    // had time to draw.
+    ViewHolder oldViewHolder = viewHolder;
+    if (isDrawingFromRight()) {
+      viewHolder = new ViewHolder(oldViewHolder.getRoot().getContext());
+      update();
+      viewHolder
+          .getPrimaryButton()
+          .setDisplayedChild(oldViewHolder.getPrimaryButton().getDisplayedChild());
+      viewHolder.getPrimaryText().setText(oldViewHolder.getPrimaryText().getText());
+    }
+
+    if (operation != null) {
+      operation.run();
+    }
+
+    if (isDrawingFromRight()) {
+      swapViewHolders(oldViewHolder);
+    }
+  }
+
+  private void swapViewHolders(ViewHolder oldViewHolder) {
+    oldViewHolder.getShadowProvider().setVisibility(View.GONE);
+    ViewGroup root = viewHolder.getRoot();
+    windowManager.addView(root, windowParams);
+    root.getViewTreeObserver()
+        .addOnPreDrawListener(
+            new OnPreDrawListener() {
+              @Override
+              public boolean onPreDraw() {
+                root.getViewTreeObserver().removeOnPreDrawListener(this);
+                // Wait a bit before removing the old view; make sure the new one has drawn over it.
+                handler.postDelayed(
+                    () -> windowManager.removeView(oldViewHolder.getRoot()),
+                    WINDOW_REDRAW_DELAY_MILLIS);
+                return true;
+              }
+            });
+  }
+
+  private void startCollapse(@CollapseEnd int endAction) {
+    View expandedView = viewHolder.getExpandedView();
+    if (expandedView.getVisibility() != View.VISIBLE || collapseAnimation != null) {
+      // Drawer is already collapsed or animation is running.
+      return;
+    }
+
+    overrideGravity = isDrawingFromRight() ? Gravity.RIGHT : Gravity.LEFT;
+    setFocused(false);
+
+    if (collapseEndAction == CollapseEnd.NOTHING) {
+      collapseEndAction = endAction;
+    }
+    if (bubbleExpansionStateListener != null && collapseEndAction == CollapseEnd.NOTHING) {
+      bubbleExpansionStateListener.onBubbleExpansionStateChanged(ExpansionState.START_COLLAPSING);
+    }
+    collapseAnimation =
+        expandedView
+            .animate()
+            .translationX(isDrawingFromRight() ? expandedView.getWidth() : -expandedView.getWidth())
+            .setInterpolator(new FastOutLinearInInterpolator())
+            .withEndAction(
+                () -> {
+                  collapseAnimation = null;
+                  expanded = false;
+
+                  if (textShowing) {
+                    // Will do resize once the text is done.
+                    return;
+                  }
+
+                  // Hide the drawer and resize if possible.
+                  viewHolder.setDrawerVisibility(View.INVISIBLE);
+                  if (!viewHolder.isMoving() || !isDrawingFromRight()) {
+                    doResize(() -> viewHolder.setDrawerVisibility(View.GONE));
+                  }
+
+                  // If this collapse was to come before a hide, do it now.
+                  if (collapseEndAction == CollapseEnd.HIDE) {
+                    hide();
+                  }
+                  collapseEndAction = CollapseEnd.NOTHING;
+
+                  // Resume normal gravity after any resizing is done.
+                  handler.postDelayed(
+                      () -> {
+                        overrideGravity = null;
+                        if (!viewHolder.isMoving()) {
+                          viewHolder.undoGravityOverride();
+                        }
+                      },
+                      // Need to wait twice as long for resize and layout
+                      WINDOW_REDRAW_DELAY_MILLIS * 2);
+                });
+  }
+
+  private boolean isDrawingFromRight() {
+    return (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
+  }
+
+  private void setFocused(boolean focused) {
+    if (focused) {
+      windowParams.flags &= ~LayoutParams.FLAG_NOT_FOCUSABLE;
+    } else {
+      windowParams.flags |= LayoutParams.FLAG_NOT_FOCUSABLE;
+    }
+    windowManager.updateViewLayout(getRootView(), windowParams);
+  }
+
+  private void defaultAfterHidingAnimation() {
+    exitAnimator = null;
+    windowManager.removeView(viewHolder.getRoot());
+    visibility = Visibility.HIDDEN;
+
+    updatePrimaryIconAnimation();
+  }
+
+  @VisibleForTesting
+  class ViewHolder {
+
+    public static final int CHILD_INDEX_ICON = 0;
+    public static final int CHILD_INDEX_TEXT = 1;
+
+    private MoveHandler moveHandler;
+    private final WindowRoot root;
+    private final ViewAnimator primaryButton;
+    private final ImageView primaryIcon;
+    private final TextView primaryText;
+
+    private final CheckableImageButton firstButton;
+    private final CheckableImageButton secondButton;
+    private final CheckableImageButton thirdButton;
+    private final View expandedView;
+    private final View shadowProvider;
+
+    public ViewHolder(Context context) {
+      // Window root is not in the layout file so that the inflater has a view to inflate into
+      this.root = new WindowRoot(context);
+      LayoutInflater inflater = LayoutInflater.from(root.getContext());
+      View contentView = inflater.inflate(R.layout.bubble_base, root, true);
+      expandedView = contentView.findViewById(R.id.bubble_expanded_layout);
+      primaryButton = contentView.findViewById(R.id.bubble_button_primary);
+      primaryIcon = contentView.findViewById(R.id.bubble_icon_primary);
+      primaryText = contentView.findViewById(R.id.bubble_text);
+      shadowProvider = contentView.findViewById(R.id.bubble_drawer_shadow_provider);
+
+      firstButton = contentView.findViewById(R.id.bubble_icon_first);
+      secondButton = contentView.findViewById(R.id.bubble_icon_second);
+      thirdButton = contentView.findViewById(R.id.bubble_icon_third);
+
+      root.setOnBackPressedListener(
+          () -> {
+            if (visibility == Visibility.SHOWING && expanded) {
+              startCollapse(CollapseEnd.NOTHING);
+              return true;
+            }
+            return false;
+          });
+      root.setOnConfigurationChangedListener(
+          (configuration) -> {
+            // The values in the current MoveHandler may be stale, so replace it. Then ensure the
+            // Window is in bounds
+            moveHandler = new MoveHandler(primaryButton, Bubble.this);
+            moveHandler.snapToBounds();
+          });
+      root.setOnTouchListener(
+          (v, event) -> {
+            if (expanded && event.getActionMasked() == MotionEvent.ACTION_OUTSIDE) {
+              startCollapse(CollapseEnd.NOTHING);
+              return true;
+            }
+            return false;
+          });
+      expandedView
+          .getViewTreeObserver()
+          .addOnDrawListener(
+              () -> {
+                int translationX = (int) expandedView.getTranslationX();
+                int parentOffset =
+                    ((MarginLayoutParams) ((ViewGroup) expandedView.getParent()).getLayoutParams())
+                        .leftMargin;
+                if (isDrawingFromRight()) {
+                  int maxLeft =
+                      shadowProvider.getRight()
+                          - context.getResources().getDimensionPixelSize(R.dimen.bubble_size);
+                  shadowProvider.setLeft(
+                      Math.min(maxLeft, expandedView.getLeft() + translationX + parentOffset));
+                } else {
+                  int minRight =
+                      shadowProvider.getLeft()
+                          + context.getResources().getDimensionPixelSize(R.dimen.bubble_size);
+                  shadowProvider.setRight(
+                      Math.max(minRight, expandedView.getRight() + translationX + parentOffset));
+                }
+              });
+      moveHandler = new MoveHandler(primaryButton, Bubble.this);
+    }
+
+    public ViewGroup getRoot() {
+      return root;
+    }
+
+    public ViewAnimator getPrimaryButton() {
+      return primaryButton;
+    }
+
+    public ImageView getPrimaryIcon() {
+      return primaryIcon;
+    }
+
+    public TextView getPrimaryText() {
+      return primaryText;
+    }
+
+    public CheckableImageButton getFirstButton() {
+      return firstButton;
+    }
+
+    public CheckableImageButton getSecondButton() {
+      return secondButton;
+    }
+
+    public CheckableImageButton getThirdButton() {
+      return thirdButton;
+    }
+
+    public View getExpandedView() {
+      return expandedView;
+    }
+
+    public View getShadowProvider() {
+      return shadowProvider;
+    }
+
+    public void setDrawerVisibility(int visibility) {
+      expandedView.setVisibility(visibility);
+      shadowProvider.setVisibility(visibility);
+    }
+
+    public boolean isMoving() {
+      return moveHandler.isMoving();
+    }
+
+    public void undoGravityOverride() {
+      moveHandler.undoGravityOverride();
+    }
+  }
+
+  /** Listener for bubble expansion state change. */
+  public interface BubbleExpansionStateListener {
+    void onBubbleExpansionStateChanged(@ExpansionState int expansionState);
+  }
+}
diff --git a/java/com/android/dialershared/bubble/BubbleInfo.java b/java/com/android/dialershared/bubble/BubbleInfo.java
new file mode 100644
index 0000000..eb9abd0
--- /dev/null
+++ b/java/com/android/dialershared/bubble/BubbleInfo.java
@@ -0,0 +1,123 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.annotation.Px;
+import com.google.auto.value.AutoValue;
+import java.util.Collections;
+import java.util.List;
+
+/** Info for displaying a {@link Bubble} */
+@AutoValue
+public abstract class BubbleInfo {
+  @ColorInt
+  public abstract int getPrimaryColor();
+
+  @NonNull
+  public abstract Icon getPrimaryIcon();
+
+  @NonNull
+  public abstract PendingIntent getPrimaryIntent();
+
+  @Px
+  public abstract int getStartingYPosition();
+
+  @NonNull
+  public abstract List<Action> getActions();
+
+  public static Builder builder() {
+    return new AutoValue_BubbleInfo.Builder().setActions(Collections.emptyList());
+  }
+
+  public static Builder from(@NonNull BubbleInfo bubbleInfo) {
+    return builder()
+        .setPrimaryIntent(bubbleInfo.getPrimaryIntent())
+        .setPrimaryColor(bubbleInfo.getPrimaryColor())
+        .setPrimaryIcon(bubbleInfo.getPrimaryIcon())
+        .setStartingYPosition(bubbleInfo.getStartingYPosition())
+        .setActions(bubbleInfo.getActions());
+  }
+
+  /** Builder for {@link BubbleInfo} */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder setPrimaryColor(@ColorInt int primaryColor);
+
+    public abstract Builder setPrimaryIcon(@NonNull Icon primaryIcon);
+
+    public abstract Builder setPrimaryIntent(@NonNull PendingIntent primaryIntent);
+
+    public abstract Builder setStartingYPosition(@Px int startingYPosition);
+
+    public abstract Builder setActions(List<Action> actions);
+
+    public abstract BubbleInfo build();
+  }
+
+  /** Represents actions to be shown in the bubble when expanded */
+  @AutoValue
+  public abstract static class Action {
+
+    @NonNull
+    public abstract Icon getIcon();
+
+    @NonNull
+    public abstract CharSequence getName();
+
+    @NonNull
+    public abstract PendingIntent getIntent();
+
+    public abstract boolean isEnabled();
+
+    public abstract boolean isChecked();
+
+    public static Builder builder() {
+      return new AutoValue_BubbleInfo_Action.Builder().setEnabled(true).setChecked(false);
+    }
+
+    public static Builder from(@NonNull Action action) {
+      return builder()
+          .setIntent(action.getIntent())
+          .setChecked(action.isChecked())
+          .setEnabled(action.isEnabled())
+          .setName(action.getName())
+          .setIcon(action.getIcon());
+    }
+
+    /** Builder for {@link Action} */
+    @AutoValue.Builder
+    public abstract static class Builder {
+
+      public abstract Builder setIcon(@NonNull Icon icon);
+
+      public abstract Builder setName(@NonNull CharSequence name);
+
+      public abstract Builder setIntent(@NonNull PendingIntent intent);
+
+      public abstract Builder setEnabled(boolean enabled);
+
+      public abstract Builder setChecked(boolean checked);
+
+      public abstract Action build();
+    }
+  }
+}
diff --git a/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java b/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java
new file mode 100644
index 0000000..8cd61af
--- /dev/null
+++ b/java/com/android/dialershared/bubble/ChangeOnScreenBounds.java
@@ -0,0 +1,191 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.support.annotation.VisibleForTesting;
+import android.transition.Transition;
+import android.transition.TransitionValues;
+import android.util.Property;
+import android.view.View;
+import android.view.ViewGroup;
+
+/** Similar to {@link android.transition.ChangeBounds ChangeBounds} but works across windows */
+public class ChangeOnScreenBounds extends Transition {
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  static final String PROPNAME_BOUNDS = "bubble:changeScreenBounds:bounds";
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  static final String PROPNAME_SCREEN_X = "bubble:changeScreenBounds:screenX";
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  static final String PROPNAME_SCREEN_Y = "bubble:changeScreenBounds:screenY";
+
+  static final String PROPNAME_WIDTH = "bubble:changeScreenBounds:width";
+  static final String PROPNAME_HEIGHT = "bubble:changeScreenBounds:height";
+
+  private static final Property<ViewBounds, PointF> TOP_LEFT_PROPERTY =
+      new Property<ViewBounds, PointF>(PointF.class, "topLeft") {
+        @Override
+        public void set(ViewBounds viewBounds, PointF topLeft) {
+          viewBounds.setTopLeft(topLeft);
+        }
+
+        @Override
+        public PointF get(ViewBounds viewBounds) {
+          return null;
+        }
+      };
+
+  private static final Property<ViewBounds, PointF> BOTTOM_RIGHT_PROPERTY =
+      new Property<ViewBounds, PointF>(PointF.class, "bottomRight") {
+        @Override
+        public void set(ViewBounds viewBounds, PointF bottomRight) {
+          viewBounds.setBottomRight(bottomRight);
+        }
+
+        @Override
+        public PointF get(ViewBounds viewBounds) {
+          return null;
+        }
+      };
+  private final int[] tempLocation = new int[2];
+
+  @Override
+  public void captureStartValues(TransitionValues transitionValues) {
+    captureValuesWithSize(transitionValues);
+  }
+
+  @Override
+  public void captureEndValues(TransitionValues transitionValues) {
+    captureValuesWithSize(transitionValues);
+  }
+
+  /**
+   * Capture location (left and top) from {@code values.view} and size (width and height) from
+   * {@code values.values}. If size is not set, use the size of {@code values.view}.
+   */
+  private void captureValuesWithSize(TransitionValues values) {
+    View view = values.view;
+
+    if (view.isLaidOut() || view.getWidth() != 0 || view.getHeight() != 0) {
+      Integer width = (Integer) values.values.get(PROPNAME_WIDTH);
+      Integer height = (Integer) values.values.get(PROPNAME_HEIGHT);
+
+      values.values.put(
+          PROPNAME_BOUNDS,
+          new Rect(
+              view.getLeft(),
+              view.getTop(),
+              width == null ? view.getRight() : view.getLeft() + width,
+              height == null ? view.getBottom() : view.getTop() + height));
+      values.view.getLocationOnScreen(tempLocation);
+      values.values.put(PROPNAME_SCREEN_X, tempLocation[0]);
+      values.values.put(PROPNAME_SCREEN_Y, tempLocation[1]);
+    }
+  }
+
+  @Override
+  public Animator createAnimator(
+      ViewGroup sceneRoot, TransitionValues startValues, TransitionValues endValues) {
+    Rect startBounds = (Rect) startValues.values.get(PROPNAME_BOUNDS);
+    Rect endBounds = (Rect) endValues.values.get(PROPNAME_BOUNDS);
+
+    if (startBounds == null || endBounds == null) {
+      // start or end values were not captured, so don't animate.
+      return null;
+    }
+
+    // Offset the startBounds by the difference in screen position
+    int startScreenX = (Integer) startValues.values.get(PROPNAME_SCREEN_X);
+    int startScreenY = (Integer) startValues.values.get(PROPNAME_SCREEN_Y);
+    int endScreenX = (Integer) endValues.values.get(PROPNAME_SCREEN_X);
+    int endScreenY = (Integer) endValues.values.get(PROPNAME_SCREEN_Y);
+    startBounds.offset(startScreenX - endScreenX, startScreenY - endScreenY);
+
+    final int startLeft = startBounds.left;
+    final int endLeft = endBounds.left;
+    final int startTop = startBounds.top;
+    final int endTop = endBounds.top;
+    final int startRight = startBounds.right;
+    final int endRight = endBounds.right;
+    final int startBottom = startBounds.bottom;
+    final int endBottom = endBounds.bottom;
+    ViewBounds viewBounds = new ViewBounds(endValues.view);
+    viewBounds.setTopLeft(new PointF(startLeft, startTop));
+    viewBounds.setBottomRight(new PointF(startRight, startBottom));
+
+    // Animate the top left and bottom right corners along a path
+    Path topLeftPath = getPathMotion().getPath(startLeft, startTop, endLeft, endTop);
+    ObjectAnimator topLeftAnimator =
+        ObjectAnimator.ofObject(viewBounds, TOP_LEFT_PROPERTY, null, topLeftPath);
+
+    Path bottomRightPath = getPathMotion().getPath(startRight, startBottom, endRight, endBottom);
+    ObjectAnimator bottomRightAnimator =
+        ObjectAnimator.ofObject(viewBounds, BOTTOM_RIGHT_PROPERTY, null, bottomRightPath);
+    AnimatorSet set = new AnimatorSet();
+    set.playTogether(topLeftAnimator, bottomRightAnimator);
+    return set;
+  }
+
+  private static class ViewBounds {
+    private int left;
+    private int top;
+    private int right;
+    private int bottom;
+    private final View view;
+    private int topLeftCalls;
+    private int bottomRightCalls;
+
+    public ViewBounds(View view) {
+      this.view = view;
+    }
+
+    public void setTopLeft(PointF topLeft) {
+      left = Math.round(topLeft.x);
+      top = Math.round(topLeft.y);
+      topLeftCalls++;
+      if (topLeftCalls == bottomRightCalls) {
+        updateLeftTopRightBottom();
+      }
+    }
+
+    public void setBottomRight(PointF bottomRight) {
+      right = Math.round(bottomRight.x);
+      bottom = Math.round(bottomRight.y);
+      bottomRightCalls++;
+      if (topLeftCalls == bottomRightCalls) {
+        updateLeftTopRightBottom();
+      }
+    }
+
+    private void updateLeftTopRightBottom() {
+      view.setLeft(left);
+      view.setTop(top);
+      view.setRight(right);
+      view.setBottom(bottom);
+      topLeftCalls = 0;
+      bottomRightCalls = 0;
+    }
+  }
+}
diff --git a/java/com/android/dialershared/bubble/CheckableImageButton.java b/java/com/android/dialershared/bubble/CheckableImageButton.java
new file mode 100644
index 0000000..7a5a432
--- /dev/null
+++ b/java/com/android/dialershared/bubble/CheckableImageButton.java
@@ -0,0 +1,101 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.content.Context;
+import android.support.v4.view.AccessibilityDelegateCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.accessibility.AccessibilityEventCompat;
+import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import android.support.v7.widget.AppCompatImageButton;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import android.widget.Checkable;
+
+/**
+ * An {@link android.widget.ImageButton ImageButton} that implements {@link Checkable} and
+ * propagates the checkable state
+ */
+public class CheckableImageButton extends AppCompatImageButton implements Checkable {
+
+  // Copied without modification from AppCompat library
+
+  private static final int[] DRAWABLE_STATE_CHECKED = new int[] {android.R.attr.state_checked};
+
+  private boolean mChecked;
+
+  public CheckableImageButton(Context context) {
+    this(context, null);
+  }
+
+  public CheckableImageButton(Context context, AttributeSet attrs) {
+    this(context, attrs, android.R.attr.imageButtonStyle);
+  }
+
+  public CheckableImageButton(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+
+    ViewCompat.setAccessibilityDelegate(
+        this,
+        new AccessibilityDelegateCompat() {
+          @Override
+          public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
+            super.onInitializeAccessibilityEvent(host, event);
+            event.setChecked(isChecked());
+          }
+
+          @Override
+          public void onInitializeAccessibilityNodeInfo(
+              View host, AccessibilityNodeInfoCompat info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            info.setCheckable(true);
+            info.setChecked(isChecked());
+          }
+        });
+  }
+
+  @Override
+  public void setChecked(boolean checked) {
+    if (mChecked != checked) {
+      mChecked = checked;
+      refreshDrawableState();
+      sendAccessibilityEvent(AccessibilityEventCompat.TYPE_WINDOW_CONTENT_CHANGED);
+    }
+  }
+
+  @Override
+  public boolean isChecked() {
+    return mChecked;
+  }
+
+  @Override
+  public void toggle() {
+    setChecked(!mChecked);
+  }
+
+  @Override
+  public int[] onCreateDrawableState(int extraSpace) {
+    if (mChecked) {
+      return mergeDrawableStates(
+          super.onCreateDrawableState(extraSpace + DRAWABLE_STATE_CHECKED.length),
+          DRAWABLE_STATE_CHECKED);
+    } else {
+      return super.onCreateDrawableState(extraSpace);
+    }
+  }
+}
diff --git a/java/com/android/dialershared/bubble/MoveHandler.java b/java/com/android/dialershared/bubble/MoveHandler.java
new file mode 100644
index 0000000..33507ef
--- /dev/null
+++ b/java/com/android/dialershared/bubble/MoveHandler.java
@@ -0,0 +1,280 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.support.animation.FloatPropertyCompat;
+import android.support.animation.SpringAnimation;
+import android.support.animation.SpringForce;
+import android.support.annotation.NonNull;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewConfiguration;
+import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
+import android.widget.Scroller;
+
+/** Handles touches and manages moving the bubble in response */
+class MoveHandler implements OnTouchListener {
+
+  // Amount the ViewConfiguration's minFlingVelocity will be scaled by for our own minVelocity
+  private static final int MIN_FLING_VELOCITY_FACTOR = 8;
+  // The friction multiplier to control how slippery the bubble is when flung
+  private static final float SCROLL_FRICTION_MULTIPLIER = 4f;
+
+  private final Context context;
+  private final WindowManager windowManager;
+  private final Bubble bubble;
+  private final int minX;
+  private final int minY;
+  private final int maxX;
+  private final int maxY;
+  private final int bubbleSize;
+  private final int shadowPaddingSize;
+  private final float touchSlopSquared;
+
+  private boolean isMoving;
+  private float firstX;
+  private float firstY;
+
+  private SpringAnimation moveXAnimation;
+  private SpringAnimation moveYAnimation;
+  private VelocityTracker velocityTracker;
+  private Scroller scroller;
+
+  private static float clamp(float value, float min, float max) {
+    return Math.min(max, Math.max(min, value));
+  }
+
+  // Handles the left/right gravity conversion and centering
+  private final FloatPropertyCompat<WindowManager.LayoutParams> xProperty =
+      new FloatPropertyCompat<LayoutParams>("xProperty") {
+        @Override
+        public float getValue(LayoutParams windowParams) {
+          int realX = windowParams.x;
+          realX = realX + bubbleSize / 2;
+          realX = realX + shadowPaddingSize;
+          if (relativeToRight(windowParams)) {
+            int displayWidth = context.getResources().getDisplayMetrics().widthPixels;
+            realX = displayWidth - realX;
+          }
+          return clamp(realX, minX, maxX);
+        }
+
+        @Override
+        public void setValue(LayoutParams windowParams, float value) {
+          boolean wasOnRight = (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
+          int displayWidth = context.getResources().getDisplayMetrics().widthPixels;
+          boolean onRight;
+          Integer gravityOverride = bubble.getGravityOverride();
+          if (gravityOverride == null) {
+            onRight = value > displayWidth / 2;
+          } else {
+            onRight = (gravityOverride & Gravity.RIGHT) == Gravity.RIGHT;
+          }
+          int centeringOffset = bubbleSize / 2 + shadowPaddingSize;
+          windowParams.x =
+              (int) (onRight ? (displayWidth - value - centeringOffset) : value - centeringOffset);
+          windowParams.gravity = Gravity.TOP | (onRight ? Gravity.RIGHT : Gravity.LEFT);
+          if (wasOnRight != onRight) {
+            bubble.onLeftRightSwitch(onRight);
+          }
+          if (bubble.isVisible()) {
+            windowManager.updateViewLayout(bubble.getRootView(), windowParams);
+          }
+        }
+      };
+
+  private final FloatPropertyCompat<WindowManager.LayoutParams> yProperty =
+      new FloatPropertyCompat<LayoutParams>("yProperty") {
+        @Override
+        public float getValue(LayoutParams object) {
+          return clamp(object.y + bubbleSize + shadowPaddingSize, minY, maxY);
+        }
+
+        @Override
+        public void setValue(LayoutParams object, float value) {
+          object.y = (int) value - bubbleSize - shadowPaddingSize;
+          if (bubble.isVisible()) {
+            windowManager.updateViewLayout(bubble.getRootView(), object);
+          }
+        }
+      };
+
+  public MoveHandler(@NonNull View targetView, @NonNull Bubble bubble) {
+    this.bubble = bubble;
+    context = targetView.getContext();
+    windowManager = context.getSystemService(WindowManager.class);
+
+    bubbleSize = context.getResources().getDimensionPixelSize(R.dimen.bubble_size);
+    shadowPaddingSize =
+        context.getResources().getDimensionPixelOffset(R.dimen.bubble_shadow_padding_size);
+    minX =
+        context.getResources().getDimensionPixelOffset(R.dimen.bubble_safe_margin_x)
+            + bubbleSize / 2;
+    minY =
+        context.getResources().getDimensionPixelOffset(R.dimen.bubble_safe_margin_y)
+            + bubbleSize / 2;
+    maxX = context.getResources().getDisplayMetrics().widthPixels - minX;
+    maxY = context.getResources().getDisplayMetrics().heightPixels - minY;
+
+    // Squared because it will be compared against the square of the touch delta. This is more
+    // efficient than needing to take a square root.
+    touchSlopSquared = (float) Math.pow(ViewConfiguration.get(context).getScaledTouchSlop(), 2);
+
+    targetView.setOnTouchListener(this);
+  }
+
+  public boolean isMoving() {
+    return isMoving;
+  }
+
+  public void undoGravityOverride() {
+    LayoutParams windowParams = bubble.getWindowParams();
+    xProperty.setValue(windowParams, xProperty.getValue(windowParams));
+  }
+
+  public void snapToBounds() {
+    ensureSprings();
+
+    moveXAnimation.animateToFinalPosition(relativeToRight(bubble.getWindowParams()) ? maxX : minX);
+    moveYAnimation.animateToFinalPosition(yProperty.getValue(bubble.getWindowParams()));
+  }
+
+  @Override
+  public boolean onTouch(View v, MotionEvent event) {
+    float eventX = event.getRawX();
+    float eventY = event.getRawY();
+    switch (event.getActionMasked()) {
+      case MotionEvent.ACTION_DOWN:
+        firstX = eventX;
+        firstY = eventY;
+        velocityTracker = VelocityTracker.obtain();
+        break;
+      case MotionEvent.ACTION_MOVE:
+        if (isMoving || hasExceededTouchSlop(event)) {
+          if (!isMoving) {
+            isMoving = true;
+            bubble.onMoveStart();
+          }
+
+          ensureSprings();
+
+          moveXAnimation.animateToFinalPosition(clamp(eventX, minX, maxX));
+          moveYAnimation.animateToFinalPosition(clamp(eventY, minY, maxY));
+        }
+
+        velocityTracker.addMovement(event);
+        break;
+      case MotionEvent.ACTION_UP:
+        if (isMoving) {
+          ViewConfiguration viewConfiguration = ViewConfiguration.get(context);
+          velocityTracker.computeCurrentVelocity(
+              1000, viewConfiguration.getScaledMaximumFlingVelocity());
+          float xVelocity = velocityTracker.getXVelocity();
+          float yVelocity = velocityTracker.getYVelocity();
+          boolean isFling = isFling(xVelocity, yVelocity);
+
+          if (isFling) {
+            Point target =
+                findTarget(
+                    xVelocity,
+                    yVelocity,
+                    (int) xProperty.getValue(bubble.getWindowParams()),
+                    (int) yProperty.getValue(bubble.getWindowParams()));
+
+            moveXAnimation.animateToFinalPosition(target.x);
+            moveYAnimation.animateToFinalPosition(target.y);
+          } else {
+            snapX();
+          }
+          isMoving = false;
+          bubble.onMoveFinish();
+        } else {
+          v.performClick();
+          bubble.primaryButtonClick();
+        }
+        break;
+      default: // fall out
+    }
+    return true;
+  }
+
+  private void ensureSprings() {
+    if (moveXAnimation == null) {
+      moveXAnimation = new SpringAnimation(bubble.getWindowParams(), xProperty);
+      moveXAnimation.setSpring(new SpringForce());
+      moveXAnimation.getSpring().setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY);
+    }
+
+    if (moveYAnimation == null) {
+      moveYAnimation = new SpringAnimation(bubble.getWindowParams(), yProperty);
+      moveYAnimation.setSpring(new SpringForce());
+      moveYAnimation.getSpring().setDampingRatio(SpringForce.DAMPING_RATIO_NO_BOUNCY);
+    }
+  }
+
+  private Point findTarget(float xVelocity, float yVelocity, int startX, int startY) {
+    if (scroller == null) {
+      scroller = new Scroller(context);
+      scroller.setFriction(ViewConfiguration.getScrollFriction() * SCROLL_FRICTION_MULTIPLIER);
+    }
+
+    // Find where a fling would end vertically
+    scroller.fling(startX, startY, (int) xVelocity, (int) yVelocity, minX, maxX, minY, maxY);
+    int targetY = scroller.getFinalY();
+    scroller.abortAnimation();
+
+    // If the x component of the velocity is above the minimum fling velocity, use velocity to
+    // determine edge. Otherwise use its starting position
+    boolean pullRight = isFling(xVelocity, 0) ? xVelocity > 0 : isOnRightHalf(startX);
+    return new Point(pullRight ? maxX : minX, targetY);
+  }
+
+  private boolean isFling(float xVelocity, float yVelocity) {
+    int minFlingVelocity =
+        ViewConfiguration.get(context).getScaledMinimumFlingVelocity() * MIN_FLING_VELOCITY_FACTOR;
+    return getMagnitudeSquared(xVelocity, yVelocity) > minFlingVelocity * minFlingVelocity;
+  }
+
+  private boolean isOnRightHalf(float currentX) {
+    return currentX > (minX + maxX) / 2;
+  }
+
+  private void snapX() {
+    // Check if x value is closer to min or max
+    boolean pullRight = isOnRightHalf(xProperty.getValue(bubble.getWindowParams()));
+    moveXAnimation.animateToFinalPosition(pullRight ? maxX : minX);
+  }
+
+  private boolean relativeToRight(LayoutParams windowParams) {
+    return (windowParams.gravity & Gravity.RIGHT) == Gravity.RIGHT;
+  }
+
+  private boolean hasExceededTouchSlop(MotionEvent event) {
+    return getMagnitudeSquared(event.getRawX() - firstX, event.getRawY() - firstY)
+        > touchSlopSquared;
+  }
+
+  private float getMagnitudeSquared(float deltaX, float deltaY) {
+    return deltaX * deltaX + deltaY * deltaY;
+  }
+}
diff --git a/java/com/android/dialershared/bubble/WindowRoot.java b/java/com/android/dialershared/bubble/WindowRoot.java
new file mode 100644
index 0000000..81d6b48
--- /dev/null
+++ b/java/com/android/dialershared/bubble/WindowRoot.java
@@ -0,0 +1,74 @@
+/*
+ * 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.dialershared.bubble;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.support.annotation.NonNull;
+import android.view.KeyEvent;
+import android.widget.FrameLayout;
+
+/**
+ * ViewGroup that handles some overlay window concerns. Allows back button and configuration change
+ * events to be listened for via interfaces.
+ */
+public class WindowRoot extends FrameLayout {
+
+  /** Callback for when the back button is pressed while this window is in focus */
+  public interface OnBackPressedListener {
+    boolean onBackPressed();
+  }
+
+  /** Callback for when the Configuration changes for this window */
+  public interface OnConfigurationChangedListener {
+    void onConfigurationChanged(Configuration newConfiguration);
+  }
+
+  private OnBackPressedListener backPressedListener;
+  private OnConfigurationChangedListener configurationChangedListener;
+
+  public WindowRoot(@NonNull Context context) {
+    super(context);
+  }
+
+  public void setOnBackPressedListener(OnBackPressedListener listener) {
+    backPressedListener = listener;
+  }
+
+  public void setOnConfigurationChangedListener(OnConfigurationChangedListener listener) {
+    configurationChangedListener = listener;
+  }
+
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && backPressedListener != null) {
+      if (event.getAction() == KeyEvent.ACTION_UP) {
+        return backPressedListener.onBackPressed();
+      }
+      return true;
+    }
+    return super.dispatchKeyEvent(event);
+  }
+
+  @Override
+  public void dispatchConfigurationChanged(Configuration newConfig) {
+    super.dispatchConfigurationChanged(newConfig);
+    if (configurationChangedListener != null) {
+      configurationChangedListener.onConfigurationChanged(newConfig);
+    }
+  }
+}
diff --git a/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md b/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md
new file mode 100644
index 0000000..a13a605
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/INTEGRATION.md
@@ -0,0 +1,69 @@
+# Floating Bubble Integration
+
+go/bubble-integration
+
+Author: keyboardr@
+
+Last Updated: 2017-06-06
+
+Floating bubbles provide a lightweight means of providing interactive UI while
+the user is away from the app. This document details the steps necessary to
+integrate these bubbles into your app.
+
+[TOC]
+
+![Floating bubble](images/bubble_collapsed.png){height=400}
+
+## Ensure Bubbles can be shown
+
+Add the `android.permission.SYSTEM_ALERT_WINDOW` permission to your manifest.
+Before you show the bubble, call `Bubble.canShowBubbles(Context)` to see if the
+user has granted you permission. If not, you can start an Activity from
+`Bubble.getRequestPermissionIntent(Context)` to navigate the user to the system
+settings to enable drawing over other apps. This is more than just a simple
+runtime permission; the user must explicitly allow you to draw over other apps
+via this system setting. System apps may have this allowed by default, but be
+sure to test.
+
+## Create your initial `BubbleInfo`
+
+Use `BubbleInfo.builder()` to populate a `BubbleInfo` with your color, main
+icon, main Intent (which should navigate back to your app), starting Y position,
+and a list of `Actions` to put in the drawer. Each `Action` will define its
+icon, user-displayable name (used for content description), Intent to perform
+when clicked, whether it is enabled (optional, default true), and whether it is
+checked (optional, default false).
+
+![Floating bubble expanded](images/bubble_expanded.png){height=400}
+
+## Create, show, and hide the Bubble
+
+Create the bubble using `Bubble.createBubble(Context, BubbleInfo)`. The `show()`
+method is safe to call at any time. If the Bubble is already showing, it is a
+no-op. `hide()` may also be called at any time and will collapse the drawer
+before hiding if already open. While `show()` will show immediately, `hide()`
+may need to wait for other operations or animations before the bubble is hidden.
+It is unlikely you will need to keep track of this, however. The bubble will be
+hidden at its next opportunity, and `hide()` will not block.
+
+![Floating bubble with state](images/bubble_state.png){height=400}
+
+## Update the Bubble's state
+
+Call `Bubble.setBubbleInfo(BubbleInfo)` to update all displayed state.
+`BubbleInfo`s are immutable, so to make a new one using an existing
+`BubbleInfo`, use `BubbleInfo.from(BubbleInfo)` to get a `Builder` with
+prepopulated info. If only the `Action` state has changed, it is more efficient
+to just call `Bubble.updateActions(List<Action>)`
+
+![Floating bubble with text](images/bubble_text.png){height=400}
+
+## Show text
+
+To temporarily replace the icon with a textual message, call
+`Bubble.showText(CharSequence)`. The text will be displayed for several seconds
+before transitioning back to the primary icon. The drawer will be closed if open
+and cannot be reopened while the text is displayed. Any calls to `hide()` will
+be deferred until after the text is done being displayed, so if you wish to show
+an ending message of some sort you may call `hide()` immediately after
+`showText(CharSequence)`.
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png
new file mode 100644
index 0000000..7ecc067
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_collapsed.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png
new file mode 100644
index 0000000..cd477f3
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_expanded.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png
new file mode 100644
index 0000000..21ca8a8
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_state.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png b/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png
new file mode 100644
index 0000000..9c476dc
--- /dev/null
+++ b/java/com/android/dialershared/bubble/g3doc/images/bubble_text.png
Binary files differ
diff --git a/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml b/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml
new file mode 100644
index 0000000..f9416ab
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/color/bubble_checkable_mask.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/white" android:state_checked="true"/>
+  <item android:color="@android:color/transparent"/>
+</selector>
diff --git a/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml b/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml
new file mode 100644
index 0000000..33ca1fd
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/color/bubble_icon_tint_states.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#80FFFFFF" android:state_enabled="false"/>
+  <item android:color="@android:color/white"/>
+</selector>
diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml
new file mode 100644
index 0000000..77c813a
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_ltr.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <corners
+      android:bottomRightRadius="@dimen/bubble_size"
+      android:topRightRadius="@dimen/bubble_size"/>
+  <solid android:color="@android:color/white"/>
+</shape>
diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml
new file mode 100644
index 0000000..9e25421
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/drawable/bubble_background_pill_rtl.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <corners
+      android:bottomLeftRadius="@dimen/bubble_size"
+      android:topLeftRadius="@dimen/bubble_size"/>
+  <solid android:color="@android:color/white"/>
+</shape>
diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml
new file mode 100644
index 0000000..85e0b24
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_checkable_circle.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/bubble_checkable_mask"/>
+    </shape>
+  </item>
+  <item android:id="@android:id/mask">
+    <shape android:shape="oval">
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</ripple>
diff --git a/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml
new file mode 100644
index 0000000..8d5cf0b
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/drawable/bubble_ripple_circle.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+  <item>
+    <shape>
+      <corners android:radius="@dimen/bubble_size"/>
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</ripple>
diff --git a/java/com/android/dialershared/bubble/res/layout/bubble_base.xml b/java/com/android/dialershared/bubble/res/layout/bubble_base.xml
new file mode 100644
index 0000000..76970f0
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/layout/bubble_base.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    tools:theme="@style/Theme.AppCompat">
+  <View
+      android:id="@+id/bubble_drawer_shadow_provider"
+      android:layout_width="@dimen/bubble_size"
+      android:layout_height="@dimen/bubble_size"
+      android:layout_marginTop="@dimen/bubble_shadow_padding_size"
+      android:layout_marginBottom="@dimen/bubble_shadow_padding_size"
+      android:layout_marginStart="@dimen/bubble_shadow_padding_size"
+      android:background="@drawable/bubble_ripple_circle"
+      android:backgroundTint="@android:color/transparent"
+      android:elevation="10dp"
+      android:visibility="invisible"
+      />
+  <FrameLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="48dp"
+      android:elevation="10dp"
+      android:paddingTop="@dimen/bubble_shadow_padding_size"
+      android:paddingBottom="@dimen/bubble_shadow_padding_size"
+      android:paddingEnd="@dimen/bubble_shadow_padding_size">
+
+    <LinearLayout
+        android:id="@+id/bubble_expanded_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="32dp"
+        android:paddingEnd="8dp"
+        android:background="@drawable/bubble_background_pill_ltr"
+        android:layoutDirection="inherit"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        tools:backgroundTint="#FF0000FF"
+        tools:visibility="visible">
+      <com.android.dialershared.bubble.CheckableImageButton
+          android:id="@+id/bubble_icon_first"
+          android:layout_width="@dimen/bubble_size"
+          android:layout_height="@dimen/bubble_size"
+          android:layout_marginStart="4dp"
+          android:padding="@dimen/bubble_icon_padding"
+          android:tint="@color/bubble_icon_tint_states"
+          android:tintMode="src_in"
+          tools:background="@drawable/bubble_ripple_checkable_circle"
+          tools:src="@android:drawable/ic_lock_idle_lock"/>
+      <com.android.dialershared.bubble.CheckableImageButton
+          android:id="@+id/bubble_icon_second"
+          android:layout_width="@dimen/bubble_size"
+          android:layout_height="@dimen/bubble_size"
+          android:layout_marginStart="4dp"
+          android:padding="@dimen/bubble_icon_padding"
+          android:tint="@color/bubble_icon_tint_states"
+          android:tintMode="src_in"
+          tools:background="@drawable/bubble_ripple_checkable_circle"
+          tools:src="@android:drawable/ic_input_add"/>
+      <com.android.dialershared.bubble.CheckableImageButton
+          android:id="@+id/bubble_icon_third"
+          android:layout_width="@dimen/bubble_size"
+          android:layout_height="@dimen/bubble_size"
+          android:layout_marginStart="4dp"
+          android:padding="@dimen/bubble_icon_padding"
+          android:tint="@color/bubble_icon_tint_states"
+          android:tintMode="src_in"
+          tools:background="@drawable/bubble_ripple_checkable_circle"
+          tools:src="@android:drawable/ic_menu_call"/>
+    </LinearLayout>
+  </FrameLayout>
+  <FrameLayout
+      android:id="@+id/bubble_primary_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="start"
+      android:animateLayoutChanges="true"
+      android:clipChildren="false"
+      android:clipToPadding="false"
+      android:elevation="12dp">
+    <ViewAnimator
+        android:id="@+id/bubble_button_primary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/bubble_shadow_padding_size"
+        android:background="@drawable/bubble_ripple_circle"
+        android:measureAllChildren="false"
+        tools:backgroundTint="#FF0000AA">
+      <ImageView
+          android:id="@+id/bubble_icon_primary"
+          android:layout_width="@dimen/bubble_size"
+          android:layout_height="@dimen/bubble_size"
+          android:padding="@dimen/bubble_icon_padding"
+          android:tint="@android:color/white"
+          android:tintMode="src_in"
+          tools:src="@android:drawable/ic_btn_speak_now"/>
+      <TextView
+          android:id="@+id/bubble_text"
+          android:layout_width="wrap_content"
+          android:layout_height="@dimen/bubble_size"
+          android:paddingStart="@dimen/bubble_icon_padding"
+          android:paddingEnd="@dimen/bubble_icon_padding"
+          android:gravity="center"
+          android:minWidth="@dimen/bubble_size"
+          android:textAppearance="@style/TextAppearance.AppCompat"
+          tools:text="Call ended"/>
+    </ViewAnimator>
+  </FrameLayout>
+
+</FrameLayout>
diff --git a/java/com/android/dialershared/bubble/res/values/colors.xml b/java/com/android/dialershared/bubble/res/values/colors.xml
new file mode 100644
index 0000000..97545fa
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources>
+  <color name="bubble_primary_background_darken">#33000000</color>
+</resources>
diff --git a/java/com/android/dialershared/bubble/res/values/values.xml b/java/com/android/dialershared/bubble/res/values/values.xml
new file mode 100644
index 0000000..f581617
--- /dev/null
+++ b/java/com/android/dialershared/bubble/res/values/values.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources>
+  <dimen name="bubble_safe_margin_x">16dp</dimen>
+  <dimen name="bubble_safe_margin_y">64dp</dimen>
+  <dimen name="bubble_size">56dp</dimen>
+  <dimen name="bubble_icon_padding">16dp</dimen>
+  <dimen name="bubble_move_elevation_change">4dp</dimen>
+  <dimen name="bubble_shadow_padding_size">16dp</dimen>
+</resources>
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 8539bd0..d854a7f 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -15,11 +15,11 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.incallui">
+    package="com.android.incallui">
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="26"/>
+      android:minSdkVersion="23"
+      android:targetSdkVersion="26"/>
 
   <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
   <!-- We use this to disable the status bar buttons of home, back and recent
@@ -31,8 +31,8 @@
   <!-- Warning: setting the required boolean to true would prevent installation of Dialer on
        devices which do not support a camera. -->
   <uses-feature
-    android:name="android.hardware.camera.any"
-    android:required="false"/>
+      android:name="android.hardware.camera.any"
+      android:required="false"/>
 
   <!-- Testing location -->
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -43,77 +43,72 @@
        Set taskAffinity for application is not working because it will be merged and the result is
   that all activities here still have same taskAffinity as activities under dialer. -->
   <application>
-    <meta-data android:name="android.telephony.hide_voicemail_settings_menu"
-      android:value="true"/>
+    <meta-data
+        android:name="android.telephony.hide_voicemail_settings_menu"
+        android:value="true"/>
+
     <activity
-      android:directBootAware="true"
-      android:excludeFromRecents="true"
-      android:exported="false"
-      android:label="@string/phoneAppLabel"
-      android:taskAffinity="com.android.incallui"
-      android:launchMode="singleInstance"
-      android:name="com.android.incallui.InCallActivity"
-      android:resizeableActivity="true"
-      android:screenOrientation="nosensor"
-      android:theme="@style/Theme.InCallScreen">
+        android:directBootAware="true"
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:label="@string/phoneAppLabel"
+        android:launchMode="singleInstance"
+        android:name="com.android.incallui.InCallActivity"
+        android:resizeableActivity="true"
+        android:screenOrientation="nosensor"
+        android:taskAffinity="com.android.incallui"
+        android:theme="@style/Theme.InCallScreen">
     </activity>
 
     <activity
-      android:directBootAware="true"
-      android:excludeFromRecents="true"
-      android:noHistory="true"
-      android:exported="false"
-      android:label="@string/manageConferenceLabel"
-      android:taskAffinity="com.android.incallui"
-      android:launchMode="singleTask"
-      android:name="com.android.incallui.ManageConferenceActivity"
-      android:resizeableActivity="true"
-      android:theme="@style/Theme.InCallScreen.ManageConference"/>
+        android:directBootAware="true"
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:label="@string/manageConferenceLabel"
+        android:launchMode="singleTask"
+        android:name="com.android.incallui.ManageConferenceActivity"
+        android:noHistory="true"
+        android:resizeableActivity="true"
+        android:taskAffinity="com.android.incallui"
+        android:theme="@style/Theme.InCallScreen.ManageConference"/>
 
     <service
-      android:directBootAware="true"
-      android:exported="true"
-      android:name="com.android.incallui.InCallServiceImpl"
-      android:permission="android.permission.BIND_INCALL_SERVICE">
+        android:directBootAware="true"
+        android:exported="true"
+        android:name="com.android.incallui.InCallServiceImpl"
+        android:permission="android.permission.BIND_INCALL_SERVICE">
       <meta-data
-        android:name="android.telecom.IN_CALL_SERVICE_UI"
-        android:value="true"/>
+          android:name="android.telecom.IN_CALL_SERVICE_UI"
+          android:value="true"/>
       <meta-data
-        android:name="android.telecom.IN_CALL_SERVICE_RINGING"
-        android:value="false"/>
+          android:name="android.telecom.IN_CALL_SERVICE_RINGING"
+          android:value="false"/>
       <meta-data
-        android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
-        android:value="true"/>
+          android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
+          android:value="true"/>
 
       <intent-filter>
         <action android:name="android.telecom.InCallService"/>
       </intent-filter>
     </service>
 
-    <!--
-       Comments for attributes in SpamNotificationActivity:
-       taskAffinity=""             -> Open the dialog without opening the dialer app behind it
-       noHistory="true"            -> Navigating away finishes activity
-       excludeFromRecents="true"   -> Don't show in "recent apps" screen
-       -->
     <activity
-      android:excludeFromRecents="true"
-      android:exported="false"
-      android:name="com.android.incallui.spam.SpamNotificationActivity"
-      android:noHistory="true"
-      android:taskAffinity=""
-      android:theme="@style/AfterCallNotificationTheme">
-    </activity>
-
-    <service
-      android:exported="false"
-      android:name="com.android.incallui.spam.SpamNotificationService"/>
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:name=".AudioRouteSelectorActivity"
+        android:noHistory="true"
+        android:theme="@style/Theme.Incall.DialogHolder"
+        />
 
     <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
     <receiver
-      android:directBootAware="true"
-      android:exported="false"
-      android:name="com.android.incallui.NotificationBroadcastReceiver"/>
+        android:directBootAware="true"
+        android:exported="false"
+        android:name="com.android.incallui.NotificationBroadcastReceiver"/>
+
+    <receiver
+        android:exported="false"
+        android:name=".ReturnToCallActionReceiver"/>
 
   </application>
 
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java
index ca34aa6..d530401 100644
--- a/java/com/android/incallui/AnswerScreenPresenter.java
+++ b/java/com/android/incallui/AnswerScreenPresenter.java
@@ -17,12 +17,14 @@
 package com.android.incallui;
 
 import android.content.Context;
+import android.os.SystemClock;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.VideoProfile;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.incallui.answer.protocol.AnswerScreen;
@@ -36,11 +38,14 @@
 /** Manages changes for an incoming call screen. */
 public class AnswerScreenPresenter
     implements AnswerScreenDelegate, DialerCall.CannedTextResponsesLoadedListener {
+  private static final int ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS = 5000;
+
   @NonNull private final Context context;
   @NonNull private final AnswerScreen answerScreen;
   @NonNull private final DialerCall call;
+  private long actionPerformedTimeMillis;
 
-  public AnswerScreenPresenter(
+  AnswerScreenPresenter(
       @NonNull Context context, @NonNull AnswerScreen answerScreen, @NonNull DialerCall call) {
     LogUtil.i("AnswerScreenPresenter.constructor", null);
     this.context = Assert.isNotNull(context);
@@ -60,6 +65,13 @@
   }
 
   @Override
+  public boolean isActionTimeout() {
+    return actionPerformedTimeMillis != 0
+        && SystemClock.elapsedRealtime() - actionPerformedTimeMillis
+            >= ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS;
+  }
+
+  @Override
   public void onAnswerScreenUnready() {
     call.removeCannedTextResponsesLoadedListener(this);
   }
@@ -73,6 +85,7 @@
   public void onRejectCallWithMessage(String message) {
     call.reject(true /* rejectWithMessage */, message);
     onDismissDialog();
+    addTimeoutCheck();
   }
 
   @Override
@@ -100,6 +113,7 @@
         call.answer();
       }
     }
+    addTimeoutCheck();
   }
 
   @Override
@@ -114,6 +128,7 @@
     } else {
       call.reject(false /* rejectWithMessage */, null);
     }
+    addTimeoutCheck();
   }
 
   @Override
@@ -124,9 +139,27 @@
       LogUtil.i("AnswerScreenPresenter.onAnswerAndReleaseCall", "activeCall == null");
       onAnswer(false);
     } else {
+      activeCall.setReleasedByAnsweringSecondCall(true);
       activeCall.addListener(new AnswerOnDisconnected(activeCall));
       activeCall.disconnect();
     }
+    addTimeoutCheck();
+  }
+
+  @Override
+  public void onAnswerAndReleaseButtonDisabled() {
+    DialerCall activeCall = CallList.getInstance().getActiveCall();
+    if (activeCall != null) {
+      activeCall.increaseSecondCallWithoutAnswerAndReleasedButtonTimes();
+    }
+  }
+
+  @Override
+  public void onAnswerAndReleaseButtonEnabled() {
+    DialerCall activeCall = CallList.getInstance().getActiveCall();
+    if (activeCall != null) {
+      activeCall.increaseAnswerAndReleaseButtonDisplayedTimes();
+    }
   }
 
   @Override
@@ -148,7 +181,7 @@
 
     private final DialerCall disconnectingCall;
 
-    public AnswerOnDisconnected(DialerCall disconnectingCall) {
+    AnswerOnDisconnected(DialerCall disconnectingCall) {
       this.disconnectingCall = disconnectingCall;
     }
 
@@ -183,10 +216,32 @@
 
     @Override
     public void onInternationalCallOnWifi() {}
+
+    @Override
+    public void onEnrichedCallSessionUpdate() {}
   }
 
   private boolean isSmsResponseAllowed(DialerCall call) {
     return UserManagerCompat.isUserUnlocked(context)
         && call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT);
   }
+
+  private void addTimeoutCheck() {
+    actionPerformedTimeMillis = SystemClock.elapsedRealtime();
+    if (answerScreen.getAnswerScreenFragment().isVisible()) {
+      ThreadUtil.postDelayedOnUiThread(
+          () -> {
+            if (!answerScreen.getAnswerScreenFragment().isVisible()) {
+              LogUtil.d(
+                  "AnswerScreenPresenter.addTimeoutCheck",
+                  "accept/reject call timed out, do nothing");
+              return;
+            }
+            LogUtil.i("AnswerScreenPresenter.addTimeoutCheck", "accept/reject call timed out");
+            // Force re-evaluate which fragment to show.
+            InCallPresenter.getInstance().refreshUi();
+          },
+          ACCEPT_REJECT_CALL_TIME_OUT_IN_MILLIS);
+    }
+  }
 }
diff --git a/java/com/android/incallui/AnswerScreenPresenterStub.java b/java/com/android/incallui/AnswerScreenPresenterStub.java
index 7bff329..2f9e608 100644
--- a/java/com/android/incallui/AnswerScreenPresenterStub.java
+++ b/java/com/android/incallui/AnswerScreenPresenterStub.java
@@ -43,5 +43,16 @@
   public void onAnswerAndReleaseCall() {}
 
   @Override
+  public void onAnswerAndReleaseButtonEnabled() {}
+
+  @Override
+  public void onAnswerAndReleaseButtonDisabled() {}
+
+  @Override
   public void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress) {}
+
+  @Override
+  public boolean isActionTimeout() {
+    return false;
+  }
 }
diff --git a/java/com/android/incallui/AudioRouteSelectorActivity.java b/java/com/android/incallui/AudioRouteSelectorActivity.java
new file mode 100644
index 0000000..dfd4d1a
--- /dev/null
+++ b/java/com/android/incallui/AudioRouteSelectorActivity.java
@@ -0,0 +1,47 @@
+/*
+ * 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.incallui;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
+import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
+import com.android.incallui.call.TelecomAdapter;
+
+/** Simple activity that just shows the audio route selector fragment */
+public class AudioRouteSelectorActivity extends FragmentActivity
+    implements AudioRouteSelectorPresenter {
+
+  @Override
+  protected void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+    AudioRouteSelectorDialogFragment.newInstance(AudioModeProvider.getInstance().getAudioState())
+        .show(getSupportFragmentManager(), null);
+  }
+
+  @Override
+  public void onAudioRouteSelected(int audioRoute) {
+    TelecomAdapter.getInstance().setAudioRoute(audioRoute);
+  }
+
+  @Override
+  public void onAudioRouteSelectorDismiss() {
+    finish();
+  }
+}
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index b0c3a99..658ae64 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Trace;
 import android.support.v4.app.Fragment;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.CallAudioState;
@@ -101,6 +102,7 @@
 
   @Override
   public void onStateChange(InCallState oldState, InCallState newState, CallList callList) {
+    Trace.beginSection("CallButtonPresenter.onStateChange");
     if (newState == InCallState.OUTGOING) {
       mCall = callList.getOutgoingCall();
     } else if (newState == InCallState.INCALL) {
@@ -124,6 +126,7 @@
       mCall = null;
     }
     updateUi(newState, mCall);
+    Trace.endSection();
   }
 
   /**
@@ -249,11 +252,21 @@
 
   @Override
   public void mergeClicked() {
+    Logger.get(mContext)
+        .logCallImpression(
+            DialerImpression.Type.IN_CALL_MERGE_BUTTON_PRESSED,
+            mCall.getUniqueCallId(),
+            mCall.getTimeAddedMs());
     TelecomAdapter.getInstance().merge(mCall.getId());
   }
 
   @Override
   public void addCallClicked() {
+    Logger.get(mContext)
+        .logCallImpression(
+            DialerImpression.Type.IN_CALL_ADD_CALL_BUTTON_PRESSED,
+            mCall.getUniqueCallId(),
+            mCall.getTimeAddedMs());
     // Automatically mute the current call
     mAutomaticallyMuted = true;
     mPreviousMuteState = AudioModeProvider.getInstance().getAudioState().isMuted();
@@ -264,6 +277,11 @@
 
   @Override
   public void showDialpadClicked(boolean checked) {
+    Logger.get(mContext)
+        .logCallImpression(
+            DialerImpression.Type.IN_CALL_SHOW_DIALPAD_BUTTON_PRESSED,
+            mCall.getUniqueCallId(),
+            mCall.getTimeAddedMs());
     LogUtil.v("CallButtonPresenter", "show dialpad " + String.valueOf(checked));
     getActivity().showDialpadFragment(checked /* show */, true /* animate */);
   }
@@ -300,23 +318,15 @@
    */
   @Override
   public void switchCameraClicked(boolean useFrontFacingCamera) {
-    InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager();
-    cameraManager.setUseFrontFacingCamera(useFrontFacingCamera);
-
-    String cameraId = cameraManager.getActiveCameraId();
-    if (cameraId != null) {
-      final int cameraDir =
-          cameraManager.isUsingFrontFacingCamera()
-              ? CameraDirection.CAMERA_DIRECTION_FRONT_FACING
-              : CameraDirection.CAMERA_DIRECTION_BACK_FACING;
-      mCall.setCameraDir(cameraDir);
-      mCall.getVideoTech().setCamera(cameraId);
-    }
+    updateCamera(useFrontFacingCamera);
   }
 
   @Override
   public void toggleCameraClicked() {
     LogUtil.i("CallButtonPresenter.toggleCameraClicked", "");
+    if (mCall == null) {
+      return;
+    }
     Logger.get(mContext)
         .logCallImpression(
             DialerImpression.Type.IN_CALL_SCREEN_SWAP_CAMERA,
@@ -345,8 +355,11 @@
             mCall.getTimeAddedMs());
 
     if (pause) {
+      mCall.getVideoTech().setCamera(null);
       mCall.getVideoTech().stopTransmission();
     } else {
+      updateCamera(
+          InCallPresenter.getInstance().getInCallCameraManager().isUsingFrontFacingCamera());
       mCall.getVideoTech().resumeTransmission();
     }
 
@@ -354,8 +367,23 @@
     mInCallButtonUi.enableButton(InCallButtonIds.BUTTON_PAUSE_VIDEO, false);
   }
 
+  private void updateCamera(boolean useFrontFacingCamera) {
+    InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager();
+    cameraManager.setUseFrontFacingCamera(useFrontFacingCamera);
+
+    String cameraId = cameraManager.getActiveCameraId();
+    if (cameraId != null) {
+      final int cameraDir =
+          cameraManager.isUsingFrontFacingCamera()
+              ? CameraDirection.CAMERA_DIRECTION_FRONT_FACING
+              : CameraDirection.CAMERA_DIRECTION_BACK_FACING;
+      mCall.setCameraDir(cameraDir);
+      mCall.getVideoTech().setCamera(cameraId);
+    }
+  }
+
   private void updateUi(InCallState state, DialerCall call) {
-    LogUtil.v("CallButtonPresenter", "updating call UI for call: ", call);
+    LogUtil.v("CallButtonPresenter", "updating call UI for call: %s", call);
 
     if (mInCallButtonUi == null) {
       return;
@@ -404,7 +432,7 @@
     final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE);
 
     final boolean hasCameraPermission =
-        isVideo && VideoUtils.hasCameraPermissionAndAllowedByUser(mContext);
+        isVideo && VideoUtils.hasCameraPermissionAndShownPrivacyToast(mContext);
     // Disabling local video doesn't seem to work when dialing. See b/30256571.
     final boolean showPauseVideo =
         isVideo
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index c2b99c1..653b51a 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -28,6 +28,7 @@
 import android.hardware.display.DisplayManager;
 import android.os.BatteryManager;
 import android.os.Handler;
+import android.os.Trace;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -44,16 +45,14 @@
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
-import com.android.dialer.enrichedcall.EnrichedCallComponent;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.postcall.PostCall;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
@@ -63,6 +62,7 @@
 import com.android.incallui.InCallPresenter.IncomingCallListener;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.DialerCallListener;
 import com.android.incallui.calllocation.CallLocation;
 import com.android.incallui.calllocation.CallLocationComponent;
@@ -70,6 +70,7 @@
 import com.android.incallui.incall.protocol.InCallScreen;
 import com.android.incallui.incall.protocol.InCallScreenDelegate;
 import com.android.incallui.incall.protocol.PrimaryCallState;
+import com.android.incallui.incall.protocol.PrimaryCallState.ButtonState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
 import com.android.incallui.videotech.utils.SessionModificationState;
@@ -85,8 +86,7 @@
         InCallDetailsListener,
         InCallEventListener,
         InCallScreenDelegate,
-        DialerCallListener,
-        EnrichedCallManager.StateChangedListener {
+        DialerCallListener {
 
   /**
    * Amount of time to wait before sending an announcement via the accessibility manager. When the
@@ -249,8 +249,10 @@
 
   @Override
   public void onStateChange(InCallState oldState, InCallState newState, CallList callList) {
-    LogUtil.v("CallCardPresenter.onStateChange", "" + newState);
+    Trace.beginSection("CallCardPresenter.onStateChange");
+    LogUtil.v("CallCardPresenter.onStateChange", "oldState: %s, newState: %s", oldState, newState);
     if (mInCallScreen == null) {
+      Trace.endSection();
       return;
     }
 
@@ -347,6 +349,7 @@
             callState != DialerCall.State.INCOMING /* animate */);
 
     maybeSendAccessibilityEvent(oldState, newState, primaryChanged);
+    Trace.endSection();
   }
 
   @Override
@@ -376,6 +379,12 @@
   @Override
   public void onInternationalCallOnWifi() {}
 
+  @Override
+  public void onEnrichedCallSessionUpdate() {
+    LogUtil.enterBlock("CallCardPresenter.onEnrichedCallSessionUpdate");
+    updatePrimaryDisplayInfo();
+  }
+
   /** Handles a change to the child number by refreshing the primary call info. */
   @Override
   public void onDialerCallChildNumberChange() {
@@ -418,12 +427,6 @@
     updatePrimaryCallState();
   }
 
-  @Override
-  public void onEnrichedCallStateChanged() {
-    LogUtil.enterBlock("CallCardPresenter.onEnrichedCallStateChanged");
-    updatePrimaryDisplayInfo();
-  }
-
   private boolean shouldRefreshPrimaryInfo(boolean primaryChanged) {
     if (mPrimary == null) {
       return false;
@@ -475,7 +478,11 @@
                   mPrimary.getConnectTimeMillis(),
                   CallerInfoUtils.isVoiceMailNumber(mContext, mPrimary),
                   mPrimary.isRemotelyHeld(),
-                  isBusiness));
+                  isBusiness,
+                  supports2ndCallOnHold(),
+                  getSwapToSecondaryButtonState(),
+                  mPrimary.isAssistedDialed(),
+                  null));
 
       InCallActivity activity =
           (InCallActivity) (mInCallScreen.getInCallScreenFragment().getActivity());
@@ -485,6 +492,16 @@
     }
   }
 
+  private @ButtonState int getSwapToSecondaryButtonState() {
+    if (mSecondary == null) {
+      return ButtonState.NOT_SUPPORT;
+    }
+    if (mPrimary.getState() == State.ACTIVE) {
+      return ButtonState.ENABLED;
+    }
+    return ButtonState.DISABLED;
+  }
+
   /** Only show the conference call button if we can manage the conference. */
   private void maybeShowManageConferenceCallButton() {
     getUi().showManageConferenceCallButton(shouldShowManageConference());
@@ -505,6 +522,15 @@
         && !mIsFullscreen;
   }
 
+  private boolean supports2ndCallOnHold() {
+    DialerCall firstCall = CallList.getInstance().getActiveOrBackgroundCall();
+    DialerCall incomingCall = CallList.getInstance().getIncomingCall();
+    if (firstCall != null && incomingCall != null && firstCall != incomingCall) {
+      return incomingCall.can(Details.CAPABILITY_HOLD);
+    }
+    return true;
+  }
+
   @Override
   public void onCallStateButtonClicked() {
     Intent broadcastIntent = Bindings.get(mContext).getCallStateButtonBroadcastIntent(mContext);
@@ -528,11 +554,6 @@
     InCallPresenter.getInstance().onShrinkAnimationComplete();
   }
 
-  @Override
-  public Drawable getDefaultContactPhotoDrawable() {
-    return ContactInfoCache.getInstance(mContext).getDefaultContactPhotoDrawable();
-  }
-
   private void maybeStartSearch(DialerCall call, boolean isPrimary) {
     // no need to start search for conference calls which show generic info.
     if (call != null && !call.isConferenceCall()) {
@@ -564,8 +585,8 @@
     if (call != null) {
       call.getLogState().contactLookupResult = entry.contactLookupResult;
     }
-    if (entry.contactUri != null) {
-      CallerInfoUtils.sendViewNotification(mContext, entry.contactUri);
+    if (entry.lookupUri != null) {
+      CallerInfoUtils.sendViewNotification(mContext, entry.lookupUri);
     }
   }
 
@@ -666,26 +687,8 @@
     boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL);
 
     MultimediaData multimediaData = null;
-    if (mPrimary.getNumber() != null) {
-      EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
-
-      EnrichedCallManager.Filter filter;
-      if (mPrimary.isIncoming()) {
-        filter = manager.createIncomingCallComposerFilter();
-      } else {
-        filter = manager.createOutgoingCallComposerFilter();
-      }
-
-      Session enrichedCallSession =
-          manager.getSession(mPrimary.getUniqueCallId(), mPrimary.getNumber(), filter);
-
-      mPrimary.setEnrichedCallSession(enrichedCallSession);
-      mPrimary.setEnrichedCallCapabilities(manager.getCapabilities(mPrimary.getNumber()));
-
-      if (enrichedCallSession != null) {
-        enrichedCallSession.setUniqueDialerCallId(mPrimary.getUniqueCallId());
-        multimediaData = enrichedCallSession.getMultimediaData();
-      }
+    if (mPrimary.getEnrichedCallSession() != null) {
+      multimediaData = mPrimary.getEnrichedCallSession().getMultimediaData();
     }
 
     if (mPrimary.isConferenceCall()) {
@@ -696,7 +699,8 @@
       mInCallScreen.setPrimary(
           new PrimaryInfo(
               null /* number */,
-              getConferenceString(mPrimary),
+              CallerInfoUtils.getConferenceString(
+                  mContext, mPrimary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)),
               false /* nameIsNumber */,
               null /* location */,
               null /* label */,
@@ -710,6 +714,7 @@
               shouldShowLocation(),
               null /* contactInfoLookupKey */,
               null /* enrichedCallMultimediaData */,
+              true /* showInCallButtonGrid */,
               mPrimary.getNumberPresentation()));
     } else if (mPrimaryContactInfo != null) {
       LogUtil.v(
@@ -757,6 +762,7 @@
               shouldShowLocation(),
               mPrimaryContactInfo.lookupKey,
               multimediaData,
+              true /* showInCallButtonGrid */,
               mPrimary.getNumberPresentation()));
     } else {
       // Clear the primary display info.
@@ -876,11 +882,20 @@
       return;
     }
 
+    if (mSecondary.isMergeInProcess()) {
+      LogUtil.i(
+          "CallCardPresenter.updateSecondaryDisplayInfo",
+          "secondary call is merge in process, clearing info");
+      mInCallScreen.setSecondary(SecondaryInfo.createEmptySecondaryInfo(mIsFullscreen));
+      return;
+    }
+
     if (mSecondary.isConferenceCall()) {
       mInCallScreen.setSecondary(
           new SecondaryInfo(
               true /* show */,
-              getConferenceString(mSecondary),
+              CallerInfoUtils.getConferenceString(
+                  mContext, mSecondary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)),
               false /* nameIsNumber */,
               null /* label */,
               mSecondary.getCallProviderLabel(),
@@ -972,7 +987,7 @@
   }
 
   /** Gets the name to display for the call. */
-  String getNameForCall(ContactCacheEntry contactInfo) {
+  private String getNameForCall(ContactCacheEntry contactInfo) {
     String preferredName =
         ContactDisplayUtils.getPreferredDisplayName(
             contactInfo.namePrimary, contactInfo.nameAlternative, mContactsPreferences);
@@ -982,19 +997,6 @@
     return preferredName;
   }
 
-  /** Gets the number to display for a call. */
-  String getNumberForCall(ContactCacheEntry contactInfo) {
-    // If the name is empty, we use the number for the name...so don't show a second
-    // number in the number field
-    String preferredName =
-        ContactDisplayUtils.getPreferredDisplayName(
-            contactInfo.namePrimary, contactInfo.nameAlternative, mContactsPreferences);
-    if (TextUtils.isEmpty(preferredName)) {
-      return contactInfo.location;
-    }
-    return contactInfo.number;
-  }
-
   @Override
   public void onSecondaryInfoClicked() {
     if (mSecondary == null) {
@@ -1004,6 +1006,11 @@
       return;
     }
 
+    Logger.get(mContext)
+        .logCallImpression(
+            DialerImpression.Type.IN_CALL_SWAP_SECONDARY_BUTTON_PRESSED,
+            mPrimary.getUniqueCallId(),
+            mPrimary.getTimeAddedMs());
     LogUtil.i(
         "CallCardPresenter.onSecondaryInfoClicked", "swapping call to foreground: " + mSecondary);
     mSecondary.unhold();
@@ -1015,6 +1022,7 @@
     if (mPrimary != null) {
       mPrimary.disconnect();
     }
+    PostCall.onDisconnectPressed(mContext);
   }
 
   /**
@@ -1035,15 +1043,6 @@
     return mPrimary != null && mPrimary.getState() == DialerCall.State.ACTIVE;
   }
 
-  private String getConferenceString(DialerCall call) {
-    boolean isGenericConference = call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE);
-    LogUtil.v("CallCardPresenter.getConferenceString", "" + isGenericConference);
-
-    final int resId =
-        isGenericConference ? R.string.generic_conference_call_name : R.string.conference_call_name;
-    return mContext.getResources().getString(resId);
-  }
-
   private boolean shouldShowEndCallButton(DialerCall primary, int callState) {
     if (primary == null) {
       return false;
@@ -1063,7 +1062,6 @@
 
   @Override
   public void onInCallScreenResumed() {
-    EnrichedCallComponent.get(mContext).getEnrichedCallManager().registerStateChangedListener(this);
     updatePrimaryDisplayInfo();
 
     if (shouldSendAccessibilityEvent) {
@@ -1072,11 +1070,7 @@
   }
 
   @Override
-  public void onInCallScreenPaused() {
-    EnrichedCallComponent.get(mContext)
-        .getEnrichedCallManager()
-        .unregisterStateChangedListener(this);
-  }
+  public void onInCallScreenPaused() {}
 
   static boolean sendAccessibilityEvent(Context context, InCallScreen inCallScreen) {
     AccessibilityManager am =
diff --git a/java/com/android/incallui/CallerInfo.java b/java/com/android/incallui/CallerInfo.java
index f0dbe91..e552d7c 100644
--- a/java/com/android/incallui/CallerInfo.java
+++ b/java/com/android/incallui/CallerInfo.java
@@ -475,7 +475,6 @@
     name = context.getString(R.string.emergency_call_dialog_number_for_display);
     phoneNumber = null;
 
-    photoResource = R.drawable.img_phone;
     mIsEmergency = true;
     return this;
   }
diff --git a/java/com/android/incallui/CallerInfoAsyncQuery.java b/java/com/android/incallui/CallerInfoAsyncQuery.java
index d620d47..858d0f4 100644
--- a/java/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/java/com/android/incallui/CallerInfoAsyncQuery.java
@@ -41,6 +41,7 @@
 import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
+import com.android.dialer.strictmode.DialerStrictMode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -189,7 +190,7 @@
       CallerInfo info,
       OnQueryCompleteListener listener,
       Object cookie) {
-    long[] directoryIds = getDirectoryIds(context);
+    long[] directoryIds = DialerStrictMode.bypass(() -> getDirectoryIds(context));
     int size = directoryIds.length;
     if (size == 0) {
       return false;
diff --git a/java/com/android/incallui/CallerInfoUtils.java b/java/com/android/incallui/CallerInfoUtils.java
index 5644466..8f23107 100644
--- a/java/com/android/incallui/CallerInfoUtils.java
+++ b/java/com/android/incallui/CallerInfoUtils.java
@@ -282,4 +282,11 @@
         });
     loader.startLoading();
   }
+
+  /** @return conference name for conference call. */
+  public static String getConferenceString(Context context, boolean isGenericConference) {
+    final int resId =
+        isGenericConference ? R.string.generic_conference_call_name : R.string.conference_call_name;
+    return context.getResources().getString(resId);
+  }
 }
diff --git a/java/com/android/incallui/ConferenceManagerFragment.java b/java/com/android/incallui/ConferenceManagerFragment.java
index cef8a38..bd6cb85 100644
--- a/java/com/android/incallui/ConferenceManagerFragment.java
+++ b/java/com/android/incallui/ConferenceManagerFragment.java
@@ -21,7 +21,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import com.android.contacts.common.ContactPhotoManager;
+import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
 import com.android.incallui.ConferenceManagerPresenter.ConferenceManagerUi;
diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java
index 712bdef..70cdf24 100644
--- a/java/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -31,12 +31,12 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index e45eb97..9b92b48 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -33,6 +33,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.os.UserManagerCompat;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
@@ -265,6 +266,8 @@
     cce.userType = info.userType;
     cce.originalPhoneNumber = info.phoneNumber;
     cce.shouldShowLocation = info.shouldShowGeoDescription;
+    cce.isEmergencyNumber = info.isEmergencyNumber();
+    cce.isVoicemailNumber = info.isVoiceMailNumber();
 
     if (info.contactExists) {
       cce.contactLookupResult = ContactLookupResult.Type.LOCAL_CONTACT;
@@ -406,7 +409,7 @@
     } else {
       ContactCacheEntry initialCacheEntry =
           updateCallerInfoInCacheOnAnyThread(
-              callId, call.getNumberPresentation(), callerInfo, isIncoming, false, queryToken);
+              callId, call.getNumberPresentation(), callerInfo, false, queryToken);
       sendInfoNotifications(callId, initialCacheEntry);
     }
   }
@@ -416,7 +419,6 @@
       String callId,
       int numberPresentation,
       CallerInfo callerInfo,
-      boolean isIncoming,
       boolean didLocalLookup,
       CallerInfoQueryToken queryToken) {
     Log.d(
@@ -428,6 +430,19 @@
             + "; didLocalLookup = "
             + didLocalLookup);
 
+    ContactCacheEntry existingCacheEntry = mInfoMap.get(callId);
+    Log.d(TAG, "Existing cacheEntry in hashMap " + existingCacheEntry);
+
+    // Mark it as emergency/voicemail if the cache exists and was emergency/voicemail before the
+    // number changed.
+    if (existingCacheEntry != null) {
+      if (existingCacheEntry.isEmergencyNumber) {
+        callerInfo.markAsEmergency(mContext);
+      } else if (existingCacheEntry.isVoicemailNumber) {
+        callerInfo.markAsVoiceMail(mContext);
+      }
+    }
+
     int presentationMode = numberPresentation;
     if (callerInfo.contactExists
         || callerInfo.isEmergencyNumber()
@@ -439,20 +454,8 @@
     ContactCacheEntry cacheEntry = buildEntry(mContext, callerInfo, presentationMode);
     cacheEntry.queryId = queryToken.mQueryId;
 
-    ContactCacheEntry existingCacheEntry = mInfoMap.get(callId);
-    Log.d(TAG, "Existing cacheEntry in hashMap " + existingCacheEntry);
-
     if (didLocalLookup) {
-      // Before issuing a request for more data from other services, we only check that the
-      // contact wasn't found in the local DB.  We don't check the if the cache entry already
-      // has a name because we allow overriding cnap data with data from other services.
-      if (!callerInfo.contactExists && mPhoneNumberService != null) {
-        Log.d(TAG, "Contact lookup. Local contacts miss, checking remote");
-        final PhoneNumberServiceListener listener =
-            new PhoneNumberServiceListener(callId, queryToken.mQueryId);
-        cacheEntry.hasPendingQuery = true;
-        mPhoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener, listener, isIncoming);
-      } else if (cacheEntry.displayPhotoUri != null) {
+      if (cacheEntry.displayPhotoUri != null) {
         // When the difference between 2 numbers is only the prefix (e.g. + or IDD),
         // we will still trigger force query so that the number can be updated on
         // the calling screen. We need not query the image again if the previous
@@ -606,13 +609,12 @@
 
     // This will only be true for emergency numbers
     if (info.photoResource != 0) {
-      cce.photo = context.getResources().getDrawable(info.photoResource);
+      cce.photo = ContextCompat.getDrawable(context, info.photoResource);
     } else if (info.isCachedPhotoCurrent) {
       if (info.cachedPhoto != null) {
         cce.photo = info.cachedPhoto;
         cce.photoType = ContactPhotoType.CONTACT;
       } else {
-        cce.photo = getDefaultContactPhotoDrawable();
         cce.photoType = ContactPhotoType.DEFAULT_PLACEHOLDER;
       }
     } else {
@@ -666,14 +668,6 @@
     mCallBacks.remove(callId);
   }
 
-  public Drawable getDefaultContactPhotoDrawable() {
-    if (mDefaultContactPhotoDrawable == null) {
-      mDefaultContactPhotoDrawable =
-          mContext.getResources().getDrawable(R.drawable.img_no_image_automirrored);
-    }
-    return mDefaultContactPhotoDrawable;
-  }
-
   /** Callback interface for the contact query. */
   public interface ContactInfoCacheCallback {
 
@@ -696,8 +690,6 @@
     // Note in cache entry whether this is a pending async loading action to know whether to
     // wait for its callback or not.
     boolean hasPendingQuery;
-    /** This will be used for the "view" notification. */
-    public Uri contactUri;
     /** Either a display photo or a thumbnail URI. */
     Uri displayPhotoUri;
 
@@ -713,6 +705,8 @@
     boolean shouldShowLocation;
 
     boolean isBusiness;
+    boolean isEmergencyNumber;
+    boolean isVoicemailNumber;
 
     @Override
     public String toString() {
@@ -736,8 +730,6 @@
           + photo
           + ", isSipCall="
           + isSipCall
-          + ", contactUri="
-          + contactUri
           + ", displayPhotoUri="
           + displayPhotoUri
           + ", contactLookupResult="
@@ -752,6 +744,10 @@
           + originalPhoneNumber
           + ", shouldShowLocation="
           + shouldShowLocation
+          + ", isEmergencyNumber="
+          + isEmergencyNumber
+          + ", isVoicemailNumber="
+          + isVoicemailNumber
           + '}';
     }
   }
@@ -789,7 +785,7 @@
       maybeUpdateFromCequintCallerId(ci, cw.cnapName, 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);
+      updateCallerInfoInCacheOnAnyThread(cw.callId, cw.numberPresentation, ci, true, mQueryToken);
     }
 
     @Override
@@ -807,6 +803,16 @@
         clearCallbacks(callId);
         return;
       }
+      // Before issuing a request for more data from other services, we only check that the
+      // contact wasn't found in the local DB.  We don't check the if the cache entry already
+      // has a name because we allow overriding cnap data with data from other services.
+      if (!callerInfo.contactExists && mPhoneNumberService != null) {
+        Log.d(TAG, "Contact lookup. Local contacts miss, checking remote");
+        final PhoneNumberServiceListener listener =
+            new PhoneNumberServiceListener(callId, mQueryToken.mQueryId);
+        cacheEntry.hasPendingQuery = true;
+        mPhoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener, listener, mIsIncoming);
+      }
       sendInfoNotifications(callId, cacheEntry);
       if (!cacheEntry.hasPendingQuery) {
         if (callerInfo.contactExists) {
@@ -870,12 +876,12 @@
         entry.shouldShowLocation = oldEntry.shouldShowLocation;
         // Contact specific ringtone is obtained from local lookup.
         entry.contactRingtoneUri = oldEntry.contactRingtoneUri;
+        entry.originalPhoneNumber = oldEntry.originalPhoneNumber;
       }
 
       // If no image and it's a business, switch to using the default business avatar.
       if (info.getImageUrl() == null && info.isBusiness()) {
         Log.d(TAG, "Business has no image. Using default.");
-        entry.photo = mContext.getResources().getDrawable(R.drawable.img_business);
         entry.photoType = ContactPhotoType.BUSINESS;
       }
 
diff --git a/java/com/android/incallui/ContactsAsyncHelper.java b/java/com/android/incallui/ContactsAsyncHelper.java
index 08ff74d..6237ca3 100644
--- a/java/com/android/incallui/ContactsAsyncHelper.java
+++ b/java/com/android/incallui/ContactsAsyncHelper.java
@@ -22,12 +22,12 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
 import android.support.annotation.MainThread;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -35,7 +35,7 @@
 public class ContactsAsyncHelper {
 
   /** Interface for a WorkerHandler result return. */
-  public interface OnImageLoadCompleteListener {
+  interface OnImageLoadCompleteListener {
 
     /**
      * Called when the image load is complete. Must be called in main thread.
@@ -55,50 +55,6 @@
     void onImageLoaded(int token, Drawable photo, Bitmap photoIcon, Object cookie);
   }
 
-  // constants
-  private static final int EVENT_LOAD_IMAGE = 1;
-  /** Handler run on a worker thread to load photo asynchronously. */
-  private static Handler sThreadHandler;
-  /** For forcing the system to call its constructor */
-  @SuppressWarnings("unused")
-  private static ContactsAsyncHelper sInstance;
-
-  static {
-    sInstance = new ContactsAsyncHelper();
-  }
-
-  private final Handler mResultHandler =
-      /** A handler that handles message to call listener notifying UI change on main thread. */
-      new Handler(Looper.getMainLooper()) {
-        @Override
-        public void handleMessage(Message msg) {
-          WorkerArgs args = (WorkerArgs) msg.obj;
-          switch (msg.arg1) {
-            case EVENT_LOAD_IMAGE:
-              if (args.listener != null) {
-                Log.d(
-                    this,
-                    "Notifying listener: "
-                        + args.listener.toString()
-                        + " image: "
-                        + args.displayPhotoUri
-                        + " completed");
-                args.listener.onImageLoadComplete(
-                    msg.what, args.photo, args.photoIcon, args.cookie);
-              }
-              break;
-            default:
-          }
-        }
-      };
-
-  /** Private constructor for static class */
-  private ContactsAsyncHelper() {
-    HandlerThread thread = new HandlerThread("ContactsAsyncWorker");
-    thread.start();
-    sThreadHandler = new WorkerHandler(thread.getLooper());
-  }
-
   /**
    * Starts an asynchronous image load. After finishing the load, {@link
    * OnImageLoadCompleteListener#onImageLoadComplete(int, Drawable, Bitmap, Object)} will be called.
@@ -114,7 +70,7 @@
    *     argument of {@link OnImageLoadCompleteListener#onImageLoadComplete(int, Drawable, Bitmap,
    *     Object)}. Can be null, at which the callback will also has null for the argument.
    */
-  public static final void startObtainPhotoAsync(
+  static void startObtainPhotoAsync(
       int token,
       Context context,
       Uri displayPhotoUri,
@@ -123,7 +79,7 @@
     // in case the source caller info is null, the URI will be null as well.
     // just update using the placeholder image in this case.
     if (displayPhotoUri == null) {
-      Log.e("startObjectPhotoAsync", "Uri is missing");
+      LogUtil.e("ContactsAsyncHelper.startObjectPhotoAsync", "uri is missing");
       return;
     }
 
@@ -132,26 +88,34 @@
 
     // setup arguments
     WorkerArgs args = new WorkerArgs();
+    args.token = token;
     args.cookie = cookie;
     args.context = context;
     args.displayPhotoUri = displayPhotoUri;
     args.listener = listener;
 
-    // setup message arguments
-    Message msg = sThreadHandler.obtainMessage(token);
-    msg.arg1 = EVENT_LOAD_IMAGE;
-    msg.obj = args;
-
-    Log.d(
-        "startObjectPhotoAsync",
-        "Begin loading image: " + args.displayPhotoUri + ", displaying default image for now.");
-
-    // notify the thread to begin working
-    sThreadHandler.sendMessage(msg);
+    DialerExecutors.createNonUiTaskBuilder(new Worker())
+        .onSuccess(
+            output -> {
+              if (args.listener != null) {
+                LogUtil.d(
+                    "ContactsAsyncHelper.startObtainPhotoAsync",
+                    "notifying listener: "
+                        + args.listener
+                        + " image: "
+                        + args.displayPhotoUri
+                        + " completed");
+                args.listener.onImageLoadComplete(
+                    args.token, args.photo, args.photoIcon, args.cookie);
+              }
+            })
+        .build()
+        .executeParallel(args);
   }
 
   private static final class WorkerArgs {
 
+    public int token;
     public Context context;
     public Uri displayPhotoUri;
     public Drawable photo;
@@ -160,76 +124,53 @@
     public OnImageLoadCompleteListener listener;
   }
 
-  /** Thread worker class that handles the task of opening the stream and loading the images. */
-  private class WorkerHandler extends Handler {
+  private static class Worker implements DialerExecutor.Worker<WorkerArgs, Void> {
 
-    public WorkerHandler(Looper looper) {
-      super(looper);
-    }
-
+    @Nullable
     @Override
-    public void handleMessage(Message msg) {
-      WorkerArgs args = (WorkerArgs) msg.obj;
+    public Void doInBackground(WorkerArgs args) throws Throwable {
+      InputStream inputStream = null;
+      try {
+        try {
+          inputStream = args.context.getContentResolver().openInputStream(args.displayPhotoUri);
+        } catch (Exception e) {
+          LogUtil.e(
+              "ContactsAsyncHelper.Worker.doInBackground", "error opening photo input stream", e);
+        }
 
-      switch (msg.arg1) {
-        case EVENT_LOAD_IMAGE:
-          InputStream inputStream = null;
+        if (inputStream != null) {
+          args.photo = Drawable.createFromStream(inputStream, args.displayPhotoUri.toString());
+
+          // This assumes Drawable coming from contact database is usually
+          // BitmapDrawable and thus we can have (down)scaled version of it.
+          args.photoIcon = getPhotoIconWhenAppropriate(args.context, args.photo);
+
+          LogUtil.d(
+              "ContactsAsyncHelper.Worker.doInBackground",
+              "loading image, URI: %s",
+              args.displayPhotoUri);
+        } else {
+          args.photo = null;
+          args.photoIcon = null;
+          LogUtil.d(
+              "ContactsAsyncHelper.Worker.doInBackground",
+              "problem with image, URI: %s, using default image.",
+              args.displayPhotoUri);
+        }
+        if (args.listener != null) {
+          args.listener.onImageLoaded(args.token, args.photo, args.photoIcon, args.cookie);
+        }
+      } finally {
+        if (inputStream != null) {
           try {
-            try {
-              inputStream = args.context.getContentResolver().openInputStream(args.displayPhotoUri);
-            } catch (Exception e) {
-              Log.e(this, "Error opening photo input stream", e);
-            }
-
-            if (inputStream != null) {
-              args.photo = Drawable.createFromStream(inputStream, args.displayPhotoUri.toString());
-
-              // This assumes Drawable coming from contact database is usually
-              // BitmapDrawable and thus we can have (down)scaled version of it.
-              args.photoIcon = getPhotoIconWhenAppropriate(args.context, args.photo);
-
-              Log.d(
-                  ContactsAsyncHelper.this,
-                  "Loading image: "
-                      + msg.arg1
-                      + " token: "
-                      + msg.what
-                      + " image URI: "
-                      + args.displayPhotoUri);
-            } else {
-              args.photo = null;
-              args.photoIcon = null;
-              Log.d(
-                  ContactsAsyncHelper.this,
-                  "Problem with image: "
-                      + msg.arg1
-                      + " token: "
-                      + msg.what
-                      + " image URI: "
-                      + args.displayPhotoUri
-                      + ", using default image.");
-            }
-            if (args.listener != null) {
-              args.listener.onImageLoaded(msg.what, args.photo, args.photoIcon, args.cookie);
-            }
-          } finally {
-            if (inputStream != null) {
-              try {
-                inputStream.close();
-              } catch (IOException e) {
-                Log.e(this, "Unable to close input stream.", e);
-              }
-            }
+            inputStream.close();
+          } catch (IOException e) {
+            LogUtil.e(
+                "ContactsAsyncHelper.Worker.doInBackground", "Unable to close input stream.", e);
           }
-          break;
-        default:
+        }
       }
-
-      // send the reply to the enclosing class.
-      Message reply = ContactsAsyncHelper.this.mResultHandler.obtainMessage(msg.what);
-      reply.arg1 = msg.arg1;
-      reply.obj = msg.obj;
-      reply.sendToTarget();
+      return null;
     }
 
     /**
@@ -254,7 +195,9 @@
         // If the longer edge is much longer than the shorter edge, the latter may
         // become 0 which will cause a crash.
         if (newWidth <= 0 || newHeight <= 0) {
-          Log.w(this, "Photo icon's width or height become 0.");
+          LogUtil.w(
+              "ContactsAsyncHelper.Worker.getPhotoIconWhenAppropriate",
+              "Photo icon's width or height become 0.");
           return null;
         }
 
diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java
index 7f494aa..fbcd407 100644
--- a/java/com/android/incallui/DialpadFragment.java
+++ b/java/com/android/incallui/DialpadFragment.java
@@ -35,6 +35,8 @@
 import com.android.dialer.dialpadview.DialpadKeyButton;
 import com.android.dialer.dialpadview.DialpadKeyButton.OnPressedListener;
 import com.android.dialer.dialpadview.DialpadView;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.incallui.DialpadPresenter.DialpadUi;
 import com.android.incallui.baseui.BaseFragment;
 import java.util.Map;
@@ -87,6 +89,8 @@
   @Override
   public void onClick(View v) {
     if (v.getId() == R.id.dialpad_back) {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.IN_CALL_DIALPAD_CLOSE_BUTTON_PRESSED);
       getActivity().onBackPressed();
     }
   }
@@ -107,6 +111,7 @@
           case KeyEvent.ACTION_UP:
             getPresenter().stopDtmf();
             break;
+          default: // fall out
         }
         // do not return true [handled] here, since we want the
         // press / click animation to be handled by the framework.
@@ -125,7 +130,7 @@
     return this;
   }
 
-  // TODO Adds hardware keyboard listener
+  // TODO(klp) Adds hardware keyboard listener
 
   @Override
   public View onCreateView(
@@ -261,6 +266,8 @@
   @Override
   public void onPressed(View view, boolean pressed) {
     if (pressed && mDisplayMap.containsKey(view.getId())) {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.IN_CALL_DIALPAD_NUMBER_BUTTON_PRESSED);
       Log.d(this, "onPressed: " + pressed + " " + mDisplayMap.get(view.getId()));
       getPresenter().processDtmf(mDisplayMap.get(view.getId()));
     }
@@ -315,7 +322,7 @@
      * Overrides the characters used in {@link DialerKeyListener#CHARACTERS} These are the valid
      * dtmf characters.
      */
-    public final char[] DTMF_CHARACTERS =
+    public final char[] dtmfCharacters =
         new char[] {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '#', '*'};
 
     private DTMFKeyListener() {
@@ -325,7 +332,7 @@
     /** Overriden to return correct DTMF-dialable characters. */
     @Override
     protected char[] getAcceptedChars() {
-      return DTMF_CHARACTERS;
+      return dtmfCharacters;
     }
 
     /** special key listener ignores backspace. */
diff --git a/java/com/android/incallui/ExternalCallNotifier.java b/java/com/android/incallui/ExternalCallNotifier.java
index 0c2493c..9e78052 100644
--- a/java/com/android/incallui/ExternalCallNotifier.java
+++ b/java/com/android/incallui/ExternalCallNotifier.java
@@ -18,7 +18,6 @@
 
 import android.annotation.TargetApi;
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +28,7 @@
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
 import android.telecom.Call;
 import android.telecom.PhoneAccount;
 import android.telecom.VideoProfile;
@@ -39,10 +39,11 @@
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.CallCompat;
 import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.BitmapUtil;
 import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.common.Assert;
+import com.android.dialer.contactphoto.BitmapUtil;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCallDelegate;
 import com.android.incallui.call.ExternalCallList;
@@ -58,16 +59,25 @@
  */
 public class ExternalCallNotifier implements ExternalCallList.ExternalCallListener {
 
-  /** Tag used with the notification manager to uniquely identify external call notifications. */
-  private static final int NOTIFICATION_ID = R.id.notification_external_call;
+  /**
+   * Common tag for all external call notifications. Unlike other grouped notifications in Dialer,
+   * external call notifications are uniquely identified by ID.
+   */
+  private static final String NOTIFICATION_TAG = "EXTERNAL_CALL";
 
-  private static final String NOTIFICATION_GROUP = "ExternalCallNotifier";
+  private static final int GROUP_SUMMARY_NOTIFICATION_ID = -1;
+  private static final String GROUP_SUMMARY_NOTIFICATION_TAG = "GroupSummary_ExternalCall";
+  /**
+   * Key used to associate all external call notifications and the summary as belonging to a single
+   * group.
+   */
+  private static final String GROUP_KEY = "ExternalCallGroup";
+
   private final Context mContext;
   private final ContactInfoCache mContactInfoCache;
   private Map<Call, NotificationInfo> mNotifications = new ArrayMap<>();
   private int mNextUniqueNotificationId;
   private ContactsPreferences mContactsPreferences;
-  private boolean mShowingSummary;
 
   /** Initializes a new instance of the external call notifier. */
   public ExternalCallNotifier(
@@ -84,9 +94,7 @@
   @Override
   public void onExternalCallAdded(android.telecom.Call call) {
     Log.i(this, "onExternalCallAdded " + call);
-    if (mNotifications.containsKey(call)) {
-      throw new IllegalArgumentException();
-    }
+    Assert.checkArgument(!mNotifications.containsKey(call));
     NotificationInfo info = new NotificationInfo(call, mNextUniqueNotificationId++);
     mNotifications.put(call, info);
 
@@ -107,9 +115,7 @@
   /** Handles updates to an external call. */
   @Override
   public void onExternalCallUpdated(Call call) {
-    if (!mNotifications.containsKey(call)) {
-      throw new IllegalArgumentException();
-    }
+    Assert.checkArgument(mNotifications.containsKey(call));
     postNotification(mNotifications.get(call));
   }
 
@@ -182,29 +188,13 @@
 
   /** Dismisses a notification for an external call. */
   private void dismissNotification(Call call) {
-    if (!mNotifications.containsKey(call)) {
-      throw new IllegalArgumentException();
-    }
+    Assert.checkArgument(mNotifications.containsKey(call));
 
-    NotificationManager notificationManager =
-        (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-    notificationManager.cancel(
-        String.valueOf(mNotifications.get(call).getNotificationId()), NOTIFICATION_ID);
+    // This will also dismiss the group summary if there are no more external call notifications.
+    DialerNotificationManager.cancel(
+        mContext, NOTIFICATION_TAG, mNotifications.get(call).getNotificationId());
 
     mNotifications.remove(call);
-
-    if (mShowingSummary && mNotifications.size() <= 1) {
-      // Where a summary notification is showing and there is now not enough notifications to
-      // necessitate a summary, cancel the summary.
-      notificationManager.cancel(NOTIFICATION_GROUP, NOTIFICATION_ID);
-      mShowingSummary = false;
-
-      // If there is still a single call requiring a notification, re-post the notification as a
-      // standalone notification without a summary notification.
-      if (mNotifications.size() == 1) {
-        postNotification(mNotifications.values().iterator().next());
-      }
-    }
   }
 
   /**
@@ -237,7 +227,7 @@
     builder.setOngoing(true);
     // Make the notification prioritized over the other normal notifications.
     builder.setPriority(Notification.PRIORITY_HIGH);
-    builder.setGroup(NOTIFICATION_GROUP);
+    builder.setGroup(GROUP_KEY);
 
     boolean isVideoCall = VideoProfile.isVideo(info.getCall().getDetails().getVideoState());
     // Set the content ("Ongoing call on another device")
@@ -251,9 +241,9 @@
     builder.setLargeIcon(info.getLargeIcon());
     builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
     builder.addPerson(info.getPersonReference());
-
-    NotificationChannelManager.applyChannel(
-        builder, mContext, Channel.EXTERNAL_CALL, info.getCall().getDetails().getAccountHandle());
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.DEFAULT);
+    }
 
     // Where the external call supports being transferred to the local device, add an action
     // to the notification to initiate the call pull process.
@@ -286,38 +276,17 @@
     Notification.Builder publicBuilder = new Notification.Builder(mContext);
     publicBuilder.setSmallIcon(R.drawable.quantum_ic_call_white_24);
     publicBuilder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color));
-
-    NotificationChannelManager.applyChannel(
-        publicBuilder,
-        mContext,
-        Channel.EXTERNAL_CALL,
-        info.getCall().getDetails().getAccountHandle());
+    if (BuildCompat.isAtLeastO()) {
+      publicBuilder.setChannelId(NotificationChannelId.DEFAULT);
+    }
 
     builder.setPublicVersion(publicBuilder.build());
     Notification notification = builder.build();
 
-    NotificationManager notificationManager =
-        (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-    notificationManager.notify(
-        String.valueOf(info.getNotificationId()), NOTIFICATION_ID, notification);
+    DialerNotificationManager.notify(
+        mContext, NOTIFICATION_TAG, info.getNotificationId(), notification);
 
-    if (!mShowingSummary && mNotifications.size() > 1) {
-      // If the number of notifications shown is > 1, and we're not already showing a group summary,
-      // build one now.  This will ensure the like notifications are grouped together.
-
-      Notification.Builder summary = new Notification.Builder(mContext);
-      // Set notification as ongoing since calls are long-running versus a point-in-time notice.
-      summary.setOngoing(true);
-      // Make the notification prioritized over the other normal notifications.
-      summary.setPriority(Notification.PRIORITY_HIGH);
-      summary.setGroup(NOTIFICATION_GROUP);
-      summary.setGroupSummary(true);
-      summary.setSmallIcon(R.drawable.quantum_ic_call_white_24);
-      NotificationChannelManager.applyChannel(
-          summary, mContext, Channel.EXTERNAL_CALL, info.getCall().getDetails().getAccountHandle());
-      notificationManager.notify(NOTIFICATION_GROUP, NOTIFICATION_ID, summary.build());
-      mShowingSummary = true;
-    }
+    showGroupSummaryNotification(mContext);
   }
 
   /**
@@ -384,11 +353,10 @@
       ContactInfoCache.ContactCacheEntry contactInfo,
       android.telecom.Call call) {
 
-    if (call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_CONFERENCE)
-        && !call.getDetails()
-            .hasProperty(android.telecom.Call.Details.PROPERTY_GENERIC_CONFERENCE)) {
-
-      return context.getResources().getString(R.string.conference_call_name);
+    if (call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_CONFERENCE)) {
+      return CallerInfoUtils.getConferenceString(
+          context,
+          call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_GENERIC_CONFERENCE));
     }
 
     String preferredName =
@@ -479,4 +447,20 @@
       mPersonReference = personReference;
     }
   }
+
+  private static void showGroupSummaryNotification(@NonNull Context context) {
+    Notification.Builder summary = new Notification.Builder(context);
+    // Set notification as ongoing since calls are long-running versus a point-in-time notice.
+    summary.setOngoing(true);
+    // Make the notification prioritized over the other normal notifications.
+    summary.setPriority(Notification.PRIORITY_HIGH);
+    summary.setGroup(GROUP_KEY);
+    summary.setGroupSummary(true);
+    summary.setSmallIcon(R.drawable.quantum_ic_call_white_24);
+    if (BuildCompat.isAtLeastO()) {
+      summary.setChannelId(NotificationChannelId.DEFAULT);
+    }
+    DialerNotificationManager.notify(
+        context, GROUP_SUMMARY_NOTIFICATION_TAG, GROUP_SUMMARY_NOTIFICATION_ID, summary.build());
+  }
 }
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index cc9a8e4..178a404 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -21,6 +21,7 @@
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.GradientDrawable.Orientation;
 import android.os.Bundle;
+import android.os.Trace;
 import android.support.annotation.ColorInt;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
@@ -28,16 +29,16 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.graphics.ColorUtils;
-import android.telecom.DisconnectCause;
 import android.telephony.TelephonyManager;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
 import com.android.incallui.answer.bindings.AnswerBindings;
@@ -48,6 +49,8 @@
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.callpending.CallPendingActivity;
+import com.android.incallui.disconnectdialog.DisconnectMessage;
 import com.android.incallui.incall.bindings.InCallBindings;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegateFactory;
@@ -67,6 +70,10 @@
         VideoCallScreenDelegateFactory,
         PseudoScreenState.StateChangedListener {
 
+  public static final int PENDING_INTENT_REQUEST_CODE_NON_FULL_SCREEN = 0;
+  public static final int PENDING_INTENT_REQUEST_CODE_FULL_SCREEN = 1;
+  public static final int PENDING_INTENT_REQUEST_CODE_BUBBLE = 2;
+
   private static final String TAG_IN_CALL_SCREEN = "tag_in_call_screen";
   private static final String TAG_ANSWER_SCREEN = "tag_answer_screen";
   private static final String TAG_VIDEO_CALL_SCREEN = "tag_video_call_screen";
@@ -112,9 +119,15 @@
 
   @Override
   protected void onCreate(Bundle icicle) {
+    Trace.beginSection("InCallActivity.onCreate");
     LogUtil.i("InCallActivity.onCreate", "");
     super.onCreate(icicle);
 
+    if (getIntent().getBooleanExtra(ReturnToCallController.RETURN_TO_CALL_EXTRA_KEY, false)) {
+      Logger.get(this).logImpression(DialerImpression.Type.BUBBLE_PRIMARY_BUTTON_RETURN_TO_CALL);
+      getIntent().removeExtra(ReturnToCallController.RETURN_TO_CALL_EXTRA_KEY);
+    }
+
     if (icicle != null) {
       didShowAnswerScreen = icicle.getBoolean(DID_SHOW_ANSWER_SCREEN_KEY);
       didShowInCallScreen = icicle.getBoolean(DID_SHOW_IN_CALL_SCREEN_KEY);
@@ -129,6 +142,8 @@
             View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
 
     pseudoBlackScreenOverlay = findViewById(R.id.psuedo_black_screen_overlay);
+    sendBroadcast(CallPendingActivity.getFinishBroadcast());
+    Trace.endSection();
   }
 
   @Override
@@ -144,6 +159,7 @@
 
   @Override
   protected void onStart() {
+    Trace.beginSection("InCallActivity.onStart");
     LogUtil.i("InCallActivity.onStart", "");
     super.onStart();
     isVisible = true;
@@ -154,40 +170,49 @@
       // Hide the dialpad because there may not be enough room
       showDialpadFragment(false, false);
     }
+    Trace.endSection();
   }
 
   @Override
   protected void onResume() {
+    Trace.beginSection("InCallActivity.onResume");
     LogUtil.i("InCallActivity.onResume", "");
     super.onResume();
     common.onResume();
     PseudoScreenState pseudoScreenState = InCallPresenter.getInstance().getPseudoScreenState();
     pseudoScreenState.addListener(this);
     onPseudoScreenStateChanged(pseudoScreenState.isOn());
+    Trace.endSection();
   }
 
   /** onPause is guaranteed to be called when the InCallActivity goes in the background. */
   @Override
   protected void onPause() {
+    Trace.beginSection("InCallActivity.onPause");
     LogUtil.i("InCallActivity.onPause", "");
     super.onPause();
     common.onPause();
     InCallPresenter.getInstance().getPseudoScreenState().removeListener(this);
+    Trace.endSection();
   }
 
   @Override
   protected void onStop() {
+    Trace.beginSection("InCallActivity.onStop");
     LogUtil.i("InCallActivity.onStop", "");
     super.onStop();
     common.onStop();
     isVisible = false;
+    Trace.endSection();
   }
 
   @Override
   protected void onDestroy() {
+    Trace.beginSection("InCallActivity.onDestroy");
     LogUtil.i("InCallActivity.onDestroy", "");
     super.onDestroy();
     common.onDestroy();
+    Trace.endSection();
   }
 
   @Override
@@ -393,8 +418,8 @@
     common.showPostCharWaitDialog(callId, chars);
   }
 
-  public void maybeShowErrorDialogOnDisconnect(DisconnectCause disconnectCause) {
-    common.maybeShowErrorDialogOnDisconnect(disconnectCause);
+  public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) {
+    common.maybeShowErrorDialogOnDisconnect(disconnectMessage);
   }
 
   public void dismissPendingDialogs() {
@@ -476,8 +501,10 @@
   }
 
   public void onPrimaryCallStateChanged() {
+    Trace.beginSection("InCallActivity.onPrimaryCallStateChanged");
     LogUtil.i("InCallActivity.onPrimaryCallStateChanged", "");
     showMainInCallFragment();
+    Trace.endSection();
   }
 
   public void onWiFiToLteHandover(DialerCall call) {
@@ -514,15 +541,18 @@
   }
 
   private void showMainInCallFragment() {
+    Trace.beginSection("InCallActivity.showMainInCallFragment");
     // If the activity's onStart method hasn't been called yet then defer doing any work.
     if (!isVisible) {
       LogUtil.i("InCallActivity.showMainInCallFragment", "not visible yet/anymore");
+      Trace.endSection();
       return;
     }
 
     // Don't let this be reentrant.
     if (isInShowMainInCallFragment) {
       LogUtil.i("InCallActivity.showMainInCallFragment", "already in method, bailing");
+      Trace.endSection();
       return;
     }
 
@@ -560,10 +590,13 @@
     }
 
     if (didChangeInCall || didChangeVideo || didChangeAnswer) {
+      Trace.beginSection("InCallActivity.commitTransaction");
       transaction.commitNow();
+      Trace.endSection();
       Logger.get(this).logScreenView(ScreenEvent.Type.INCALL, this);
     }
     isInShowMainInCallFragment = false;
+    Trace.endSection();
   }
 
   private ShouldShowUiResult getShouldShowAnswerUi() {
@@ -630,12 +663,22 @@
       AnswerScreen answerScreen = getAnswerScreen();
       if (answerScreen.getCallId().equals(call.getId())
           && answerScreen.isVideoCall() == call.isVideoCall()
-          && answerScreen.isVideoUpgradeRequest() == isVideoUpgradeRequest) {
+          && answerScreen.isVideoUpgradeRequest() == isVideoUpgradeRequest
+          && !answerScreen.isActionTimeout()) {
+        LogUtil.d(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists for same call and has NOT been accepted/rejected/timed out");
         return false;
       }
-      LogUtil.i(
-          "InCallActivity.showAnswerScreenFragment",
-          "answer fragment exists but arguments do not match");
+      if (answerScreen.isActionTimeout()) {
+        LogUtil.i(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists but has been accepted/rejected and timed out");
+      } else {
+        LogUtil.i(
+            "InCallActivity.showAnswerScreenFragment",
+            "answer fragment exists but arguments do not match");
+      }
       hideAnswerScreenFragment(transaction);
     }
 
@@ -694,13 +737,8 @@
     if (didShowInCallScreen) {
       return false;
     }
-    InCallScreen inCallScreen = getInCallScreen();
-    if (inCallScreen == null) {
-      inCallScreen = InCallBindings.createInCallScreen();
-      transaction.add(R.id.main, inCallScreen.getInCallScreenFragment(), TAG_IN_CALL_SCREEN);
-    } else {
-      transaction.show(inCallScreen.getInCallScreenFragment());
-    }
+    InCallScreen inCallScreen = InCallBindings.createInCallScreen();
+    transaction.add(R.id.main, inCallScreen.getInCallScreenFragment(), TAG_IN_CALL_SCREEN);
     Logger.get(this).logScreenView(ScreenEvent.Type.INCALL, this);
     didShowInCallScreen = true;
     return true;
@@ -712,7 +750,7 @@
     }
     InCallScreen inCallScreen = getInCallScreen();
     if (inCallScreen != null) {
-      transaction.hide(inCallScreen.getInCallScreenFragment());
+      transaction.remove(inCallScreen.getInCallScreenFragment());
     }
     didShowInCallScreen = false;
     return true;
diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java
index 4b0a3cd..14531e0 100644
--- a/java/com/android/incallui/InCallActivityCommon.java
+++ b/java/com/android/incallui/InCallActivityCommon.java
@@ -21,7 +21,7 @@
 import android.app.ActivityManager.TaskDescription;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.Context;
+import android.app.KeyguardManager;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnDismissListener;
@@ -36,10 +36,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.res.ResourcesCompat;
-import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccountHandle;
-import android.text.TextUtils;
-import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -62,9 +59,9 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.disconnectdialog.DisconnectMessage;
 import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment;
 import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment.Callback;
-import com.android.incallui.wifi.EnableWifiCallingPrompt;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -109,6 +106,8 @@
   private boolean animateDialpadOnShow;
   private String dtmfTextToPreopulate;
   @DialpadRequestType private int showDialpadRequest = DIALPAD_REQUEST_NONE;
+  // If activity is going to be recreated. This is usually happening in {@link onNewIntent}.
+  private boolean isRecreating;
 
   private final SelectPhoneAccountListener selectAccountListener =
       new SelectPhoneAccountListener() {
@@ -213,7 +212,8 @@
           }
         });
 
-    if (icicle != null) {
+    // Don't override the value if show dialpad request is true in intent extras.
+    if (icicle != null && showDialpadRequest == DIALPAD_REQUEST_NONE) {
       // If the dialpad was shown before, set variables indicating it should be shown and
       // populated with the previous DTMF text.  The dialpad is actually shown and populated
       // in onResume() to ensure the hosting fragment has been inflated and is ready to receive it.
@@ -323,6 +323,18 @@
   }
 
   public void onStop() {
+    // Disconnects call waiting for account when activity is hidden e.g. user press home button.
+    // This is necessary otherwise the pending call will stuck on account choose and no new call
+    // will be able to create. See b/63600434 for more details.
+    // Skip this on locked screen since the activity may go over life cycle and start again.
+    if (!isRecreating
+        && !inCallActivity.getSystemService(KeyguardManager.class).isKeyguardLocked()) {
+      DialerCall waitingForAccountCall = CallList.getInstance().getWaitingForAccountCall();
+      if (waitingForAccountCall != null) {
+        waitingForAccountCall.disconnect();
+      }
+    }
+
     enableInCallOrientationEventListener(false);
     InCallPresenter.getInstance().updateIsChangingConfigurations();
     InCallPresenter.getInstance().onActivityStopped();
@@ -335,6 +347,7 @@
 
   void onNewIntent(Intent intent, boolean isRecreating) {
     LogUtil.i("InCallActivityCommon.onNewIntent", "");
+    this.isRecreating = isRecreating;
 
     // We're being re-launched with a new Intent.  Since it's possible for a
     // single InCallActivity instance to persist indefinitely (even if we
@@ -497,18 +510,15 @@
     }
   }
 
-  public void maybeShowErrorDialogOnDisconnect(DisconnectCause cause) {
+  public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) {
     LogUtil.i(
-        "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", "disconnect cause: %s", cause);
+        "InCallActivityCommon.maybeShowErrorDialogOnDisconnect",
+        "disconnect cause: %s",
+        disconnectMessage);
 
     if (!inCallActivity.isFinishing()) {
-      if (EnableWifiCallingPrompt.shouldShowPrompt(cause)) {
-        Pair<Dialog, CharSequence> pair =
-            EnableWifiCallingPrompt.createDialog(inCallActivity, cause);
-        showErrorDialog(pair.first, pair.second);
-      } else if (shouldShowDisconnectErrorDialog(cause)) {
-        Pair<Dialog, CharSequence> pair = getDisconnectErrorDialog(inCallActivity, cause);
-        showErrorDialog(pair.first, pair.second);
+      if (disconnectMessage.dialog != null) {
+        showErrorDialog(disconnectMessage.dialog, disconnectMessage.toastMessage);
       }
     }
   }
@@ -557,23 +567,6 @@
     }
   }
 
-  private static boolean shouldShowDisconnectErrorDialog(@NonNull DisconnectCause cause) {
-    return !TextUtils.isEmpty(cause.getDescription())
-        && (cause.getCode() == DisconnectCause.ERROR
-            || cause.getCode() == DisconnectCause.RESTRICTED);
-  }
-
-  private static Pair<Dialog, CharSequence> getDisconnectErrorDialog(
-      @NonNull Context context, @NonNull DisconnectCause cause) {
-    CharSequence message = cause.getDescription();
-    Dialog dialog =
-        new AlertDialog.Builder(context)
-            .setMessage(message)
-            .setPositiveButton(android.R.string.ok, null)
-            .create();
-    return new Pair<>(dialog, message);
-  }
-
   private void showErrorDialog(Dialog dialog, CharSequence message) {
     LogUtil.i("InCallActivityCommon.showErrorDialog", "message: %s", message);
     inCallActivity.dismissPendingDialogs();
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 2d6d83c..9b1f674 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -21,6 +21,7 @@
 import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Trace;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
@@ -41,6 +42,7 @@
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DefaultDialerExecutorFactory;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.InteractionEvent;
@@ -54,6 +56,7 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.ExternalCallList;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.disconnectdialog.DisconnectMessage;
 import com.android.incallui.latencyreport.LatencyReport;
 import com.android.incallui.legacyblocking.BlockedNumberContentObserver;
 import com.android.incallui.spam.SpamCallListListener;
@@ -77,7 +80,8 @@
  * of a state machine at this point. Consider renaming.
  */
 public class InCallPresenter implements CallList.Listener {
-
+  private static final String PIXEL2017_SYSTEM_FEATURE =
+      "com.google.android.feature.PIXEL_2017_EXPERIENCE";
   private static final String EXTRA_FIRST_TIME_SHOWN =
       "com.android.incallui.intent.extra.FIRST_TIME_SHOWN";
 
@@ -133,7 +137,9 @@
             android.telecom.Call telecomCall, String remainingPostDialSequence) {
           final DialerCall call = mCallList.getDialerCallFromTelecomCall(telecomCall);
           if (call == null) {
-            Log.w(this, "DialerCall not found in call list: " + telecomCall);
+            LogUtil.w(
+                "InCallPresenter.onPostDialWait",
+                "DialerCall not found in call list: " + telecomCall);
             return;
           }
           onPostDialCharWait(call.getId(), remainingPostDialSequence);
@@ -144,7 +150,9 @@
             android.telecom.Call telecomCall, android.telecom.Call.Details details) {
           final DialerCall call = mCallList.getDialerCallFromTelecomCall(telecomCall);
           if (call == null) {
-            Log.w(this, "DialerCall not found in call list: " + telecomCall);
+            LogUtil.w(
+                "InCallPresenter.onDetailsChanged",
+                "DialerCall not found in call list: " + telecomCall);
             return;
           }
 
@@ -152,7 +160,7 @@
               && !mExternalCallList.isCallTracked(telecomCall)) {
 
             // A regular call became an external call so swap call lists.
-            Log.i(this, "Call became external: " + telecomCall);
+            LogUtil.i("InCallPresenter.onDetailsChanged", "Call became external: " + telecomCall);
             mCallList.onInternalCallMadeExternal(mContext, telecomCall);
             mExternalCallList.onCallAdded(telecomCall);
             return;
@@ -166,7 +174,9 @@
         @Override
         public void onConferenceableCallsChanged(
             android.telecom.Call telecomCall, List<android.telecom.Call> conferenceableCalls) {
-          Log.i(this, "onConferenceableCallsChanged: " + telecomCall);
+          LogUtil.i(
+              "InCallPresenter.onConferenceableCallsChanged",
+              "onConferenceableCallsChanged: " + telecomCall);
           onDetailsChanged(telecomCall, telecomCall.getDetails());
         }
       };
@@ -182,6 +192,8 @@
   /** Determines if the InCall UI is in fullscreen mode or not. */
   private boolean mIsFullScreen = false;
 
+  private boolean mScreenTimeoutEnabled = true;
+
   private PhoneStateListener mPhoneStateListener =
       new PhoneStateListener() {
         @Override
@@ -289,7 +301,8 @@
 
       if ((call.getAccountHandle() == null
           && (phoneAccountHandles == null || phoneAccountHandles.isEmpty()))) {
-        Log.i(InCallPresenter.getInstance(), "No valid accounts for call " + call);
+        LogUtil.i(
+            "InCallPresenter.isCallWithNoValidAccounts", "No valid accounts for call " + call);
         return true;
       }
     }
@@ -313,11 +326,13 @@
       ContactInfoCache contactInfoCache,
       ProximitySensor proximitySensor,
       FilteredNumberAsyncQueryHandler filteredNumberQueryHandler) {
+    Trace.beginSection("InCallPresenter.setUp");
     if (mServiceConnected) {
-      Log.i(this, "New service connection replacing existing one.");
+      LogUtil.i("InCallPresenter.setUp", "New service connection replacing existing one.");
       if (context != mContext || callList != mCallList) {
         throw new IllegalStateException();
       }
+      Trace.endSection();
       return;
     }
 
@@ -352,7 +367,7 @@
     mCallList.addListener(this);
 
     // Create spam call list listener and add it to the list of listeners
-    mSpamCallListListener = new SpamCallListListener(context);
+    mSpamCallListListener = new SpamCallListListener(context, new DefaultDialerExecutorFactory());
     mCallList.addListener(mSpamCallListListener);
 
     VideoPauseController.getInstance().setUp(this);
@@ -362,7 +377,8 @@
         .getSystemService(TelephonyManager.class)
         .listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
 
-    Log.d(this, "Finished InCallPresenter.setUp");
+    LogUtil.d("InCallPresenter.setUp", "Finished InCallPresenter.setUp");
+    Trace.endSection();
   }
 
   /**
@@ -373,7 +389,7 @@
    * secondary method that performs the aforementioned logic.
    */
   public void tearDown() {
-    Log.d(this, "tearDown");
+    LogUtil.d("InCallPresenter.tearDown", "tearDown");
     mCallList.clearOnDisconnect();
 
     mServiceConnected = false;
@@ -387,8 +403,9 @@
   }
 
   private void attemptFinishActivity() {
+    mScreenTimeoutEnabled = true;
     final boolean doFinish = (mInCallActivity != null && isActivityStarted());
-    Log.i(this, "Hide in call UI: " + doFinish);
+    LogUtil.i("InCallPresenter.attemptFinishActivity", "Hide in call UI: " + doFinish);
     if (doFinish) {
       mInCallActivity.setExcludeFromRecents(true);
       mInCallActivity.finish();
@@ -404,12 +421,13 @@
       throw new IllegalArgumentException("unregisterActivity cannot be called with null");
     }
     if (mInCallActivity == null) {
-      Log.i(this, "No InCallActivity currently set, no need to unset.");
+      LogUtil.i(
+          "InCallPresenter.unsetActivity", "No InCallActivity currently set, no need to unset.");
       return;
     }
     if (mInCallActivity != inCallActivity) {
-      Log.w(
-          this,
+      LogUtil.w(
+          "InCallPresenter.unsetActivity",
           "Second instance of InCallActivity is trying to unregister when another"
               + " instance is active. Ignoring.");
       return;
@@ -428,7 +446,7 @@
     if (inCallActivity != null) {
       if (mInCallActivity == null) {
         updateListeners = true;
-        Log.i(this, "UI Initialized");
+        LogUtil.i("InCallPresenter.updateActivity", "UI Initialized");
       } else {
         // since setActivity is called onStart(), it can be called multiple times.
         // This is fine and ignorable, but we do not want to update the world every time
@@ -451,12 +469,12 @@
       // NOTE: This code relies on {@link #mInCallActivity} being set so we run it after
       // it has been set.
       if (mInCallState == InCallState.NO_CALLS) {
-        Log.i(this, "UI Initialized, but no calls left.  shut down.");
+        LogUtil.i("InCallPresenter.updateActivity", "UI Initialized, but no calls left. Shut down");
         attemptFinishActivity();
         return;
       }
     } else {
-      Log.i(this, "UI Destroyed");
+      LogUtil.i("InCallPresenter.updateActivity", "UI Destroyed");
       updateListeners = true;
       mInCallActivity = null;
 
@@ -496,11 +514,12 @@
   }
 
   public void onBringToForeground(boolean showDialpad) {
-    Log.i(this, "Bringing UI to foreground.");
+    LogUtil.i("InCallPresenter.onBringToForeground", "Bringing UI to foreground.");
     bringToForeground(showDialpad);
   }
 
   public void onCallAdded(final android.telecom.Call call) {
+    Trace.beginSection("InCallPresenter.onCallAdded");
     LatencyReport latencyReport = new LatencyReport(call);
     if (shouldAttemptBlocking(call)) {
       maybeBlockCall(call, latencyReport);
@@ -516,6 +535,7 @@
     // Since a call has been added we are no longer waiting for Telecom to send us a call.
     setBoundAndWaitingForOutgoingCall(false, null);
     call.registerCallback(mCallCallback);
+    Trace.endSection();
   }
 
   private boolean shouldAttemptBlocking(android.telecom.Call call) {
@@ -529,11 +549,15 @@
       return false;
     }
     if (TelecomCallUtil.isEmergencyCall(call)) {
-      Log.i(this, "Not attempting to block incoming emergency call");
+      LogUtil.i(
+          "InCallPresenter.shouldAttemptBlocking",
+          "Not attempting to block incoming emergency call");
       return false;
     }
     if (FilteredNumbersUtil.hasRecentEmergencyCall(mContext)) {
-      Log.i(this, "Not attempting to block incoming call due to recent emergency call");
+      LogUtil.i(
+          "InCallPresenter.shouldAttemptBlocking",
+          "Not attempting to block incoming call due to recent emergency call");
       return false;
     }
     if (call.getDetails().hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL)) {
@@ -583,7 +607,7 @@
           @Override
           public void onCheckComplete(final Integer id) {
             if (isReadyForTearDown()) {
-              Log.i(this, "InCallPresenter is torn down, not adding call");
+              LogUtil.i("InCallPresenter.onCheckComplete", "torn down, not adding call");
               return;
             }
             if (!hasTimedOut.get()) {
@@ -595,7 +619,8 @@
                 mCallList.onCallAdded(mContext, call, latencyReport);
               }
             } else if (id == FilteredNumberAsyncQueryHandler.INVALID_ID) {
-              Log.d(this, "checkForBlockedCall: invalid number, skipping block checking");
+              LogUtil.d(
+                  "InCallPresenter.onCheckComplete", "invalid number, skipping block checking");
               if (!hasTimedOut.get()) {
                 handler.removeCallbacks(runnable);
 
@@ -603,7 +628,8 @@
                 mCallList.onCallAdded(mContext, call, latencyReport);
               }
             } else {
-              Log.i(this, "Rejecting incoming call from blocked number");
+              LogUtil.i(
+                  "InCallPresenter.onCheckComplete", "Rejecting incoming call from blocked number");
               call.reject(false, null);
               Logger.get(mContext).logInteraction(InteractionEvent.Type.CALL_BLOCKED);
 
@@ -672,11 +698,14 @@
    */
   @Override
   public void onCallListChange(CallList callList) {
+    Trace.beginSection("InCallPresenter.onCallListChange");
     if (mInCallActivity != null && mInCallActivity.isInCallScreenAnimating()) {
       mAwaitingCallListUpdate = true;
+      Trace.endSection();
       return;
     }
     if (callList == null) {
+      Trace.endSection();
       return;
     }
 
@@ -684,7 +713,9 @@
 
     InCallState newState = getPotentialStateFromCallList(callList);
     InCallState oldState = mInCallState;
-    Log.d(this, "onCallListChange oldState= " + oldState + " newState=" + newState);
+    LogUtil.d(
+        "InCallPresenter.onCallListChange",
+        "onCallListChange oldState= " + oldState + " newState=" + newState);
 
     // If the user placed a call and was asked to choose the account, but then pressed "Home", the
     // incall activity for that call will still exist (even if it's not visible). In the case of
@@ -695,19 +726,27 @@
     if (newState == InCallState.INCOMING
         && (waitingForAccountCall = callList.getWaitingForAccountCall()) != null) {
       waitingForAccountCall.disconnect();
-      mInCallActivity.dismissPendingDialogs();
+      // The InCallActivity might be destroyed or not started yet at this point.
+      if (isActivityStarted()) {
+        mInCallActivity.dismissPendingDialogs();
+      }
     }
 
     newState = startOrFinishUi(newState);
-    Log.d(this, "onCallListChange newState changed to " + newState);
+    LogUtil.d(
+        "InCallPresenter.onCallListChange", "onCallListChange newState changed to " + newState);
 
     // Set the new state before announcing it to the world
-    Log.i(this, "Phone switching state: " + oldState + " -> " + newState);
+    LogUtil.i(
+        "InCallPresenter.onCallListChange",
+        "Phone switching state: " + oldState + " -> " + newState);
     mInCallState = newState;
 
     // notify listeners of new state
     for (InCallStateListener listener : mListeners) {
-      Log.d(this, "Notify " + listener + " of state " + mInCallState.toString());
+      LogUtil.d(
+          "InCallPresenter.onCallListChange",
+          "Notify " + listener + " of state " + mInCallState.toString());
       listener.onStateChange(oldState, mInCallState, callList);
     }
 
@@ -716,15 +755,18 @@
           callList.getActiveOrBackgroundCall() != null || callList.getOutgoingCall() != null;
       mInCallActivity.dismissKeyguard(hasCall);
     }
+    Trace.endSection();
   }
 
   /** Called when there is a new incoming call. */
   @Override
   public void onIncomingCall(DialerCall call) {
+    Trace.beginSection("InCallPresenter.onIncomingCall");
     InCallState newState = startOrFinishUi(InCallState.INCOMING);
     InCallState oldState = mInCallState;
 
-    Log.i(this, "Phone switching state: " + oldState + " -> " + newState);
+    LogUtil.i(
+        "InCallPresenter.onIncomingCall", "Phone switching state: " + oldState + " -> " + newState);
     mInCallState = newState;
 
     for (IncomingCallListener listener : mIncomingCallListeners) {
@@ -735,6 +777,7 @@
       // Re-evaluate which fragment is being shown.
       mInCallActivity.onPrimaryCallStateChanged();
     }
+    Trace.endSection();
   }
 
   @Override
@@ -826,7 +869,7 @@
 
     if (newState == InCallState.NO_CALLS) {
       if (mBoundAndWaitingForOutgoingCall) {
-        return InCallState.OUTGOING;
+        return InCallState.PENDING_OUTGOING;
       }
     }
 
@@ -838,11 +881,13 @@
   }
 
   public void setBoundAndWaitingForOutgoingCall(boolean isBound, PhoneAccountHandle handle) {
-    Log.i(this, "setBoundAndWaitingForOutgoingCall: " + isBound);
+    LogUtil.i(
+        "InCallPresenter.setBoundAndWaitingForOutgoingCall",
+        "setBoundAndWaitingForOutgoingCall: " + isBound);
     mBoundAndWaitingForOutgoingCall = isBound;
     mThemeColorManager.setPendingPhoneAccountHandle(handle);
     if (isBound && mInCallState == InCallState.NO_CALLS) {
-      mInCallState = InCallState.OUTGOING;
+      mInCallState = InCallState.PENDING_OUTGOING;
     }
   }
 
@@ -967,7 +1012,9 @@
     if (mInCallActivity != null) {
       mIsChangingConfigurations = mInCallActivity.isChangingConfigurations();
     }
-    Log.v(this, "updateIsChangingConfigurations = " + mIsChangingConfigurations);
+    LogUtil.v(
+        "InCallPresenter.updateIsChangingConfigurations",
+        "updateIsChangingConfigurations = " + mIsChangingConfigurations);
   }
 
   /** Called when the activity goes in/out of the foreground. */
@@ -987,10 +1034,10 @@
       broadcastIntent.putExtra(EXTRA_FIRST_TIME_SHOWN, !mIsActivityPreviouslyStarted);
 
       if (showing) {
-        Log.d(this, "Sending sticky broadcast: ", broadcastIntent);
+        LogUtil.d("InCallPresenter.onUiShowing", "Sending sticky broadcast: ", broadcastIntent);
         mContext.sendStickyBroadcast(broadcastIntent);
       } else {
-        Log.d(this, "Removing sticky broadcast: ", broadcastIntent);
+        LogUtil.d("InCallPresenter.onUiShowing", "Removing sticky broadcast: ", broadcastIntent);
         mContext.removeStickyBroadcast(broadcastIntent);
       }
     }
@@ -1011,6 +1058,13 @@
     }
   }
 
+  public void refreshUi() {
+    if (mInCallActivity != null) {
+      // Re-evaluate which fragment is being shown.
+      mInCallActivity.onPrimaryCallStateChanged();
+    }
+  }
+
   public void addInCallUiListener(InCallUiListener listener) {
     mInCallUiListeners.add(listener);
   }
@@ -1021,23 +1075,25 @@
 
   /*package*/
   void onActivityStarted() {
-    Log.d(this, "onActivityStarted");
+    LogUtil.d("InCallPresenter.onActivityStarted", "onActivityStarted");
     notifyVideoPauseController(true);
     if (mStatusBarNotifier != null) {
-      // TODO - b/36649622: Investigate this redundant call
+      // TODO(maxwelb) - b/36649622: Investigate this redundant call
       mStatusBarNotifier.updateNotification(mCallList);
     }
+    applyScreenTimeout();
   }
 
   /*package*/
   void onActivityStopped() {
-    Log.d(this, "onActivityStopped");
+    LogUtil.d("InCallPresenter.onActivityStopped", "onActivityStopped");
     notifyVideoPauseController(false);
   }
 
   private void notifyVideoPauseController(boolean showing) {
-    Log.d(
-        this, "notifyVideoPauseController: mIsChangingConfigurations=" + mIsChangingConfigurations);
+    LogUtil.d(
+        "InCallPresenter.notifyVideoPauseController",
+        "mIsChangingConfigurations=" + mIsChangingConfigurations);
     if (!mIsChangingConfigurations) {
       VideoPauseController.getInstance().onUiShowing(showing);
     }
@@ -1096,8 +1152,9 @@
       final boolean canSwap =
           activeCall.can(android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE);
 
-      Log.v(
-          this, "activeCall: " + activeCall + ", canMerge: " + canMerge + ", canSwap: " + canSwap);
+      LogUtil.v(
+          "InCallPresenter.handleCallKey",
+          "activeCall: " + activeCall + ", canMerge: " + canMerge + ", canSwap: " + canSwap);
 
       // (2) Attempt actions on conference calls
       if (canMerge) {
@@ -1116,7 +1173,7 @@
       // there is no harm in double checking.
       final boolean canHold = heldCall.can(android.telecom.Call.Details.CAPABILITY_HOLD);
 
-      Log.v(this, "heldCall: " + heldCall + ", canHold: " + canHold);
+      LogUtil.v("InCallPresenter.handleCallKey", "heldCall: " + heldCall + ", canHold: " + canHold);
 
       // (4) unhold call
       if (heldCall.getState() == DialerCall.State.ONHOLD && canHold) {
@@ -1134,7 +1191,7 @@
    * checks to see if there should be any UI left and if not attempts to tear down the UI.
    */
   public void onDismissDialog() {
-    Log.i(this, "Dialog dismissed");
+    LogUtil.i("InCallPresenter.onDismissDialog", "Dialog dismissed");
     if (mInCallState == InCallState.NO_CALLS) {
       attemptFinishActivity();
       attemptCleanup();
@@ -1164,16 +1221,18 @@
    * @param force {@code true} if fullscreen mode should be set regardless of its current state.
    */
   public void setFullScreen(boolean isFullScreen, boolean force) {
-    Log.i(this, "setFullScreen = " + isFullScreen);
+    LogUtil.i("InCallPresenter.setFullScreen", "setFullScreen = " + isFullScreen);
 
     // As a safeguard, ensure we cannot enter fullscreen if the dialpad is shown.
     if (isDialpadVisible()) {
       isFullScreen = false;
-      Log.v(this, "setFullScreen overridden as dialpad is shown = " + isFullScreen);
+      LogUtil.v(
+          "InCallPresenter.setFullScreen",
+          "setFullScreen overridden as dialpad is shown = " + isFullScreen);
     }
 
     if (mIsFullScreen == isFullScreen && !force) {
-      Log.v(this, "setFullScreen ignored as already in that state.");
+      LogUtil.v("InCallPresenter.setFullScreen", "setFullScreen ignored as already in that state.");
       return;
     }
     mIsFullScreen = isFullScreen;
@@ -1209,7 +1268,8 @@
       if (call.getAccountHandle() == null && !call.isConferenceCall()) {
         setDisconnectCauseForMissingAccounts(call);
       }
-      mInCallActivity.maybeShowErrorDialogOnDisconnect(call.getDisconnectCause());
+      mInCallActivity.maybeShowErrorDialogOnDisconnect(
+          new DisconnectMessage(mInCallActivity, call));
     }
   }
 
@@ -1218,7 +1278,8 @@
    * UI needs to be started or finished depending on the new state and does it.
    */
   private InCallState startOrFinishUi(InCallState newState) {
-    Log.d(this, "startOrFinishUi: " + mInCallState + " -> " + newState);
+    LogUtil.d(
+        "InCallPresenter.startOrFinishUi", "startOrFinishUi: " + mInCallState + " -> " + newState);
 
     // TODO: Consider a proper state machine implementation
 
@@ -1300,7 +1361,9 @@
     // up so we aren't going to lose anything by avoiding a second startup here.
     boolean activityIsFinishing = mInCallActivity != null && !isActivityStarted();
     if (activityIsFinishing) {
-      Log.i(this, "Undo the state change: " + newState + " -> " + mInCallState);
+      LogUtil.i(
+          "InCallPresenter.startOrFinishUi",
+          "Undo the state change: " + newState + " -> " + mInCallState);
       return mInCallState;
     }
 
@@ -1315,10 +1378,10 @@
     }
 
     if (showCallUi || showAccountPicker) {
-      Log.i(this, "Start in call UI");
+      LogUtil.i("InCallPresenter.startOrFinishUi", "Start in call UI");
       showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */);
     } else if (startIncomingCallSequence) {
-      Log.i(this, "Start Full Screen in call UI");
+      LogUtil.i("InCallPresenter.startOrFinishUi", "Start Full Screen in call UI");
 
       mStatusBarNotifier.updateNotification(mCallList);
     } else if (newState == InCallState.NO_CALLS) {
@@ -1371,7 +1434,7 @@
    */
   private void attemptCleanup() {
     if (isReadyForTearDown()) {
-      Log.i(this, "Cleaning up");
+      LogUtil.i("InCallPresenter.attemptCleanup", "Cleaning up");
 
       cleanupSurfaces();
 
@@ -1421,12 +1484,12 @@
       mInCallEventListeners.clear();
       mInCallUiListeners.clear();
 
-      Log.d(this, "Finished InCallPresenter.CleanUp");
+      LogUtil.d("InCallPresenter.attemptCleanup", "finished");
     }
   }
 
   public void showInCall(boolean showDialpad, boolean newOutgoingCall) {
-    Log.i(this, "Showing InCallActivity");
+    LogUtil.i("InCallPresenter.showInCall", "Showing InCallActivity");
     mContext.startActivity(
         InCallActivity.getIntent(
             mContext, showDialpad, newOutgoingCall, false /* forFullScreen */));
@@ -1497,12 +1560,14 @@
    *     InCallOrientationEventListener#SCREEN_ORIENTATION_270}).
    */
   public void onDeviceOrientationChange(@ScreenOrientation int orientation) {
-    Log.d(this, "onDeviceOrientationChange: orientation= " + orientation);
+    LogUtil.d(
+        "InCallPresenter.onDeviceOrientationChange",
+        "onDeviceOrientationChange: orientation= " + orientation);
 
     if (mCallList != null) {
       mCallList.notifyCallsOfDeviceRotation(orientation);
     } else {
-      Log.w(this, "onDeviceOrientationChange: CallList is null.");
+      LogUtil.w("InCallPresenter.onDeviceOrientationChange", "CallList is null.");
     }
 
     // Notify listeners of device orientation changed.
@@ -1520,21 +1585,28 @@
    */
   public void setInCallAllowsOrientationChange(boolean allowOrientationChange) {
     if (mInCallActivity == null) {
-      Log.e(this, "InCallActivity is null. Can't set requested orientation.");
+      LogUtil.e(
+          "InCallPresenter.setInCallAllowsOrientationChange",
+          "InCallActivity is null. Can't set requested orientation.");
       return;
     }
     mInCallActivity.setAllowOrientationChange(allowOrientationChange);
   }
 
   public void enableScreenTimeout(boolean enable) {
-    Log.v(this, "enableScreenTimeout: value=" + enable);
+    LogUtil.v("InCallPresenter.enableScreenTimeout", "enableScreenTimeout: value=" + enable);
+    mScreenTimeoutEnabled = enable;
+    applyScreenTimeout();
+  }
+
+  private void applyScreenTimeout() {
     if (mInCallActivity == null) {
-      Log.e(this, "enableScreenTimeout: InCallActivity is null.");
+      LogUtil.e("InCallPresenter.applyScreenTimeout", "InCallActivity is null.");
       return;
     }
 
     final Window window = mInCallActivity.getWindow();
-    if (enable) {
+    if (mScreenTimeoutEnabled) {
       window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     } else {
       window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -1590,7 +1662,8 @@
       throw new IllegalArgumentException("registerActivity cannot be called with null");
     }
     if (mInCallActivity != null && mInCallActivity != inCallActivity) {
-      Log.w(this, "Setting a second activity before destroying the first.");
+      LogUtil.w(
+          "InCallPresenter.setActivity", "Setting a second activity before destroying the first.");
     }
     updateActivity(inCallActivity);
   }
@@ -1601,14 +1674,18 @@
 
   VideoSurfaceTexture getLocalVideoSurfaceTexture() {
     if (mLocalVideoSurfaceTexture == null) {
-      mLocalVideoSurfaceTexture = VideoSurfaceBindings.createLocalVideoSurfaceTexture();
+      mLocalVideoSurfaceTexture =
+          VideoSurfaceBindings.createLocalVideoSurfaceTexture(
+              mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE));
     }
     return mLocalVideoSurfaceTexture;
   }
 
   VideoSurfaceTexture getRemoteVideoSurfaceTexture() {
     if (mRemoteVideoSurfaceTexture == null) {
-      mRemoteVideoSurfaceTexture = VideoSurfaceBindings.createRemoteVideoSurfaceTexture();
+      mRemoteVideoSurfaceTexture =
+          VideoSurfaceBindings.createRemoteVideoSurfaceTexture(
+              mContext.getPackageManager().hasSystemFeature(PIXEL2017_SYSTEM_FEATURE));
     }
     return mRemoteVideoSurfaceTexture;
   }
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 4ab92a7..a08ee0a 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
+import android.os.Trace;
 import android.telecom.Call;
 import android.telecom.CallAudioState;
 import android.telecom.InCallService;
@@ -36,6 +37,8 @@
  */
 public class InCallServiceImpl extends InCallService {
 
+  private ReturnToCallController returnToCallController;
+
   @Override
   public void onCallAudioStateChanged(CallAudioState audioState) {
     AudioModeProvider.getInstance().onAudioStateChanged(audioState);
@@ -43,28 +46,38 @@
 
   @Override
   public void onBringToForeground(boolean showDialpad) {
+    Trace.beginSection("InCallServiceImpl.onBringToForeground");
     InCallPresenter.getInstance().onBringToForeground(showDialpad);
+    Trace.endSection();
   }
 
   @Override
   public void onCallAdded(Call call) {
+    Trace.beginSection("InCallServiceImpl.onCallAdded");
     InCallPresenter.getInstance().onCallAdded(call);
+    Trace.endSection();
   }
 
   @Override
   public void onCallRemoved(Call call) {
+    Trace.beginSection("InCallServiceImpl.onCallRemoved");
     InCallPresenter.getInstance().onCallRemoved(call);
+    Trace.endSection();
   }
 
   @Override
   public void onCanAddCallChanged(boolean canAddCall) {
+    Trace.beginSection("InCallServiceImpl.onCanAddCallChanged");
     InCallPresenter.getInstance().onCanAddCallChanged(canAddCall);
+    Trace.endSection();
   }
 
   @Override
   public IBinder onBind(Intent intent) {
+    Trace.beginSection("InCallServiceImpl.onBind");
     final Context context = getApplicationContext();
     final ContactInfoCache contactInfoCache = ContactInfoCache.getInstance(context);
+    AudioModeProvider.getInstance().initializeAudioState(this);
     InCallPresenter.getInstance()
         .setUp(
             context,
@@ -79,24 +92,37 @@
     InCallPresenter.getInstance().onServiceBind();
     InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
     TelecomAdapter.getInstance().setInCallService(this);
+    if (ReturnToCallController.isEnabled(this)) {
+      returnToCallController = new ReturnToCallController(this);
+    }
 
-    return super.onBind(intent);
+    IBinder iBinder = super.onBind(intent);
+    Trace.endSection();
+    return iBinder;
   }
 
   @Override
   public boolean onUnbind(Intent intent) {
+    Trace.beginSection("InCallServiceImpl.onUnbind");
     super.onUnbind(intent);
 
     InCallPresenter.getInstance().onServiceUnbind();
     tearDown();
 
+    Trace.endSection();
     return false;
   }
 
   private void tearDown() {
+    Trace.beginSection("InCallServiceImpl.tearDown");
     Log.v(this, "tearDown");
     // Tear down the InCall system
     TelecomAdapter.getInstance().clearInCallService();
     InCallPresenter.getInstance().tearDown();
+    if (returnToCallController != null) {
+      returnToCallController.tearDown();
+      returnToCallController = null;
+    }
+    Trace.endSection();
   }
 }
diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java
index 653d85b..db538ab 100644
--- a/java/com/android/incallui/ProximitySensor.java
+++ b/java/com/android/incallui/ProximitySensor.java
@@ -102,7 +102,10 @@
     // sensor during incoming call screen. We check hasLiveCall() because a disconnected call
     // can also put the in-call screen in the INCALL state.
     boolean hasOngoingCall = InCallState.INCALL == newState && callList.hasLiveCall();
-    boolean isOffhook = (InCallState.OUTGOING == newState) || hasOngoingCall;
+    boolean isOffhook =
+        InCallState.PENDING_OUTGOING == newState
+            || InCallState.OUTGOING == newState
+            || hasOngoingCall;
 
     DialerCall activeCall = callList.getActiveCall();
     boolean isVideoCall = activeCall != null && activeCall.isVideoCall();
diff --git a/java/com/android/incallui/ReturnToCallActionReceiver.java b/java/com/android/incallui/ReturnToCallActionReceiver.java
new file mode 100644
index 0000000..b645c15
--- /dev/null
+++ b/java/com/android/incallui/ReturnToCallActionReceiver.java
@@ -0,0 +1,132 @@
+/*
+ * 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.incallui;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telecom.CallAudioState;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.TelecomAdapter;
+
+/** Handles clicks on the return-to-call bubble */
+public class ReturnToCallActionReceiver extends BroadcastReceiver {
+
+  public static final String ACTION_TOGGLE_SPEAKER = "toggleSpeaker";
+  public static final String ACTION_SHOW_AUDIO_ROUTE_SELECTOR = "showAudioRouteSelector";
+  public static final String ACTION_TOGGLE_MUTE = "toggleMute";
+  public static final String ACTION_END_CALL = "endCall";
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    switch (intent.getAction()) {
+      case ACTION_TOGGLE_SPEAKER:
+        toggleSpeaker(context);
+        break;
+      case ACTION_SHOW_AUDIO_ROUTE_SELECTOR:
+        showAudioRouteSelector(context);
+        break;
+      case ACTION_TOGGLE_MUTE:
+        toggleMute(context);
+        break;
+      case ACTION_END_CALL:
+        endCall(context);
+        break;
+    }
+  }
+
+  private void toggleSpeaker(Context context) {
+    CallAudioState audioState = AudioModeProvider.getInstance().getAudioState();
+
+    if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
+        == CallAudioState.ROUTE_BLUETOOTH) {
+      LogUtil.w(
+          "ReturnToCallActionReceiver.toggleSpeaker",
+          "toggleSpeaker() called when bluetooth available."
+              + " Probably should have shown audio route selector");
+    }
+
+    DialerCall call = getCall();
+
+    int newRoute;
+    if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) {
+      newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE;
+      Logger.get(context)
+          .logCallImpression(
+              DialerImpression.Type.BUBBLE_TURN_ON_WIRED_OR_EARPIECE,
+              call != null ? call.getUniqueCallId() : "",
+              call != null ? call.getTimeAddedMs() : 0);
+    } else {
+      newRoute = CallAudioState.ROUTE_SPEAKER;
+      Logger.get(context)
+          .logCallImpression(
+              DialerImpression.Type.BUBBLE_TURN_ON_SPEAKERPHONE,
+              call != null ? call.getUniqueCallId() : "",
+              call != null ? call.getTimeAddedMs() : 0);
+    }
+    TelecomAdapter.getInstance().setAudioRoute(newRoute);
+  }
+
+  public void showAudioRouteSelector(Context context) {
+    context.startActivity(new Intent(context, AudioRouteSelectorActivity.class));
+  }
+
+  private void toggleMute(Context context) {
+    DialerCall call = getCall();
+    boolean shouldMute = !AudioModeProvider.getInstance().getAudioState().isMuted();
+    Logger.get(context)
+        .logCallImpression(
+            shouldMute
+                ? DialerImpression.Type.BUBBLE_MUTE_CALL
+                : DialerImpression.Type.BUBBLE_UNMUTE_CALL,
+            call != null ? call.getUniqueCallId() : "",
+            call != null ? call.getTimeAddedMs() : 0);
+    TelecomAdapter.getInstance().mute(shouldMute);
+  }
+
+  private void endCall(Context context) {
+    DialerCall call = getCall();
+
+    Logger.get(context)
+        .logCallImpression(
+            DialerImpression.Type.BUBBLE_END_CALL,
+            call != null ? call.getUniqueCallId() : "",
+            call != null ? call.getTimeAddedMs() : 0);
+    if (call != null) {
+      call.disconnect();
+    }
+  }
+
+  private DialerCall getCall() {
+    CallList callList = InCallPresenter.getInstance().getCallList();
+    if (callList != null) {
+      DialerCall call = callList.getOutgoingCall();
+      if (call == null) {
+        call = callList.getActiveOrBackgroundCall();
+      }
+      if (call != null) {
+        return call;
+      }
+    }
+    return null;
+  }
+}
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
new file mode 100644
index 0000000..e5c7618
--- /dev/null
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -0,0 +1,257 @@
+/*
+ * 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.incallui;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.telecom.CallAudioState;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialershared.bubble.Bubble;
+import com.android.dialershared.bubble.Bubble.BubbleExpansionStateListener;
+import com.android.dialershared.bubble.Bubble.ExpansionState;
+import com.android.dialershared.bubble.BubbleInfo;
+import com.android.dialershared.bubble.BubbleInfo.Action;
+import com.android.incallui.InCallPresenter.InCallUiListener;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.CallList.Listener;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
+import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Listens for events relevant to the return-to-call bubble and updates the bubble's state as
+ * necessary
+ */
+public class ReturnToCallController implements InCallUiListener, Listener, AudioModeListener {
+
+  public static final String RETURN_TO_CALL_EXTRA_KEY = "RETURN_TO_CALL_BUBBLE";
+
+  private final Context context;
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  Bubble bubble;
+
+  private CallAudioState audioState;
+
+  private final PendingIntent toggleSpeaker;
+  private final PendingIntent showSpeakerSelect;
+  private final PendingIntent toggleMute;
+  private final PendingIntent endCall;
+
+  public static boolean isEnabled(Context context) {
+    return ConfigProviderBindings.get(context).getBoolean("enable_return_to_call_bubble", false);
+  }
+
+  public ReturnToCallController(Context context) {
+    this.context = context;
+
+    toggleSpeaker = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_SPEAKER);
+    showSpeakerSelect =
+        createActionIntent(ReturnToCallActionReceiver.ACTION_SHOW_AUDIO_ROUTE_SELECTOR);
+    toggleMute = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_MUTE);
+    endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL);
+
+    InCallPresenter.getInstance().addInCallUiListener(this);
+    CallList.getInstance().addListener(this);
+    AudioModeProvider.getInstance().addListener(this);
+    audioState = AudioModeProvider.getInstance().getAudioState();
+  }
+
+  public void tearDown() {
+    InCallPresenter.getInstance().removeInCallUiListener(this);
+    CallList.getInstance().removeListener(this);
+    AudioModeProvider.getInstance().removeListener(this);
+  }
+
+  @Override
+  public void onUiShowing(boolean showing) {
+    if (showing) {
+      hide();
+    } else {
+      if (TelecomUtil.isInCall(context)) {
+        show();
+      }
+    }
+  }
+
+  private void hide() {
+    if (bubble != null) {
+      bubble.hide();
+    } else {
+      LogUtil.i("ReturnToCallController.hide", "hide() called without calling show()");
+    }
+  }
+
+  private void hideAndReset() {
+    if (bubble != null) {
+      bubble.hideAndReset();
+    } else {
+      LogUtil.i("ReturnToCallController.reset", "reset() called without calling show()");
+    }
+  }
+
+  private void show() {
+    if (bubble == null) {
+      bubble = startNewBubble();
+    } else {
+      bubble.show();
+    }
+  }
+
+  @VisibleForTesting
+  public Bubble startNewBubble() {
+    if (!Bubble.canShowBubbles(context)) {
+      LogUtil.i("ReturnToCallController.startNewBubble", "can't show bubble, no permission");
+      return null;
+    }
+    Bubble returnToCallBubble = Bubble.createBubble(context, generateBubbleInfo());
+    returnToCallBubble.setBubbleExpansionStateListener(
+        new BubbleExpansionStateListener() {
+          @Override
+          public void onBubbleExpansionStateChanged(@ExpansionState int expansionState) {
+            switch (expansionState) {
+              case ExpansionState.START_EXPANDING:
+                Logger.get(context)
+                    .logImpression(DialerImpression.Type.BUBBLE_PRIMARY_BUTTON_EXPAND);
+                break;
+              case ExpansionState.START_COLLAPSING:
+                Logger.get(context).logImpression(DialerImpression.Type.BUBBLE_COLLAPSE_BY_USER);
+                break;
+              default:
+                break;
+            }
+          }
+        });
+    returnToCallBubble.show();
+    return returnToCallBubble;
+  }
+
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {}
+
+  @Override
+  public void onDisconnect(DialerCall call) {
+    if (call.wasParentCall()) {
+      // It's disconnected after the last child call is disconnected, and we already did everything
+      // for the last child.
+      LogUtil.i(
+          "ReturnToCallController.onDisconnect", "being called for a parent call and do nothing");
+      return;
+    }
+    if (bubble != null
+        && bubble.isVisible()
+        && (!TelecomUtil.isInCall(context)
+            || CallList.getInstance().getActiveOrBackgroundCall() != null)) {
+      bubble.showText(context.getText(R.string.incall_call_ended));
+    }
+    // For conference call, we should hideAndReset for the last disconnected child call while the
+    // parent call is still there.
+    if (!CallList.getInstance().hasNonParentActiveOrBackgroundCall()) {
+      hideAndReset();
+    }
+  }
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {}
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+
+  @Override
+  public void onAudioStateChanged(CallAudioState audioState) {
+    this.audioState = audioState;
+    if (bubble != null) {
+      bubble.updateActions(generateActions());
+    }
+  }
+
+  private BubbleInfo generateBubbleInfo() {
+    Intent activityIntent = InCallActivity.getIntent(context, false, false, false);
+    activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    activityIntent.putExtra(RETURN_TO_CALL_EXTRA_KEY, true);
+    return BubbleInfo.builder()
+        .setPrimaryColor(context.getResources().getColor(R.color.dialer_theme_color, null))
+        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.on_going_call))
+        .setStartingYPosition(
+            context.getResources().getDimensionPixelOffset(R.dimen.return_to_call_initial_offset_y))
+        .setPrimaryIntent(
+            PendingIntent.getActivity(
+                context, InCallActivity.PENDING_INTENT_REQUEST_CODE_BUBBLE, activityIntent, 0))
+        .setActions(generateActions())
+        .build();
+  }
+
+  @NonNull
+  private List<Action> generateActions() {
+    List<Action> actions = new ArrayList<>();
+    SpeakerButtonInfo speakerButtonInfo = new SpeakerButtonInfo(audioState, IconSize.SIZE_24_DP);
+
+    actions.add(
+        Action.builder()
+            .setIcon(Icon.createWithResource(context, speakerButtonInfo.icon))
+            .setName(context.getText(speakerButtonInfo.label))
+            .setChecked(speakerButtonInfo.isChecked)
+            .setIntent(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect)
+            .build());
+
+    actions.add(
+        Action.builder()
+            .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_mic_off_white_24))
+            .setName(context.getText(R.string.incall_label_mute))
+            .setChecked(audioState.isMuted())
+            .setIntent(toggleMute)
+            .build());
+    actions.add(
+        Action.builder()
+            .setIcon(Icon.createWithResource(context, R.drawable.quantum_ic_call_end_vd_theme_24))
+            .setName(context.getText(R.string.incall_label_end_call))
+            .setIntent(endCall)
+            .build());
+    return actions;
+  }
+
+  @NonNull
+  private PendingIntent createActionIntent(String action) {
+    Intent toggleSpeaker = new Intent(context, ReturnToCallActionReceiver.class);
+    toggleSpeaker.setAction(action);
+    return PendingIntent.getBroadcast(context, 0, toggleSpeaker, 0);
+  }
+}
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 165b30b..e6969c1 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -28,8 +28,6 @@
 import android.Manifest;
 import android.app.ActivityManager;
 import android.app.Notification;
-import android.app.Notification.Builder;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -61,17 +59,19 @@
 import android.text.style.ForegroundColorSpan;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
 import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.BitmapUtil;
 import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.contactphoto.BitmapUtil;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.lettertile.LetterTileDrawable.ContactType;
 import com.android.dialer.multimedia.MultimediaData;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.util.DrawableConverter;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
@@ -93,6 +93,9 @@
 public class StatusBarNotifier
     implements InCallPresenter.InCallStateListener, EnrichedCallManager.StateChangedListener {
 
+  private static final String NOTIFICATION_TAG = "STATUS_BAR_NOTIFIER";
+  private static final int NOTIFICATION_ID = 1;
+
   // Notification types
   // Indicates that no notification is currently showing.
   private static final int NOTIFICATION_NONE = 0;
@@ -104,14 +107,10 @@
   // This is non-interruptive, but otherwise behaves the same as NOTIFICATION_INCOMING_CALL
   private static final int NOTIFICATION_INCOMING_CALL_QUIET = 3;
 
-  private static final int PENDING_INTENT_REQUEST_CODE_NON_FULL_SCREEN = 0;
-  private static final int PENDING_INTENT_REQUEST_CODE_FULL_SCREEN = 1;
-
   private static final long[] VIBRATE_PATTERN = new long[] {0, 1000, 1000};
 
   private final Context mContext;
   private final ContactInfoCache mContactInfoCache;
-  private final NotificationManager mNotificationManager;
   private final DialerRingtoneManager mDialerRingtoneManager;
   @Nullable private ContactsPreferences mContactsPreferences;
   private int mCurrentNotification = NOTIFICATION_NONE;
@@ -124,11 +123,9 @@
   private StatusBarCallListener mStatusBarCallListener;
 
   public StatusBarNotifier(@NonNull Context context, @NonNull ContactInfoCache contactInfoCache) {
-    Objects.requireNonNull(context);
-    mContext = context;
+    mContext = Assert.isNotNull(context);
     mContactsPreferences = ContactsPreferencesFactory.newContactsPreferences(mContext);
     mContactInfoCache = contactInfoCache;
-    mNotificationManager = context.getSystemService(NotificationManager.class);
     mDialerRingtoneManager =
         new DialerRingtoneManager(
             new InCallTonePlayer(new ToneGeneratorFactory(), new PausableExecutorImpl()),
@@ -140,23 +137,17 @@
    * Should only be called from a irrecoverable state where it is necessary to dismiss all
    * notifications.
    */
-  static void clearAllCallNotifications(Context backupContext) {
-    LogUtil.i(
+  static void clearAllCallNotifications(Context context) {
+    LogUtil.e(
         "StatusBarNotifier.clearAllCallNotifications",
         "something terrible happened, clear all InCall notifications");
 
-    NotificationManager notificationManager =
-        backupContext.getSystemService(NotificationManager.class);
-    notificationManager.cancel(R.id.notification_ongoing_call);
+    DialerNotificationManager.cancel(context, NOTIFICATION_TAG, NOTIFICATION_ID);
   }
 
   private static int getWorkStringFromPersonalString(int resId) {
     if (resId == R.string.notification_ongoing_call) {
       return R.string.notification_ongoing_work_call;
-    } else if (resId == R.string.notification_ongoing_call_wifi) {
-      return R.string.notification_ongoing_work_call_wifi;
-    } else if (resId == R.string.notification_incoming_call_wifi) {
-      return R.string.notification_incoming_work_call_wifi;
     } else if (resId == R.string.notification_incoming_call) {
       return R.string.notification_incoming_work_call;
     } else {
@@ -173,12 +164,6 @@
     return PendingIntent.getBroadcast(context, 0, intent, 0);
   }
 
-  private static void setColorized(@NonNull Builder builder) {
-    if (BuildCompat.isAtLeastO()) {
-      builder.setColorized(true);
-    }
-  }
-
   /** Creates notifications according to the state we receive from {@link InCallPresenter}. */
   @Override
   @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
@@ -226,7 +211,7 @@
     }
     if (mCurrentNotification != NOTIFICATION_NONE) {
       LogUtil.i("StatusBarNotifier.cancelNotification", "cancel");
-      mNotificationManager.cancel(R.id.notification_ongoing_call);
+      DialerNotificationManager.cancel(mContext, NOTIFICATION_TAG, NOTIFICATION_ID);
     }
     mCurrentNotification = NOTIFICATION_NONE;
   }
@@ -313,11 +298,19 @@
     if (callState == DialerCall.State.INCOMING
         || callState == DialerCall.State.CALL_WAITING
         || isVideoUpgradeRequest) {
-      boolean alreadyActive =
-          callList.getActiveOrBackgroundCall() != null
-              && InCallPresenter.getInstance().isShowingInCallUi();
-      notificationType =
-          alreadyActive ? NOTIFICATION_INCOMING_CALL_QUIET : NOTIFICATION_INCOMING_CALL;
+      if (ConfigProviderBindings.get(mContext)
+          .getBoolean("quiet_incoming_call_if_ui_showing", true)) {
+        notificationType =
+            InCallPresenter.getInstance().isShowingInCallUi()
+                ? NOTIFICATION_INCOMING_CALL_QUIET
+                : NOTIFICATION_INCOMING_CALL;
+      } else {
+        boolean alreadyActive =
+            callList.getActiveOrBackgroundCall() != null
+                && InCallPresenter.getInstance().isShowingInCallUi();
+        notificationType =
+            alreadyActive ? NOTIFICATION_INCOMING_CALL_QUIET : NOTIFICATION_INCOMING_CALL;
+      }
     } else {
       notificationType = NOTIFICATION_IN_CALL;
     }
@@ -365,13 +358,13 @@
     LogUtil.i("StatusBarNotifier.buildAndSendNotification", "notificationType=" + notificationType);
     switch (notificationType) {
       case NOTIFICATION_INCOMING_CALL:
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.INCOMING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          builder.setChannelId(NotificationChannelId.INCOMING_CALL);
+        }
         configureFullScreenIntent(builder, createLaunchPendingIntent(true /* isFullScreen */));
         // Set the notification category and bump the priority for incoming calls
         builder.setCategory(Notification.CATEGORY_CALL);
         // This will be ignored on O+ and handled by the channel
-        //noinspection deprecation
         builder.setPriority(Notification.PRIORITY_MAX);
         if (mCurrentNotification != NOTIFICATION_INCOMING_CALL) {
           LogUtil.i(
@@ -379,18 +372,22 @@
               "Canceling old notification so this one can be noisy");
           // Moving from a non-interuptive notification (or none) to a noisy one. Cancel the old
           // notification (if there is one) so the fullScreenIntent or HUN will show
-          mNotificationManager.cancel(R.id.notification_ongoing_call);
+          DialerNotificationManager.cancel(mContext, NOTIFICATION_TAG, NOTIFICATION_ID);
         }
         break;
       case NOTIFICATION_INCOMING_CALL_QUIET:
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.ONGOING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          builder.setChannelId(NotificationChannelId.ONGOING_CALL);
+        }
         break;
       case NOTIFICATION_IN_CALL:
-        setColorized(publicBuilder);
-        setColorized(builder);
-        NotificationChannelManager.applyChannel(
-            builder, mContext, Channel.ONGOING_CALL, accountHandle);
+        if (BuildCompat.isAtLeastO()) {
+          publicBuilder.setColorized(true);
+          builder.setColorized(true);
+          builder.setChannelId(NotificationChannelId.ONGOING_CALL);
+        }
+        break;
+      default:
         break;
     }
 
@@ -436,7 +433,7 @@
         "displaying notification for " + notificationType);
 
     try {
-      mNotificationManager.notify(R.id.notification_ongoing_call, notification);
+      DialerNotificationManager.notify(mContext, NOTIFICATION_TAG, NOTIFICATION_ID, notification);
     } catch (RuntimeException e) {
       // TODO(b/34744003): Move the memory stats into silent feedback PSD.
       ActivityManager activityManager = mContext.getSystemService(ActivityManager.class);
@@ -565,8 +562,9 @@
   @VisibleForTesting
   @Nullable
   String getContentTitle(ContactCacheEntry contactInfo, DialerCall call) {
-    if (call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) {
-      return mContext.getResources().getString(R.string.conference_call_name);
+    if (call.isConferenceCall()) {
+      return CallerInfoUtils.getConferenceString(
+          mContext, call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE));
     }
 
     String preferredName =
@@ -604,20 +602,16 @@
     if (contactInfo.photo == null) {
       int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width);
       int height = (int) resources.getDimension(android.R.dimen.notification_large_icon_height);
-      int contactType = LetterTileDrawable.TYPE_DEFAULT;
+      @ContactType
+      int contactType =
+          LetterTileDrawable.getContactTypeFromPrimitives(
+              CallerInfoUtils.isVoiceMailNumber(context, call),
+              call.isSpam(),
+              contactInfo.isBusiness,
+              call.getNumberPresentation(),
+              call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE));
       LetterTileDrawable lettertile = new LetterTileDrawable(resources);
 
-      // TODO: Deduplicate across Dialer. b/36195917
-      if (CallerInfoUtils.isVoiceMailNumber(context, call)) {
-        contactType = LetterTileDrawable.TYPE_VOICEMAIL;
-      } else if (contactInfo.isBusiness) {
-        contactType = LetterTileDrawable.TYPE_BUSINESS;
-      } else if (call.getNumberPresentation() == TelecomManager.PRESENTATION_RESTRICTED) {
-        contactType = LetterTileDrawable.TYPE_GENERIC_AVATAR;
-      } else if (call.isConferenceCall()
-          && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) {
-        contactType = LetterTileDrawable.TYPE_CONFERENCE;
-      }
       lettertile.setCanonicalDialerLetterTileDetails(
           contactInfo.namePrimary == null ? contactInfo.number : contactInfo.namePrimary,
           contactInfo.lookupKey,
@@ -663,13 +657,17 @@
       return R.drawable.quantum_ic_videocam_white_24;
     } else if (call.hasProperty(PROPERTY_HIGH_DEF_AUDIO)
         && MotorolaUtils.shouldShowHdIconInNotification(mContext)) {
-      // Normally when a call is ongoing the status bar displays an icon of a phone with animated
-      // lines. This is a helpful hint for users so they know how to get back to the call.
-      // For Sprint HD calls, we replace this icon with an icon of a phone with a HD badge.
-      // This is a carrier requirement.
+      // Normally when a call is ongoing the status bar displays an icon of a phone. This is a
+      // helpful hint for users so they know how to get back to the call. For Sprint HD calls, we
+      // replace this icon with an icon of a phone with a HD badge. This is a carrier requirement.
       return R.drawable.ic_hd_call;
     }
-    return R.anim.on_going_call;
+    // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
+    if (ReturnToCallController.isEnabled(mContext)) {
+      return R.drawable.quantum_ic_call_vd_theme_24;
+    } else {
+      return R.drawable.on_going_call;
+    }
   }
 
   /** Returns the message to use with the notification. */
@@ -689,27 +687,19 @@
     }
 
     int resId = R.string.notification_ongoing_call;
+    String wifiBrand = mContext.getString(R.string.notification_call_wifi_brand);
     if (call.hasProperty(Details.PROPERTY_WIFI)) {
-      resId = R.string.notification_ongoing_call_wifi;
+      resId = R.string.notification_ongoing_call_wifi_template;
     }
 
     if (isIncomingOrWaiting) {
-      EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
-      Session session = null;
-      if (call.getNumber() != null) {
-        session =
-            manager.getSession(
-                call.getUniqueCallId(),
-                call.getNumber(),
-                manager.createIncomingCallComposerFilter());
-      }
-
       if (call.isSpam()) {
         resId = R.string.notification_incoming_spam_call;
-      } else if (session != null) {
-        resId = getECIncomingCallText(session);
+      } else if (shouldShowEnrichedCallNotification(call.getEnrichedCallSession())) {
+        resId = getECIncomingCallText(call.getEnrichedCallSession());
       } else if (call.hasProperty(Details.PROPERTY_WIFI)) {
-        resId = R.string.notification_incoming_call_wifi;
+        resId = R.string.notification_incoming_call_wifi_template;
+
       } else {
         resId = R.string.notification_incoming_call;
       }
@@ -726,11 +716,25 @@
     boolean isWorkCall = call.hasProperty(PROPERTY_ENTERPRISE_CALL);
     if (userType == ContactsUtils.USER_TYPE_WORK || isWorkCall) {
       resId = getWorkStringFromPersonalString(resId);
+      wifiBrand = mContext.getString(R.string.notification_call_wifi_work_brand);
+    }
+
+    if (resId == R.string.notification_incoming_call_wifi_template
+        || resId == R.string.notification_ongoing_call_wifi_template) {
+      // TODO(b/64525903): Potentially apply this template logic everywhere.
+      return mContext.getString(resId, wifiBrand);
     }
 
     return mContext.getString(resId);
   }
 
+  private boolean shouldShowEnrichedCallNotification(Session session) {
+    if (session == null) {
+      return false;
+    }
+    return session.getMultimediaData().hasData() || session.getMultimediaData().isImportant();
+  }
+
   private int getECIncomingCallText(Session session) {
     int resId;
     MultimediaData data = session.getMultimediaData();
@@ -756,8 +760,10 @@
         } else {
           resId = R.string.important_notification_incoming_call_with_photo;
         }
-      } else {
+      } else if (hasSubject) {
         resId = R.string.important_notification_incoming_call_with_message;
+      } else {
+        resId = R.string.important_notification_incoming_call;
       }
       if (mContext.getString(resId).length() > 50) {
         resId = R.string.important_notification_incoming_call_attachments;
@@ -827,13 +833,9 @@
         "will show \"answer\" action in the incoming call Notification");
     PendingIntent answerVoicePendingIntent =
         createNotificationPendingIntent(mContext, ACTION_ANSWER_VOICE_INCOMING_CALL);
-    // We put animation resources in "anim" folder instead of "drawable", which causes Android
-    // Studio to complain.
-    // TODO: Move "anim" resources to "drawable" as recommended in AnimationDrawable doc?
-    //noinspection ResourceType
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.anim.on_going_call),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_call_white_24),
                 getActionText(
                     R.string.notification_action_answer, R.color.notification_action_accept),
                 answerVoicePendingIntent)
@@ -863,7 +865,7 @@
         createNotificationPendingIntent(mContext, ACTION_HANG_UP_ONGOING_CALL);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(mContext, R.drawable.ic_call_end_white_24dp),
+                Icon.createWithResource(mContext, R.drawable.quantum_ic_call_end_white_24),
                 mContext.getText(R.string.notification_action_end_call),
                 hangupPendingIntent)
             .build());
@@ -931,7 +933,7 @@
     builder.setOngoing(true);
     builder.setOnlyAlertOnce(true);
     // This will be ignored on O+ and handled by the channel
-    //noinspection deprecation
+    // noinspection deprecation
     builder.setPriority(Notification.PRIORITY_HIGH);
 
     return builder;
@@ -942,11 +944,11 @@
         InCallActivity.getIntent(
             mContext, false /* showDialpad */, false /* newOutgoingCall */, isFullScreen);
 
-    int requestCode = PENDING_INTENT_REQUEST_CODE_NON_FULL_SCREEN;
+    int requestCode = InCallActivity.PENDING_INTENT_REQUEST_CODE_NON_FULL_SCREEN;
     if (isFullScreen) {
       // Use a unique request code so that the pending intent isn't clobbered by the
       // non-full screen pending intent.
-      requestCode = PENDING_INTENT_REQUEST_CODE_FULL_SCREEN;
+      requestCode = InCallActivity.PENDING_INTENT_REQUEST_CODE_FULL_SCREEN;
     }
 
     // PendingIntent that can be used to launch the InCallActivity.  The
@@ -1005,6 +1007,9 @@
     @Override
     public void onInternationalCallOnWifi() {}
 
+    @Override
+    public void onEnrichedCallSessionUpdate() {}
+
     /**
      * Responds to changes in the session modification state for the call by dismissing the status
      * bar notification as required.
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 31999ef..89cddb9 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -27,9 +27,10 @@
 import android.view.Surface;
 import android.view.SurfaceView;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallOrientationListener;
 import com.android.incallui.InCallPresenter.InCallStateListener;
@@ -186,7 +187,7 @@
    */
   public static boolean showOutgoingVideo(
       Context context, int videoState, int sessionModificationState) {
-    if (!VideoUtils.hasCameraPermissionAndAllowedByUser(context)) {
+    if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(context)) {
       LogUtil.i("VideoCallPresenter.showOutgoingVideo", "Camera permission is disabled by user.");
       return false;
     }
@@ -421,7 +422,7 @@
   @Override
   public void onCameraPermissionGranted() {
     LogUtil.i("VideoCallPresenter.onCameraPermissionGranted", "");
-    VideoUtils.setCameraAllowedByUser(mContext);
+    PermissionsUtil.setCameraPrivacyToastShown(mContext);
     enableCamera(mPrimaryCall.getVideoCall(), isCameraRequired());
     showVideoUi(
         mPrimaryCall.getVideoState(),
@@ -761,7 +762,7 @@
   /**
    * Adjusts the current video mode by setting up the preview and display surfaces as necessary.
    * Expected to be called whenever the video state associated with a call changes (e.g. a user
-   * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO: Need
+   * turns their camera on or off) to ensure the correct surfaces are shown/hidden. TODO(vt): Need
    * to adjust size and orientation of preview surface here.
    */
   private void adjustVideoMode(DialerCall call) {
@@ -839,11 +840,11 @@
       return;
     }
 
-    boolean hasCameraPermission = VideoUtils.hasCameraPermissionAndAllowedByUser(mContext);
+    boolean hasCameraPermission = VideoUtils.hasCameraPermissionAndShownPrivacyToast(mContext);
     if (!hasCameraPermission) {
       videoCall.setCamera(null);
       mPreviewSurfaceState = PreviewSurfaceState.NONE;
-      // TODO: Inform remote party that the video is off. This is similar to b/30256571.
+      // TODO(wangqi): Inform remote party that the video is off. This is similar to b/30256571.
     } else if (isCameraRequired) {
       InCallCameraManager cameraManager = InCallPresenter.getInstance().getInCallCameraManager();
       videoCall.setCamera(cameraManager.getActiveCameraId());
@@ -866,7 +867,7 @@
         false /* isRemotelyHeld */);
     enableCamera(mVideoCall, false);
     InCallPresenter.getInstance().setFullScreen(false);
-
+    InCallPresenter.getInstance().enableScreenTimeout(false);
     mIsVideoMode = false;
   }
 
@@ -1081,22 +1082,23 @@
   }
 
   @Override
-  public boolean shouldShowCameraPermissionDialog() {
+  public boolean shouldShowCameraPermissionToast() {
     if (mPrimaryCall == null) {
-      LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionDialog", "null call");
+      LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionToast", "null call");
       return false;
     }
     if (mPrimaryCall.didShowCameraPermission()) {
       LogUtil.i(
-          "VideoCallPresenter.shouldShowCameraPermissionDialog", "already shown for this call");
+          "VideoCallPresenter.shouldShowCameraPermissionToast", "already shown for this call");
       return false;
     }
     if (!ConfigProviderBindings.get(mContext)
         .getBoolean("camera_permission_dialog_allowed", true)) {
-      LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionDialog", "disabled by config");
+      LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionToast", "disabled by config");
       return false;
     }
-    return !VideoUtils.hasCameraPermission(mContext) || !VideoUtils.isCameraAllowedByUser(mContext);
+    return !VideoUtils.hasCameraPermission(mContext)
+        || !PermissionsUtil.hasCameraPrivacyToastShown(mContext);
   }
 
   @Override
diff --git a/java/com/android/incallui/VideoPauseController.java b/java/com/android/incallui/VideoPauseController.java
index 2595e2f..36c9ef3 100644
--- a/java/com/android/incallui/VideoPauseController.java
+++ b/java/com/android/incallui/VideoPauseController.java
@@ -66,11 +66,6 @@
     return sVideoPauseController;
   }
 
-  private boolean wasIncomingCall() {
-    return (mPrevCallState == DialerCall.State.CALL_WAITING
-        || mPrevCallState == DialerCall.State.INCOMING);
-  }
-
   /**
    * Determines if a call is in incoming/waiting state.
    *
@@ -198,7 +193,7 @@
     }
     final boolean canVideoPause = videoCanPause(call);
 
-    if ((wasIncomingCall() || wasDialing()) && canVideoPause && !mIsInBackground) {
+    if (canVideoPause && !mIsInBackground) {
       // Send resume request for the active call, if user rejects incoming call, ends dialing
       // call, or the call was previously in a paused state and UI is in the foreground.
       sendRequest(call, true);
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 1f0541c4..db6d43d 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -216,6 +216,7 @@
   private void performAnswerAndRelease() {
     restoreAnswerAndReleaseButtonAnimation();
     answerScreenDelegate.onAnswerAndReleaseCall();
+    buttonAcceptClicked = true;
   }
 
   private void restoreAnswerAndReleaseButtonAnimation() {
@@ -359,6 +360,11 @@
   }
 
   @Override
+  public boolean isActionTimeout() {
+    return (buttonAcceptClicked || buttonRejectClicked) && answerScreenDelegate.isActionTimeout();
+  }
+
+  @Override
   @NonNull
   public String getCallId() {
     return Assert.isNotNull(getArguments().getString(ARG_CALL_ID));
@@ -427,8 +433,10 @@
 
     if (allowAnswerAndRelease()) {
       answerAndReleaseButton.setVisibility(View.VISIBLE);
+      answerScreenDelegate.onAnswerAndReleaseButtonEnabled();
     } else {
       answerAndReleaseButton.setVisibility(View.INVISIBLE);
+      answerScreenDelegate.onAnswerAndReleaseButtonDisabled();
     }
   }
 
@@ -524,6 +532,7 @@
     if (!isAdded()) {
       return;
     }
+    LogUtil.enterBlock("AnswerFragment.updateDataFragment");
     Fragment current = getChildFragmentManager().findFragmentById(R.id.incall_data_container);
     Fragment newFragment = null;
 
@@ -540,6 +549,7 @@
           || !Objects.equals(((MultimediaFragment) current).getSubject(), subject)
           || !Objects.equals(((MultimediaFragment) current).getImageUri(), imageUri)
           || !Objects.equals(((MultimediaFragment) current).getLocation(), location)) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Replacing multimedia fragment");
         // Needs replacement
         newFragment =
             MultimediaFragment.newInstance(
@@ -551,12 +561,14 @@
     } else if (shouldShowAvatar()) {
       // Needs Avatar
       if (!(current instanceof AvatarFragment)) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Replacing avatar fragment");
         // Needs replacement
         newFragment = new AvatarFragment();
       }
     } else {
       // Needs empty
       if (current != null) {
+        LogUtil.i("AnswerFragment.updateDataFragment", "Removing current fragment");
         getChildFragmentManager().beginTransaction().remove(current).commitNow();
       }
       contactGridManager.setAvatarImageView(null, 0, false);
@@ -706,7 +718,7 @@
     }
     view.setSystemUiVisibility(flags);
     if (isVideoCall() || isVideoUpgradeRequest()) {
-      if (VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+      if (VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
         if (isSelfManagedCamera()) {
           answerVideoCallScreen = new SelfManagedAnswerVideoCallScreen(getCallId(), this, view);
         } else {
@@ -930,7 +942,7 @@
         if (hasCallOnHold()) {
           getAnswerMethod()
               .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_third));
-        } else {
+        } else if (primaryCallState.supportsCallOnHold) {
           getAnswerMethod()
               .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_second));
         }
@@ -942,7 +954,7 @@
 
   private void showMessageMenu() {
     LogUtil.i("AnswerFragment.showMessageMenu", "Show sms menu.");
-    if (getChildFragmentManager().isDestroyed()) {
+    if (getContext() == null || isDetached() || getChildFragmentManager().isDestroyed()) {
       return;
     }
 
@@ -1019,7 +1031,7 @@
   }
 
   private void updateImportanceBadgeVisibility() {
-    if (!isAdded()) {
+    if (!isAdded() || getView() == null) {
       return;
     }
 
diff --git a/java/com/android/incallui/answer/impl/PillDrawable.java b/java/com/android/incallui/answer/impl/PillDrawable.java
deleted file mode 100644
index 57d84c4..0000000
--- a/java/com/android/incallui/answer/impl/PillDrawable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 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.incallui.answer.impl;
-
-import android.graphics.Rect;
-import android.graphics.drawable.GradientDrawable;
-
-/** Draws a pill-shaped background */
-public class PillDrawable extends GradientDrawable {
-
-  public PillDrawable() {
-    super();
-    setShape(RECTANGLE);
-  }
-
-  @Override
-  protected void onBoundsChange(Rect r) {
-    super.onBoundsChange(r);
-    setCornerRadius(r.height() / 2);
-  }
-
-  @Override
-  public void setShape(int shape) {
-    if (shape != GradientDrawable.RECTANGLE) {
-      throw new UnsupportedOperationException("PillDrawable must be a rectangle");
-    }
-    super.setShape(shape);
-  }
-}
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/drawable/call_answer.xml b/java/com/android/incallui/answer/impl/answermethod/res/drawable/call_answer.xml
deleted file mode 100644
index 451c862..0000000
--- a/java/com/android/incallui/answer/impl/answermethod/res/drawable/call_answer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="32.0"
-  android:viewportWidth="32.0"
-  android:width="24dp">
-  <group
-    android:name="rotationGroup"
-    android:pivotX="12"
-    android:pivotY="12"
-    android:translateX="4"
-    android:translateY="4"
-    android:rotation="0"
-    >
-    <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-  </group>
-</vector>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
index 9a49075..600115e 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
@@ -41,6 +41,7 @@
         android:layout_marginBottom="116dp"
         android:layout_gravity="center_horizontal"
         android:alpha="0"
+        android:gravity="center_horizontal"
         android:text="@string/call_incoming_will_disconnect"
         android:textColor="@color/blue_grey_100"
         android:textSize="16sp"
@@ -59,6 +60,7 @@
         android:layout_marginBottom="18dp"
         android:layout_gravity="center_horizontal"
         android:focusable="false"
+        android:gravity="center_horizontal"
         android:text="@string/call_incoming_swipe_to_answer"
         android:textAlignment="center"
         android:textAppearance="@style/Dialer.Incall.TextAppearance.Hint"/>
@@ -110,6 +112,7 @@
         android:layout_gravity="center_horizontal"
         android:alpha="0"
         android:focusable="false"
+        android:gravity="center_horizontal"
         android:text="@string/call_incoming_swipe_to_reject"
         android:textAppearance="@style/Dialer.Incall.TextAppearance.Hint"
         tools:alpha="1"/>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values/values.xml b/java/com/android/incallui/answer/impl/answermethod/res/values/values.xml
index 43b2cd2..cc17183 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values/values.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values/values.xml
@@ -16,10 +16,8 @@
   -->
 
 <resources>
-  <color name="incoming_or_outgoing_call_screen_mask">@android:color/transparent</color>
   <color name="call_hangup_background">#DF0000</color>
   <color name="call_accept_background">#00C853</color>
   <color name="incoming_answer_icon">#00C853</color>
-  <integer name="button_exit_fade_delay_ms">300</integer>
   <bool name="two_button_show_button_labels">false</bool>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
index 1d3d7ef..5e83dfc 100644
--- a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
+++ b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
@@ -20,7 +20,7 @@
 import android.hardware.SensorEvent;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 
 /** An classifier trying to determine whether it is a human interacting with the phone or not. */
 class HumanInteractionClassifier extends Classifier {
diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHint.java b/java/com/android/incallui/answer/impl/hint/AnswerHint.java
index dd3b822..1e78f50 100644
--- a/java/com/android/incallui/answer/impl/hint/AnswerHint.java
+++ b/java/com/android/incallui/answer/impl/hint/AnswerHint.java
@@ -27,7 +27,7 @@
   /**
    * Inflates the hint's layout into the container.
    *
-   * <p>TODO: if the hint becomes more dependent on other UI elements of the AnswerFragment,
+   * <p>TODO(twyen): if the hint becomes more dependent on other UI elements of the AnswerFragment,
    * should put put and hintText into another data structure.
    */
   void onCreateView(LayoutInflater inflater, ViewGroup container, View puck, TextView hintText);
diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
index 77b45ec..94cf893 100644
--- a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
+++ b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
@@ -23,9 +23,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProvider;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.util.DialerUtils;
 import com.android.incallui.util.AccessibilityUtil;
 
@@ -35,8 +34,9 @@
  */
 public class AnswerHintFactory {
 
-  private static final String CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY =
-      "answer_hint_answered_threshold";
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  static final String CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY = "answer_hint_answered_threshold";
+
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String CONFIG_ANSWER_HINT_WHITELISTED_DEVICES_KEY =
       "answer_hint_whitelisted_devices";
@@ -58,12 +58,7 @@
 
   @NonNull
   public AnswerHint create(Context context, long puckUpDuration, long puckUpDelay) {
-
-    if (shouldShowAnswerHint(
-        context,
-        ConfigProviderBindings.get(context),
-        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context),
-        Build.PRODUCT)) {
+    if (shouldShowAnswerHint(context, Build.PRODUCT)) {
       return new DotAnswerHint(context, puckUpDuration, puckUpDelay);
     }
 
@@ -84,24 +79,23 @@
   }
 
   @VisibleForTesting
-  static boolean shouldShowAnswerHint(
-      Context context,
-      ConfigProvider configProvider,
-      SharedPreferences sharedPreferences,
-      String device) {
+  static boolean shouldShowAnswerHint(Context context, String device) {
     if (AccessibilityUtil.isTouchExplorationEnabled(context)) {
       return false;
     }
     // Devices that has the legacy dialer installed are whitelisted as they are likely to go through
     // a UX change during updates.
-    if (!isDeviceWhitelisted(device, configProvider)) {
+    if (!isDeviceWhitelisted(context, device)) {
       return false;
     }
 
     // If the user has gone through the process a few times we can assume they have learnt the
     // method.
-    int answeredCount = sharedPreferences.getInt(ANSWERED_COUNT_PREFERENCE_KEY, 0);
-    long threshold = configProvider.getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3);
+    int answeredCount =
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+            .getInt(ANSWERED_COUNT_PREFERENCE_KEY, 0);
+    long threshold =
+        ConfigProviderBindings.get(context).getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3);
     LogUtil.i(
         "AnswerHintFactory.shouldShowAnswerHint",
         "answerCount: %d, threshold: %d",
@@ -115,8 +109,8 @@
    * @param configProvider should provide a list of devices quoted with '/' concatenated to a
    *     string.
    */
-  private static boolean isDeviceWhitelisted(String device, ConfigProvider configProvider) {
-    return configProvider
+  private static boolean isDeviceWhitelisted(Context context, String device) {
+    return ConfigProviderBindings.get(context)
         .getString(CONFIG_ANSWER_HINT_WHITELISTED_DEVICES_KEY, DEFAULT_WHITELISTED_DEVICES_CSV)
         .contains("/" + device + "/");
   }
diff --git a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
index 21154ca..05358d8 100644
--- a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
+++ b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
@@ -24,7 +24,9 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.util.DialerUtils;
+import com.android.incallui.answer.impl.hint.PawSecretCodeListener.PawType;
 
 /** Decrypt the event payload to be shown if in a specific time range and the key is received. */
 @TargetApi(VERSION_CODES.M)
@@ -40,10 +42,25 @@
     if (!preferences.getBoolean(PawSecretCodeListener.PAW_ENABLED_WITH_SECRET_CODE_KEY, false)) {
       return null;
     }
-    int drawableId = preferences.getInt(PawSecretCodeListener.PAW_DRAWABLE_ID_KEY, 0);
-    if (drawableId == 0) {
-      return null;
+    @PawType
+    int pawType =
+        preferences.getInt(PawSecretCodeListener.PAW_TYPE, PawSecretCodeListener.PAW_TYPE_INVALID);
+
+    if (pawType == PawSecretCodeListener.PAW_TYPE_INVALID) {
+      LogUtil.i("PawImageLoaderImpl.loadPayload", "paw type not found, rerolling");
+      PawSecretCodeListener.selectPawType(preferences);
+      pawType =
+          preferences.getInt(
+              PawSecretCodeListener.PAW_TYPE, PawSecretCodeListener.PAW_TYPE_INVALID);
     }
-    return context.getDrawable(drawableId);
+
+    switch (pawType) {
+      case PawSecretCodeListener.PAW_TYPE_CAT:
+        return context.getDrawable(R.drawable.cat_paw);
+      case PawSecretCodeListener.PAW_TYPE_DOG:
+        return context.getDrawable(R.drawable.dog_paw);
+      default:
+        throw Assert.createAssertionFailException("unknown paw type " + pawType);
+    }
   }
 }
diff --git a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
index a8737c3..871d80c 100644
--- a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
+++ b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
@@ -20,15 +20,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.widget.Toast;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.util.DialerUtils;
 import java.util.Random;
 
 /**
@@ -40,12 +40,27 @@
   static final String CONFIG_PAW_SECRET_CODE = "paw_secret_code";
 
   public static final String PAW_ENABLED_WITH_SECRET_CODE_KEY = "paw_enabled_with_secret_code";
-  public static final String PAW_DRAWABLE_ID_KEY = "paw_drawable_id";
+
+  /** Which paw to show, must be {@link PawType} */
+  public static final String PAW_TYPE = "paw_type";
+
+  /** Resource id is not stable across app versions. Use {@link #PAW_TYPE} instead. */
+  @Deprecated public static final String PAW_DRAWABLE_ID_KEY = "paw_drawable_id";
+
+  /** Enum for all paws. */
+  @IntDef({PAW_TYPE_INVALID, PAW_TYPE_CAT, PAW_TYPE_DOG})
+  @interface PawType {}
+
+  public static final int PAW_TYPE_INVALID = 0;
+  public static final int PAW_TYPE_CAT = 1;
+  public static final int PAW_TYPE_DOG = 2;
 
   @Override
   public void onReceive(Context context, Intent intent) {
     String host = intent.getData().getHost();
-    Assert.checkState(!TextUtils.isEmpty(host));
+    if (TextUtils.isEmpty(host)) {
+      return;
+    }
     String secretCode =
         ConfigProviderBindings.get(context).getString(CONFIG_PAW_SECRET_CODE, "729");
     if (secretCode == null) {
@@ -54,7 +69,8 @@
     if (!TextUtils.equals(secretCode, host)) {
       return;
     }
-    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    SharedPreferences preferences =
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context);
     boolean wasEnabled = preferences.getBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, false);
     if (wasEnabled) {
       preferences.edit().putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, false).apply();
@@ -62,20 +78,24 @@
       Logger.get(context).logImpression(Type.EVENT_ANSWER_HINT_DEACTIVATED);
       LogUtil.i("PawSecretCodeListener.onReceive", "PawAnswerHint disabled");
     } else {
-      int drawableId;
-      if (new Random().nextBoolean()) {
-        drawableId = R.drawable.cat_paw;
-      } else {
-        drawableId = R.drawable.dog_paw;
-      }
-      preferences
-          .edit()
-          .putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, true)
-          .putInt(PAW_DRAWABLE_ID_KEY, drawableId)
-          .apply();
+      selectPawType(preferences);
       Toast.makeText(context, R.string.event_activated, Toast.LENGTH_SHORT).show();
       Logger.get(context).logImpression(Type.EVENT_ANSWER_HINT_ACTIVATED);
       LogUtil.i("PawSecretCodeListener.onReceive", "PawAnswerHint enabled");
     }
   }
+
+  public static void selectPawType(SharedPreferences preferences) {
+    @PawType int pawType;
+    if (new Random().nextBoolean()) {
+      pawType = PAW_TYPE_CAT;
+    } else {
+      pawType = PAW_TYPE_DOG;
+    }
+    preferences
+        .edit()
+        .putBoolean(PAW_ENABLED_WITH_SECRET_CODE_KEY, true)
+        .putInt(PAW_TYPE, pawType)
+        .apply();
+  }
 }
diff --git a/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_icon_entry.xml b/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_icon_entry.xml
deleted file mode 100644
index 6490bbc..0000000
--- a/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_icon_entry.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-  android:ordering="together">
-  <alpha
-    android:duration="583"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:startOffset="167"
-    android:toAlpha="1.0"/>
-  <scale
-    android:duration="600"
-    android:fromXScale="0px"
-    android:fromYScale="0px"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:toXScale="100%"
-    android:toYScale="100%"/>
-</set>
diff --git a/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_text_entry.xml b/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_text_entry.xml
deleted file mode 100644
index 9d3195a..0000000
--- a/java/com/android/incallui/answer/impl/res/anim/incoming_unlocked_text_entry.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="583"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:startOffset="167"
-    android:toAlpha="1.0"/>
-</set>
diff --git a/java/com/android/incallui/answer/impl/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
index 82a8796..bd20e64 100644
--- a/java/com/android/incallui/answer/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swiep vanaf ikoon om met boodskap af te wys"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swiep op om te antwoord en die aangehoude oproep te beëindig"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swiep van die ikoon af om te antwoord en die voortgesette oproep te beëindig"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skryf jou eie …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Selfoon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Luidsprekerfoon"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skryf jou eie …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Kanselleer"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Stuur"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Antwoord en beëindig die voortgesette oproep"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is af"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swiep op met twee vingers om te antwoord. Swiep af met twee vingers om af te wys."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Dringend"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Belangrik"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
index 4086977..328236c 100644
--- a/java/com/android/incallui/answer/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"በመልዕክት ላለመቀበል ከአዶ ያንሸራቱ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"በይቆይ ላይ ያለ ጥሪ ለመመለስ እና ለመጨረስ ወደ ላይ ያንሸራትቱ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ለመመለስ እና በመካሄድ ላይ ያለ ጥሪን ለመጨረስ ከአዶ ያንሸራትቱ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"የእራስዎን ይጻፉ…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ይቅር"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ላክ"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ"</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="4090408168895243702">"አስቸኳይ"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"አስፈላጊ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
index fc29c16..ea6d5da 100644
--- a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"تمرير سريع من الرمز للرفض مع إرسال رسالة"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"التمرير السريع لأعلى للرد وإنهاء المكالمة قيد التعليق"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"التمرير السريع على الرمز للرد وإنهاء مكالمة جارية"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"اكتب ردك…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"إلغاء"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"إرسال"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"الرد وإنهاء مكالمة جارية"</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="4090408168895243702">"عاجل"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"مهم"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
index fff561d..6994922 100644
--- a/java/com/android/incallui/answer/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Mesaj göndərərək imtina etmək üçün ikonadan sürüşdürün"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cavab vermək üçün yuxarı sürüşdürün və gözləmədə olan zəngi bitirin"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Cavab vermək üçün ikonadan sürüşdürün və gedən zəngi bitirin"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Özünüzünkünü yazın…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Dəstək"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spiker"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Özünüzünkünü yazın…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ləğv edin"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Göndərin"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Cavab verin və gedən zəngi bitirin"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoları deaktivdir"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cavab vermək üçün iki barmaq ilə yuxarı sürüşdürün. İmtina etmək üçün iki barmaq ilə aşağı sürüşdürün."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Vacib"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Önəmli"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
index 7b29bfa..3618613 100644
--- a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prevucite od ikone da biste odbili porukom"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da biste odgovorili i završili poziv koji je na čekanju"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite od ikone da biste se javili i završili poziv koji je u toku"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite sami…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spikerfon"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite sami…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Otkaži"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Javite se i završite poziv koji je u toku"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite nagore pomoću dva prsta da biste odgovorili. Prevucite nadole pomoću dva prsta da biste odbili."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Hitno"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
index 228a80f..908b2d2 100644
--- a/java/com/android/incallui/answer/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Правядзіце ад значка, каб адхіліць, адправіўшы SMS"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Правядзіце пальцам уверх, каб адказаць і завяршыць выклік на ўтрыманні"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Правядзіце пальцам ад значка, каб адказаць і скончыць бягучы выклік"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Свой варыянт..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Скасаваць"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Адправіць"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Адказаць і скончыць бягучы выклік"</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="4090408168895243702">"Тэрмінова"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важны"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
index 4e9422f..d119ff7 100644
--- a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Прекарайте пръст от иконата, за да отхвърлите със съобщение"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Прекарайте пръст нагоре, за да отговорите и да завършите задържаното обаждане"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Прекарайте пръст от иконата, за да отговорите и да завършите текущото обаждане"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишете свое собствено…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Отказ"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Изпращане"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Отговор и завършване на текущото обаждане"</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="4090408168895243702">"Спешно"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</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 869f7b9..a46ec95 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
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"বার্তা সহ প্রত্যাখ্যান করতে আইকন থেকে সোয়াইপ করুন"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"উত্তর দিতে এবং চলছে এমন কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"আপনার নিজের পছন্দ মত লিখুন…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"বাতিল করুন"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"পাঠান"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"উত্তর দিন এবং  চলছে এমন কল কেটে দিন"</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="4090408168895243702">"জরুরি"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"গুরুত্বপূর্ণ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
index b36e178..38bc3d3 100644
--- a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prevucite preko ikone da odbijete porukom"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da odgovorite na poziv i završite poziv koji je na čekanju"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite ikonu da odgovorite na poziv i završite ga"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite svoj…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalice"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvučnik"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite svoj…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Otkaži"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i završite ga"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite pomoću dva prsta prema gore da odgovorite. Prevucite pomoću dva prsta prema dolje da odbijete."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Hitno"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
 </resources>
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 13b3b32..0989b02 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
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     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>
@@ -7,8 +23,6 @@
     <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="662432029870261061">"Llisca des de la icona per respondre a la trucada 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>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Telèfon amb altaveu"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escriu la teva…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel·la"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envia"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Respon a la trucada i finalitza l\'actual"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo està desactivat"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Llisca amb dos dits cap amunt per respondre a la trucada i cap avall per rebutjar-la."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
index 6c69030..effd45a 100644
--- a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Přejetím prstem od ikony hovor odmítnete a pošlete zprávu"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Přejetím prstem nahoru hovor přijmete a podržený hovor ukončíte"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Přejetím prstem od ikony hovor přijmete a probíhající hovor ukončíte"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napište vlastní odpověď…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Sluchátko"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hlasitý odposlech"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napište vlastní odpověď…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Zrušit"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odeslat"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Přijmout hovor a ukončit probíhající hovor"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Přejetím dvěma prsty nahoru hovor přijmete. Přejetím dvěma prsty dolů jej odmítnete."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Naléhavé"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Důležité"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
index 3a87d44..d174ab7 100644
--- a/java/com/android/incallui/answer/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Stryg fra ikonet for at afvise med en besked"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Stryg op for at besvare og afslutte opkaldet i venteposition"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Stryg fra ikonet for at besvare og afslutte det igangværende opkald"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv dit eget…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Håndsæt"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Medhør"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv dit eget…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuller"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Besvar, og afslut det igangværende opkald"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er deaktiveret"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Stryg op med to fingre for at besvare. Stryg ned med to fingre for at afvise."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Haster"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Vigtigt"</string>
 </resources>
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 f4356d2..24f920c 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
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     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>
@@ -7,8 +23,6 @@
     <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="662432029870261061">"Wische vom Symbol weg, um den 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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Eigene Antwort schreiben…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Abbrechen"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senden"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Nimm den 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="4090408168895243702">"Dringend"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Wichtig"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
index 9c9a0f3..a725b45 100644
--- a/java/com/android/incallui/answer/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Σύρετε από το εικονίδιο προς τα έξω για απόρριψη του μηνύματος"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Σύρετε προς τα επάνω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Συντάξτε το δικό σας…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ακύρωση"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Αποστολή"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Απάντηση και τερματισμός κλήσης σε εξέλιξη"</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="4090408168895243702">"Επείγον"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Σημαντικό"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
index fb8d156..2bd3459 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
index fb8d156..2bd3459 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
index fb8d156..2bd3459 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
index 14928ee..c159c57 100644
--- a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Desliza desde el ícono para rechazar la llamada con un mensaje"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder y finalizar la llamada en espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Desliza el dedo desde el ícono para responder y 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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe tu propia respuesta…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder y finalizar la llamada en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El video está desactivado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
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 972bbc5..6d98929 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
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     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>
@@ -7,8 +23,6 @@
     <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="662432029870261061">"Desliza el dedo desde el icono para responder a una llamada y para finalizar otra 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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe tu propia respuesta…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder a una llamada y finalizar otra 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="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
index 9e303bb..103b796 100644
--- a/java/com/android/incallui/answer/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sõnumiga keeldumiseks pühkige ikoonilt eemale"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pühkige üles, et vastata ja ootel kõne lõpetada"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pühkige ikoonilt eemale, et vastata ja käimasolev kõne lõpetada"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjutage ise …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Käsitelefon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Valjuhääldi"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kirjutage ise …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Tühista"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Saada"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastake ja lõpetage käimasolev kõne"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video on välja lülitatud"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastamiseks pühkige kahe sõrmega üles. Keeldumiseks pühkige kahe sõrmega alla."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Kiireloomuline"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Tähtis"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
index a1f6d71..98d9e22 100644
--- a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Pasatu hatza ikonotik baztertzeko eta mezu bat bidaltzeko"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasatu hatza gorantz erantzuteko eta zain dagoen deia amaitzeko"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasatu hatza ikonotik erantzuteko eta uneko deia amaitzeko"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Idatzi erantzuna…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefonoa"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Bozgorailua"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Idatzi erantzuna…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Utzi"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Bidali"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Erantzun eta amaitu uneko deia"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Desaktibatuta dago kamera"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasatu bi hatz gora erantzuteko; eta behera, baztertzeko."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Premiazkoa"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Garrantzitsua"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
index 28cf826..66818c3 100644
--- a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"برای رد کردن با ارسال پیام، انگشتتان را تند از روی نماد بکشید"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"برای پاسخ دادن و پایان دادن به تماس در انتظار، تند به بالا بکشید"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"برای پاسخ دادن به تماس درحال انجام و پایان دادن به آن، انگشتتان را تند از روی نماد بکشید"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"بنویسید..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"لغو"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ارسال"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"پاسخ دادن به تماس درحال انجام و پایان دادن به آن"</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="4090408168895243702">"فوری"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"مهم"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
index 8b8eac9..6a0dd9a 100644
--- a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Hylkää ja kirjoita viesti pyyhkäisemällä kuvaketta."</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun pyyhkäisemällä ylös"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vastaa puheluun ja lopeta nykyinen puhelu pyyhkäisemällä kuvakkeesta."</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjoita oma…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Matkapuhelin"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Kaiutinpuhelin"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kirjoita oma…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Peruuta"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Lähetä"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastaa puheluun ja lopeta nykyinen puhelu"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokuva ei ole käytössä."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastaa pyyhkäisemällä ylös kahdella sormella. Hylkää pyyhkäisemällä alas kahdella sormella."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Kiireellinen"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Tärkeä"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
index 9ea27b8..f00da8b 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Balayez à partir de l\'icône pour refuser avec un message"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayez l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Balayez l\'écran à partir de l\'icône pour répondre et mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Combiné"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Téléphone à haut-parleur"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Réponse personnalisée…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuler"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre et mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez vers le haut avec deux doigts pour répondre. Balayez vers le bas avec deux doigts pour refuser."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
index 3aa3c12..c10b584 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Appuyer sur l\'icône, puis balayer l\'écran pour refuser l\'appel en envoyant un message"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayer l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre ou mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Combiné"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Haut-parleur"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Réponse personnalisée"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuler"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre ou mettre fin à l\'appel en cours"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez l\'écran avec deux doigts vers le haut pour répondre, ou vers le bas pour refuser l\'appel."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importants"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
index 16c0f69..ed04437 100644
--- a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Pasar o dedo desde a icona para rexeitar cunha mensaxe"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasa o dedo cara arriba para responder e finalizar a chamada en espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe a túa propia…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Teléfono"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altofalante"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe a túa propia…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responde á chamada entrante e finaliza a chamada en curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desactivado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urxente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
index 3f99c71..c7d31ec 100644
--- a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"સંદેશ સાથે નકારવા માટે આઇકનથી સ્વાઇપ કરો"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"જવાબ આપવા અને હૉલ્ડ પરનો કૉલ સમાપ્ત કરવા માટે ઉપર સ્વાઇપ કરો"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"જવાબ આપવા અને ચાલુ કૉલ સમાપ્ત કરવા માટે આઇકનમાંથી સ્વાઇપ કરો"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"તમારો પોતાનો સંદેશ લખો…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"રદ કરો"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"મોકલો"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</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="4090408168895243702">"તાત્કાલિક"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"મહત્વપૂર્ણ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
index f28505f..d940d3a 100644
--- a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"संदेश के साथ अस्वीकार करने के लिए आइकन से स्वाइप करें"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाब देने और होल्ड पर रखा कॉल समाप्त करने के लिए ऊपर स्वाइप करें"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"कॉल का जवाब देने और जारी कॉल समाप्त करने के लिए आइकन से स्वाइप करें"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"अपना स्वयं का लिखें…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द करें"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"भेजें"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"कॉल का जवाब दें और जारी कॉल समाप्त करें"</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="4090408168895243702">"बहुत ज़रूरी"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"महत्वपूर्ण"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
index 2807439..14c30bf 100644
--- a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prijeđite prstom od ikone da biste odbili poruku"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prijeđite prstom prema gore za odgovor na poziv i prekidanje poziva na čekanju"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prijeđite prstom od ikone da biste prihvatili poziv i prekinuli poziv u tijeku"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite vlastiti…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalice"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvučnik"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite vlastiti…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Odustani"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i prekinite poziv u tijeku"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokamera je isključena"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prijeđite dvama prstima prema gore za odgovor, a dvama prstima prema dolje za odbijanje."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Hitno"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
index d7dacbf..abaa869 100644
--- a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Csúsztassa el az ujját az ikonról az üzenettel való elutasításhoz"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Csúsztassa felfelé az ujját a hívás fogadásához és a várakoztatott hívás befejezéséhez"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Csúsztassa el az ujját az ikontól a hívásfogadáshoz és a folyamatban lévő hívás befejezéséhez"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Saját válasz írása…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Kézibeszélő"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Kihangosító"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Saját válasz írása…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Mégse"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Küldés"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Hívásfogadás és a folyamatban lévő hívás befejezése"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"A videokép ki van kapcsolva"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Csúsztassa felfelé két ujját a hívás fogadásához. Csúsztassa lefelé két ujját a hívás elutasításához."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Sürgős"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Fontos"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
index 4492833..ef601e2 100644
--- a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Զանգը մերժելու և հաղորդագրություն ուղարկելու համար պատկերակից մատով մի կողմ սահեցրեք"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Սահեցրեք վերև՝ պատասխանելու և սպասման մեջ գտնվող զանգն ավարտելու համար"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Պատկերակից մատով մի կողմ սահեցրեք՝ պատասխանելու և ընթացիկ զանգն ավարտելու համար"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Գրեք ձեր պատասխանը…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Չեղարկել"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ուղարկել"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Պատասխանել և ավարտել ընթացիկ զանգը"</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="4090408168895243702">"Շտապ"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Կարևոր"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
index a1fd19f..a259926 100644
--- a/java/com/android/incallui/answer/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Gesek dari ikon untuk menolak dengan pesan"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Geser ke atas untuk menjawab dan mengakhiri panggilan yang ditangguhkan"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Geser dari ikon untuk menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis respons Anda sendiri…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speaker ponsel"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Tulis respons Anda sendiri…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Batal"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Kirim"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video nonaktif"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Geser ke atas dengan dua jari untuk menjawab. Geser ke bawah dengan dua jari untuk menolak."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Penting"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Penting"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
index c4f9eb4..eb65362 100644
--- a/java/com/android/incallui/answer/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Strjúktu frá tákninu til að hafna með skilaboðum"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Strjúktu upp til að svara og ljúka símtali í bið"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Strjúktu frá tákninu til að svara og ljúka yfirstandandi símtali"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skrifaðu þitt eigið…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Símtól"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hátalari"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skrifaðu þitt eigið…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Hætta við"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senda"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara og ljúka yfirstandandi símtali"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Slökkt á myndavél"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Strjúktu upp með tveimur fingrum til að svara. Strjúktu niður með tveimur fingrum til að hafna."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Áríðandi"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Mikilvægt"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
index 70e9722..7bc17d5 100644
--- a/java/com/android/incallui/answer/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Fai scorrere dall\'icona per rifiutare e inviare un messaggio"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Fai scorrere verso l\'alto per rispondere e terminare la chiamata in attesa"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Fai scorrere dall\'icona per rispondere e terminare la chiamata in corso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrivi risposta personale…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Ricevitore"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Vivavoce"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Scrivi risposta personale…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annulla"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Invia"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Rispondi e termina la chiamata in corso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Il video è disattivato"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Fai scorrere con due dita verso l\'alto per rispondere e verso il basso per rifiutare."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
index 08c02e3..9118ff0 100644
--- a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"החלק מהסמל כדי לדחות עם הודעה"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"החלק למעלה כדי לענות ולסיים את השיחה שבהמתנה"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"החלק מהסמל כדי לענות ולסיים שיחה"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"כתוב אחת משלך…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ביטול"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"שלח"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"מענה וסיום שיחה"</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="4090408168895243702">"דחופה"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"חשוב"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
index b7bd65b..ac9c677 100644
--- a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"アイコンをスワイプして着信を拒否し、メッセージを送信"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"上にスワイプして通話に応答し、保留中の通話を終了"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"アイコンをスワイプして通話に応答し、進行中の通話を終了"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"カスタム返信を作成…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"キャンセル"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"送信"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"通話に応答し、進行中の通話を終了"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ビデオ: OFF"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。"</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"緊急"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
index 6813067..fa01807 100644
--- a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"გადაუსვით ხატულადან შეტყობინებით უარყოფისთვის"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"შეყოვნებული ზარის საპასუხოდ და დასასრულებლად გადაფურცლეთ ზემოთ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"მიმდინარე ზარის საპასუხოდ და დასასრულებლად გადაუსვით ხატულას"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"დაწერეთ თქვენი საკუთარი…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"გაუქმება"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"გაგზავნა"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"პასუხი და მიმდინარე ზარის დასრულება"</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="4090408168895243702">"სასწრაფო"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"მნიშვნელოვანი"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
index 3d18633..c03b6dc 100644
--- a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Қабылдамай, жай хабар жіберу үшін, белгішеден әрі қарай сырғытыңыз"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Күту күйіндегі қоңырауға жауап беру және оны аяқтау үшін жоғары сырғытыңыз"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Қоңырауға жауап беру үшін және ағымдағы қоңырауды аяқтау үшін белгішеден сырғытыңыз"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Өзіңіз жазыңыз…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Жабу"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жіберу"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау"</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="4090408168895243702">"Шұғыл"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Маңызды"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
index 89f9031..854fcb7 100644
--- a/java/com/android/incallui/answer/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​បដិសេធ​​ដោយ​មាន​សារ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ដែល​កំពុង​រង់ចាំ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"អូស​ពី​រូបតំណាង ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"សរសេរ​​ផ្ទាល់ខ្លួន​អ្នក…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"បោះបង់"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ផ្ញើ"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</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="4090408168895243702">"បន្ទាន់"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"សំខាន់"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
index f02a6b8..0349450 100644
--- a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ಸಂದೇಶದ ಜೊತೆಗೆ ನಿರಾಕರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಹೋಲ್ಡ್‌ನಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಲು ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ರದ್ದುಮಾಡಿ"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ಕಳುಹಿಸು"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ"</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="4090408168895243702">"ತುರ್ತು"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"ಪ್ರಮುಖ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
index 850b440..bc22246 100644
--- a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"메시지를 거부하려면 아이콘에서 스와이프하세요."</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"대기 중 통화를 종료하고 받으려면 위로 스와이프"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"현재 통화를 종료하고 전화를 받으려면 아이콘에서 스와이프하세요."</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"직접 메시지 쓰기…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"취소"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"보내기"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"현재 통화를 종료하고 전화 받기"</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="4090408168895243702">"긴급"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"중요"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
index dc08e84..daea11a 100644
--- a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Чалууну билдирүү менен четке кагуу үчүн сүрөтчөнү сүрүңүз"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Жооп берүү же кармалып турган чалууну бутүрүү үчүн экранды өйдө сүрүп коюңуз"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чалууга жооп берүү же чалууну аяктоо үчүн сүрөтчөнү сүрүңүз"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Сиздин жообуңуз..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Баш тартуу"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жөнөтүү"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</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="4090408168895243702">"Шашылыш"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Маанилүү"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
index 06ad00c..13dfe3a 100644
--- a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ປັດຈາກໄອຄອນເພື່ອປະຕິເສດຂໍ້ຄວາມ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງພັກຢູ່"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ຍົກເລີກ"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ສົ່ງ"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</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="4090408168895243702">"ດ່ວນ"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"ສຳຄັນ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
index 3366e33..9edef8d 100644
--- a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Perbraukite iš piktogramos, kad atmestumėte išsiųsdami pranešimą"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Perbraukite aukštyn, kad atsakytumėte ir užbaigtumėte sulaikytą skambutį"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Perbraukite iš piktogramos, kad atsakytumėte ir užbaigtumėte vykstantį skambutį"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Parašykite savo…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefono ragelis"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Garsiakalbis"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Parašykite savo…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Atšaukti"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Siųsti"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atsakykite ir užbaikite vykstantį skambutį"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Vaizdas išjungtas"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Perbraukite dviem pirštais aukštyn, kad atsakytumėte. Perbraukite dviem pirštais žemyn, kad atmestumėte."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Skubus"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Svarbu"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
index 49d1dc9..36124ae 100644
--- a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Lai noraidītu, izmantojot ziņojumu, velciet no ikonas"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Velciet augšup, lai atbildētu un beigtu aizturēto zvanu"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Velciet no ikonas, lai atbildētu un beigtu notiekošo zvanu"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Rakstīt savu…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Austiņas"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Skaļrunis"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Rakstīt savu…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Atcelt"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Sūtīt"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atbildiet un beidziet notiekošo zvanu"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video ir izslēgts"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ar diviem pirkstiem velciet augšup, lai atbildētu. Ar diviem pirkstiem velciet lejup, lai noraidītu."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Steidzams"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Svarīgs"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
index c068f66..c447106 100644
--- a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Повлечете од иконата за да одбиете со порака"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Повлечете нагоре за да одговорите и да завршите повик на чекање"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Повлечете од иконата за да одговорите и да го завршите тековниот повик"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишете сопствен…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Откажи"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Испрати"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Одговорете и завршете го тековниот повик"</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="4090408168895243702">"Итно"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
index 8e1d492..82362c6 100644
--- a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"സന്ദേശമയച്ചുകൊണ്ട് നിരസിക്കാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"മറുപടി നൽകാനും ഹോൾഡിലുള്ള കോൾ അവസാനിപ്പിക്കാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"മറുപടി നൽകാനും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കാനും ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"നിങ്ങളുടേതായത് എഴുതുക…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"റദ്ദാക്കുക"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"അയയ്‌ക്കുക"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</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="4090408168895243702">"അടിയന്തിര പ്രാധാന്യം"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"പ്രധാനപ്പെട്ടവ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
index 4bdd912..648056b 100644
--- a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Зурвас явуулангаа татгалзах бол дүрснээс шударна уу"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Дээш шударч дуудлагыг аваад, түр хүлээлгэсэн дуудлагыг таслах"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Дүрснээс шударч ирсэн дуудлагыг аваад одоогийн дуудлагыг таслах"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Өөрийнхөөрөө бичнэ үү…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Цуцлах"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Илгээх"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах"</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="4090408168895243702">"Яаралтай"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Чухал"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
index 11c8268..c8f7d3f 100644
--- a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"संदेशासह नाकारण्यासाठी आयकॉनपासून स्वाइप करा"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"उत्तर देण्यासाठी आणि होल्ड केलेला कॉल बंद करण्‍यासाठी वर स्वाइप करा"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"उत्तर देण्‍यासाठी आणि सुरु असलेला कॉल बंद करण्‍यासाठी चिन्हावरून स्वाइप करा"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"आपण स्वतःच लिहा…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द करा"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पाठवा"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</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="4090408168895243702">"त्वरित"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"महत्त्वाचे"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
index 36ede75..4361f8a 100644
--- a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Leret dari ikon untuk menolak dengan mesej"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Leret ke atas untuk menjawab dan menamatkan panggilan yang ditahan"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Leret dari ikon untuk menjawab dan menamatkan panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis mesej anda sendiri…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon bimbit"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Fon pembesar suara"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Tulis mesej anda sendiri…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Batal"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Hantar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jawab dan tamatkan panggilan yang sedang berlangsung"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video dimatikan"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Leret dua jari ke atas untuk menjawab. Leret dua jari ke bawah untuk menolak."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Segera"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Penting"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
index 5ad7a82..444c4f7 100644
--- a/java/com/android/incallui/answer/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"မက်ဆေ့ဂျ်ဖြင့်ငြင်းပယ်ရန် သင်္ကေတမှ ပွတ်ဆွဲပါ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး ကိုင်ထားသောခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"သင့်ကိုယ်ပိုင်ရေးပါ…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"မလုပ်တော့"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ပို့ရန်"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</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="4090408168895243702">"အရေးတကြီး"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"အရေးကြီး"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
index b1c32be..4b37234 100644
--- a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sveip fra ikonet for å avslå med en melding"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Høyttaler"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv noe selv …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Haster"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Viktig"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
index 40ef7b6..2577cbe 100644
--- a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"सन्देश सहित अस्वीकार गर्न आइकनबाट स्वाइप गर्नुहोस्"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाफ दिन र होल्डमा रहेको कल अन्त्य गर्न माथितिर स्वाइप गर्नुहोस्"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"जवाफ फर्काउन र जारी कललाई अन्त्य गर्न आइकनबाट स्वाइप गर्नुहोस्"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"तपाईँको आफ्नै लेख्नुहोस्…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द गर्नुहोस्"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पठाउनुहोस्"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्"</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="4090408168895243702">"जरुरी"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"महत्त्वपूर्ण"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
index b2f619f..1478890 100644
--- a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Veeg vanaf pictogram om te weigeren met bericht"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Veeg omhoog om op te nemen en oproep in de wacht te beëindigen"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Veeg vanaf pictogram om op te nemen en actieve oproep te beëindigen"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigen bericht opstellen…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Luidspreker"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Eigen bericht opstellen…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuleren"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Verzenden"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Opnemen en actieve oproep beëindigen"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is uit"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Veeg met twee vingers omhoog om te beantwoorden. Veeg met twee vingers omlaag om te weigeren."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Belangrijk"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
index b1c32be..4b37234 100644
--- a/java/com/android/incallui/answer/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sveip fra ikonet for å avslå med en melding"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Høyttaler"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv noe selv …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Haster"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Viktig"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
index d2b1452..5fc9286 100644
--- a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ਸੁਨੇਹੇ ਦੇ ਨਾਲ ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਰੋਕੀ ਗਈ ਕਾਲ ਸਮਾਪਤ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਕ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ਰੱਦ ਕਰੋ"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ਭੇਜੋ"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</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="4090408168895243702">"ਜ਼ਰੂਰੀ"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"ਮਹੱਤਵਪੂਰਨ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
index b0c44e7..5de5572 100644
--- a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Przesuń palcem od ikony, aby odrzucić połączenie i wysłać wiadomość"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Przesuń w górę, aby odebrać połączenie i zakończyć wstrzymaną rozmowę"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Przesuń palcem od ikony, aby odebrać połączenie i zakończyć trwającą rozmowę"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napisz własną…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Słuchawka"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Głośnik"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napisz własną…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anuluj"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Wyślij"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Wideo jest wyłączone"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Przesuń dwoma palcami w górę, aby odebrać. Przesuń dwoma palcami w dół, aby odrzucić."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Pilne"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Ważne"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
index fe1c89d..e6c3b06 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize a partir do ícone para recusar com uma mensagem"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Aparelho"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Viva-voz"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva sua resposta..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
index 1a23a4a..d9a1549 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize rapidamente a partir do ícone para recusar com uma mensagem"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize rapidamente para cima para atender e terminar uma chamada em espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslizar rapidamente a partir do ícone para atender e terminar uma chamada em curso"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva a sua própria…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Dispositivo"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altifalante"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva a sua própria…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e terminar uma chamada em curso"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize rapidamente com dois dedos para cima para responder. Deslize rapidamente com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
index fe1c89d..e6c3b06 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize a partir do ícone para recusar com uma mensagem"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Aparelho"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Viva-voz"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva sua resposta..."</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
index 6c8bafa..7986f38 100644
--- a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Glisați de pe pictogramă pentru a respinge cu un mesaj"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Glisați în sus ca să răspundeți și să încheiați apelul în așteptare."</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Glisați din pictogramă ca să răspundeți și să încheiați apelul în curs"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrieți propriul răspuns…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Receptor"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Difuzor"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Scrieți propriul răspuns…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anulați"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Trimiteți"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Răspundeți și încheiați apelul în curs"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Camera video este dezactivată."</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Glisați cu două degete în sus pentru a răspunde și în jos pentru a respinge."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgent"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
index 67ff06a..97baef5 100644
--- a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Чтобы отклонить вызов и отправить SMS, проведите пальцем от значка"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Чтобы ответить и завершить вызов на удержании, проведите по экрану вверх"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чтобы ответить и завершить текущий вызов, проведите пальцем от значка"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Ваш ответ…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Отмена"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Отправить"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ответить и завершить текущий вызов"</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="4090408168895243702">"Срочно"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важный звонок"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
index ae3c080..70aa95b 100644
--- a/java/com/android/incallui/answer/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"පණිවිඩය සහිතව ප්‍රතික්ෂේප කිරීමට නිරූපකයේ සිට ස්වයිප් කරන්න"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"රඳවා තබා ගෙන සිටින ඇමතුමට පිළිතුරු දීමට සහ අවසන් කිරීමට ඉහළට ස්වයිප් කරන්න"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"යන ඇමතුමට පිළිතුරු දී අවසන් කිරීමට නිරූපකයෙන් ස්වයිප් කරන්න"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ඔබෙම එක ලියන්න…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"අවලංගු කරන්න"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"යවන්න"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"යන අැමතුමට පිළිතරු දී අවසන් කරන්න"</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="4090408168895243702">"හදිසි"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"වැදගත්"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
index 179be7b..2fbc79d 100644
--- a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prejdením prstom od ikony odmietnuť so správou"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prejdením prstom nahor prijmete hovor a ukončíte podržaný hovor"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prejdením prstom od ikony hovor prijmete a ukončíte prebiehajúci hovor"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napíšte vlastnú…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slúchadlo"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Reproduktor"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napíšte vlastnú…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Zrušiť"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odoslať"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Prijať hovor a ukončiť prebiehajúci hovor"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ak chcete hovor prijať, prejdite dvomi prstami nahor. Ak ho chcete odmietnuť, prejdite dvomi prstami nadol."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Naliehavé"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Dôležité"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
index 5f658be..0279b10 100644
--- a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Povlecite z ikone, da klic zavrnete s sporočilom"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Povlecite navzgor, da sprejmete klic in končate zadržani klic"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Povlecite z ikone, da sprejmete klic in končate aktivni klic"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite lastno besedilo …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Slušalka"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Zvočnik"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite lastno besedilo …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Prekliči"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošlji"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sprejmi klic in končaj aktivni klic"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je izklopljen"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Nujno"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Pomembno"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
index 1de60c9..9a05402 100644
--- a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Rrëshqit nga ikona për të refuzuar me mesazh"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Rrëshqit shpejt lart për t\'u përgjigjur dhe për të mbyllur telefonatën në pritje"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Rrëshqit shpejt nga ikona për t\'u përgjigjur dhe për të mbyllur telefonatën në vazhdim"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Shkruaj tënden…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Kufje"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altoparlanti"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Shkruaj tënden…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anulo"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Dërgo"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Përgjigju dhe mbyll telefonatën në vazhdim"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoja është joaktive"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Rrëshqit dy gishta lart për t\'u përgjigjur. Rrëshqit dy gishta poshtë për të refuzuar."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Urgjente"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"E rëndësishme"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
index 4d6ef56..8d20283 100644
--- a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Превуците од иконе да бисте одбили поруком"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Превуците нагоре да бисте одговорили и завршили позив који је на чекању"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Превуците од иконе да бисте се јавили и завршили позив који је у току"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишите сами…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Откажи"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Пошаљи"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Јавите се и завршите позив који је у току"</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="4090408168895243702">"Хитно"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
index e47b4e0..afd87e7 100644
--- a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Svep från ikonen för att avvisa med meddelande"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Svep uppåt för att svara och avsluta parkerat samtal"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Svep från ikonen för att svara och avsluta pågående samtal"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv eget …"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefonlur"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Högtalartelefon"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv eget …"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Skicka"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara och avsluta pågående samtal"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video avstängd"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Dra två fingrar uppåt för att svara och två nedåt för att avvisa."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Brådskande"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Viktigt"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
index 1e58966..202cc78 100644
--- a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Telezesha kidole ukianzia kwenye aikoni ili utume ujumbe wa kukataa"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Telezesha kidole ili upokee na ukate simu iliyositishwa"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Telezesha kidole ukianzia kwenye aikoni ili ujibu na ukate simu inayoendelea"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Andika yako mwenyewe…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Spika ya masikioni"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Spika ya simu"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Andika yako mwenyewe…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ghairi"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Tuma"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jibu na ukate simu inayoendelea"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video imezimwa"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Telezesha juu kwa vidole viwili ili uijibu. Telezesha chini kwa vidole viwili ili uikate."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Dharura"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Muhimu"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
index 847936f..8863fc1 100644
--- a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"செய்தியுடன் நிராகரிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, ஹோல்டில் உள்ள அழைப்பை முடிக்க, மேலே ஸ்வைப் செய்யவும்"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"நீங்களே எழுதவும்…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ரத்துசெய்"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"அனுப்பு"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்கும்"</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="4090408168895243702">"அவசரம்"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"முக்கிய அழைப்பு"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
index abc3902..112cc1d 100644
--- a/java/com/android/incallui/answer/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"సందేశంతో తిరస్కరించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"సమాధానం ఇవ్వడానికి మరియు హోల్డ్‌లో ఉన్న కాల్‌ను ముగించడానికి పైకి స్వైప్ చేయండి"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను ముగించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"మీ స్వంతంగా వ్రాయండి…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"రద్దు చేయి"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"పంపు"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది"</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="4090408168895243702">"అత్యవసరం"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"ముఖ్యమైనది"</string>
 </resources>
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 54069b3..5169ac4 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
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"เลื่อนจากไอคอนเพื่อรับและวางสาย"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"เขียนคำตอบของคุณเอง…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ยกเลิก"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ส่ง"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"รับและวางสาย"</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="4090408168895243702">"ด่วน"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"สำคัญ"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
index 8f87b56..9a6c333 100644
--- a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"I-swipe mula sa icon upang tanggihan gamit ang mensahe"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"I-swipe nang pataas upang sagutin at tapusin ang tawag na naka-hold"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Mag-swipe mula sa icon upang sagutin at tapusin ang kasalukuyang tawag"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Magsulat ng sarili mo…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Handset"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Speakerphone"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Magsulat ng sarili mo…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Kanselahin"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ipadala"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sagutin at tapusin ang kasalukuyang tawag"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Naka-off ang video"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"I-swipe nang pataas gamit ang dalawang daliri upang sagutin. I-swipe nang pababa gamit ang dalawang daliri upang tanggihan."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Apurahan"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Mahalaga"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
index 53f5eb9..8af5a21 100644
--- a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Mesajla reddetmek için, simgeden hızlıca kaydırın"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cevaplamak ve beklemedeki çağrıyı sona erdirmek için hızlıca yukarı kaydırın"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Bir çağrıyı cevaplamak ve devam eden çağrıyı sona erdirmek için simgeden hızlıca kaydırın"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kendi yanıtınızı oluşturun…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Mobil cihaz kulaklığı"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Hoparlör"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kendi yanıtınızı oluşturun…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"İptal"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gönder"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Bir çağrı cevaplanır ve devam eden çağrı sona erdirilir"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video kapalı"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cevaplamak için iki parmağınızla hızlıca yukarı kaydırın. Reddetmek içinse iki parmağınızla hızlıca aşağı kaydırın."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Acil"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Önemli"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
index a0332d3..ef3252c 100644
--- a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Проведіть пальцем убік від значка, щоб відхилити з повідомленням"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Проведіть пальцем угору, щоб відповісти, завершивши утримуваний виклик"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Проведіть пальцем від значка, щоб відповісти на виклик, завершивши поточний"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишіть власну відповідь…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Скасувати"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Надіслати"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Відповісти на виклик, завершивши поточний"</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="4090408168895243702">"Терміново"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Важливо"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
index e1813cb..1989465 100644
--- a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"پیغام کے ساتھ رد کرنے کیلئے آئیکن سے سوائپ کریں"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"جواب دینے اور ہولڈ کردہ کال کو ختم کرنے کیلئے اوپر سوائپ کریں"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"جواب دینے اور جاری کال ختم کرنے کیلے آئیکن سے سوائپ کریں"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"خود اپنا تحریر کریں…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"منسوخ کریں"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"بھیجیں"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"جواب دیں اور جاری کال ختم کریں"</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="4090408168895243702">"ارجنٹ"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"اہم"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
index b83abcc..9f15af6 100644
--- a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Qo‘ng‘iroqni SMS bilan rad etish uchun nishonchadan suring."</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Javob berish va kutish rejimidagi qo‘ng‘iroqni tugatish uchun tepaga suring"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish uchun nishonchadan suring"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Sizning javobingiz…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Baland ovoz"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Sizning javobingiz…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Bekor qilish"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Yuborish"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera o‘chiq"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Chaqiruvga javob berish uchun ikki barmoq bilan tepaga, rad etish uchun ikki barmoq bilan pastga suring."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Juda muhim"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Muhim qo‘ng‘iroq"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
index 94dd1c3..57b68cf 100644
--- a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Vuốt từ biểu tượng để từ chối kèm thông báo"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Vuốt lên để trả lời và kết thúc cuộc gọi đang chờ"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vuốt từ biểu tượng để trả lời và kết thúc cuộc gọi đang diễn ra"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Viết trả lời của riêng bạn…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Điện thoại di động"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Loa ngoài"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Viết trả lời của riêng bạn…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Hủy"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gửi"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Trả lời và kết thúc cuộc gọi đang diễn ra"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video đã tắt"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vuốt hai ngón tay lên để trả lời. Vuốt hai ngón tay xuống để từ chối."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Khẩn cấp"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Quan trọng"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
index fc7ce64..8f1cfc9 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"滑动图标即可拒接来电并发送信息"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑动即可接听并结束保持的通话"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑动图标即可接听并结束当前通话"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰写回复…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"发送"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接听并结束当前通话"</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="4090408168895243702">"紧急"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
index 9795539..aeffeef 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"從圖示快速滑動即可透過訊息拒絕"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽並結束保留的通話"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"從圖示快速滑動即可接聽及結束進行中的通話"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰寫回覆…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"發送"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽及結束進行中的通話"</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="4090408168895243702">"緊急"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"重要事項"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
index f27e5ae..66624b2 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"滑動圖示即可拒接來電並傳送簡訊"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽及結束保留中的通話"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑動圖示即可接聽來電及結束進行中的通話"</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>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰寫回應…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"傳送"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽來電及結束進行中的通話"</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="4090408168895243702">"緊急"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
index 52f2400..6271d3b 100644
--- a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swayipha isithonjana ukuze wenqabe ngomlayezo"</string>
@@ -7,8 +23,6 @@
     <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swayiphela phezulu ukuze uphendule futhi uphelise ikholi ebanjiwe"</string>
     <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swayipha kusukela kusithonjana ukuze uphendule uphinde uqede ikholi eqhubekayo"</string>
     <string name="call_incoming_message_custom" msgid="5819492800418293238">"Bhala okwakho…"</string>
-    <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Okuphathwa ngesandla"</string>
-    <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Isipikhasefoni"</string>
     <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Bhala okwakho…"</string>
     <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Khansela"</string>
     <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Thumela"</string>
@@ -20,5 +34,5 @@
     <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Phendula uphinde uqede ikholi eqhubekayo"</string>
     <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Ividiyo ivaliwe"</string>
     <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swayiphela iminwe emibili phezulu ukuze uphendule. Swayiphela iminwe emibili phansi ukuze wenqabe."</string>
-    <string name="call_incoming_important" msgid="4090408168895243702">"Okuphuthumayo"</string>
+    <string name="call_incoming_important" msgid="3762352743365137090">"Kubalulekile"</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values/attrs.xml b/java/com/android/incallui/answer/impl/res/values/attrs.xml
index 1086e1c..9b0e65d 100644
--- a/java/com/android/incallui/answer/impl/res/values/attrs.xml
+++ b/java/com/android/incallui/answer/impl/res/values/attrs.xml
@@ -20,7 +20,4 @@
     <attr name="scaleWidth" format="boolean"/>
     <attr name="scaleHeight" format="boolean"/>
   </declare-styleable>
-
-  <item name="match_parent" type="dimen">-1</item>
-  <item name="wrap_content" type="dimen">-2</item>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/answer/impl/res/values/strings.xml b/java/com/android/incallui/answer/impl/res/values/strings.xml
index 2359220..2bc9ca0 100644
--- a/java/com/android/incallui/answer/impl/res/values/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
   <string name="call_incoming_swipe_to_decline_with_message">Swipe from icon to decline with message</string>
   <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string>
@@ -6,8 +21,6 @@
   <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string>
   <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string>
   <string name="call_incoming_message_custom">Write your own…</string>
-  <string name="call_incoming_audio_handset">Handset</string>
-  <string name="call_incoming_audio_speakerphone">Speakerphone</string>
   <!-- "Respond via SMS" option that lets you compose a custom response. [CHAR LIMIT=30] -->
   <string name="call_incoming_respond_via_sms_custom_message">Write your own…</string>
   <!-- "Custom Message" Cancel alert dialog button -->
@@ -26,5 +39,5 @@
   <!-- Voice prompt of swipe gesture when accessibility is turned on. -->
   <string description="The message announced to accessibility assistance on incoming call."
     name="a11y_incoming_call_swipe_gesture_prompt">Two finger swipe up to answer. Two finger swipe down to decline.</string>
-  <string name="call_incoming_important">Urgent</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreen.java b/java/com/android/incallui/answer/protocol/AnswerScreen.java
index 8bcad6e..5ad5002 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreen.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreen.java
@@ -30,6 +30,8 @@
 
   boolean allowAnswerAndRelease();
 
+  boolean isActionTimeout();
+
   void setTextResponses(List<String> textResponses);
 
   boolean hasPendingDialogs();
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
index 9815981..5d2c415 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
@@ -32,6 +32,10 @@
   void onReject();
 
   void onAnswerAndReleaseCall();
+
+  void onAnswerAndReleaseButtonEnabled();
+
+  void onAnswerAndReleaseButtonDisabled();
   /**
    * Sets the window background color based on foreground call's theme and the given progress. This
    * is called from the answer UI to animate the accept and reject action.
@@ -42,4 +46,7 @@
    * @param progress float from -1 to 1. -1 is fully rejected, 1 is fully accepted, and 0 is neutral
    */
   void updateWindowBackgroundColor(@FloatRange(from = -1f, to = 1.0f) float progress);
+
+  /** Returns true if any answer/reject action timed out. */
+  boolean isActionTimeout();
 }
diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
index 24fbfc4..16fad8b 100644
--- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
+++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
@@ -20,8 +20,8 @@
 import android.hardware.display.DisplayManager;
 import android.os.PowerManager;
 import android.view.Display;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.DialerCallListener;
@@ -80,7 +80,7 @@
         .getBoolean(CONFIG_ANSWER_PSEUDO_PROXIMITY_WAKE_LOCK_ENABLED, true)) {
       answerProximityWakeLock = new PseudoProximityWakeLock(context, pseudoScreenState);
     } else {
-      // TODO: choose a wake lock implementation base on framework/device.
+      // TODO(twyen): choose a wake lock implementation base on framework/device.
       // These bugs requires the PseudoProximityWakeLock workaround:
       // b/30439151 Proximity sensor not working on M
       // b/31499931 fautly touch input when screen is off on marlin/sailfish
@@ -143,6 +143,9 @@
   public void onInternationalCallOnWifi() {}
 
   @Override
+  public void onEnrichedCallSessionUpdate() {}
+
+  @Override
   public void onDialerCallSessionModificationStateChange() {}
 
   @Override
diff --git a/java/com/android/incallui/audiomode/AudioModeProvider.java b/java/com/android/incallui/audiomode/AudioModeProvider.java
index f62afa7..eb59e95 100644
--- a/java/com/android/incallui/audiomode/AudioModeProvider.java
+++ b/java/com/android/incallui/audiomode/AudioModeProvider.java
@@ -16,7 +16,11 @@
 
 package com.android.incallui.audiomode;
 
+import android.content.Context;
+import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
 import android.telecom.CallAudioState;
+import com.android.dialer.common.LogUtil;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,6 +65,47 @@
     return audioState;
   }
 
+  /**
+   * Sets a approximated audio state before {@link #onAudioStateChanged} is called. Classes such as
+   * {@link com.android.incallui.ProximitySensor} fetches the audio state before it is updated by
+   * telecom. This method attempts to guess the correct routing based on connected audio devices.
+   * The audio state may still be wrong on a second call due to b/64811128, telecom setting the
+   * route back to earpiece when a call ends.
+   */
+  public void initializeAudioState(Context context) {
+    onAudioStateChanged(
+        new CallAudioState(false, getApproximatedAudioRoute(context), SUPPORTED_AUDIO_ROUTE_ALL));
+  }
+
+  private static int getApproximatedAudioRoute(Context context) {
+    AudioManager audioManager = context.getSystemService(AudioManager.class);
+    boolean hasBluetooth = false;
+    boolean hasHeadset = false;
+    for (AudioDeviceInfo info : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
+      switch (info.getType()) {
+        case AudioDeviceInfo.TYPE_BLUETOOTH_A2DP:
+        case AudioDeviceInfo.TYPE_BLUETOOTH_SCO:
+          hasBluetooth = true;
+          continue;
+        case AudioDeviceInfo.TYPE_WIRED_HEADSET:
+          hasHeadset = true;
+          continue;
+        default:
+          continue;
+      }
+    }
+    if (hasBluetooth) {
+      LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to bluetooth");
+      return CallAudioState.ROUTE_BLUETOOTH;
+    }
+    if (hasHeadset) {
+      LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to headset");
+      return CallAudioState.ROUTE_WIRED_HEADSET;
+    }
+    LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to earpiece");
+    return CallAudioState.ROUTE_EARPIECE;
+  }
+
   /** Notified on changes to audio mode. */
   public interface AudioModeListener {
 
diff --git a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
index c757477..c7a9d63 100644
--- a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
+++ b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
@@ -18,6 +18,7 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff.Mode;
 import android.os.Bundle;
@@ -41,6 +42,8 @@
   /** Called when an audio route is picked */
   public interface AudioRouteSelectorPresenter {
     void onAudioRouteSelected(int audioRoute);
+
+    void onAudioRouteSelectorDismiss();
   }
 
   public static AudioRouteSelectorDialogFragment newInstance(CallAudioState audioState) {
@@ -91,6 +94,14 @@
     return view;
   }
 
+  @Override
+  public void onDismiss(DialogInterface dialogInterface) {
+    super.onDismiss(dialogInterface);
+    FragmentUtils.getParentUnsafe(
+            AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
+        .onAudioRouteSelectorDismiss();
+  }
+
   private void initItem(TextView item, final int itemRoute, CallAudioState audioState) {
     int selectedColor = getResources().getColor(R.color.dialer_theme_color);
     if ((audioState.getSupportedRouteMask() & itemRoute) == 0) {
diff --git a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
index eedcbe5..5a22b93 100644
--- a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
+++ b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
@@ -146,7 +146,7 @@
     float maxTextSize = TypedValue.applyDimension(unit, size, displayMetrics);
     if (this.maxTextSize != maxTextSize) {
       this.maxTextSize = maxTextSize;
-      // TODO: It's not actually necessary to clear the whole cache here. To optimize cache
+      // TODO(tobyj): It's not actually necessary to clear the whole cache here. To optimize cache
       // deletion we'd have to delete all entries in the cache with a value equal or larger than
       // MIN(old_max_size, new_max_size) when changing maxTextSize; and all entries with a value
       // equal or smaller than MAX(old_min_size, new_min_size) when changing minTextSize.
diff --git a/java/com/android/incallui/bindings/InCallUiBindings.java b/java/com/android/incallui/bindings/InCallUiBindings.java
index d3d3a8b..5c6aef4 100644
--- a/java/com/android/incallui/bindings/InCallUiBindings.java
+++ b/java/com/android/incallui/bindings/InCallUiBindings.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import com.android.dialer.common.ConfigProvider;
 
 /** This interface allows the container application to customize the in call UI. */
 public interface InCallUiBindings {
@@ -37,12 +36,4 @@
    */
   @Nullable
   Intent getCallStateButtonBroadcastIntent(Context context);
-
-  @Nullable
-  DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener);
-
-  @Nullable
-  ContactUtils getContactUtilsInstance(Context context);
-
-  ConfigProvider getConfigProvider();
 }
diff --git a/java/com/android/incallui/bindings/InCallUiBindingsStub.java b/java/com/android/incallui/bindings/InCallUiBindingsStub.java
index 7b42fb3..3a005b0 100644
--- a/java/com/android/incallui/bindings/InCallUiBindingsStub.java
+++ b/java/com/android/incallui/bindings/InCallUiBindingsStub.java
@@ -19,11 +19,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import com.android.dialer.common.ConfigProvider;
 
 /** Default implementation for InCallUi bindings. */
 public class InCallUiBindingsStub implements InCallUiBindings {
-  private ConfigProvider configProvider;
 
   @Override
   @Nullable
@@ -42,40 +40,4 @@
   public Intent getCallStateButtonBroadcastIntent(Context context) {
     return null;
   }
-
-  @Override
-  @Nullable
-  public DistanceHelper newDistanceHelper(Context context, DistanceHelper.Listener listener) {
-    return null;
-  }
-
-  @Override
-  @Nullable
-  public ContactUtils getContactUtilsInstance(Context context) {
-    return null;
-  }
-
-  @Override
-  public ConfigProvider getConfigProvider() {
-    if (configProvider == null) {
-      configProvider =
-          new ConfigProvider() {
-            @Override
-            public String getString(String key, String defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public long getLong(String key, long defaultValue) {
-              return defaultValue;
-            }
-
-            @Override
-            public boolean getBoolean(String key, boolean defaultValue) {
-              return defaultValue;
-            }
-          };
-    }
-    return configProvider;
-  }
 }
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 34f0cc0..d0931dd 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -32,6 +32,8 @@
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
@@ -112,11 +114,16 @@
 
   public void onCallAdded(
       final Context context, final android.telecom.Call telecomCall, LatencyReport latencyReport) {
-    Trace.beginSection("onCallAdded");
+    Trace.beginSection("CallList.onCallAdded");
     final DialerCall call =
         new DialerCall(context, this, telecomCall, latencyReport, true /* registerCallback */);
     logSecondIncomingCall(context, call);
 
+    EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager();
+    manager.registerCapabilitiesListener(call);
+    manager.registerStateChangedListener(call);
+
+    Trace.beginSection("checkSpam");
     final DialerCallListenerImpl dialerCallListener = new DialerCallListenerImpl(call);
     call.addListener(dialerCallListener);
     LogUtil.d("CallList.onCallAdded", "callState=" + call.getState());
@@ -163,7 +170,9 @@
 
       updateUserMarkedSpamStatus(call, context, number, dialerCallListener);
     }
+    Trace.endSection();
 
+    Trace.beginSection("checkBlock");
     FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler =
         new FilteredNumberAsyncQueryHandler(context);
 
@@ -179,6 +188,7 @@
         },
         call.getNumber(),
         GeoUtil.getCurrentCountryIso(context));
+    Trace.endSection();
 
     if (call.getState() == DialerCall.State.INCOMING
         || call.getState() == DialerCall.State.CALL_WAITING) {
@@ -278,6 +288,10 @@
       DialerCall call = mCallByTelecomCall.get(telecomCall);
       Assert.checkArgument(!call.isExternalCall());
 
+      EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager();
+      manager.unregisterCapabilitiesListener(call);
+      manager.unregisterStateChangedListener(call);
+
       // Don't log an already logged call. logCall() might be called multiple times
       // for the same call due to b/24109437.
       if (call.getLogState() != null && !call.getLogState().isLogged) {
@@ -289,6 +303,8 @@
         LogUtil.w(
             "CallList.onCallRemoved", "Removing call not previously disconnected " + call.getId());
       }
+
+      call.onRemovedFromCallList();
     }
 
     if (!hasLiveCall()) {
@@ -341,6 +357,7 @@
 
   /** Called when a single call has changed. */
   private void onIncoming(DialerCall call) {
+    Trace.beginSection("CallList.onIncoming");
     if (updateCallInMap(call)) {
       LogUtil.i("CallList.onIncoming", String.valueOf(call));
     }
@@ -348,6 +365,7 @@
     for (Listener listener : mListeners) {
       listener.onIncomingCall(call);
     }
+    Trace.endSection();
   }
 
   public void addListener(@NonNull Listener listener) {
@@ -518,6 +536,22 @@
   }
 
   /**
+   * Return if there is any active or background call which was not a parent call (never had a child
+   * call)
+   */
+  public boolean hasNonParentActiveOrBackgroundCall() {
+    for (DialerCall call : mCallById.values()) {
+      if ((call.getState() == State.ACTIVE
+              || call.getState() == State.ONHOLD
+              || call.getState() == State.CONFERENCED)
+          && !call.wasParentCall()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
    * This is called when the service disconnects, either expectedly or unexpectedly. For the
    * expected case, it's because we have no calls left. For the unexpected case, it is likely a
    * crash of phone and we need to clean up our calls manually. Without phone, there can be no
@@ -556,7 +590,9 @@
    *
    * @param call The call to update.
    */
-  private void onUpdateCall(DialerCall call) {
+  @VisibleForTesting
+  void onUpdateCall(DialerCall call) {
+    Trace.beginSection("CallList.onUpdateCall");
     LogUtil.d("CallList.onUpdateCall", String.valueOf(call));
     if (!mCallById.containsKey(call.getId()) && call.isExternalCall()) {
       // When a regular call becomes external, it is removed from the call list, and there may be
@@ -569,6 +605,7 @@
     if (updateCallInMap(call)) {
       LogUtil.i("CallList.onUpdateCall", String.valueOf(call));
     }
+    Trace.endSection();
   }
 
   /**
@@ -593,6 +630,7 @@
    * @return false if no call previously existed and no call was added, otherwise true.
    */
   private boolean updateCallInMap(DialerCall call) {
+    Trace.beginSection("CallList.updateCallInMap");
     Objects.requireNonNull(call);
 
     boolean updated = false;
@@ -622,6 +660,7 @@
       updated = true;
     }
 
+    Trace.endSection();
     return updated;
   }
 
@@ -751,7 +790,7 @@
 
     @Override
     public void onDialerCallUpdate() {
-      Trace.beginSection("onUpdate");
+      Trace.beginSection("CallList.onDialerCallUpdate");
       onUpdateCall(mCall);
       notifyGenericListeners();
       Trace.endSection();
@@ -793,6 +832,9 @@
     }
 
     @Override
+    public void onEnrichedCallSessionUpdate() {}
+
+    @Override
     public void onDialerCallSessionModificationStateChange() {
       for (Listener listener : mListeners) {
         listener.onSessionModificationStateChange(mCall);
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index acedf41..1a99809 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -41,16 +41,20 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.contacts.common.compat.CallCompat;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener;
+import com.android.dialer.enrichedcall.EnrichedCallManager.Filter;
+import com.android.dialer.enrichedcall.EnrichedCallManager.StateChangedListener;
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.ContactLookupResult;
@@ -77,7 +81,7 @@
 import java.util.concurrent.TimeUnit;
 
 /** Describes a single call and its state. */
-public class DialerCall implements VideoTechListener {
+public class DialerCall implements VideoTechListener, StateChangedListener, CapabilitiesListener {
 
   public static final int CALL_HISTORY_STATUS_UNKNOWN = 0;
   public static final int CALL_HISTORY_STATUS_PRESENT = 1;
@@ -143,6 +147,13 @@
   private EnrichedCallCapabilities mEnrichedCallCapabilities;
   private Session mEnrichedCallSession;
 
+  private int answerAndReleaseButtonDisplayedTimes = 0;
+  private boolean releasedByAnsweringSecondCall = false;
+  // Times when a second call is received but AnswerAndRelease button is not shown
+  // since it's not supported.
+  private int secondCallWithoutAnswerAndReleasedButtonTimes = 0;
+  private VideoTech videoTech;
+
   public static String getNumberFromHandle(Uri handle) {
     return handle == null ? "" : handle.getSchemeSpecificPart();
   }
@@ -153,6 +164,9 @@
    */
   private boolean isRemotelyHeld;
 
+  /** Indicates whether this call is currently in the process of being merged into a conference. */
+  private boolean isMergeInProcess;
+
   /**
    * Indicates whether the phone account associated with this call supports specifying a call
    * subject.
@@ -181,14 +195,15 @@
 
         @Override
         public void onDetailsChanged(Call call, Call.Details details) {
-          LogUtil.v("TelecomCallCallback.onStateChanged", " call=" + call + " details=" + details);
+          LogUtil.v(
+              "TelecomCallCallback.onDetailsChanged", " call=" + call + " details=" + details);
           update();
         }
 
         @Override
         public void onCannedTextResponsesLoaded(Call call, List<String> cannedTextResponses) {
           LogUtil.v(
-              "TelecomCallCallback.onStateChanged",
+              "TelecomCallCallback.onCannedTextResponsesLoaded",
               "call=" + call + " cannedTextResponses=" + cannedTextResponses);
           for (CannedTextResponsesLoadedListener listener : mCannedTextResponsesLoadedListeners) {
             listener.onCannedTextResponsesLoaded(DialerCall.this);
@@ -198,7 +213,7 @@
         @Override
         public void onPostDialWait(Call call, String remainingPostDialSequence) {
           LogUtil.v(
-              "TelecomCallCallback.onStateChanged",
+              "TelecomCallCallback.onPostDialWait",
               "call=" + call + " remainingPostDialSequence=" + remainingPostDialSequence);
           update();
         }
@@ -206,20 +221,20 @@
         @Override
         public void onVideoCallChanged(Call call, VideoCall videoCall) {
           LogUtil.v(
-              "TelecomCallCallback.onStateChanged", "call=" + call + " videoCall=" + videoCall);
+              "TelecomCallCallback.onVideoCallChanged", "call=" + call + " videoCall=" + videoCall);
           update();
         }
 
         @Override
         public void onCallDestroyed(Call call) {
-          LogUtil.v("TelecomCallCallback.onStateChanged", "call=" + call);
+          LogUtil.v("TelecomCallCallback.onCallDestroyed", "call=" + call);
           unregisterCallback();
         }
 
         @Override
         public void onConferenceableCallsChanged(Call call, List<Call> conferenceableCalls) {
           LogUtil.v(
-              "DialerCall.onConferenceableCallsChanged",
+              "TelecomCallCallback.onConferenceableCallsChanged",
               "call %s, conferenceable calls: %d",
               call,
               conferenceableCalls.size());
@@ -229,7 +244,7 @@
         @Override
         public void onConnectionEvent(android.telecom.Call call, String event, Bundle extras) {
           LogUtil.v(
-              "DialerCall.onConnectionEvent",
+              "TelecomCallCallback.onConnectionEvent",
               "Call: " + call + ", Event: " + event + ", Extras: " + extras);
           switch (event) {
               // The Previous attempt to Merge two calls together has failed in Telecom. We must
@@ -255,6 +270,14 @@
             case TelephonyManagerCompat.EVENT_NOTIFY_INTERNATIONAL_CALL_ON_WFC:
               notifyInternationalCallOnWifi();
               break;
+            case TelephonyManagerCompat.EVENT_MERGE_START:
+              LogUtil.i("DialerCall.onConnectionEvent", "merge start");
+              isMergeInProcess = true;
+              break;
+            case TelephonyManagerCompat.EVENT_MERGE_COMPLETE:
+              LogUtil.i("DialerCall.onConnectionEvent", "merge complete");
+              isMergeInProcess = false;
+              break;
             default:
               break;
           }
@@ -292,6 +315,8 @@
 
     mTimeAddedMs = System.currentTimeMillis();
     parseCallSpecificAppData();
+
+    updateEnrichedCallSession();
   }
 
   private static int translateState(int state) {
@@ -404,15 +429,27 @@
     }
   }
 
+  public boolean wasParentCall() {
+    return mLogState.conferencedCalls != 0;
+  }
+
   private void update() {
-    Trace.beginSection("Update");
+    Trace.beginSection("DialerCall.update");
     int oldState = getState();
+    // Clear any cache here that could potentially change on update.
+    videoTech = null;
     // We want to potentially register a video call callback here.
     updateFromTelecomCall();
     if (oldState != getState() && getState() == DialerCall.State.DISCONNECTED) {
       for (DialerCallListener listener : mListeners) {
         listener.onDialerCallDisconnect();
       }
+      EnrichedCallComponent.get(mContext)
+          .getEnrichedCallManager()
+          .unregisterCapabilitiesListener(this);
+      EnrichedCallComponent.get(mContext)
+          .getEnrichedCallManager()
+          .unregisterStateChangedListener(this);
     } else {
       for (DialerCallListener listener : mListeners) {
         listener.onDialerCallUpdate();
@@ -422,6 +459,7 @@
   }
 
   private void updateFromTelecomCall() {
+    Trace.beginSection("DialerCall.updateFromTelecomCall");
     LogUtil.v("DialerCall.updateFromTelecomCall", mTelecomCall.toString());
 
     mVideoTechManager.dispatchCallStateChanged(mTelecomCall.getState());
@@ -470,6 +508,7 @@
         }
       }
     }
+    Trace.endSection();
   }
 
   /**
@@ -647,13 +686,23 @@
   }
 
   public void setState(int state) {
-    mState = state;
-    if (mState == State.INCOMING) {
+    if (state == State.INCOMING) {
       mLogState.isIncoming = true;
-    } else if (mState == State.DISCONNECTED) {
-      mLogState.duration =
+    } else if (state == State.DISCONNECTED) {
+      long newDuration =
           getConnectTimeMillis() == 0 ? 0 : System.currentTimeMillis() - getConnectTimeMillis();
+      if (mState != state) {
+        mLogState.duration = newDuration;
+      } else {
+        LogUtil.i(
+            "DialerCall.setState",
+            "ignoring state transition from DISCONNECTED to DISCONNECTED."
+                + " Duration would have changed from %s to %s",
+            mLogState.duration,
+            newDuration);
+      }
     }
+    mState = state;
   }
 
   public int getNumberPresentation() {
@@ -952,14 +1001,49 @@
     return isRemotelyHeld;
   }
 
+  public boolean isMergeInProcess() {
+    return isMergeInProcess;
+  }
+
   public boolean isIncoming() {
     return mLogState.isIncoming;
   }
 
+  public boolean isAssistedDialed() {
+    if (getIntentExtras() != null) {
+      return getIntentExtras().getBoolean(TelephonyManagerCompat.IS_ASSISTED_DIALED, false);
+    }
+    return false;
+  }
+
   public LatencyReport getLatencyReport() {
     return mLatencyReport;
   }
 
+  public int getAnswerAndReleaseButtonDisplayedTimes() {
+    return answerAndReleaseButtonDisplayedTimes;
+  }
+
+  public void increaseAnswerAndReleaseButtonDisplayedTimes() {
+    answerAndReleaseButtonDisplayedTimes++;
+  }
+
+  public boolean getReleasedByAnsweringSecondCall() {
+    return releasedByAnsweringSecondCall;
+  }
+
+  public void setReleasedByAnsweringSecondCall(boolean releasedByAnsweringSecondCall) {
+    this.releasedByAnsweringSecondCall = releasedByAnsweringSecondCall;
+  }
+
+  public int getSecondCallWithoutAnswerAndReleasedButtonTimes() {
+    return secondCallWithoutAnswerAndReleasedButtonTimes;
+  }
+
+  public void increaseSecondCallWithoutAnswerAndReleasedButtonTimes() {
+    secondCallWithoutAnswerAndReleasedButtonTimes++;
+  }
+
   @Nullable
   public EnrichedCallCapabilities getEnrichedCallCapabilities() {
     return mEnrichedCallCapabilities;
@@ -1057,7 +1141,10 @@
   }
 
   public VideoTech getVideoTech() {
-    return mVideoTechManager.getVideoTech();
+    if (videoTech == null) {
+      videoTech = mVideoTechManager.getVideoTech();
+    }
+    return videoTech;
   }
 
   public String getCallbackNumber() {
@@ -1172,6 +1259,76 @@
     TelecomAdapter.getInstance().setAudioRoute(CallAudioState.ROUTE_SPEAKER);
   }
 
+  @Override
+  public void onCapabilitiesUpdated() {
+    if (getNumber() == null) {
+      return;
+    }
+    EnrichedCallCapabilities capabilities =
+        EnrichedCallComponent.get(mContext).getEnrichedCallManager().getCapabilities(getNumber());
+    if (capabilities != null) {
+      setEnrichedCallCapabilities(capabilities);
+      update();
+    }
+  }
+
+  @Override
+  public void onEnrichedCallStateChanged() {
+    updateEnrichedCallSession();
+  }
+
+  @Override
+  public void onImpressionLoggingNeeded(DialerImpression.Type impressionType) {
+    Logger.get(mContext).logCallImpression(impressionType, getUniqueCallId(), getTimeAddedMs());
+  }
+
+  private void updateEnrichedCallSession() {
+    if (getNumber() == null) {
+      return;
+    }
+    if (getEnrichedCallSession() != null) {
+      // State changes to existing sessions are currently handled by the UI components (which have
+      // their own listeners). Someday instead we could remove those and just call update() here and
+      // have the usual onDialerCallUpdate update the UI.
+      dispatchOnEnrichedCallSessionUpdate();
+      return;
+    }
+
+    EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
+
+    Filter filter =
+        isIncoming()
+            ? manager.createIncomingCallComposerFilter()
+            : manager.createOutgoingCallComposerFilter();
+
+    Session session = manager.getSession(getUniqueCallId(), getNumber(), filter);
+    if (session == null) {
+      return;
+    }
+
+    session.setUniqueDialerCallId(getUniqueCallId());
+    setEnrichedCallSession(session);
+
+    LogUtil.i(
+        "DialerCall.updateEnrichedCallSession",
+        "setting session %d's dialer id to %s",
+        session.getSessionId(),
+        getUniqueCallId());
+
+    dispatchOnEnrichedCallSessionUpdate();
+  }
+
+  private void dispatchOnEnrichedCallSessionUpdate() {
+    for (DialerCallListener listener : mListeners) {
+      listener.onEnrichedCallSessionUpdate();
+    }
+  }
+
+  void onRemovedFromCallList() {
+    // Ensure we clean up when this call is removed.
+    mVideoTechManager.dispatchRemovedFromCallList();
+  }
+
   /**
    * Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN}
    * means there is no result.
@@ -1203,6 +1360,7 @@
     public static final int CONNECTING = 13; /* Waiting for Telecom broadcast to finish */
     public static final int BLOCKED = 14; /* The number was found on the block list */
     public static final int PULLING = 15; /* An external call being pulled to the device */
+    public static final int CALL_PENDING = 16; /* A call is pending on a long process to finish */
 
     public static boolean isConnectingOrConnected(int state) {
       switch (state) {
@@ -1372,6 +1530,7 @@
 
       String phoneNumber = call.getNumber();
       phoneNumber = phoneNumber != null ? phoneNumber : "";
+      phoneNumber = phoneNumber.replaceAll("[^+0-9]", "");
 
       // Insert order here determines the priority of that video tech option
       videoTechs = new ArrayList<>();
@@ -1390,7 +1549,10 @@
 
       videoTechs.add(
           new LightbringerTech(
-              LightbringerComponent.get(call.mContext).getLightbringer(), call, phoneNumber));
+              LightbringerComponent.get(call.mContext).getLightbringer(),
+              call,
+              call.mTelecomCall,
+              phoneNumber));
     }
 
     VideoTech getVideoTech() {
@@ -1402,6 +1564,7 @@
         if (tech.isAvailable(context)) {
           // Remember the first VideoTech that becomes available and always use it
           savedTech = tech;
+          savedTech.becomePrimary();
           return savedTech;
         }
       }
@@ -1414,6 +1577,12 @@
         videoTech.onCallStateChanged(context, newState);
       }
     }
+
+    void dispatchRemovedFromCallList() {
+      for (VideoTech videoTech : videoTechs) {
+        videoTech.onRemovedFromCallList();
+      }
+    }
   }
 
   /** Called when canned text responses have been loaded. */
diff --git a/java/com/android/incallui/call/DialerCallListener.java b/java/com/android/incallui/call/DialerCallListener.java
index ed321be..5d24a4d 100644
--- a/java/com/android/incallui/call/DialerCallListener.java
+++ b/java/com/android/incallui/call/DialerCallListener.java
@@ -36,4 +36,6 @@
   void onHandoverToWifiFailure();
 
   void onInternationalCallOnWifi();
+
+  void onEnrichedCallSessionUpdate();
 }
diff --git a/java/com/android/incallui/call/ExternalCallList.java b/java/com/android/incallui/call/ExternalCallList.java
index 52a7a30..f104dfe 100644
--- a/java/com/android/incallui/call/ExternalCallList.java
+++ b/java/com/android/incallui/call/ExternalCallList.java
@@ -22,6 +22,7 @@
 import android.telecom.Call;
 import android.util.ArraySet;
 import com.android.contacts.common.compat.CallCompat;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import java.util.Collections;
 import java.util.Set;
@@ -48,9 +49,8 @@
 
   /** Begins tracking an external call and notifies listeners of the new call. */
   public void onCallAdded(Call telecomCall) {
-    if (!telecomCall.getDetails().hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL)) {
-      throw new IllegalArgumentException();
-    }
+    Assert.checkArgument(
+        telecomCall.getDetails().hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL));
     mExternalCalls.add(telecomCall);
     telecomCall.registerCallback(mTelecomCallCallback, new Handler(Looper.getMainLooper()));
     notifyExternalCallAdded(telecomCall);
diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index ebf4ecf..005278b 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -20,12 +20,13 @@
 import android.content.Intent;
 import android.os.Looper;
 import android.support.annotation.MainThread;
+import android.support.annotation.VisibleForTesting;
 import android.telecom.InCallService;
 import com.android.dialer.common.LogUtil;
 import java.util.List;
 
 /** Wrapper around Telecom APIs. */
-public final class TelecomAdapter implements InCallServiceListener {
+public class TelecomAdapter implements InCallServiceListener {
 
   private static final String ADD_CALL_MODE_KEY = "add_call_mode";
 
@@ -45,6 +46,11 @@
     return sInstance;
   }
 
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void setInstanceForTesting(TelecomAdapter telecomAdapter) {
+    sInstance = telecomAdapter;
+  }
+
   @Override
   public void setInCallService(InCallService inCallService) {
     mInCallService = inCallService;
@@ -82,9 +88,13 @@
       List<android.telecom.Call> conferenceable = call.getConferenceableCalls();
       if (!conferenceable.isEmpty()) {
         call.conference(conferenceable.get(0));
+        // It's safe to clear restrict count for merge action.
+        DialerCall.clearRestrictedCount();
       } else {
         if (call.getDetails().can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE)) {
           call.mergeConference();
+          // It's safe to clear restrict count for merge action.
+          DialerCall.clearRestrictedCount();
         }
       }
     } else {
diff --git a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
index 550c580..fda9404 100644
--- a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
+++ b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
@@ -19,6 +19,7 @@
   package="com.android.incallui.calllocation.impl">
 
   <application>
+
     <meta-data
       android:name="com.google.android.gms.version"
       android:value="@integer/google_play_services_version"/>
diff --git a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
index 801b0d3..035f5cd 100644
--- a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
+++ b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
@@ -21,6 +21,7 @@
 import android.net.TrafficStats;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.TrafficStatsTags;
 import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
@@ -49,9 +50,9 @@
 
     try {
       URL mapUrl = new URL(LocationUrlBuilder.getStaticMapUrl(ui.getContext(), locations[0]));
+      TrafficStats.setThreadStatsTag(TrafficStatsTags.DOWNLOAD_LOCATION_MAP_TAG);
       InputStream content = (InputStream) mapUrl.getContent();
 
-      TrafficStats.setThreadStatsTag(TrafficStatsTags.DOWNLOAD_LOCATION_MAP_TAG);
       return Drawable.createFromStream(content, STATIC_MAP_SRC_NAME);
     } catch (Exception ex) {
       LogUtil.e("DownloadMapImageTask.doInBackground", "Exception!!!", ex);
diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java
index 3a14789..99a759b 100644
--- a/java/com/android/incallui/calllocation/impl/LocationHelper.java
+++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java
@@ -24,6 +24,7 @@
 import android.os.Handler;
 import android.support.annotation.IntDef;
 import android.support.annotation.MainThread;
+import android.support.v4.os.UserManagerCompat;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.util.PermissionsUtil;
@@ -87,6 +88,12 @@
       LogUtil.i("LocationHelper.canGetLocation", "location service is disabled.");
       return false;
     }
+
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      LogUtil.i("LocationHelper.canGetLocation", "location unavailable in FBE mode.");
+      return false;
+    }
+
     return true;
   }
 
diff --git a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java
index a57bdf6..14a9c76 100644
--- a/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java
+++ b/java/com/android/incallui/calllocation/impl/LocationUrlBuilder.java
@@ -134,7 +134,7 @@
         url += String.format(Locale.US, "(%s)", addressLine1.toString());
       }
     } else {
-      // TODO: i18n
+      // TODO(mdooley): i18n
       url +=
           String.format(
               Locale.US,
diff --git a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
index eb5957b..060ec0b 100644
--- a/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
+++ b/java/com/android/incallui/calllocation/impl/ReverseGeocodeTask.java
@@ -20,6 +20,7 @@
 import android.net.TrafficStats;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.TrafficStatsTags;
 import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi;
 import java.lang.ref.WeakReference;
 import org.json.JSONArray;
diff --git a/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java b/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java
deleted file mode 100644
index 02cc2e0..0000000
--- a/java/com/android/incallui/calllocation/impl/TrafficStatsTags.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.incallui.calllocation.impl;
-
-/** Constants used for logging */
-public class TrafficStatsTags {
-
-  /**
-   * Must be greater than {@link com.android.contacts.common.util.TrafficStatsTags#TAG_MAX}, to
-   * respect the namespace of the tags in ContactsCommon.
-   */
-  public static final int DOWNLOAD_LOCATION_MAP_TAG = 0xd000;
-
-  public static final int REVERSE_GEOCODE_TAG = 0xd001;
-}
diff --git a/java/com/android/incallui/callpending/AndroidManifest.xml b/java/com/android/incallui/callpending/AndroidManifest.xml
new file mode 100644
index 0000000..231553e
--- /dev/null
+++ b/java/com/android/incallui/callpending/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+ ~ 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
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.incallui.callpending">
+  <application android:theme="@style/Theme.AppCompat">
+    <!-- Identical to .InCallActivity except orientation is locked to portrait -->
+    <activity
+        android:directBootAware="true"
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:label="@string/phoneAppLabel"
+        android:name="com.android.incallui.callpending.CallPendingActivity"
+        android:resizeableActivity="true"
+        android:screenOrientation="portrait"
+        android:taskAffinity="com.android.incallui"
+        android:theme="@style/Theme.InCallScreen"/>
+  </application>
+</manifest>
diff --git a/java/com/android/incallui/callpending/CallPendingActivity.java b/java/com/android/incallui/callpending/CallPendingActivity.java
new file mode 100644
index 0000000..26490d9
--- /dev/null
+++ b/java/com/android/incallui/callpending/CallPendingActivity.java
@@ -0,0 +1,356 @@
+/*
+ * 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.incallui.callpending;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.telecom.CallAudioState;
+import android.telecom.TelecomManager;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.Session;
+import com.android.dialer.multimedia.MultimediaData;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.incall.bindings.InCallBindings;
+import com.android.incallui.incall.protocol.ContactPhotoType;
+import com.android.incallui.incall.protocol.InCallButtonIds;
+import com.android.incallui.incall.protocol.InCallButtonUi;
+import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
+import com.android.incallui.incall.protocol.InCallButtonUiDelegateFactory;
+import com.android.incallui.incall.protocol.InCallScreen;
+import com.android.incallui.incall.protocol.InCallScreenDelegate;
+import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
+import com.android.incallui.incall.protocol.PrimaryCallState;
+import com.android.incallui.incall.protocol.PrimaryInfo;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+/**
+ * Activity useful for showing the incall ui without an actual call being placed.
+ *
+ * <p>The UI currently displays the following:
+ *
+ * <ul>
+ *   <li>Contact info
+ *   <li>"Dialing..." call state
+ *   <li>Enriched calling data
+ * </ul>
+ *
+ * If the user presses the back or disconnect buttons, {@link #finish()} is called.
+ */
+public class CallPendingActivity extends FragmentActivity
+    implements InCallButtonUiDelegateFactory, InCallScreenDelegateFactory {
+
+  private static final String TAG_IN_CALL_SCREEN = "tag_in_call_screen";
+  private static final String ACTION_FINISH_BROADCAST =
+      "dialer.intent.action.CALL_PENDING_ACTIVITY_FINISH";
+
+  private static final String EXTRA_SESSION_ID = "extra_session_id";
+  private static final String EXTRA_NUMBER = "extra_number";
+  private static final String EXTRA_NAME = "extra_name";
+  private static final String EXTRA_LABEL = "extra_label";
+  private static final String EXTRA_LOOKUP_KEY = "extra_lookup_key";
+  private static final String EXTRA_CALL_PENDING_LABEL = "extra_call_pending_label";
+  private static final String EXTRA_PHOTO_URI = "extra_photo_uri";
+
+  private final BroadcastReceiver finishReceiver =
+      new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context arg0, Intent intent) {
+          LogUtil.i("CallPendingActivity.onReceive", "finish broadcast received");
+          String action = intent.getAction();
+          if (action.equals(ACTION_FINISH_BROADCAST)) {
+            finish();
+          }
+        }
+      };
+
+  private InCallButtonUiDelegate inCallButtonUiDelegate;
+  private InCallScreenDelegate inCallScreenDelegate;
+
+  public static Intent getIntent(
+      Context context,
+      String name,
+      String number,
+      String label,
+      String lookupKey,
+      String callPendingLabel,
+      Uri photoUri,
+      long sessionId) {
+    Intent intent = new Intent(context, CallPendingActivity.class);
+    intent.putExtra(EXTRA_NAME, name);
+    intent.putExtra(EXTRA_NUMBER, number);
+    intent.putExtra(EXTRA_LABEL, label);
+    intent.putExtra(EXTRA_LOOKUP_KEY, lookupKey);
+    intent.putExtra(EXTRA_CALL_PENDING_LABEL, callPendingLabel);
+    intent.putExtra(EXTRA_PHOTO_URI, photoUri);
+    intent.putExtra(EXTRA_SESSION_ID, sessionId);
+    return intent;
+  }
+
+  public static Intent getFinishBroadcast() {
+    return new Intent(ACTION_FINISH_BROADCAST);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.pending_incall_screen);
+    registerReceiver(finishReceiver, new IntentFilter(ACTION_FINISH_BROADCAST));
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    InCallScreen inCallScreen = InCallBindings.createInCallScreen();
+    getSupportFragmentManager()
+        .beginTransaction()
+        .add(R.id.main, inCallScreen.getInCallScreenFragment(), TAG_IN_CALL_SCREEN)
+        .commit();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    setupInCallScreen();
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    unregisterReceiver(finishReceiver);
+  }
+
+  private void setupInCallScreen() {
+    InCallScreen inCallScreen =
+        (InCallScreen) getSupportFragmentManager().findFragmentByTag(TAG_IN_CALL_SCREEN);
+    inCallScreen.setPrimary(createPrimaryInfo());
+    inCallScreen.setCallState(
+        PrimaryCallState.createEmptyPrimaryCallStateWithState(
+            State.CALL_PENDING, getCallPendingLabel()));
+    inCallScreen.setEndCallButtonEnabled(true, true);
+  }
+
+  private PrimaryInfo createPrimaryInfo() {
+    Session session =
+        EnrichedCallComponent.get(this).getEnrichedCallManager().getSession(getSessionId());
+    MultimediaData multimediaData;
+    if (session == null) {
+      LogUtil.i("CallPendingActivity.createPrimaryInfo", "Null session.");
+      multimediaData = null;
+    } else {
+      multimediaData = session.getMultimediaData();
+    }
+
+    Drawable photo = null;
+    try {
+      // TODO(calderwoodra) move to background thread
+      Uri photoUri = getPhotoUri();
+      InputStream is = getContentResolver().openInputStream(photoUri);
+      photo = Drawable.createFromStream(is, photoUri.toString());
+    } catch (FileNotFoundException e) {
+      LogUtil.e("CallPendingActivity.createPrimaryInfo", "Contact photo not found", e);
+    }
+
+    String name = getName();
+    String number = getNumber();
+
+    // DialerCall with caller that is a work contact.
+    return new PrimaryInfo(
+        number,
+        name,
+        name != null && name.equals(number),
+        null /* location */,
+        getPhoneLabel(),
+        photo,
+        ContactPhotoType.CONTACT,
+        false /* isSipCall */,
+        true /* isContactPhotoShown */,
+        false /* isWorkCall */,
+        false /* isSpam */,
+        false /* answeringDisconnectsOngoingCall */,
+        false /* shouldShowLocation */,
+        getLookupKey(),
+        multimediaData,
+        false /*showInCallButtonGrid */,
+        TelecomManager.PRESENTATION_ALLOWED);
+  }
+
+  @Override
+  public InCallButtonUiDelegate newInCallButtonUiDelegate() {
+    if (inCallButtonUiDelegate != null) {
+      return inCallButtonUiDelegate;
+    }
+    return inCallButtonUiDelegate =
+        new InCallButtonUiDelegate() {
+
+          @Override
+          public void onInCallButtonUiReady(InCallButtonUi inCallButtonUi) {
+            inCallButtonUi.showButton(InCallButtonIds.BUTTON_DIALPAD, true);
+            inCallButtonUi.showButton(InCallButtonIds.BUTTON_MUTE, true);
+            inCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);
+            inCallButtonUi.showButton(InCallButtonIds.BUTTON_ADD_CALL, true);
+
+            inCallButtonUi.enableButton(InCallButtonIds.BUTTON_DIALPAD, false);
+            inCallButtonUi.enableButton(InCallButtonIds.BUTTON_MUTE, false);
+            inCallButtonUi.enableButton(InCallButtonIds.BUTTON_AUDIO, false);
+            inCallButtonUi.enableButton(InCallButtonIds.BUTTON_ADD_CALL, false);
+          }
+
+          @Override
+          public void onInCallButtonUiUnready() {}
+
+          @Override
+          public void onSaveInstanceState(Bundle outState) {}
+
+          @Override
+          public void onRestoreInstanceState(Bundle savedInstanceState) {}
+
+          @Override
+          public void refreshMuteState() {}
+
+          @Override
+          public void addCallClicked() {}
+
+          @Override
+          public void muteClicked(boolean checked, boolean clickedByUser) {}
+
+          @Override
+          public void mergeClicked() {}
+
+          @Override
+          public void holdClicked(boolean checked) {}
+
+          @Override
+          public void swapClicked() {}
+
+          @Override
+          public void showDialpadClicked(boolean checked) {}
+
+          @Override
+          public void changeToVideoClicked() {}
+
+          @Override
+          public void switchCameraClicked(boolean useFrontFacingCamera) {}
+
+          @Override
+          public void toggleCameraClicked() {}
+
+          @Override
+          public void pauseVideoClicked(boolean pause) {}
+
+          @Override
+          public void toggleSpeakerphone() {}
+
+          @Override
+          public CallAudioState getCurrentAudioState() {
+            return AudioModeProvider.getInstance().getAudioState();
+          }
+
+          @Override
+          public void setAudioRoute(int route) {}
+
+          @Override
+          public void onEndCallClicked() {}
+
+          @Override
+          public void showAudioRouteSelector() {}
+
+          @Override
+          public Context getContext() {
+            return CallPendingActivity.this;
+          }
+        };
+  }
+
+  @Override
+  public InCallScreenDelegate newInCallScreenDelegate() {
+    if (inCallScreenDelegate != null) {
+      return inCallScreenDelegate;
+    }
+    return inCallScreenDelegate =
+        new InCallScreenDelegate() {
+
+          @Override
+          public void onInCallScreenDelegateInit(InCallScreen inCallScreen) {}
+
+          @Override
+          public void onInCallScreenReady() {}
+
+          @Override
+          public void onInCallScreenUnready() {}
+
+          @Override
+          public void onEndCallClicked() {
+            finish();
+          }
+
+          @Override
+          public void onSecondaryInfoClicked() {}
+
+          @Override
+          public void onCallStateButtonClicked() {}
+
+          @Override
+          public void onManageConferenceClicked() {}
+
+          @Override
+          public void onShrinkAnimationComplete() {}
+
+          @Override
+          public void onInCallScreenResumed() {}
+
+          @Override
+          public void onInCallScreenPaused() {}
+        };
+  }
+
+  private long getSessionId() {
+    return getIntent().getLongExtra(EXTRA_SESSION_ID, -1);
+  }
+
+  private String getNumber() {
+    return getIntent().getStringExtra(EXTRA_NUMBER);
+  }
+
+  private String getName() {
+    return getIntent().getStringExtra(EXTRA_NAME);
+  }
+
+  private String getPhoneLabel() {
+    return getIntent().getStringExtra(EXTRA_LABEL);
+  }
+
+  private String getLookupKey() {
+    return getIntent().getStringExtra(EXTRA_LOOKUP_KEY);
+  }
+
+  private String getCallPendingLabel() {
+    return getIntent().getStringExtra(EXTRA_CALL_PENDING_LABEL);
+  }
+
+  private Uri getPhotoUri() {
+    return getIntent().getParcelableExtra(EXTRA_PHOTO_URI);
+  }
+}
diff --git a/java/com/android/incallui/callpending/res/layout/pending_incall_screen.xml b/java/com/android/incallui/callpending/res/layout/pending_incall_screen.xml
new file mode 100644
index 0000000..398042b
--- /dev/null
+++ b/java/com/android/incallui/callpending/res/layout/pending_incall_screen.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- In-call Phone UI; see CallPendingActivity.java. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/java/com/android/incallui/commontheme/res/anim/blinking.xml b/java/com/android/incallui/commontheme/res/anim/blinking.xml
deleted file mode 100644
index 4b921c6..0000000
--- a/java/com/android/incallui/commontheme/res/anim/blinking.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-  <alpha
-    android:duration="800"
-    android:fromAlpha="0.26"
-    android:interpolator="@android:anim/linear_interpolator"
-    android:repeatCount="infinite"
-    android:repeatMode="reverse"
-    android:toAlpha="0.6"/>
-</set>
\ No newline at end of file
diff --git a/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png
deleted file mode 100644
index 26f3fe0..0000000
--- a/java/com/android/incallui/commontheme/res/drawable-hdpi/ic_phone_audio_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png
deleted file mode 100644
index 5b0a9d6..0000000
--- a/java/com/android/incallui/commontheme/res/drawable-mdpi/ic_phone_audio_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png
deleted file mode 100644
index d595b19..0000000
--- a/java/com/android/incallui/commontheme/res/drawable-xhdpi/ic_phone_audio_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png
deleted file mode 100644
index fb7cf16..0000000
--- a/java/com/android/incallui/commontheme/res/drawable-xxhdpi/ic_phone_audio_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png b/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png
deleted file mode 100644
index 4bb58d9..0000000
--- a/java/com/android/incallui/commontheme/res/drawable-xxxhdpi/ic_phone_audio_white_36dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/commontheme/res/values-af/strings.xml b/java/com/android/incallui/commontheme/res/values-af/strings.xml
index 0dfdbc7..0721869 100644
--- a/java/com/android/incallui/commontheme/res/values-af/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-af/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Beëindig oproep"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aan"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video af"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Verwissel video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Luidspreker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Klank"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-am/strings.xml b/java/com/android/incallui/commontheme/res/values-am/strings.xml
index 3155c39..9d748e3 100644
--- a/java/com/android/incallui/commontheme/res/values-am/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-am/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ጥሪ ጨርስ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ቪዲዮ በርቷል"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ቪዲዮ ጠፍቷል"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ቪዲዮ አገላብጥ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"የድምጽ ማጉያ"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ድምፅ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ar/strings.xml b/java/com/android/incallui/commontheme/res/values-ar/strings.xml
index ecb3608..693bfc5 100644
--- a/java/com/android/incallui/commontheme/res/values-ar/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ar/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"إنهاء المكالمة"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"الفيديو قيد التشغيل"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"الفيديو ليس قيد التشغيل"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"تبديل الفيديو"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"مكبر الصوت"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"صوت"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-az/strings.xml b/java/com/android/incallui/commontheme/res/values-az/strings.xml
index d935a6c..a1d88ce 100644
--- a/java/com/android/incallui/commontheme/res/values-az/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-az/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Zəngi sonlandırın"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aktivdir"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video deaktivdir"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videonu dəyişdirin"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Dinamik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Səs"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
index 36430c4..05ae59c 100644
--- a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Završi poziv"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Uključi video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Isključi video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zameni video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-be/strings.xml b/java/com/android/incallui/commontheme/res/values-be/strings.xml
index 9609a63..e772e27 100644
--- a/java/com/android/incallui/commontheme/res/values-be/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-be/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завяршыць выклік"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Відэа ўкл."</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Відэа выкл."</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Пераключыць відэа"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Вонк.дынамік"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Гук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bg/strings.xml b/java/com/android/incallui/commontheme/res/values-bg/strings.xml
index 1a0f3e3..63364f8 100644
--- a/java/com/android/incallui/commontheme/res/values-bg/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bg/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Край на обаждането"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Видеото е включено"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Видеото е изключено"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Размяна на видеото"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Високогов."</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bn/strings.xml b/java/com/android/incallui/commontheme/res/values-bn/strings.xml
index ef2408f..9871ea4 100644
--- a/java/com/android/incallui/commontheme/res/values-bn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"কল কেটে দিন"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ভিডিও চালু আছে"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ভিডিও বন্ধ আছে"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ভিডিও অদল বদল করুন"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"স্পিকার"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"শব্দ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bs/strings.xml b/java/com/android/incallui/commontheme/res/values-bs/strings.xml
index bfaff98..76f991d 100644
--- a/java/com/android/incallui/commontheme/res/values-bs/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Prekini poziv"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Kamera je uključena"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Kamera je isključena"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamijeni kameru"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ca/strings.xml b/java/com/android/incallui/commontheme/res/values-ca/strings.xml
index 1b6ed44..832027d 100644
--- a/java/com/android/incallui/commontheme/res/values-ca/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ca/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalitza la trucada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activat"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivat"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Canvia de vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altaveu"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"So"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-cs/strings.xml b/java/com/android/incallui/commontheme/res/values-cs/strings.xml
index 1f10d85..7afdcba 100644
--- a/java/com/android/incallui/commontheme/res/values-cs/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-cs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ukončit hovor"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Zapnuté video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vypnuté video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Přepnout video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Reproduktor"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-da/strings.xml b/java/com/android/incallui/commontheme/res/values-da/strings.xml
index 35d01e3..bd26e90 100644
--- a/java/com/android/incallui/commontheme/res/values-da/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-da/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Afslut opkald"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video til"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video fra"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Byt video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Højttaler"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-de/strings.xml b/java/com/android/incallui/commontheme/res/values-de/strings.xml
index 57a95b7..3fd10f0 100644
--- a/java/com/android/incallui/commontheme/res/values-de/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-de/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Anruf beenden"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video an"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video aus"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video wechseln"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Lautsprecher"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Tonausgabe"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-el/strings.xml b/java/com/android/incallui/commontheme/res/values-el/strings.xml
index 6bb9edc..71c0be9 100644
--- a/java/com/android/incallui/commontheme/res/values-el/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-el/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Τερματισμός"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Εικόνα βίντεο ενεργοποιημένη"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Εικόνα βίντεο απενεργοποιημένη"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Εναλλαγή βίντεο"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Ηχείο"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Ήχος"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
index 8133185..4869c3f 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
index 8133185..4869c3f 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
index 8133185..4869c3f 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
index 45f2e2f..a9596d9 100644
--- a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar llamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video activado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video desactivado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Intercambiar video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altavoz"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sonido"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-es/strings.xml b/java/com/android/incallui/commontheme/res/values-es/strings.xml
index 56c8b28..aa84c62 100644
--- a/java/com/android/incallui/commontheme/res/values-es/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-es/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar llamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Cambiar de vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altavoz"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sonido"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-et/strings.xml b/java/com/android/incallui/commontheme/res/values-et/strings.xml
index 069f3b5..ae2e1ba 100644
--- a/java/com/android/incallui/commontheme/res/values-et/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-et/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kõne lõpetamine"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on sees"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video on väljas"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video vahetamine"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Kõlar"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Heli"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-eu/strings.xml b/java/com/android/incallui/commontheme/res/values-eu/strings.xml
index bbcf5dc..0dd126c 100644
--- a/java/com/android/incallui/commontheme/res/values-eu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-eu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Amaitu deia"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Aktibatuta dago bideoa"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Desaktibatuta dago bideoa"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Aldatu bideoa"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Bozgorailua"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Soinua"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fa/strings.xml b/java/com/android/incallui/commontheme/res/values-fa/strings.xml
index ea967bb..1996ad4 100644
--- a/java/com/android/incallui/commontheme/res/values-fa/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"پایان تماس"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ویدئو فعال"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ویدئو غیرفعال"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"جابه‌جایی ویدئو"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"بلندگو"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"صدا"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fi/strings.xml b/java/com/android/incallui/commontheme/res/values-fi/strings.xml
index f0da44f..5a57981 100644
--- a/java/com/android/incallui/commontheme/res/values-fi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Päätä puhelu"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Videokuva käytössä"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Videokuva poissa käytöstä"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Vaihda videota"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Kaiutin"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Ääni"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
index bf74dfb..a1db306 100644
--- a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mettre fin à l\'appel"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vidéo activée"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vidéo désactivée"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Permuter la vidéo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Haut-parleur"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Son"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fr/strings.xml b/java/com/android/incallui/commontheme/res/values-fr/strings.xml
index fb674a4..e169a3d 100644
--- a/java/com/android/incallui/commontheme/res/values-fr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mettre fin à l\'appel"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vidéo activée"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vidéo désactivée"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Permuter la vidéo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Haut-parleur"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Audio"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-gl/strings.xml b/java/com/android/incallui/commontheme/res/values-gl/strings.xml
index c7e2214..ba98a98 100644
--- a/java/com/android/incallui/commontheme/res/values-gl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-gl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar chamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Alternar vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altofalante"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Son"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-gu/strings.xml b/java/com/android/incallui/commontheme/res/values-gu/strings.xml
index 75584ea..194590c 100644
--- a/java/com/android/incallui/commontheme/res/values-gu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-gu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"કૉલ સમાપ્ત કરો"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"વિડિઓ ચાલુ"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"વિડિઓ બંધ"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"વિડિઓ સ્વેપ કરો"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"સ્પીકર"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ધ્વનિ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hi/strings.xml b/java/com/android/incallui/commontheme/res/values-hi/strings.xml
index f7ea68a..207bbf2 100644
--- a/java/com/android/incallui/commontheme/res/values-hi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"कॉल समाप्त करें"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"वीडियो चालू"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"वीडियो बंद"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"वीडियो स्वैप करें"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"स्‍पीकर"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ध्वनि"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hr/strings.xml b/java/com/android/incallui/commontheme/res/values-hr/strings.xml
index c30f397..c58ab85 100644
--- a/java/com/android/incallui/commontheme/res/values-hr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Prekid poziva"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Videopoziv uključen"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Videopoziv isključen"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamijeni videopoziv"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hu/strings.xml b/java/com/android/incallui/commontheme/res/values-hu/strings.xml
index 9ee2300..ba7fec7 100644
--- a/java/com/android/incallui/commontheme/res/values-hu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Hívás befejezése"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Videó be"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Videó ki"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videó cseréje"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Hangszóró"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Hang"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hy/strings.xml b/java/com/android/incallui/commontheme/res/values-hy/strings.xml
index 96a0cab..81262e4 100644
--- a/java/com/android/incallui/commontheme/res/values-hy/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hy/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ավարտել զանգը"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Տեսախցիկը միացած է"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Տեսախցիկն անջատած է"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Փոխարկել խցիկը"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Բարձրախոս"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Ձայն"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-in/strings.xml b/java/com/android/incallui/commontheme/res/values-in/strings.xml
index 4536f5d..fb3fc56 100644
--- a/java/com/android/incallui/commontheme/res/values-in/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-in/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Akhiri panggilan"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aktif"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video nonaktif"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Tukar Video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Suara"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-is/strings.xml b/java/com/android/incallui/commontheme/res/values-is/strings.xml
index 357f90e..438b143 100644
--- a/java/com/android/incallui/commontheme/res/values-is/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-is/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ljúka símtali"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Kveikja á mynd"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Slökkva á mynd"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Skipta um mynd"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Hátalari"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Hljóð"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-it/strings.xml b/java/com/android/incallui/commontheme/res/values-it/strings.xml
index a63d314..b7c1d3f 100644
--- a/java/com/android/incallui/commontheme/res/values-it/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-it/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Termina chiamata"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video attivo"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video non attivo"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Scambia video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altoparlante"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Suono"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-iw/strings.xml b/java/com/android/incallui/commontheme/res/values-iw/strings.xml
index 1e2b7f2..cbd6d75 100644
--- a/java/com/android/incallui/commontheme/res/values-iw/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-iw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"סיים שיחה"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"הווידאו מופעל"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"הווידאו מושבת"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"החלף וידאו"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"רמקול"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"קול"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ja/strings.xml b/java/com/android/incallui/commontheme/res/values-ja/strings.xml
index 658b513..4ea9495 100644
--- a/java/com/android/incallui/commontheme/res/values-ja/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ja/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"通話を終了"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ビデオが ON になっています"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ビデオが OFF になっています"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ビデオを切り替える"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"スピーカー"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"音声"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ka/strings.xml b/java/com/android/incallui/commontheme/res/values-ka/strings.xml
index ffba7ce..3163476 100644
--- a/java/com/android/incallui/commontheme/res/values-ka/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ka/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ზარის დასრულება"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ვიდეო ჩართულია"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ვიდეო გამორთულია"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ვიდეოს შენაცვლება"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"სპიკერი"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ხმა"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-kk/strings.xml b/java/com/android/incallui/commontheme/res/values-kk/strings.xml
index ace83ec..23b3a2a 100644
--- a/java/com/android/incallui/commontheme/res/values-kk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-kk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Қоңырауды аяқтау"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Бейне қосулы"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Бейне өшірулі"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Бейнені ауыстыру"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамик"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Дыбыс"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-km/strings.xml b/java/com/android/incallui/commontheme/res/values-km/strings.xml
index e28f120..55cfa0a 100644
--- a/java/com/android/incallui/commontheme/res/values-km/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-km/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"បញ្ចប់​ការ​ហៅ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"បើក​វីដេអូ​"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"បិទ​វីដេអូ"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ប្ដូរ​វីដេអូ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ឧបករណ៍​បំពង​សំឡេង"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"សំឡេង"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-kn/strings.xml b/java/com/android/incallui/commontheme/res/values-kn/strings.xml
index 59186e0..685ef64 100644
--- a/java/com/android/incallui/commontheme/res/values-kn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-kn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ವೀಡಿಯೊ ಆನ್"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ವೀಡಿಯೊ ಆಫ್"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ವೀಡಿಯೊ ಬದಲಾಯಿಸಿ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ಸ್ಪೀಕರ್‌"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ಶಬ್ದ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ko/strings.xml b/java/com/android/incallui/commontheme/res/values-ko/strings.xml
index 0a0e3c9..088746d 100644
--- a/java/com/android/incallui/commontheme/res/values-ko/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ko/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"통화 종료"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"동영상 켜짐"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"동영상 꺼짐"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"동영상 전환"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"스피커"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"소리"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ky/strings.xml b/java/com/android/incallui/commontheme/res/values-ky/strings.xml
index ac697e4..5dd4d0c 100644
--- a/java/com/android/incallui/commontheme/res/values-ky/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ky/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Чалууну бүтүрүү"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Видео күйүк"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Видео өчүк"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Видеону иштетүү/өчүрүү"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Катуу сүйлөткүч"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Добуш"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lo/strings.xml b/java/com/android/incallui/commontheme/res/values-lo/strings.xml
index da2050a..2f0b94b 100644
--- a/java/com/android/incallui/commontheme/res/values-lo/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lo/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ວາງສາຍ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ວິດີໂອເປີດ"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ວິດີໂອປິດ"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ສະຫຼັບວິດີໂອ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ລຳໂພງ"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ສຽງ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lt/strings.xml b/java/com/android/incallui/commontheme/res/values-lt/strings.xml
index bda53d6..d0a5e0d 100644
--- a/java/com/android/incallui/commontheme/res/values-lt/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Baigti skambutį"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vaizdas įjungtas"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vaizdas išjungtas"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Sukeisti vaizdą"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Garsiakalbis"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Garsas"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lv/strings.xml b/java/com/android/incallui/commontheme/res/values-lv/strings.xml
index beaf35c..443ac5e 100644
--- a/java/com/android/incallui/commontheme/res/values-lv/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Beigt zvanu"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video ieslēgts"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video izslēgts"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Mainīt video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Skaļrunis"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Skaņa"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mk/strings.xml b/java/com/android/incallui/commontheme/res/values-mk/strings.xml
index 5b4f6d0..d9a339e 100644
--- a/java/com/android/incallui/commontheme/res/values-mk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завршете го повикот"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Видеото е вклучено"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Видеото е исклучено"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Заменете го видеото"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Звучник"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ml/strings.xml b/java/com/android/incallui/commontheme/res/values-ml/strings.xml
index 0242667..0f2d889 100644
--- a/java/com/android/incallui/commontheme/res/values-ml/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ml/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"വീഡിയോ ഓണാണ്"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"വീഡിയോ ഓഫാണ്"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"വീഡിയോ സ്വാപ്പുചെയ്യുക"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"സ്പീക്കർ"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ശബ്‌ദം"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mn/strings.xml b/java/com/android/incallui/commontheme/res/values-mn/strings.xml
index cd286ed..3665fcf 100644
--- a/java/com/android/incallui/commontheme/res/values-mn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Дуудлагыг таслах"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Видео идэвхтэй"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Видео идэвхгүй"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Видеог солих"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Чанга яригч"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Дуу"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mr/strings.xml b/java/com/android/incallui/commontheme/res/values-mr/strings.xml
index 2c626ed..f749809 100644
--- a/java/com/android/incallui/commontheme/res/values-mr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"कॉल समाप्त करा"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"व्हिडिओ चालू"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"व्हिडिओ बंद"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"व्हिडिओ बदला"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"स्पीकर"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ध्वनी"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ms/strings.xml b/java/com/android/incallui/commontheme/res/values-ms/strings.xml
index f6c358d..fb38fa9d 100644
--- a/java/com/android/incallui/commontheme/res/values-ms/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ms/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Tamatkan panggilan"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video dihidupkan"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video dimatikan"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Silih video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Pmbsr suara"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Bunyi"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-my/strings.xml b/java/com/android/incallui/commontheme/res/values-my/strings.xml
index 6b6614c..5b396be 100644
--- a/java/com/android/incallui/commontheme/res/values-my/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-my/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ခေါ်ဆိုမှုအပြီးသတ်ရန်"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ဗီဒီယိုဖွင့်ထားသည်"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ဗီဒီယိုပိတ်ထားသည်"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ဗီဒီယိုဖလှယ်ရန်"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"စပီကာ"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"အသံ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-nb/strings.xml b/java/com/android/incallui/commontheme/res/values-nb/strings.xml
index 4974411..506b15e 100644
--- a/java/com/android/incallui/commontheme/res/values-nb/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-nb/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avslutt samtalen"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Bytt video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Høyttaler"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ne/strings.xml b/java/com/android/incallui/commontheme/res/values-ne/strings.xml
index 5cd91b3..fa9d87f 100644
--- a/java/com/android/incallui/commontheme/res/values-ne/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ne/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"कल अन्त्य गर्नुहोस्"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"सक्रिय भिडियो"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"निष्क्रिय भिडियो"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"भिडियो साट्नुहोस्"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"स्पिकर"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"आवाज"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-nl/strings.xml b/java/com/android/incallui/commontheme/res/values-nl/strings.xml
index d33d600..192c47b 100644
--- a/java/com/android/incallui/commontheme/res/values-nl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-nl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Oproep beëindigen"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aan"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video uit"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video wisselen"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Luidspreker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Geluid"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-no/strings.xml b/java/com/android/incallui/commontheme/res/values-no/strings.xml
index 4974411..506b15e 100644
--- a/java/com/android/incallui/commontheme/res/values-no/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-no/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avslutt samtalen"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Bytt video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Høyttaler"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pa/strings.xml b/java/com/android/incallui/commontheme/res/values-pa/strings.xml
index 7e59e61..77ceb25 100644
--- a/java/com/android/incallui/commontheme/res/values-pa/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ਕਾਲ ਸਮਾਪਤ ਕਰੋ"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ਵੀਡੀਓ ਚਾਲੂ"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ਵੀਡੀਓ ਬੰਦ"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ਵੀਡੀਓ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ਸਪੀਕਰ"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ਧੁਨੀ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pl/strings.xml b/java/com/android/incallui/commontheme/res/values-pl/strings.xml
index 4ab1d24..d9b037e 100644
--- a/java/com/android/incallui/commontheme/res/values-pl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Zakończ połączenie"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Wideo włączone"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Wideo wyłączone"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Przełącz wideo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Głośnik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Dźwięk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
index 67f3674..2c1834e 100644
--- a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Encerrar chamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Trocar vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Alto-falante"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
index 27c5649..f0c14d0 100644
--- a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Terminar chamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Alternar vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altifalante"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt/strings.xml b/java/com/android/incallui/commontheme/res/values-pt/strings.xml
index 67f3674..2c1834e 100644
--- a/java/com/android/incallui/commontheme/res/values-pt/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Encerrar chamada"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Trocar vídeo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Alto-falante"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ro/strings.xml b/java/com/android/incallui/commontheme/res/values-ro/strings.xml
index b7fec9a..f7c8f72 100644
--- a/java/com/android/incallui/commontheme/res/values-ro/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ro/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Încheiați apelul"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Imaginea video este activată"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Imaginea video este dezactivată"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Schimbați imaginea video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Difuzor"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sunet"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ru/strings.xml b/java/com/android/incallui/commontheme/res/values-ru/strings.xml
index 5d1807f..1853ad2 100644
--- a/java/com/android/incallui/commontheme/res/values-ru/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ru/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завершить вызов"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Камера включена"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Камера выключена"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Включить/выключить камеру"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамик"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-si/strings.xml b/java/com/android/incallui/commontheme/res/values-si/strings.xml
index 0a0f35c..ae13cc4 100644
--- a/java/com/android/incallui/commontheme/res/values-si/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-si/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"ඇමතුම අවසන් කරන්න"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"වීඩියෝව ක්‍රියාත්මකයි"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"වීඩියෝව ක්‍රියාවිරහිතයි"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"වීඩියෝව මාරු කරන්න"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ස්පීකරය"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"හඬ"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sk/strings.xml b/java/com/android/incallui/commontheme/res/values-sk/strings.xml
index 97eabeb..cd9aa99 100644
--- a/java/com/android/incallui/commontheme/res/values-sk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ukončiť hovor"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video je zapnuté"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video je vypnuté"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zameniť video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Reproduktor"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sl/strings.xml b/java/com/android/incallui/commontheme/res/values-sl/strings.xml
index 46cf2e8..0aa6e69 100644
--- a/java/com/android/incallui/commontheme/res/values-sl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Končaj klic"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Vklopi video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Izklopi video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamenjaj video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvočnik"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Zvok"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sq/strings.xml b/java/com/android/incallui/commontheme/res/values-sq/strings.xml
index 17ec081..b9c97d1 100644
--- a/java/com/android/incallui/commontheme/res/values-sq/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sq/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mbylle telefonatën"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Videoja aktive"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Videoja joaktive"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Shkëmbe video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Altoparlanti"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Tingulli"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sr/strings.xml b/java/com/android/incallui/commontheme/res/values-sr/strings.xml
index 2928bc9..67586b7 100644
--- a/java/com/android/incallui/commontheme/res/values-sr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Заврши позив"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Укључи видео"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Искључи видео"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Замени видео"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Звучник"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sv/strings.xml b/java/com/android/incallui/commontheme/res/values-sv/strings.xml
index 17b5d37..957a2f8 100644
--- a/java/com/android/incallui/commontheme/res/values-sv/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avsluta samtal"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Byt video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Högtalare"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Ljud"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sw/strings.xml b/java/com/android/incallui/commontheme/res/values-sw/strings.xml
index 165d576..8752c2d 100644
--- a/java/com/android/incallui/commontheme/res/values-sw/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kata simu"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Washa video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Zima video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Badilisha video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Spika"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Sauti"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ta/strings.xml b/java/com/android/incallui/commontheme/res/values-ta/strings.xml
index fa2dfb2..69258d2 100644
--- a/java/com/android/incallui/commontheme/res/values-ta/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ta/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"அழைப்பைத் துண்டிக்கும்"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"வீடியோ இயக்கப்பட்டது"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"வீடியோ முடக்கப்பட்டது"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"வீடியோவிற்கு மாற்றும்"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ஸ்பீக்கர்"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ஒலி"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-te/strings.xml b/java/com/android/incallui/commontheme/res/values-te/strings.xml
index 3ce431c..9454e15 100644
--- a/java/com/android/incallui/commontheme/res/values-te/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-te/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"కాల్‌ను ముగిస్తుంది"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"వీడియో ఆన్‌లో ఉంది"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"వీడియో ఆఫ్‌లో ఉంది"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"వీడియోను మారుస్తుంది"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"స్పీకర్"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"ధ్వని"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-th/strings.xml b/java/com/android/incallui/commontheme/res/values-th/strings.xml
index 1fa145c..8235310 100644
--- a/java/com/android/incallui/commontheme/res/values-th/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-th/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"วางสาย"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"เปิดวิดีโอ"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ปิดวิดีโอ"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"สลับวิดีโอ"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"ลำโพง"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"เสียง"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-tl/strings.xml b/java/com/android/incallui/commontheme/res/values-tl/strings.xml
index a53e11c..f368e3a 100644
--- a/java/com/android/incallui/commontheme/res/values-tl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-tl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Tapusin ang tawag"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Naka-on ang video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Naka-off ang video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Pagpalitin ang video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Tunog"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-tr/strings.xml b/java/com/android/incallui/commontheme/res/values-tr/strings.xml
index 0955273..cbf5502 100644
--- a/java/com/android/incallui/commontheme/res/values-tr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-tr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Çağrıyı sonlandırın"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video açık"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video kapalı"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videoyu değiştirin"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Hoparlör"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Ses"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-uk/strings.xml b/java/com/android/incallui/commontheme/res/values-uk/strings.xml
index e17e781..2bcd04c 100644
--- a/java/com/android/incallui/commontheme/res/values-uk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-uk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завершити виклик"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Відео ввімкнено"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Відео вимкнено"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Поміняти відео"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамік"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ur/strings.xml b/java/com/android/incallui/commontheme/res/values-ur/strings.xml
index 5082e9d..bd8cf68 100644
--- a/java/com/android/incallui/commontheme/res/values-ur/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ur/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"کال ختم کریں"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"ویڈیو آن ہے"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"ویڈیو آف ہے"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"ویڈیو کا تبادلہ کریں"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"اسپیکر"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"آواز"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-uz/strings.xml b/java/com/android/incallui/commontheme/res/values-uz/strings.xml
index d349d3f..9bc995d 100644
--- a/java/com/android/incallui/commontheme/res/values-uz/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-uz/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Qo‘ng‘iroqni tugatish"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Video yoniq"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Video o‘chiq"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videoni yoqish/ochirish"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Karnay"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Tovush"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-vi/strings.xml b/java/com/android/incallui/commontheme/res/values-vi/strings.xml
index 3bd39ae..caf8f34 100644
--- a/java/com/android/incallui/commontheme/res/values-vi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-vi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kết thúc cuộc gọi"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Bật video"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Tắt video"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Hoán đổi video"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Loa"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Âm báo"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
index 0f57120..4d8bda6 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"结束通话"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"视频已开启"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"视频已关闭"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"切换视频"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"免提"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"音频路径"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
index a3809eb..175b3e6 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"結束通話"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"視像已開啟"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"視像已關閉"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"切換視像"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"喇叭"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"音效"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
index 983dddd..dee1b9c 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"結束通話"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"開啟視訊畫面"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"關閉視訊畫面"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"切換視訊畫面"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"擴音"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"音訊"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zu/strings.xml b/java/com/android/incallui/commontheme/res/values-zu/strings.xml
index 2dd2c89..9535962 100644
--- a/java/com/android/incallui/commontheme/res/values-zu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_content_description_end_call" msgid="8232796487777787200">"Qeda ikholi"</string>
@@ -15,4 +31,6 @@
     <string name="incall_content_description_video_on" msgid="899266487647420613">"Ividiyo ivuliwe"</string>
     <string name="incall_content_description_video_off" msgid="762985912616707076">"Ividiyo ivaliwe"</string>
     <string name="incall_content_description_swap_video" msgid="297943299827908998">"Shintsha ividiyo"</string>
+    <string name="incall_label_speaker" msgid="1814254833253409394">"Isipikha"</string>
+    <string name="incall_label_audio" msgid="5923781170533336820">"Umsindo"</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values/colors.xml b/java/com/android/incallui/commontheme/res/values/colors.xml
index d38e347..50b0617 100644
--- a/java/com/android/incallui/commontheme/res/values/colors.xml
+++ b/java/com/android/incallui/commontheme/res/values/colors.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
   <!-- 50% black background drawn over the video to make it easier to see text and buttons. -->
   <color name="videocall_overlay_background_color">#7E000000</color>
-</resources>
\ No newline at end of file
+
+  <!-- Background color for spam. This color must match one of background_colors_dark in call UI. -->
+  <color name="incall_call_spam_background_color">@color/blocked_contact_background</color>
+</resources>
diff --git a/java/com/android/incallui/commontheme/res/values/strings.xml b/java/com/android/incallui/commontheme/res/values/strings.xml
index 6f346a3..94a8c90 100644
--- a/java/com/android/incallui/commontheme/res/values/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
 
   <string name="incall_content_description_end_call">End call</string>
@@ -32,4 +47,11 @@
 
   <string name="incall_content_description_swap_video">Swap video</string>
 
+  <!-- Button shown during a phone to route audio from earpiece to speaker phone.
+     [CHAR LIMIT=12] -->
+  <string name="incall_label_speaker">Speaker</string>
+  <!-- Button shown during a phone to switch the audio route.
+     [CHAR LIMIT=12] -->
+  <string name="incall_label_audio">Sound</string>
+
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values/styles.xml b/java/com/android/incallui/commontheme/res/values/styles.xml
index c0a745d..a979cc3 100644
--- a/java/com/android/incallui/commontheme/res/values/styles.xml
+++ b/java/com/android/incallui/commontheme/res/values/styles.xml
@@ -17,6 +17,11 @@
 
 <resources>
 
+  <style name="Dialer.Incall.TextAppearance" parent="android:TextAppearance.Material">
+    <item name="android:textColor">?android:textColorSecondary</item>
+    <item name="android:textSize">18sp</item>
+  </style>
+
   <style name="Dialer.Incall.TextAppearance.Large">
     <item name="android:textColor">?android:textColorPrimary</item>
     <item name="android:textSize">36sp</item>
@@ -28,11 +33,6 @@
     <item name="android:textSize">12sp</item>
   </style>
 
-  <style name="Dialer.Incall.TextAppearance" parent="android:TextAppearance.Material">
-    <item name="android:textColor">?android:textColorSecondary</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
   <style name="BottomRowIcon">
     <item name="android:layout_height">24dp</item>
     <item name="android:layout_width">24dp</item>
diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java
index 228c786..6068cc0 100644
--- a/java/com/android/incallui/contactgrid/BottomRow.java
+++ b/java/com/android/incallui/contactgrid/BottomRow.java
@@ -22,7 +22,6 @@
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
@@ -50,6 +49,7 @@
     public final boolean isForwardIconVisible;
     public final boolean isSpamIconVisible;
     public final boolean shouldPopulateAccessibilityEvent;
+    public final boolean isAssistedDialedVisisble;
 
     public Info(
         @Nullable CharSequence label,
@@ -59,7 +59,8 @@
         boolean isHdIconVisible,
         boolean isForwardIconVisible,
         boolean isSpamIconVisible,
-        boolean shouldPopulateAccessibilityEvent) {
+        boolean shouldPopulateAccessibilityEvent,
+        boolean isAssistedDialedVisisble) {
       this.label = label;
       this.isTimerVisible = isTimerVisible;
       this.isWorkIconVisible = isWorkIconVisible;
@@ -68,6 +69,7 @@
       this.isForwardIconVisible = isForwardIconVisible;
       this.isSpamIconVisible = isSpamIconVisible;
       this.shouldPopulateAccessibilityEvent = shouldPopulateAccessibilityEvent;
+      this.isAssistedDialedVisisble = isAssistedDialedVisisble;
     }
   }
 
@@ -82,6 +84,7 @@
     boolean isHdAttemptingIconVisible = state.isHdAttempting;
     boolean isSpamIconVisible = false;
     boolean shouldPopulateAccessibilityEvent = true;
+    boolean isAssistedDialedVisisble = state.isAssistedDialed;
 
     if (isIncoming(state) && primaryInfo.isSpam) {
       label = context.getString(R.string.contact_grid_incoming_suspected_spam);
@@ -118,14 +121,15 @@
         isHdIconVisible,
         isForwardIconVisible,
         isSpamIconVisible,
-        shouldPopulateAccessibilityEvent);
+        shouldPopulateAccessibilityEvent,
+        isAssistedDialedVisisble);
   }
 
   private static CharSequence getLabelForPhoneNumber(PrimaryInfo primaryInfo) {
     if (primaryInfo.location != null) {
       return primaryInfo.location;
     }
-    if (!TextUtils.isEmpty(primaryInfo.number)) {
+    if (!primaryInfo.nameIsNumber && !TextUtils.isEmpty(primaryInfo.number)) {
       CharSequence spannedNumber = spanDisplayNumber(primaryInfo.number);
       if (primaryInfo.label == null) {
         return spannedNumber;
@@ -137,7 +141,7 @@
   }
 
   private static CharSequence spanDisplayNumber(String displayNumber) {
-    return PhoneNumberUtilsCompat.createTtsSpannable(
+    return PhoneNumberUtils.createTtsSpannable(
         BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR));
   }
 
diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index 1322d58..ddf16e3 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -20,10 +20,8 @@
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
-import android.telecom.TelecomManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -32,8 +30,9 @@
 import android.widget.TextView;
 import android.widget.ViewAnimator;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.util.DrawableConverter;
 import com.android.incallui.incall.protocol.ContactPhotoType;
 import com.android.incallui.incall.protocol.PrimaryCallState;
@@ -61,7 +60,7 @@
   @Nullable private ImageView avatarImageView;
 
   // Row 2: Mobile +1 (650) 253-0000
-  // Row 2: [HD attempting icon]/[HD icon] 00:15
+  // Row 2: [HD attempting icon]/[HD icon] [Assisted Dialing Icon] 00:15
   // Row 2: Call ended
   // Row 2: Hanging up
   // Row 2: [Alert sign] Suspected spam caller
@@ -69,6 +68,7 @@
   private final ImageView workIconImageView;
   private final ImageView hdIconImageView;
   private final ImageView forwardIconImageView;
+  private final ImageView assistedDialingImageView;
   private final TextView forwardedNumberView;
   private final ImageView spamIconImageView;
   private final ViewAnimator bottomTextSwitcher;
@@ -78,6 +78,7 @@
   private boolean hideAvatar;
   private boolean showAnonymousAvatar;
   private boolean middleRowVisible = true;
+  private boolean isTimerStarted;
 
   private PrimaryInfo primaryInfo = PrimaryInfo.createEmptyPrimaryInfo();
   private PrimaryCallState primaryCallState = PrimaryCallState.createEmptyPrimaryCallState();
@@ -98,6 +99,7 @@
     hdIconImageView = view.findViewById(R.id.contactgrid_hdIcon);
     forwardIconImageView = view.findViewById(R.id.contactgrid_forwardIcon);
     forwardedNumberView = view.findViewById(R.id.contactgrid_forwardNumber);
+    assistedDialingImageView = view.findViewById(R.id.contactgrid_assistedDialingIcon);
     spamIconImageView = view.findViewById(R.id.contactgrid_spamIcon);
     bottomTextSwitcher = view.findViewById(R.id.contactgrid_bottom_text_switcher);
     bottomTextView = view.findViewById(R.id.contactgrid_bottom_text);
@@ -105,6 +107,7 @@
 
     contactGridLayout = (View) contactNameTextView.getParent();
     letterTile = new LetterTileDrawable(context.getResources());
+    isTimerStarted = false;
   }
 
   public void show() {
@@ -213,7 +216,7 @@
    * </ul>
    */
   private void updateTopRow() {
-    TopRow.Info info = TopRow.getInfo(context, primaryCallState);
+    TopRow.Info info = TopRow.getInfo(context, primaryCallState, primaryInfo);
     if (TextUtils.isEmpty(info.label)) {
       // Use INVISIBLE here to prevent the rows below this one from moving up and down.
       statusTextView.setVisibility(View.INVISIBLE);
@@ -233,26 +236,6 @@
   }
 
   /**
-   * Returns the appropriate LetterTileDrawable.TYPE_ based on a given call state.
-   *
-   * <p>If no special state is detected, yields TYPE_DEFAULT.
-   */
-  private static @LetterTileDrawable.ContactType int getContactTypeForPrimaryCallState(
-      @NonNull PrimaryCallState callState, @NonNull PrimaryInfo primaryInfo) {
-    if (callState.isVoiceMailNumber) {
-      return LetterTileDrawable.TYPE_VOICEMAIL;
-    } else if (callState.isBusinessNumber) {
-      return LetterTileDrawable.TYPE_BUSINESS;
-    } else if (primaryInfo.numberPresentation == TelecomManager.PRESENTATION_RESTRICTED) {
-      return LetterTileDrawable.TYPE_GENERIC_AVATAR;
-    } else if (callState.isConference) {
-      return LetterTileDrawable.TYPE_CONFERENCE;
-    } else {
-      return LetterTileDrawable.TYPE_DEFAULT;
-    }
-  }
-
-  /**
    * Updates row 1. For example:
    *
    * <ul>
@@ -295,8 +278,12 @@
               primaryInfo.name,
               primaryInfo.contactInfoLookupKey,
               LetterTileDrawable.SHAPE_CIRCLE,
-              getContactTypeForPrimaryCallState(primaryCallState, primaryInfo));
-
+              LetterTileDrawable.getContactTypeFromPrimitives(
+                  primaryCallState.isVoiceMailNumber,
+                  primaryInfo.isSpam,
+                  primaryCallState.isBusinessNumber,
+                  primaryInfo.numberPresentation,
+                  primaryCallState.isConference));
           // By invalidating the avatarImageView we force a redraw of the letter tile.
           // This is required to properly display the updated letter tile iconography based on the
           // contact type, because the background drawable reference cached in the view, and the
@@ -324,6 +311,8 @@
     bottomTextView.setText(info.label);
     bottomTextView.setAllCaps(info.isSpamIconVisible);
     workIconImageView.setVisibility(info.isWorkIconVisible ? View.VISIBLE : View.GONE);
+    assistedDialingImageView.setVisibility(
+        info.isAssistedDialedVisisble ? View.VISIBLE : View.GONE);
     if (hdIconImageView.getVisibility() == View.GONE) {
       if (info.isHdAttemptingIconVisible) {
         hdIconImageView.setVisibility(View.VISIBLE);
@@ -368,10 +357,18 @@
           primaryCallState.connectTimeMillis
               - System.currentTimeMillis()
               + SystemClock.elapsedRealtime());
-      bottomTimerView.start();
+      if (!isTimerStarted) {
+        LogUtil.i(
+            "ContactGridManager.updateBottomRow",
+            "starting timer with base: %d",
+            bottomTimerView.getBase());
+        bottomTimerView.start();
+        isTimerStarted = true;
+      }
     } else {
       bottomTextSwitcher.setDisplayedChild(0);
       bottomTimerView.stop();
+      isTimerStarted = false;
     }
   }
 }
diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java
index 8c3d6b0..fa8b985 100644
--- a/java/com/android/incallui/contactgrid/TopRow.java
+++ b/java/com/android/incallui/contactgrid/TopRow.java
@@ -19,10 +19,14 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
 import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.incall.protocol.PrimaryCallState;
+import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.videotech.utils.SessionModificationState;
 import com.android.incallui.videotech.utils.VideoUtils;
 
@@ -55,7 +59,7 @@
 
   private TopRow() {}
 
-  public static Info getInfo(Context context, PrimaryCallState state) {
+  public static Info getInfo(Context context, PrimaryCallState state, PrimaryInfo primaryInfo) {
     CharSequence label = null;
     Drawable icon = state.connectionIcon;
     boolean labelIsSingleLine = true;
@@ -73,6 +77,11 @@
         labelIsSingleLine = false;
       } else {
         label = getLabelForIncoming(context, state);
+        // Show phone number if it's not displayed in name (center row) or location field (bottom
+        // row).
+        if (shouldShowNumber(primaryInfo)) {
+          label = TextUtils.concat(label, " ", spanDisplayNumber(primaryInfo.number));
+        }
       }
     } else if (VideoUtils.hasSentVideoUpgradeRequest(state.sessionModificationState)
         || VideoUtils.hasReceivedVideoUpgradeRequest(state.sessionModificationState)) {
@@ -85,6 +94,10 @@
       label = getLabelForDialing(context, state);
     } else if (state.state == State.ACTIVE && state.isRemotelyHeld) {
       label = context.getString(R.string.incall_remotely_held);
+    } else if (state.state == State.ACTIVE && shouldShowNumber(primaryInfo)) {
+      label = spanDisplayNumber(primaryInfo.number);
+    } else if (state.state == State.CALL_PENDING && !TextUtils.isEmpty(state.customLabel)) {
+      label = state.customLabel;
     } else {
       // Video calling...
       // [Wi-Fi icon] Starbucks Wi-Fi
@@ -94,9 +107,27 @@
     return new Info(label, icon, labelIsSingleLine);
   }
 
+  private static CharSequence spanDisplayNumber(String displayNumber) {
+    return PhoneNumberUtils.createTtsSpannable(
+        BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR));
+  }
+
+  private static boolean shouldShowNumber(PrimaryInfo primaryInfo) {
+    if (primaryInfo.nameIsNumber) {
+      return false;
+    }
+    if (primaryInfo.location == null) {
+      return false;
+    }
+    if (TextUtils.isEmpty(primaryInfo.number)) {
+      return false;
+    }
+    return true;
+  }
+
   private static CharSequence getLabelForIncoming(Context context, PrimaryCallState state) {
     if (state.isVideoCall) {
-      return getLabelForIncomingVideo(context, state.isWifi);
+      return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi);
     } else if (state.isWifi && !TextUtils.isEmpty(state.connectionLabel)) {
       return state.connectionLabel;
     } else if (isAccount(state)) {
@@ -108,11 +139,20 @@
     }
   }
 
-  private static CharSequence getLabelForIncomingVideo(Context context, boolean isWifi) {
-    if (isWifi) {
-      return context.getString(R.string.contact_grid_incoming_wifi_video_call);
+  private static CharSequence getLabelForIncomingVideo(
+      Context context, @SessionModificationState int sessionModificationState, boolean isWifi) {
+    if (sessionModificationState == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
+      if (isWifi) {
+        return context.getString(R.string.contact_grid_incoming_wifi_video_request);
+      } else {
+        return context.getString(R.string.contact_grid_incoming_video_request);
+      }
     } else {
-      return context.getString(R.string.contact_grid_incoming_video_call);
+      if (isWifi) {
+        return context.getString(R.string.contact_grid_incoming_wifi_video_call);
+      } else {
+        return context.getString(R.string.contact_grid_incoming_video_call);
+      }
     }
   }
 
@@ -154,7 +194,7 @@
       case SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_TIMED_OUT:
         return context.getString(R.string.incall_video_call_request_timed_out);
       case SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST:
-        return getLabelForIncomingVideo(context, state.isWifi);
+        return getLabelForIncomingVideo(context, state.sessionModificationState, state.isWifi);
       case SessionModificationState.NO_REQUEST:
       default:
         Assert.fail();
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
index c74017e..8850dd8 100644
--- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,6 +32,10 @@
       android:src="@drawable/asd_hd_icon"
       android:visibility="gone"/>
   <ImageView
+      android:id="@+id/contactgrid_assistedDialingIcon"
+      style="@style/BottomRowIcon"
+      android:src="@drawable/quantum_ic_language_vd_theme_24"/>
+  <ImageView
       android:id="@id/contactgrid_forwardIcon"
       style="@style/BottomRowIcon"
       android:src="@drawable/quantum_ic_forward_vd_theme_24"/>
diff --git a/java/com/android/incallui/contactgrid/res/values-af/strings.xml b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
index 95ec39b..75a8bf3 100644
--- a/java/com/android/incallui/contactgrid/res/values-af/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Bel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Hou aan"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video-oproep vanaf"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-video-oproep vanaf"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Versoekvorm vir video-opgradering"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Versoekvorm vir Wi-Fi-video-opgradering"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep vanaf"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Werkoproep vanaf"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-am/strings.xml b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
index d8060c9..3d11f73 100644
--- a/java/com/android/incallui/contactgrid/res/values-am/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል በመደወል ላይ"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ያዝና ቆይ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ቪዲዮ ጥሪ ከ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi ቪዲዮ ጥሪ ከ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"የቪዲዮ ማሻሻል ጥያቄ ከ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"የWi-Fi ቪዲዮ ማሻሻል ጥያቄ ከ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ጥሪ ከ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"የሥራ ጥሪ ከ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል የገባ"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
index 30fd32c..cddd1ec 100644
--- a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"الاتصال عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"معلقة"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"مكالمة فيديو من"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"‏مكالمة فيديو عبر Wi-Fi من"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"طلب ترقية الفيديو من"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"‏طلب ترقية فيديو Wi-Fi من"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"اتصال من"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"مكالمة عمل من"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"واردة عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-az/strings.xml b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
index 4fe79ee..8c1993d 100644
--- a/java/com/android/incallui/contactgrid/res/values-az/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə zəng edilir"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Gözləmədə"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video zəng edən"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video zəng edən"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video təkmilləşdirilməsi üçün təklif"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi video təkmilləşdirilməsi üçün təklif"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zəng edən"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"İş zəngi edən"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə gələn"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
index f1a938e..caa61bd 100644
--- a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivamo preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video poziv od"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video poziv od"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Zahtev za prelazak na video poziv od"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Zahtev za prelazak na video poziv preko Wi-Fi-ja od"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-be/strings.xml b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
index aec3a31..51f7ea9 100644
--- a/java/com/android/incallui/contactgrid/res/values-be/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Званкі праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"На ўтрыманні"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Відэавыклік ад"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Відэавыклік праз Wi-Fi ад"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Запыт на абнаўленне да відэавыкліка ад"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Запыт на абнаўленне да відэавыкліка па Wi-Fi ад"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Выклік ад"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочы выклік ад"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Уваходны выклік праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
index f162e4c..4e313d4 100644
--- a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Задържано"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видеообаждане от"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Видеообаждане по Wi-Fi от"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Заявка за преминаване към видеообаждане от"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Заявка за преминаване към видеообаждане през Wi-Fi от"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Обаждане от"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Служебно обаждане от"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящо обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
index 6d3a50c..8fce2e4 100644
--- a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে কল করা হচ্ছে"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"হোল্ডে রয়েছে"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"এর থেকে আগত ভিডিও কল"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"এর থেকে আগত Wi-Fi ভিডিও কল"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"এর থেকে ভিডিও আপগ্রেড করার অনুরোধ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"এর থেকে ওয়াই-ফাই ভিডিও আপগ্রেড করার অনুরোধ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"এর থেকে আগত কল"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"এর থেকে আগত কর্মক্ষেত্রের কল"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে আগত কল"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
index 2587992..0d4dfb3 100644
--- a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem mreže <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videopoziv od"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi videopoziv od"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Zahtjev za nadogradnju na videozapis od pozivaoca"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Zahtjev za nadogradnju na Wi-Fi videozapis od pozivaoca"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv putem <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
index 07598a2..b4aa2dd 100644
--- a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"S\'està trucant amb <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videotrucada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videotrucada per Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Sol·licitud d\'actualització a videotrucada procedent de:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Sol·licitud d\'actualització a videotrucada per Wi-Fi procedent de:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Trucada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Trucada de feina de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
index d27a028..b8698f0 100644
--- a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Volání přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Podrženo"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Příchozí videohovor:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Příchozí videohovor přes Wi-Fi:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Žádost o upgrade na videohovor od uživatele"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Žádost o upgrade na videohovor přes Wi-Fi od uživatele"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Příchozí hovor:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Příchozí pracovní hovor:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Příchozí hovor přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-da/strings.xml b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
index 555a2ac..71a651f 100644
--- a/java/com/android/incallui/contactgrid/res/values-da/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"I venteposition"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videoopkald fra"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videoopkald fra"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Anmodning om opgradering til et videoopkald fra"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Anmodning om opgradering til et Wi-Fi-videoopkald fra"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Opkald fra"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Arbejdsopkald fra"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Indgående opkald via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-de/strings.xml b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
index 3d3838c..d69e0f6 100644
--- a/java/com/android/incallui/contactgrid/res/values-de/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Anruf wird gehalten"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videoanruf von"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"WLAN-Videoanruf von"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Anfrage für Upgrade auf Videoanruf von"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Anfrage für Upgrade auf Videoanruf über WLAN von"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anruf von"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Geschäftlicher Anruf von"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Eingehender Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-el/strings.xml b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
index 337da7b..954e7b7 100644
--- a/java/com/android/incallui/contactgrid/res/values-el/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Σε αναμονή"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Βιντεοκλήση από"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Βιντεοκλήση μέσω Wi-Fi από"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Αίτημα αναβάθμισης βίντεο από"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Αίτημα αναβάθμισης βίντεο Wi-Fi από"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Κλήση από"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Κλήση από το γραφείο από"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Εισερχόμενη κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
index 3748db2..a1402ff 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video call from"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video call from"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video upgrade request from"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi video upgrade request from"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
index 3748db2..a1402ff 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video call from"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video call from"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video upgrade request from"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi video upgrade request from"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
index 3748db2..a1402ff 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video call from"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video call from"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video upgrade request from"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi video upgrade request from"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
index fa56849..abb2b01 100644
--- a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Llamada por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videollamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videollamada con Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Actualización a video solicitada por"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Actualización a video con Wi-Fi solicitada por"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada laboral de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrante por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-es/strings.xml b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
index 1d57f9c..ef7c457 100644
--- a/java/com/android/incallui/contactgrid/res/values-es/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videollamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videollamada por Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Solicitud de actualización de videollamada de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Solicitud de actualización de videollamada por Wi-Fi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada de trabajo de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Recibida a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-et/strings.xml b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
index 2d81062..b91f073 100644
--- a/java/com/android/incallui/contactgrid/res/values-et/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Kõne edastab <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Ootel"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videokõne kontaktilt"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"WiFi-videokõne kontaktilt"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video täiendamise taotlus:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"WiFi kaudu video täiendamise taotlus:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Kõne kontaktilt"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Töökõne kontaktilt"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Sissetulev kõne teenusepakkuja <xliff:g id="PROVIDER_NAME">%s</xliff:g> kaudu"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
index f08347b..ba7995a 100644
--- a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez deitzen"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Zain"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Bideo-deia:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi bidezko bideo-deia:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Bideo-dei bat egiteko eskaera bidali dizu erabiltzaile honek:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi bidezko bideo-dei bat egiteko eskaera bidali dizu erabiltzaile honek:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Deia:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Laneko deia:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez jasotzen"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
index 0dfc0f4..40873ca 100644
--- a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"تماس از طریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"درانتظار"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"تماس ویدئویی از"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"‏تماس ویدئویی Wi-Fi از"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"درخواست ارتقای تماس ویدیویی از"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"‏در خواست ارتقای تماس ویدیویی Wi-Fi از"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"تماس از"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"تماس کاری از"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"تماس‌های ورودی ازطریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
index 00503bf..241fef5 100644
--- a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Käytetään operaattoria <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Pidossa"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videopuhelu henkilöltä"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videopuhelu henkilöltä"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Videoon siirtymispyyntö, jonka lähettäjä on"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi-videopuheluun siirtymispyyntö, jonka lähettäjän on"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Puhelu henkilöltä"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Työpuhelu henkilöltä"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Saapuva puhelu (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
index ee0196d..3ffc1e9 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Appel par <xliff:g id="PROVIDER_NAME">%s</xliff:g> en cours…"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Appel vidéo de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Appel vidéo Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Demande de mise à niveau vidéo de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Demande de mise à niveau vidéo Wi-Fi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant par <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
index 9849ad6..0db6ae0 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Appel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Appel vidéo de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Appel vidéo Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Demande de passage en mode vidéo par"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Demande de passage en mode vidéo Wi-Fi par"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
index c85f336..2970014 100644
--- a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Chamando a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videochamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videochamada por wifi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Solicitude de actualización a videochamada de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Solicitude de actualización a videochamada por wifi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de traballo de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada entrante a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
index 5179cc0..220bebe 100644
--- a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે કૉલ કરી રહ્યાં છે"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"હોલ્ડ પર"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"આમના તરફથી વિડિઓ કૉલ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"આમના તરફથી Wi-Fi વિડિઓ કૉલ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"આમના તરફથી વિડિઓ અપગ્રેડની વિનંતી"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"આમના તરફથી Wi-Fi વિડિઓ અપગ્રેડની વિનંતી"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"આમના તરફથી કૉલ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"આમના તરફથી કાર્ય કૉલ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે ઇનકમિંગ"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
index dec7b62..da128b6 100644
--- a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के माध्यम से कॉल किया जा रहा है"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड पर"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"इससे वीडियो कॉल"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"इससे वाई-फ़ाई वीडियो कॉल"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"इसकी ओर से वीडियो में अपग्रेड करने का अनुरोध"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"इसकी ओर से वाई-फ़ाई वीडियो में अपग्रेड करने का अनुरोध"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"इससे कॉल"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"इससे कार्य संबंधी कॉल"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> की ओर से इनकमिंग"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
index d7023ac..24429a2 100644
--- a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem operatera <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videopoziv s broja"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videopoziv putem Wi-Fi veze s broja"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Video upgrade request from"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi video upgrade request from"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv s broja"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv s broja"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni pozivi putem davatelja <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
index f7da923..600b69f 100644
--- a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Hívás a(z) <xliff:g id="PROVIDER_NAME">%s</xliff:g> szolgáltatón keresztül"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Várakoztatva"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videohívás a következőtől:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videohívás a következőtől:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Videófrissítési kérelem a következőtől"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi-videófrissítési kérelem a következőtől"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hívás a következőtől:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Munkahelyi hívás a következőről:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Bejövő hívás a következőn keresztül: <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
index 6384fa9..88a49eb 100644
--- a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Զանգում է <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի միջոցով"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Սպասում"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Տեսազանգ հետևյալ բաժանորդից՝"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi տեսազանգ հետևյալ բաժանորդից՝"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Տեսազանգին անցնելու խնդրանք հետևյալ օգտատիրոջից՝"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi-ի միջոցով տեսազանգին անցնելու խնդրանք հետևյալ օգտատիրոջից՝"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Զանգ հետևյալ բաժանորդից՝"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Գործնական զանգ հետևյալ բաժանորդից՝"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Մուտքային զանգ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ցանցից"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-in/strings.xml b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
index 7556838..f673583 100644
--- a/java/com/android/incallui/contactgrid/res/values-in/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Menelepon melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Ditangguhkan"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video call dari"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Video call Wi-Fi dari"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Permintaan upgrade video dari"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Permintaan upgrade video Wi-Fi dari"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telepon dari"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan telepon kerja dari"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-is/strings.xml b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
index 86d577c..9e83031 100644
--- a/java/com/android/incallui/contactgrid/res/values-is/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Hringt í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Í bið"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Myndsímtal berst frá"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi myndsímtal berst frá"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Beiðni um að uppfæra í myndsímtal frá"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Beiðni um að uppfæra í Wi-Fi myndsímtal frá"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Símtal berst frá"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Vinnusímtal berst frá"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Berst í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-it/strings.xml b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
index 9576a6d..76958cf 100644
--- a/java/com/android/incallui/contactgrid/res/values-it/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Chiamate tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"In attesa"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videochiamata da"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videochiamata Wi-Fi da"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Upgrade della videochiamata richiesto da"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Upgrade della videochiamata Wi-Fi richiesto da"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chiamata da"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chiamata di lavoro da"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"In arrivo tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
index 62771d1..b06c321 100644
--- a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"שיחה באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"בהמתנה"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"שיחת וידאו מאת"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"‏שיחת וידאו ב-Wi-Fi מאת"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"בקשה לשדרוג לשיחת וידאו מאת"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"‏בקשת לשדרוג לשיחת וידאו ברשת Wi-Fi מאת"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"שיחה מאת"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"שיחת עבודה מאת"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"שיחה נכנסת באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
index a5d958c..a2fce09 100644
--- a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> で発信中"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ビデオハングアウトの着信"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi ビデオハングアウトの着信"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ビデオハングアウトへの変更リクエスト"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi ビデオハングアウトへの変更リクエスト"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"着信"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"仕事の通話の着信"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> から着信"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
index 7848f59..cb0094d 100644
--- a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"მიმდინარეობს დარეკვა <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ის მეშვეობით"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"მოცდის რეჟიმში"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ვიდეოზარი აბონენტისგან"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi ვიდეოზარი აბონენტისგან"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ვიდეოზარზე გადასვლის მოთხოვნა კონტაქტისგან:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi ვიდეოზარზე გადასვლის მოთხოვნა კონტაქტისგან:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ზარი აბონენტისგან"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"სამსახურებრივი ზარი აბონენტისგან"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"შემომავალი, <xliff:g id="PROVIDER_NAME">%s</xliff:g>-იდან"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
index aaf260b..3fc68c2 100644
--- a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы қоңырау шалу"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Күтуде"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Бейне қоңырау шалушы:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi бейне қоңырау шалушы:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Бейне қоңырауға ауысу өтініші:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi арқылы бейне қоңырауға ауысу өтініші:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Қоңырау шалушы:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Жұмыстан қоңырау шалушы:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы кіріс"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-km/strings.xml b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
index b2bfc96..7ee21ba 100644
--- a/java/com/android/incallui/contactgrid/res/values-km/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"កំពុង​ហៅតាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"កំពុង​រង់ចាំ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ការ​ហៅ​ជា​វីដេអូ​ពី"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"ការ​ហៅ​ជា​វីដេអូ​តាម Wi-Fi ពី"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ស្នើ​ដំឡើង​កំណែ​វីដេអូ​ពី"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"ស្នើ​ដំឡើង​កំណែ​វីដេអូតាម Wi-Fi ពី"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ការ​ហៅ​ពី"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ការ​ហៅ​ការងារ​ពី"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ការ​ហៅ​ចូល​តាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
index 0ee73ba..e90bd6b 100644
--- a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ಇವರಿಂದ ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"ಇವರಿಂದ ವೈ-ಫೈ ವೀಡಿಯೊ ಕರೆ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ಇದರಿಂದ ವೀಡಿಯೊ ಅಪ್‌ಗ್ರೇಡ್ ವಿನಂತಿ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"ಇದರಿಂದ ವೈಫೈ ವೀಡಿಯೊ ಅಪ್‌ಗ್ರೇಡ್ ವಿನಂತಿ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ಇವರಿಂದ ಕರೆ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ಇವರಿಂದ ಕೆಲಸದ ಕರೆ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
index a5a34e3..85dd613 100644
--- a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 거는 전화"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"대기 중"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"화상 통화 발신:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi 화상 통화 발신:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"화상 통화로의 업그레이드를 요청한 사용자:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi 화상 통화로의 업그레이드를 요청한 사용자:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"통화 발신:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"업무 통화 발신:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 걸려온 전화"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
index a020e70..6028022 100644
--- a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Күтүү режиминде"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видео чалуу"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi аркылуу видео чалуу:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Видеону кийинки версияга көтөрүү сурамы:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi аркылуу видеомаектешүү сурамы:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Чалып жатат:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Иш боюнча чалып жатат:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалып жатат"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
index 96c1dcf..6ad1178 100644
--- a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"ກຳລັງໂທຜ່ານ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ຖືສາຍລໍຖ້າ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ການໂທວິດີໂອຈາກ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi video call from"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ຄຳຮ້ອງອັບເກຣດວິດີໂອຈາກ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"ຄຳຮ້ອງອັບເກຣດວິດີໂອ Wi-Fi ຈາກ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ການໂທຈາກ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ສາຍໂທເຂົ້າ​ຈາກ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
index e8e42fc..3cca55c 100644
--- a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Skambinama naudojantis „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ paslaugomis"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Sulaikytas"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Vaizdo skambutis nuo"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"„Wi-Fi“ vaizdo skambutis nuo"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Vaizdo skambučio naujovinimo užklausa nuo"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"„Wi-Fi“ vaizdo skambučio naujovinimo užklausa nuo"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Skambutis nuo"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darbo skambutis nuo"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Gaunama per „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
index 1b3823f..87e5c90 100644
--- a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Zvanu nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Aizturēts"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videozvans no:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi videozvans no:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Videozvana jaunināšanas pieprasījums no:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi videozvana jaunināšanas pieprasījums no:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zvans no:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darba zvans no:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ienākošie zvani, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
index 1044683..fcab8f4 100644
--- a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Повикување преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"На чекање"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видеоповик од"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Видеоповик преку Wi-Fi од"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Барање за надградба на видеоповик од"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Барање за надградба на видеоповик преку Wi-Fi од"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Повик од"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Работен повик од"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Дојдовни повици преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
index 519e9f4..1dfb46a 100644
--- a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേന വിളിക്കുന്നു"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ഹോള്‍ഡിലാണ്"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ഈ വ്യക്തിയിൽ നിന്നുള്ള വീഡിയോ കോൾ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"ഈ വ്യക്തിയിൽ നിന്നുള്ള Wi-Fi വീഡിയോ കോൾ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള വീഡിയോ അപ്‌ഗ്രേഡ് അഭ്യർത്ഥന"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"ഇനിപ്പറയുന്നതിൽ നിന്നുള്ള Wi-Fi വീഡിയോ അപ്‌ഗ്രേഡ് അഭ്യർത്ഥന"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേനയുള്ള ഇൻകമിംഗ്"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
index c87e071..c93bd46 100644
--- a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р залгаж байна"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Хүлээлгэнд байгаа"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видео дуудлага"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi видео дуудлага"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Видеог сайжруулах хүсэлт"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi видеог сайжруулах хүсэлт"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Дуудлага"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ажлын дуудлага"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р ирж байна"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
index 6a01817..81d76dd 100644
--- a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे कॉल करीत आहे"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड वर"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"यावरून व्हिडिओ कॉल"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi व्हिडिओ कॉल"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"याकडून व्हिडिओ श्रेणीसुधारणेची विनंती"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"याकडून Wi-Fi व्हिडिओ श्रेणीसुधारणेची विनंती"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"यावरील कॉल"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"कडून कार्य कॉल"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे येणारे"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
index 17ca753..815df79 100644
--- a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Memanggil melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Panggilan ditahan"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Panggilan video daripada"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Panggilan video Wi-Fi daripada"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Permintaan peningkatan video daripada"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Permintaan peningkatan video Wi-Fi daripada"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Panggilan daripada"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan kerja daripada"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Panggilan masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-my/strings.xml b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
index 14770cf..3c8a88e 100644
--- a/java/com/android/incallui/contactgrid/res/values-my/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် ခေါ်ဆိုနေသည်"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ဖုန်းကိုင်ထားသည်"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"အောက်ပါထံမှ ဗီဒီယိုခေါ်ဆိုမှု"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"အောက်ပါထံမှ Wi-Fi ဗီဒီယိုခေါ်ဆိုမှု"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"အောက်ပါထံမှ ဗီဒီယိုအဆင့်မြှင့်ခြင်းတောင်းဆိုချက်"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"အောက်ပါထံမှ Wi-Fi ဗီဒီယိုအဆင့်မြှင့်ခြင်းတောင်းဆိုချက်"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"အောက်ပါထံမှ ခေါ်ဆိုမှု"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
index fbf9895..9ad8d0d 100644
--- a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videoanrop fra"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videoanrop fra"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Forespørsel om videooppdatering fra"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Forespørsel om Wi-Fi-videooppdatering fra"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
index d618af4..e6e65c5 100644
--- a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत कल गर्दै"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"होल्डमा छ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"निम्नबाट भिडियो कल आएको छ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"निम्नबाट Wi-Fi मार्फत गरिएको भिडियो कल आएको छ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"निम्नबाट आएको भिडियो अपग्रेडसम्बन्धी अनुरोध"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"निम्नबाट आएको Wi-Fi मार्फत भिडियो अपग्रेडसम्बन्धी अनुरोध"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"निम्नबाट कल आएको छ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"निम्नबाट कार्य सम्बन्धी कल आएको छ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत गरिएको आगमन कल"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
index 10dcd13..828a7a2 100644
--- a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Bellen via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"In de wacht"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videogesprek van"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wifi-videogesprek van"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Upgradeverzoek voor videogesprek van"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Upgradeverzoek voor wifi-videogesprek van"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep van"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Zakelijke oproep van"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-no/strings.xml b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
index fbf9895..9ad8d0d 100644
--- a/java/com/android/incallui/contactgrid/res/values-no/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videoanrop fra"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videoanrop fra"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Forespørsel om videooppdatering fra"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Forespørsel om Wi-Fi-videooppdatering fra"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
index fb261d6..1d4801c 100644
--- a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ਇਸ ਤੋਂ ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"ਇਸ ਤੋਂ Wi-Fi ਵੀਡੀਓ ਕਾਲ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ਇਸ ਤੋਂ ਵੀਡੀਓ ਅੱਪਗ੍ਰੇਡ ਬੇਨਤੀ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"ਇਸ ਤੋਂ Wi-Fi ਵੀਡੀਓ ਅੱਪਗ੍ਰੇਡ ਬੇਨਤੀ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ਇਸ ਤੋਂ ਕਾਲ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਇਨਕਮਿੰਗ"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
index 998e49e..586f39e 100644
--- a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Dzwonię przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Oczekujące"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Rozmowa wideo z:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Rozmowa wideo przez Wi-Fi z:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Prośba o przejście na rozmowę wideo wysłana przez:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Prośba o przejście na rozmowę wideo przez Wi-Fi wysłana przez:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Połączenie z:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Połączenie służbowe z:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Przychodzące z sieci <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
index 4365cba..a445cdf 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videochamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videochamada via Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Solicitação de upgrade de vídeo de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Solicitação de upgrade de vídeo por Wi-Fi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
index 55d3c26..ca07b3f 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"A telefonar através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>…"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videochamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videochamada a partir de rede Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Pedido de atualização para videochamada de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Pedido de atualização para videochamada por Wi-Fi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada recebida através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
index 4365cba..a445cdf 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videochamada de"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videochamada via Wi-Fi de"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Solicitação de upgrade de vídeo de"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Solicitação de upgrade de vídeo por Wi-Fi de"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
index f8d1c9b..180a01f 100644
--- a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Se apelează prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"În așteptare"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Apel video de la"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Apel video prin Wi-Fi de la"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Solicitare de upgrade la apel video de la"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Solicitare de upgrade la apel video prin Wi-Fi de la"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Apel primit de la"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Apel de serviciu de la"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Primite prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
index dfbc088..e0a6351 100644
--- a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Вызов через <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"На удержании"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видеовызов от"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Видеовызов по Wi-Fi от"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Запрос на переход к видеовстрече от:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Запрос на переход к видеовстрече через Wi-Fi от:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Вызов от"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочий вызов от"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящий вызов (оператор: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-si/strings.xml b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
index 00ca2aa..451dc39 100644
--- a/java/com/android/incallui/contactgrid/res/values-si/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා අමතමින්"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"රඳවා ගත්"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"වෙතින් වීඩියෝ ඇමතුම"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"වෙතින් Wi-Fi වීඩියෝ ඇමතුම"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"වෙතින් වීඩියෝ උත්ශ්‍රේණි කිරීමේ ඉල්ලීම"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"වෙතින් Wi-Fi වීඩියෝ උත්ශ්‍රේණි කිරීමේ ඉල්ලීම"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"වෙතින් ඇමතුම"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"වෙතින් කාර්යාල ඇමතුම"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා එන"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
index 40039ee..ae21ec8 100644
--- a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Voláte prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Podržané"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videohovor od:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videohovor cez Wi-Fi od:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Žiadosť o inováciu na videohovor od používateľa"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Žiadosť o inováciu na videohovor cez Wi-Fi od používateľa"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hovor od:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Pracovný hovor od:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Prichádzajúci hovor prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
index f76b5cd..1d93d21 100644
--- a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Klicanje prek ponudnika <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Zadržano"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videoklic osebe"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Videoklic prek omrežja Wi-Fi osebe"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Zahteva za nadgradnjo v video – zahteva osebe"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Zahteva za nadgradnjo v video prek omrežja Wi-Fi – zahteva osebe"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Klic osebe"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Delovni klic osebe"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dohodni klic prek storitve <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
index 34ec2d1..8c28eb7 100644
--- a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Telefonatë nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Në pritje"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Telefonatë me video nga"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Telefonatë me video në Wi-Fi nga"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Kërkesë për përmirësimin me video nga"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Kërkesë për përmirësimin me video me Wi-Fi nga"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telefonatë nga"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Telefonatë pune nga"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Telefonatë hyrëse nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
index 9ad1499..66ea45d 100644
--- a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Позивамо преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"На чекању"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Видео позив од"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi видео позив од"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Захтев за прелазак на видео позив од"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Захтев за прелазак на видео позив преко Wi-Fi-ја од"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Позив од"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Пословни позив од"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Долазни позив преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
index d5dd159..931d9c9 100644
--- a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer med <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Parkerat"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Videosamtal från"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi-videosamtal från"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Begäran om videouppgradering från"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Begäran om uppgradering av Wi-Fi-video från"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Samtal från"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbsamtal från"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkommande via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
index 72bc26f..581d797 100644
--- a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Inapiga simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Imesitishwa"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Simu ya video kutoka kwa"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Simu ya video kupitia Wi-Fi kutoka kwa"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Umetumiwa ombi ili ubadilishe utumie simu ya video na"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Umetumiwa ombi ili ubadilishe utumie simu ya video kwenye Wi-Fi na"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Simu kutoka kwa"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Simu ya kazi kutoka kwa"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Simu zinazoingia kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
index 2f5b1b8..37ff876 100644
--- a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> வழியாக அழைக்கிறது"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ஹோல்டில் உள்ளது"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"வீடியோ அழைப்பு:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"வைஃபை வீடியோ அழைப்பு:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"வீடியோவை மேம்படுத்துவதற்கான கோரிக்கை:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"வைஃபையில் வீடியோவை மேம்படுத்துவதற்கான கோரிக்கை:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"அழைப்பு:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"அழைப்பு (பணி) :"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் உள்வரும் அழைப்பு"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-te/strings.xml b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
index 52038db..913c944 100644
--- a/java/com/android/incallui/contactgrid/res/values-te/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా కాల్ చేస్తోంది"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"హోల్డ్‌లో ఉంది"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"వీరి నుండి వీడియో కాల్:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"వీరి నుండి Wi-Fi వీడియో కాల్:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"వీరి నుండి వీడియో అప్‌గ్రేడ్ అభ్యర్థన"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"వీరి నుండి Wi-Fi వీడియో అప్‌గ్రేడ్ అభ్యర్థన"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"వీరి నుండి కాల్:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"వీరి నుండి కార్యాలయ కాల్:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా ఇన్‌కమింగ్ కాల్"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-th/strings.xml b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
index 419db19..6503959 100644
--- a/java/com/android/incallui/contactgrid/res/values-th/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"โทรผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"พักสาย"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"แฮงเอาท์วิดีโอจาก"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"แฮงเอาท์วิดีโอผ่าน Wi-Fi จาก"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"คำขออัปเกรดวิดีโอจาก"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"คำขออัปเกรดวิดีโอผ่าน Wi-Fi จาก"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"โทรจาก"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"โทรเรื่องงานจาก"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"สายเรียกเข้าผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
index 282ec10..7fa063b 100644
--- a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Tumatawag sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Naka-hold"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Video call mula kay"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi na video call mula kay"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Kahilingan upang i-upgrade ang video mula kay"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Kahilingan upang i-upgrade ang video gamit ang Wi-Fi mula kay"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Tawag mula kay"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Tawag sa trabaho mula kay"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Papasok sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
index 5ecbf35..1ce565d 100644
--- a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden çağrı yapılıyor"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Beklemede"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Gelen video görüşmesi isteği:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Gelen kablosuz video görüşmesi isteği:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Görüntülü görüşmeye geçme isteği alındı:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Kablosuz görüntülü görüşmeye geçme isteği alındı:"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Gelen çağrı:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Gelen iş çağrısı:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> adlı sağlayıcı üzerinden gelen çağrı"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
index 7b84fb6..0d4a595 100644
--- a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Виклик здійснюється через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Утримується"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Відеодзвінок від:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Відеодзвінок через Wi-Fi від:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Запит на відеодзвінок від користувача"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Запит на відеодзвінок через Wi-Fi від користувача"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Виклик від:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Виклик на робочий телефон від:"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Вхідні виклики через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
index 6584181..793e487 100644
--- a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"کالنگ بذریعہ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"ہولڈ پر ہے"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"ویڈیو کال منجانب"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"‏Wi-Fi ویڈیو کال منجانب"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"ویڈیو اپ گریڈ کی درخواست منجانب"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"‏Wi-Fi ویڈیو اپ گریڈ کی درخواست منجانب"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"کال منجانب"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"دفتری کال منجانب"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> کے ذریعے آنے والی کال"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
index db11a18..b84c083 100644
--- a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chaqirmoqda…"</string>
+    <string name="incall_connecting" msgid="1708280493198276616">"Chaqiruv…"</string>
     <string name="incall_transferring" msgid="7909128243635579407">"O‘tkazilmoqda…"</string>
     <string name="incall_video_call_requesting" msgid="5251915562785911238">"Chaqirmoqda (video)…"</string>
     <string name="incall_wifi_video_call_requesting" msgid="8783968191180862607">"Wi-Fi orqali video qo‘ng‘iroq…"</string>
@@ -14,9 +30,11 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Kutish rejimida"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Kimdan video qo‘ng‘iroq:"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi orqali kimdan video qo‘ng‘iroq:"</string>
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Kimdan qo‘ng‘iroq:"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Bu foydalanuvchi video suhbatga o‘tishni so‘ramoqda:"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Bu foydalanuvchi Wi-Fi orqali video suhbatga o‘tishni so‘ramoqda:"</string>
+    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chaqiruv:"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ish telefoniga kimdan qo‘ng‘iroq:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Kiruvchi qo‘ng‘iroq (operator: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
+    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Kiruvchi chaqiruv (operator: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
     <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Shubhali abonent"</string>
     <string name="contact_grid_callback_number" msgid="1284649030313415807">"Teskari qo‘ng‘iroq uchun raqam: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
index 340a115..9ce0f18 100644
--- a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Đang gọi điện qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Đang chờ"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Cuộc gọi điện video từ"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Cuộc gọi điện video qua Wi-Fi từ"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Yêu cầu nâng cấp video từ"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Yêu cầu nâng cấp video Wi-Fi từ"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Cuộc gọi từ"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Cuộc gọi về công việc từ"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Cuộc gọi đến qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
index 16031b8..af5008a 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"正在通过<xliff:g id="PROVIDER_NAME">%s</xliff:g>进行通话"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"保持"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"视频通话来自："</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"WLAN 视频通话来自："</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"视频通话升级请求来自："</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"WLAN 视频通话升级请求来自："</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通话来自："</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通话来自："</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人通过 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 来电"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
index 14a4441..9f47481 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"保留"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"視像通話來自"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi 視像通話來自"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"視像升級要求來自"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi 視像升級要求來自"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通話來自"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通話來自"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 的來電"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
index bdee41e..563bb28 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"視訊通話來電："</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Wi-Fi 視訊通話來電："</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"視訊升級要求，來自："</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Wi-Fi 視訊升級要求，來自："</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"語音來電："</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"公司來電："</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 來電"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
index 150d5cc..19951cc 100644
--- a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2016 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_calling_via_template" msgid="3416867359475780924">"Ishaya ucingo nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
@@ -14,6 +30,8 @@
     <string name="incall_remotely_held" msgid="8561379039177396615">"Ibambile"</string>
     <string name="contact_grid_incoming_video_call" msgid="4935122585117803710">"Ikholi yevidiyo kusukela ku-"</string>
     <string name="contact_grid_incoming_wifi_video_call" msgid="5938822096623593533">"Ikholi yevidiyo ye-Wi-Fi kusukela ku-"</string>
+    <string name="contact_grid_incoming_video_request" msgid="7488892854791471116">"Isicelo sokuthuthukiswa kwevidiyo kusukela"</string>
+    <string name="contact_grid_incoming_wifi_video_request" msgid="4516902096577976768">"Isicelo sokuthuthukiswa kwevidiyo ye-Wi-Fi kusukela"</string>
     <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Ikholi esuka ku-"</string>
     <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ikholi yomsebenzi kusukela ku-"</string>
     <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ingena nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml
index 385f843..5a9272c 100644
--- a/java/com/android/incallui/contactgrid/res/values/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- Title displayed in the overlay for outgoing calls which include the name of the provider.
@@ -50,6 +65,12 @@
   <!-- Displayed in the answer call screen for incoming video calls over Wi-F. -->
   <string name="contact_grid_incoming_wifi_video_call">Wi-Fi video call from</string>
 
+  <!-- Displayed in the answer call screen for incoming requests to upgrade to a video call. -->
+  <string name="contact_grid_incoming_video_request">Video upgrade request from</string>
+
+  <!-- Displayed in the answer call screen for incoming requests to upgrade to a video call over Wi-F. -->
+  <string name="contact_grid_incoming_wifi_video_request">Wi-Fi video upgrade request from</string>
+
   <!-- Displayed in the answer call screen for incoming voice calls. -->
   <string name="contact_grid_incoming_voice_call">Call from</string>
 
diff --git a/java/com/android/incallui/disconnectdialog/AndroidManifest.xml b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml
new file mode 100644
index 0000000..eec9807
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ 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.incallui.disconnectdialog">
+</manifest>
diff --git a/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java
new file mode 100644
index 0000000..2ce2387
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java
@@ -0,0 +1,50 @@
+/*
+ * 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.incallui.disconnectdialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.telecom.DisconnectCause;
+import android.text.TextUtils;
+import android.util.Pair;
+import com.android.incallui.call.DialerCall;
+
+/** Default error dialog shown to user after disconnect. */
+public class DefaultErrorDialog implements DisconnectDialog {
+
+  @Override
+  public boolean shouldShow(DisconnectCause disconnectCause) {
+    return !TextUtils.isEmpty(disconnectCause.getDescription())
+        && (disconnectCause.getCode() == DisconnectCause.ERROR
+            || disconnectCause.getCode() == DisconnectCause.RESTRICTED);
+  }
+
+  @Override
+  public Pair<Dialog, CharSequence> createDialog(@NonNull Context context, DialerCall call) {
+    DisconnectCause disconnectCause = call.getDisconnectCause();
+    CharSequence message = disconnectCause.getDescription();
+
+    Dialog dialog =
+        new AlertDialog.Builder(context)
+            .setMessage(message)
+            .setPositiveButton(android.R.string.cancel, null)
+            .create();
+    return new Pair<>(dialog, message);
+  }
+}
diff --git a/java/com/android/incallui/disconnectdialog/DisconnectDialog.java b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java
new file mode 100644
index 0000000..0b2b8cc
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java
@@ -0,0 +1,32 @@
+/*
+ * 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.incallui.disconnectdialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.telecom.DisconnectCause;
+import android.util.Pair;
+import com.android.incallui.call.DialerCall;
+
+/** Interface for disconnect dialog. */
+public interface DisconnectDialog {
+
+  boolean shouldShow(DisconnectCause disconnectCause);
+
+  Pair<Dialog, CharSequence> createDialog(@NonNull Context context, DialerCall call);
+}
diff --git a/java/com/android/incallui/disconnectdialog/DisconnectMessage.java b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java
new file mode 100644
index 0000000..97d58f2
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java
@@ -0,0 +1,66 @@
+/*
+ * 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.incallui.disconnectdialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.telecom.DisconnectCause;
+import android.util.Pair;
+import com.android.incallui.call.DialerCall;
+import java.util.Locale;
+
+/**
+ * Wrapper class around @Code{android.telecom.DisconnectCause} to provide more information to user.
+ */
+public class DisconnectMessage {
+
+  // Disconnect dialog catalog. Default error dialog MUST be last one.
+  private static final DisconnectDialog[] DISCONNECT_DIALOGS =
+      new DisconnectDialog[] {
+        new EnableWifiCallingPrompt(), new VideoCallNotAvailablePrompt(), new DefaultErrorDialog()
+      };
+
+  public final Dialog dialog;
+  public final CharSequence toastMessage;
+  private final DisconnectCause cause;
+
+  public DisconnectMessage(Context context, DialerCall call) {
+    cause = call.getDisconnectCause();
+
+    for (DisconnectDialog disconnectDialog : DISCONNECT_DIALOGS) {
+      if (disconnectDialog.shouldShow(cause)) {
+        Pair<Dialog, CharSequence> pair = disconnectDialog.createDialog(context, call);
+        dialog = pair.first;
+        toastMessage = pair.second;
+        return;
+      }
+    }
+    dialog = null;
+    toastMessage = null;
+  }
+
+  @Override
+  public String toString() {
+    return String.format(
+        Locale.ENGLISH,
+        "DisconnectMessage {code: %d, description: %s, reason: %s, message: %s}",
+        cause.getCode(),
+        cause.getDescription(),
+        cause.getReason(),
+        toastMessage);
+  }
+}
diff --git a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
new file mode 100644
index 0000000..a0ca8cd
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
@@ -0,0 +1,75 @@
+/*
+ * 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.incallui.disconnectdialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.telecom.DisconnectCause;
+import android.util.Pair;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.incallui.call.DialerCall;
+
+/** Prompts the user to enable Wi-Fi calling. */
+public class EnableWifiCallingPrompt implements DisconnectDialog {
+  // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect
+  // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might
+  // consider using a more explicit way to signal this.
+  private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";
+  private static final String ACTION_WIFI_CALLING_SETTINGS =
+      "android.settings.WIFI_CALLING_SETTINGS";
+  private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings";
+
+  @Override
+  public boolean shouldShow(DisconnectCause disconnectCause) {
+    String reason = disconnectCause.getReason();
+    if (reason != null && reason.startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) {
+      LogUtil.i(
+          "EnableWifiCallingPrompt.shouldShowPrompt",
+          "showing prompt for disconnect cause: %s",
+          reason);
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public Pair<Dialog, CharSequence> createDialog(final @NonNull Context context, DialerCall call) {
+    Assert.isNotNull(context);
+    DisconnectCause cause = call.getDisconnectCause();
+    CharSequence message = cause.getDescription();
+    Dialog dialog =
+        new AlertDialog.Builder(context)
+            .setMessage(message)
+            .setPositiveButton(
+                R.string.incall_enable_wifi_calling_button,
+                (OnClickListener) (dialog1, which) -> openWifiCallingSettings(context))
+            .setNegativeButton(android.R.string.cancel, null)
+            .create();
+    return new Pair<>(dialog, message);
+  }
+
+  private static void openWifiCallingSettings(@NonNull Context context) {
+    LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings");
+    context.startActivity(
+        new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE));
+  }
+}
diff --git a/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java
new file mode 100644
index 0000000..526d45e
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java
@@ -0,0 +1,76 @@
+/*
+ * 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.incallui.disconnectdialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccountHandle;
+import android.util.Pair;
+import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.util.DialerUtils;
+import com.android.incallui.call.DialerCall;
+
+/** Prompt user to make voice call if video call is not currently available. */
+public class VideoCallNotAvailablePrompt implements DisconnectDialog {
+
+  @Override
+  public boolean shouldShow(DisconnectCause disconnectCause) {
+    if (disconnectCause.getCode() == DisconnectCause.ERROR
+        && TelecomManagerCompat.REASON_IMS_ACCESS_BLOCKED.equals(disconnectCause.getReason())) {
+      LogUtil.i(
+          "VideoCallNotAvailablePrompt.shouldShowPrompt",
+          "showing prompt for disconnect cause: %s",
+          disconnectCause.getReason());
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  @Override
+  public Pair<Dialog, CharSequence> createDialog(@NonNull Context context, DialerCall call) {
+    CharSequence title = context.getString(R.string.video_call_not_available_title);
+
+    Dialog dialog =
+        new AlertDialog.Builder(context)
+            .setTitle(title)
+            .setMessage(context.getString(R.string.video_call_not_available_message))
+            .setPositiveButton(
+                R.string.voice_call,
+                (dialog1, which) ->
+                    makeVoiceCall(context, call.getNumber(), call.getAccountHandle()))
+            .setNegativeButton(android.R.string.cancel, null)
+            .create();
+    return new Pair<>(dialog, title);
+  }
+
+  private void makeVoiceCall(Context context, String number, PhoneAccountHandle accountHandle) {
+    LogUtil.enterBlock("VideoCallNotAvailablePrompt.makeVoiceCall");
+    Intent intent =
+        new CallIntentBuilder(number, CallInitiationType.Type.IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE)
+            .setPhoneAccountHandle(accountHandle)
+            .build();
+    DialerUtils.startActivityWithErrorToast(context, intent);
+  }
+}
diff --git a/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml
new file mode 100644
index 0000000..5f07dfc
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktiveer"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video-oproepe is nie nou beskikbaar nie"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probeer weer later bel of gaan voort met die oproep as \'n stemoproep."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Stemoproep"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml
new file mode 100644
index 0000000..62a77e4
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"አንቃ"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"የቪዲዮ ጥሪ ለጊዜው አይገኝም"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"በኋላ እንደገና ለመደወል ይሞክሩ ወይም ጥሪውን እንደ የድምጽ ጥሪ ይቀጥሉ።"</string>
+    <string name="voice_call" msgid="6748636104112578475">"የድምጽ ጥሪ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml
new file mode 100644
index 0000000..e29ee2f
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"تمكين"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"اتصال الفيديو غير متوفر حاليًا"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"حاول الاتصال مرة أخرى لاحقًا أو أكمل المكالمة كمكالمة صوتية."</string>
+    <string name="voice_call" msgid="6748636104112578475">"مكالمة صوتية"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml
new file mode 100644
index 0000000..5a72e4c
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktiv edin"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video zəng hazırda əlçatan deyil"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Daha sonra yenidən cəhd edin və ya audio zənglə davam edin."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Video zəng"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..e782e70
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video poziv trenutno nije dostupan"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probajte ponovo da uputite poziv kasnije ili ga nastavite kao audio poziv."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Audio poziv"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml
new file mode 100644
index 0000000..d4cab26
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Уключыць"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Відэавыклікі зараз недаступныя"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Паспрабуйце зрабіць выклік пазней або працягніце выклік як галасавы."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Галасавы выклік"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml
new file mode 100644
index 0000000..e9211ab
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Активиране"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"В момента не е възможно видеообаждане"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Опитайте да се обадите отново по-късно или продължете обаждането като гласово."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Гласово обаждане"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml
new file mode 100644
index 0000000..dd0297c
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"সক্ষম করুন"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ভিডিও কলিং বর্তমানে উপলব্ধ নয়"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"পরে আবার কল করার চেষ্টা করুন বা কলটিকে একটি ভয়েস কল হিসাবে চালিয়ে যান৷"</string>
+    <string name="voice_call" msgid="6748636104112578475">"ভয়েস কল"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml
new file mode 100644
index 0000000..309427a
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopozivanje trenutno nije dostupno"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Pozovite ponovo kasnije ili nastavite poziv kao glasovni poziv."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Glasovni poziv"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml
new file mode 100644
index 0000000..dca9551
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activa"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Les videotrucades no estan disponibles actualment"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Torna-ho a provar més tard o continua com a trucada de veu."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Trucada de veu"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml
new file mode 100644
index 0000000..502434a
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Zapnout"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videohovory momentálně nejsou dostupné"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Zkuste zavolat později nebo v hovoru pokračujte bez videa."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Hlasový hovor"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
new file mode 100644
index 0000000..817226e
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivér"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Det er ikke muligt at foretage videoopkald i øjeblikket"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv at ringe igen senere, eller fortsæt med et taleopkald."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Taleopkald"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml
new file mode 100644
index 0000000..8ebc527
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivieren"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrufe sind momentan nicht verfügbar"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Versuche es später noch einmal oder setze den Anruf als Sprachanruf fort."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Sprachanruf"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml
new file mode 100644
index 0000000..1e182be
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ενεργοποίηση"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Η βιντεοκλήσεις δεν είναι προς το παρόν διαθέσιμες"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Δοκιμάστε να καλέσετε ξανά αργότερα ή συνεχίστε την κλήση ως φωνητική κλήση."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Φωνητική κλήση"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..4665e11
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..4665e11
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..4665e11
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..98afb12
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Habilitar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"La videollamada no está disponible en este momento"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prueba llamando de nuevo más tarde o continúa la llamada como una llamada de voz."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Llamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml
new file mode 100644
index 0000000..580ac8b
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Habilitar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"No se pueden hacer videollamadas en estos momentos"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prueba a llamar de nuevo más tarde o haz una llamada de voz."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Llamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml
new file mode 100644
index 0000000..dae212d
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Luba"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Vidokõned pole praegu saadaval"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Proovige hiljem uuesti helistada või jätkake helistamist häälkõnena."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Häälkõne"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml
new file mode 100644
index 0000000..c207d39
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Gaitu"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Une honetan, bideo-deiak ez daude erabilgarri"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Saiatu geroago berriro deitzen, edo aldatu ahots-deira."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Ahots-deia"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml
new file mode 100644
index 0000000..73c2a86
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"فعال کردن"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"تماس ویدیویی درحال حاضر امکان‌پذیر نیست"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"بعداً دوباره تماس بگیرید یا با تماس صوتی ادامه دهید."</string>
+    <string name="voice_call" msgid="6748636104112578475">"تماس صوتی"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml
new file mode 100644
index 0000000..93d4cc7
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ota käyttöön"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopuhelut ei ole tällä hetkellä saatavilla"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Yritä soittaa myöhemmin uudelleen tai jatka puhelua äänipuheluna."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Puhelu"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..e2bd4b1
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activer"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Les appels vidéo ne sont pas disponibles pour le moment"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Essayez de rappeler plus tard ou passez à un appel vocal."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Appel vocal"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml
new file mode 100644
index 0000000..f9dfdfa
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activer"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"La fonction d\'appel vidéo est momentanément indisponible"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Réessayez plus tard ou reprenez l\'appel en mode vocal."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Appel vocal"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml
new file mode 100644
index 0000000..3313c44
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"As videochamadas non están dispoñibles actualmente"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Proba a chamar de novo máis tarde ou continuar a chamada como unha chamada de voz."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml
new file mode 100644
index 0000000..28825da
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"સક્ષમ કરો"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"વિડિઓ કૉલિંગ હાલમાં ઉપલબ્ધ નથી"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"પછીથી ફરી કૉલ કરવાનો પ્રયાસ કરો અથવા કૉલને વૉઇસ કૉલ તરીકે ચાલુ રાખો."</string>
+    <string name="voice_call" msgid="6748636104112578475">"વૉઇસ કૉલ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml
new file mode 100644
index 0000000..8201539
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"सक्षम करें"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"इस समय वीडियो कॉलिंग की सुविधा उपलब्ध नहीं है"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"बाद में दोबारा कॉल करने की कोशिश करें या कॉल को वॉइस कॉल के रूप में जारी रखें."</string>
+    <string name="voice_call" msgid="6748636104112578475">"वॉइस कॉल"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml
new file mode 100644
index 0000000..c1b56b7
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopozivanje trenutačno nije dostupno"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Pokušajte ponovno nazvati kasnije ili nastavite poziv kao glasovni."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Glasovni poziv"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml
new file mode 100644
index 0000000..e1f9bd9
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Engedélyezés"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"A videohívás jelenleg nem érhető el"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Indítson hívást később, vagy folytassa hanghívásként."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Hanghívás"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml
new file mode 100644
index 0000000..d2c10be
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Միացնել"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Տեսազանգը ներկայումս հասանելի չէ"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ավելի ուշ նորից փորձեք զանգել կամ շարունակեք զանգն առանց տեսապատկերի:"</string>
+    <string name="voice_call" msgid="6748636104112578475">"Զանգ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml
new file mode 100644
index 0000000..8b895bc
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktifkan"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video call saat ini tidak tersedia"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Coba lagi nanti atau lanjutkan sebagai panggilan suara."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Panggilan suara"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml
new file mode 100644
index 0000000..b16b431
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Kveikja"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Myndsímtal er ekki í boði sem stendur"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prófaðu að hringja aftur seinna eða hringdu hefðbundið símtal í staðinn"</string>
+    <string name="voice_call" msgid="6748636104112578475">"Símtal"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml
new file mode 100644
index 0000000..1b862f7
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Abilita"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Le videochiamate non sono disponibili in questo momento"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prova a chiamare di nuovo più tardi o continua la chiamata come chiamata vocale."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Chiamata vocale"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml
new file mode 100644
index 0000000..91af8a9
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"הפעלה"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"לא ניתן לשוחח בשיחת וידאו כרגע"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"מומלץ לנסות להתקשר מאוחר יותר או להמשיך לשוחח בשיחה קולית."</string>
+    <string name="voice_call" msgid="6748636104112578475">"שיחה קולית"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml
new file mode 100644
index 0000000..8e196f2
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"有効にする"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ビデオハングアウトは現在利用できません"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"しばらくしてからもう一度試すか、音声通話で続けてください。"</string>
+    <string name="voice_call" msgid="6748636104112578475">"音声通話"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml
new file mode 100644
index 0000000..8045979
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ჩართვა"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ვიდეოზარი ამჟამად მიუწვდომელია"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"სცადეთ, დარეკოთ მოგვიანებით ან გააგრძელოთ ხმოვანი ზარით."</string>
+    <string name="voice_call" msgid="6748636104112578475">"ხმოვანი ზარი"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml
new file mode 100644
index 0000000..47294f9
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Қосу"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Бейне қоңырау қазір қолжетімді емес"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Кейінірек қайталап көріңіз немесе дасуыстық қоңырау ретінде жалғастырыңыз."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Дауыстық қоңырау"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml
new file mode 100644
index 0000000..6e1c0fe
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"បើក"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ការហៅ​វីដេអូ​មិន​អាច​ធ្វើ​បាន​ទេ​នៅពេល​នេះ"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"សាកល្បងហៅ​ម្ដងទៀត​នៅពេលក្រោយ ឬ​បន្ត​ការហៅ​ជា​សំឡេង។"</string>
+    <string name="voice_call" msgid="6748636104112578475">"ការ​ហៅ​ជា​សំឡេង"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml
new file mode 100644
index 0000000..384e92b
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ವೀಡಿಯೊ ಕರೆ ಪ್ರಸ್ತುತವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"ನಂತರ ಮತ್ತೆ ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಧ್ವನಿ ಕರೆಯಂತೆ ಕರೆಯನ್ನು ಮುಂದುವರಿಸಿ."</string>
+    <string name="voice_call" msgid="6748636104112578475">"ಧ್ವನಿ ಕರೆ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml
new file mode 100644
index 0000000..30e1565
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"사용"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"현재 화상 통화를 사용할 수 없음"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"나중에 다시 전화하거나, 계속하려면 음성 통화를 이용하세요."</string>
+    <string name="voice_call" msgid="6748636104112578475">"음성 통화"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml
new file mode 100644
index 0000000..1553169
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Иштетүү"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Видео режиминде чалуу учурда жеткиликсиз"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Кийинчерээк кайра чалыңыз же үн режиминде чалып көрүңүз."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Үн чалуусу"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml
new file mode 100644
index 0000000..c3f8b96
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ເປິດນຳໃຊ້"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ຕອນນີ້ບໍ່ສາມາດໃຊ້ການໂທວິດີໂອໄດ້"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"ກະລຸນາລອງໂທໃໝ່ໃນພາຍຫຼັງ ຫຼື ສືບຕໍ່ສາຍເປັນການໂທແບບສຽງ."</string>
+    <string name="voice_call" msgid="6748636104112578475">"ການໂທດ້ວຍສຽງ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml
new file mode 100644
index 0000000..38d6ef8
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Įgalinti"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Vaizdo skambučių funkcija šiuo metu nepasiekiama"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Vėliau pabandykite skambinti dar kartą arba tęskite skambutį kaip balso skambutį."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Balso skambutis"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml
new file mode 100644
index 0000000..279f0f5
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Iespējot"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videozvani pašlaik nav pieejami"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Vēlāk mēģiniet zvanīt vēlreiz vai turpiniet sarunu kā balss zvanu."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Balss zvans"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml
new file mode 100644
index 0000000..3c061df
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Овозможи"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Видеоповикувањето е недостапно во моментов."</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Обидете се да повикате повторно подоцна или продолжете со гласовен повик."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Гласовен повик"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml
new file mode 100644
index 0000000..719d6e8
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"വീഡിയോ കോളിംഗ് നിലവിൽ ലഭ്യമല്ല"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"പിന്നീട് വീണ്ടും വിളിക്കുന്നതോ വോയ്‌സ് കോളായി കോൾ തുടരുന്നതോ പരീക്ഷിക്കൂ."</string>
+    <string name="voice_call" msgid="6748636104112578475">"വോയ്‌സ് കോൾ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml
new file mode 100644
index 0000000..fae6708
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Идэвхжүүлэх"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Одоогоор видео дуудлага хийх боломжгүй"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Дараа дахин залгаж үзэх буюу энгийн дуудлагаар үргэлжлүүлнэ үү."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Дуудлага"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml
new file mode 100644
index 0000000..8549785
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"चालू करा"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"व्हिडिओ कॉलिंग सध्या उपलब्ध नाही"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"नंतर पुन्हा कॉल करून पहा किंवा कॉल व्हॉइस कॉल म्हणून सुरू ठेवा."</string>
+    <string name="voice_call" msgid="6748636104112578475">"व्हॉईस कॉल"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml
new file mode 100644
index 0000000..efe8799
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Dayakan"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Panggilan video tidak tersedia pada masa ini"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Cuba hubungi semula kemudian atau teruskan panggilan sebagai panggilan suara."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Panggilan suara"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml
new file mode 100644
index 0000000..04a4f3a
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ဖွင့်ရန်"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ဗီဒီယိုခေါ်ဆိုမှုကို လက်ရှိတွင် မရရှိနိုင်ပါ"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"နောက်မှ ထပ်မံခေါ်ဆိုကြည့်ပါ (သို့) အသံခေါ်ဆိုမှု ဆက်လုပ်ကြည့်ပါ။"</string>
+    <string name="voice_call" msgid="6748636104112578475">"အသံခေါ်ဆိုမှု"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml
new file mode 100644
index 0000000..14a41fa
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Slå på"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrop er ikke tilgjengelige akkurat nå"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv å ringe på nytt senere eller fortsett anropet som taleanrop."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Taleanrop"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml
new file mode 100644
index 0000000..9cc63fd
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"सक्षम पार्नुहोस्"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"भिडियो कल हाल उपलब्ध छैन"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"पछि फेरि कल गर्ने प्रयास गर्नुहोस् वा भ्वाइस कलका रूपमा कल जारी राख्नुहोस्।"</string>
+    <string name="voice_call" msgid="6748636104112578475">"भ्वाइस कल"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml
new file mode 100644
index 0000000..c3380db
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Inschakelen"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videobellen is momenteel niet beschikbaar"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probeer later opnieuw te bellen of start een spraakoproep."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Spraakoproep"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml
new file mode 100644
index 0000000..14a41fa
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Slå på"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrop er ikke tilgjengelige akkurat nå"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv å ringe på nytt senere eller fortsett anropet som taleanrop."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Taleanrop"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml
new file mode 100644
index 0000000..722183b
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ਯੋਗ ਬਣਾਓ"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕਾਲ ਨੂੰ ਵੌਇਸ ਕਾਲ ਵਜੋਂ ਜਾਰੀ ਰੱਖੋ।"</string>
+    <string name="voice_call" msgid="6748636104112578475">"ਵੌਇਸ ਕਾਲ"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml
new file mode 100644
index 0000000..b8307e9
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Włącz"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Rozmowy wideo nie są obecnie dostępne"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Spróbuj zadzwonić później, aby kontynuować rozmowę w trybie wideo."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Połączenie głosowe"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..ce249f6
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"O recurso de videochamada não está disponível no momento"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ligue novamente mais tarde ou continue esta chamada sem o vídeo."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..fb6980a
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Neste momento, não é possível efetuar videochamadas"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Experimente efetuar a videochamada mais tarde ou continue a chamada como uma chamada de voz."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml
new file mode 100644
index 0000000..ce249f6
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"O recurso de videochamada não está disponível no momento"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ligue novamente mais tarde ou continue esta chamada sem o vídeo."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml
new file mode 100644
index 0000000..7836192
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activați"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Apelarea video este indisponibilă momentan"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Încercați să apelați din nou mai târziu sau continuați ca apel vocal."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Apel vocal"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml
new file mode 100644
index 0000000..ffc3f61
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Включить"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"В настоящее время видеовызовы недоступны"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Повторите попытку позже или продолжайте выполнять вызов как голосовой."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Голосовой вызов"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml
new file mode 100644
index 0000000..6948877
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"සබල කරන්න"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"වීඩියෝ ඇමතීම දැනට ලබා ගැනීමට නොහැකිය"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"පසුව නැවත ඇමතීම උත්සාහ කරන්න නැතහොත් ඇමතුම හඬ ඇමතුමක් ලෙස දිගටම කරගෙන යන්න."</string>
+    <string name="voice_call" msgid="6748636104112578475">"හඬ ඇමතීම"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml
new file mode 100644
index 0000000..8f4b059
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Povoliť"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videohovor momentálne nie je k dispozícii"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Skúste zavolať znova neskôr alebo pokračujte v hovore bez videa."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Hlasový hovor"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml
new file mode 100644
index 0000000..6afd14c
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogoči"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoklicanje trenutno ni na voljo"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Poskusite klicati znova pozneje ali pa klic nadaljujte kot glasovni klic."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Glasovni klic"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml
new file mode 100644
index 0000000..cccc83f
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivizo"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Telefonatat me video nuk ofrohen aktualisht"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Provo të telefonosh përsëri më vonë ose vazhdoje telefonatën si një telefonatë zanore."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Telefonatë me video"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml
new file mode 100644
index 0000000..620c39e
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Омогући"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Видео позив тренутно није доступан"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Пробајте поново да упутите позив касније или га наставите као аудио позив."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Аудио позив"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml
new file mode 100644
index 0000000..e6be384
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivera"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Det går inte att ringa videosamtal just nu"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Försök ringa upp igen senare eller fortsätt samtalet som ett röstsamtal"</string>
+    <string name="voice_call" msgid="6748636104112578475">"Röstsamtal"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml
new file mode 100644
index 0000000..6d6a6a0
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Washa"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Kipengele cha kupiga simu za video hakipatikani kwa sasa"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Jaribu kupiga simu ya video tena hapo baadaye au uendelee na mazungumzo kama simu ya sauti."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Simu ya sauti"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml
new file mode 100644
index 0000000..626d0d6
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"இயக்கு"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"தற்போது வீடியோவில் அழைக்க முடியாது"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"பிறகு அழைக்க முயற்சிக்கவும் அல்லது குரல் அழைப்பைச் செய்யவும்."</string>
+    <string name="voice_call" msgid="6748636104112578475">"குரல் அழைப்பு"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml
new file mode 100644
index 0000000..737d677
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ప్రారంభించు"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ప్రస్తుతం వీడియో కాలింగ్ అందుబాటులో లేదు"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"మళ్లీ కాల్ చేసి ప్రయత్నించండి లేదా కాల్‌ను వాయిస్ కాల్ వలె కొనసాగించండి."</string>
+    <string name="voice_call" msgid="6748636104112578475">"వాయిస్ కాల్"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml
new file mode 100644
index 0000000..a6fa2b1
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"เปิดใช้"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"วิดีโอคอลไม่พร้อมใช้งานในตอนนี้"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"ลองโทรอีกครั้งในภายหลัง หรือโทรด้วยเสียงต่อไป"</string>
+    <string name="voice_call" msgid="6748636104112578475">"การโทรด้วยเสียง"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml
new file mode 100644
index 0000000..17f29af
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"I-enable"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Kasalukuyang hindi available ang pakikipag-video call"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Subukang tumawag muli sa ibang pagkakataon o ipagpatuloy ang tawag bilang isang voice call."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml
new file mode 100644
index 0000000..a0ba4fa
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Etkinleştir"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Görüntülü görüşme şu anda kullanılamıyor"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Görüntülü görüşme yapmayı daha sonra tekrar deneyin veya görüşmeye sesli arama olarak devam edin."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Sesli arama"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml
new file mode 100644
index 0000000..36a3c45
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Увімкнути"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Наразі не можна здійснювати відеодзвінки"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Спробуйте пізніше або перейдіть у режим голосового дзвінка."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Голосовий дзвінок"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml
new file mode 100644
index 0000000..4fa8b50
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"فعال کریں"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"ویڈیو کالنگ فی الحال دستیاب نہیں ہے"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"بعد میں دوبارہ کال کرنے کی کوشش کریں یا کال کو بطور صوتی کال جاری رکھیں۔"</string>
+    <string name="voice_call" msgid="6748636104112578475">"صوتی کال"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml
new file mode 100644
index 0000000..229e6e7
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Yoqish"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Video muloqot funksiyasidan hozirgi vaqtda foydalanib bo‘lmaydi."</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Keyinroq qayta urinib ko‘ring yoki ovozli muloqot rejimida o‘ting."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Ovozli muloqot"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml
new file mode 100644
index 0000000..3e49451
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Bật"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Hiện không sử dụng được tính năng gọi điện video"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Hãy thử gọi lại sau hoặc tiếp tục gọi dưới dạng cuộc gọi thoại."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Cuộc gọi thoại"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..3f8cd6d
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"启用"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"当前无法使用视频通话功能"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"请稍后再试，或者改用语音通话。"</string>
+    <string name="voice_call" msgid="6748636104112578475">"语音通话"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..605c847
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"啟用"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"視像通話目前無法使用"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"請稍後再撥，或是以語音通話的形式繼續通話。"</string>
+    <string name="voice_call" msgid="6748636104112578475">"語音通話"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..5201a34
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"啟用"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"目前無法使用視訊通話功能"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"請稍後再嘗試撥打電話，或以語音方式繼續進行通話。"</string>
+    <string name="voice_call" msgid="6748636104112578475">"語音通話"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml
new file mode 100644
index 0000000..1c0dd48
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Nika amandla"</string>
+    <string name="video_call_not_available_title" msgid="987490011944013201">"Ukushaya kwevidiyo manje akutholakali"</string>
+    <string name="video_call_not_available_message" msgid="2284146863894603221">"Zama ukushaya emuva kwesikhathi noma qhuba ikholi njengekholi yezwi."</string>
+    <string name="voice_call" msgid="6748636104112578475">"Ikholi yezwi"</string>
+</resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values/strings.xml b/java/com/android/incallui/disconnectdialog/res/values/strings.xml
new file mode 100644
index 0000000..91389db
--- /dev/null
+++ b/java/com/android/incallui/disconnectdialog/res/values/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- Button to enable Wi-Fi calling. This is displayed in a dialog after a phone call disconnects
+      because there is no cellular service.
+      [CHAR LIMIT=20] -->
+  <string name="incall_enable_wifi_calling_button">Enable</string>
+
+  <!-- Title of alert dialog displayed when video call is not available. [CHAR LIMIT=NONE] -->
+  <string name="video_call_not_available_title">Video calling is currently not available</string>
+  <!-- Message of alert dialog displayed when video call is not available. [CHAR LIMIT=NONE] -->
+  <string name="video_call_not_available_message">Try calling again later or continue the call as a voice call.</string>
+  <!-- Voice call button label of alert dialog displayed when video call is not available. [CHAR LIMIT=20] -->
+  <string name="voice_call">Voice call</string>
+
+</resources>
diff --git a/java/com/android/incallui/incall/impl/ButtonChooser.java b/java/com/android/incallui/incall/impl/ButtonChooser.java
index 55b82f0..095a8be 100644
--- a/java/com/android/incallui/incall/impl/ButtonChooser.java
+++ b/java/com/android/incallui/incall/impl/ButtonChooser.java
@@ -18,6 +18,7 @@
 
 import android.support.annotation.NonNull;
 import com.android.dialer.common.Assert;
+import com.android.incallui.incall.impl.MappedButtonConfig.MappingInfo;
 import com.android.incallui.incall.protocol.InCallButtonIds;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -103,12 +104,29 @@
       if (placedButtons.size() >= numUiButtons) {
         return;
       }
+
       // If the conflict button is allowed but disabled, don't place it since it probably will
       // move when it's enabled.
       if (!allowedButtons.contains(conflict) || disabledButtons.contains(conflict)) {
         continue;
       }
+
+      if (isMutuallyExclusiveButtonAvailable(
+          config.lookupMappingInfo(conflict).getMutuallyExclusiveButton(), allowedButtons)) {
+        continue;
+      }
       placedButtons.add(conflict);
     }
   }
+
+  private boolean isMutuallyExclusiveButtonAvailable(
+      int mutuallyExclusiveButton, @NonNull Set<Integer> allowedButtons) {
+    if (mutuallyExclusiveButton == MappingInfo.NO_MUTUALLY_EXCLUSIVE_BUTTON_SET) {
+      return false;
+    }
+    if (allowedButtons.contains(mutuallyExclusiveButton)) {
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
index 0dcfdb5..0f4a95d 100644
--- a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
+++ b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
@@ -74,6 +74,12 @@
     mapping.put(
         InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, MappingInfo.builder(4).setSlotOrder(10).build());
     mapping.put(InCallButtonIds.BUTTON_SWAP, MappingInfo.builder(5).setSlotOrder(0).build());
+    mapping.put(
+        InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY,
+        MappingInfo.builder(5)
+            .setSlotOrder(Integer.MAX_VALUE)
+            .setMutuallyExclusiveButton(InCallButtonIds.BUTTON_SWAP)
+            .build());
 
     return new ButtonChooser(new MappedButtonConfig(mapping));
   }
@@ -83,11 +89,18 @@
     mapping.put(
         InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY, MappingInfo.builder(4).setSlotOrder(0).build());
     mapping.put(
-        InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE,
-        MappingInfo.builder(4).setSlotOrder(5).build());
-    mapping.put(
         InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, MappingInfo.builder(4).setSlotOrder(10).build());
-    mapping.put(InCallButtonIds.BUTTON_HOLD, MappingInfo.builder(5).setSlotOrder(0).build());
+
+    /*
+     * Unlike the other configurations, MANAGE_VOICE_CONFERENCE shares a spot with HOLD for GSM.
+     * On GSM, pressing hold while there's a background call just swaps to the background call. It
+     * doesn't make sense to show both SWITCH_TO_SECONDARY and HOLD when they do the same thing, so
+     * we show MANAGE_VOICE_CONFERENCE instead. Previously MANAGE_VOICE_CONFERENCE would not show.
+     */
+    mapping.put(
+        InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE,
+        MappingInfo.builder(5).setSlotOrder(0).build());
+    mapping.put(InCallButtonIds.BUTTON_HOLD, MappingInfo.builder(5).setSlotOrder(5).build());
 
     return new ButtonChooser(new MappedButtonConfig(mapping));
   }
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java
index 8c11364..b7a47f0 100644
--- a/java/com/android/incallui/incall/impl/ButtonController.java
+++ b/java/com/android/incallui/incall/impl/ButtonController.java
@@ -29,6 +29,8 @@
 import com.android.incallui.incall.protocol.InCallButtonIds;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
 import com.android.incallui.incall.protocol.InCallScreenDelegate;
+import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
+import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize;
 
 /** Manages a single button. */
 interface ButtonController {
@@ -376,36 +378,13 @@
     }
 
     public void setAudioState(CallAudioState audioState) {
-      @StringRes int contentDescriptionResId;
-      if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
-          == CallAudioState.ROUTE_BLUETOOTH) {
-        checkable = false;
-        isChecked = false;
-        label = R.string.incall_label_audio;
+      SpeakerButtonInfo info = new SpeakerButtonInfo(audioState, IconSize.SIZE_36_DP);
 
-        if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH)
-            == CallAudioState.ROUTE_BLUETOOTH) {
-          icon = R.drawable.quantum_ic_bluetooth_audio_white_36;
-          contentDescriptionResId = R.string.incall_content_description_bluetooth;
-        } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER)
-            == CallAudioState.ROUTE_SPEAKER) {
-          icon = R.drawable.quantum_ic_volume_up_white_36;
-          contentDescriptionResId = R.string.incall_content_description_speaker;
-        } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET)
-            == CallAudioState.ROUTE_WIRED_HEADSET) {
-          icon = R.drawable.quantum_ic_headset_white_36;
-          contentDescriptionResId = R.string.incall_content_description_headset;
-        } else {
-          icon = R.drawable.ic_phone_audio_white_36dp;
-          contentDescriptionResId = R.string.incall_content_description_earpiece;
-        }
-      } else {
-        checkable = true;
-        isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER;
-        label = R.string.incall_label_speaker;
-        icon = R.drawable.quantum_ic_volume_up_white_36;
-        contentDescriptionResId = R.string.incall_content_description_speaker;
-      }
+      checkable = info.checkable;
+      isChecked = info.isChecked;
+      label = info.label;
+      icon = info.icon;
+      @StringRes int contentDescriptionResId = info.contentDescription;
 
       contentDescription = delegate.getContext().getText(contentDescriptionResId);
       checkedContentDescription =
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index c5d7532..d91b5f2 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -41,7 +41,11 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
+import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.dialer.widget.LockableViewPager;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
 import com.android.incallui.contactgrid.ContactGridManager;
@@ -57,6 +61,7 @@
 import com.android.incallui.incall.protocol.InCallScreenDelegate;
 import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
 import com.android.incallui.incall.protocol.PrimaryCallState;
+import com.android.incallui.incall.protocol.PrimaryCallState.ButtonState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
 import java.util.ArrayList;
@@ -135,7 +140,10 @@
       @Nullable ViewGroup viewGroup,
       @Nullable Bundle bundle) {
     LogUtil.i("InCallFragment.onCreateView", null);
-    final View view = layoutInflater.inflate(R.layout.frag_incall_voice, viewGroup, false);
+    // Bypass to avoid StrictModeResourceMismatchViolation
+    final View view =
+        DialerStrictMode.bypass(
+            () -> layoutInflater.inflate(R.layout.frag_incall_voice, viewGroup, false));
     contactGridManager =
         new ContactGridManager(
             view,
@@ -223,6 +231,8 @@
   public void onClick(View view) {
     if (view == endCallButton) {
       LogUtil.i("InCallFragment.onClick", "end call button clicked");
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.IN_CALL_DIALPAD_HANG_UP_BUTTON_PRESSED);
       inCallScreenDelegate.onEndCallClicked();
     } else {
       LogUtil.e("InCallFragment.onClick", "unknown view: " + view);
@@ -233,7 +243,7 @@
   @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("InCallFragment.setPrimary", primaryInfo.toString());
-    setAdapterMedia(primaryInfo.multimediaData);
+    setAdapterMedia(primaryInfo.multimediaData, primaryInfo.showInCallButtonGrid);
     contactGridManager.setPrimary(primaryInfo);
 
     if (primaryInfo.shouldShowLocation) {
@@ -259,9 +269,10 @@
     }
   }
 
-  private void setAdapterMedia(MultimediaData multimediaData) {
+  private void setAdapterMedia(MultimediaData multimediaData, boolean showInCallButtonGrid) {
     if (adapter == null) {
-      adapter = new InCallPagerAdapter(getChildFragmentManager(), multimediaData);
+      adapter =
+          new InCallPagerAdapter(getChildFragmentManager(), multimediaData, showInCallButtonGrid);
       pager.setAdapter(adapter);
     } else {
       adapter.setAttachments(multimediaData);
@@ -284,10 +295,6 @@
   @Override
   public void setSecondary(@NonNull SecondaryInfo secondaryInfo) {
     LogUtil.i("InCallFragment.setSecondary", secondaryInfo.toString());
-    getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY)
-        .setEnabled(secondaryInfo.shouldShow);
-    getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY)
-        .setAllowed(secondaryInfo.shouldShow);
     updateButtonStates();
 
     if (!isAdded()) {
@@ -312,6 +319,10 @@
   public void setCallState(@NonNull PrimaryCallState primaryCallState) {
     LogUtil.i("InCallFragment.setCallState", primaryCallState.toString());
     contactGridManager.setCallState(primaryCallState);
+    getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY)
+        .setAllowed(primaryCallState.swapToSecondaryButtonState != ButtonState.NOT_SUPPORT);
+    getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY)
+        .setEnabled(primaryCallState.swapToSecondaryButtonState == ButtonState.ENABLED);
     buttonChooser =
         ButtonChooserFactory.newButtonChooser(voiceNetworkType, primaryCallState.isWifi, phoneType);
     updateButtonStates();
@@ -384,6 +395,10 @@
         show);
     if (isSupportedButton(buttonId)) {
       getButtonController(buttonId).setAllowed(show);
+      if (buttonId == InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO && show) {
+        Logger.get(getContext())
+            .logImpression(DialerImpression.Type.UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN);
+      }
     }
   }
 
@@ -473,6 +488,9 @@
     inCallButtonUiDelegate.setAudioRoute(audioRoute);
   }
 
+  @Override
+  public void onAudioRouteSelectorDismiss() {}
+
   @NonNull
   @Override
   public ButtonController getButtonController(@InCallButtonIds int id) {
diff --git a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java
index 0b1088d..ead3534 100644
--- a/java/com/android/incallui/incall/impl/InCallPagerAdapter.java
+++ b/java/com/android/incallui/incall/impl/InCallPagerAdapter.java
@@ -21,7 +21,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.PagerAdapter;
-import android.text.TextUtils;
+import com.android.dialer.common.Assert;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.incallui.sessiondata.MultimediaFragment;
 
@@ -29,29 +29,44 @@
 public class InCallPagerAdapter extends FragmentStatePagerAdapter {
 
   @Nullable private MultimediaData attachments;
+  private final boolean showInCallButtonGrid;
 
-  public InCallPagerAdapter(FragmentManager fragmentManager, @Nullable MultimediaData attachments) {
+  public InCallPagerAdapter(
+      FragmentManager fragmentManager,
+      @Nullable MultimediaData attachments,
+      boolean showInCallButtonGrid) {
     super(fragmentManager);
     this.attachments = attachments;
+    this.showInCallButtonGrid = showInCallButtonGrid;
   }
 
   @Override
   public Fragment getItem(int position) {
-    if (position == getButtonGridPosition()) {
+    if (!showInCallButtonGrid) {
+      // TODO(calderwoodra): handle fragment invalidation for when the data changes.
+      return MultimediaFragment.newInstance(
+          attachments, true /* isInteractive */, false /* showAvatar */, false /* isSpam */);
+
+    } else if (position == getButtonGridPosition()) {
       return InCallButtonGridFragment.newInstance();
+
     } else {
-      // TODO: handle fragment invalidation for when the data changes.
-      return MultimediaFragment.newInstance(attachments, true, false, false);
+      return MultimediaFragment.newInstance(
+          attachments, true /* isInteractive */, false /* showAvatar */, false /* isSpam */);
     }
   }
 
   @Override
   public int getCount() {
-    if (attachments != null
-        && (!TextUtils.isEmpty(attachments.getText()) || attachments.hasImageData())) {
-      return 2;
+    int count = 0;
+    if (showInCallButtonGrid) {
+      count++;
     }
-    return 1;
+    if (attachments != null && attachments.hasData()) {
+      count++;
+    }
+    Assert.checkArgument(count > 0, "InCallPager adapter doesn't have any pages.");
+    return count;
   }
 
   public void setAttachments(@Nullable MultimediaData attachments) {
diff --git a/java/com/android/incallui/incall/impl/LockableViewPager.java b/java/com/android/incallui/incall/impl/LockableViewPager.java
deleted file mode 100644
index 5b8b126..0000000
--- a/java/com/android/incallui/incall/impl/LockableViewPager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 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.incallui.incall.impl;
-
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-/** {@link ViewPager} useful for disabled swiping between pages. */
-public class LockableViewPager extends ViewPager {
-
-  private boolean swipingLocked;
-
-  public LockableViewPager(Context context, AttributeSet attributeSet) {
-    super(context, attributeSet);
-  }
-
-  public void setSwipingLocked(boolean swipingLocked) {
-    this.swipingLocked = swipingLocked;
-  }
-
-  @Override
-  public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
-    return !swipingLocked && super.onInterceptTouchEvent(motionEvent);
-  }
-
-  @Override
-  public boolean onTouchEvent(MotionEvent motionEvent) {
-    return !swipingLocked && super.onTouchEvent(motionEvent);
-  }
-}
diff --git a/java/com/android/incallui/incall/impl/MappedButtonConfig.java b/java/com/android/incallui/incall/impl/MappedButtonConfig.java
index 7229837..67c4137 100644
--- a/java/com/android/incallui/incall/impl/MappedButtonConfig.java
+++ b/java/com/android/incallui/incall/impl/MappedButtonConfig.java
@@ -141,7 +141,7 @@
   }
 
   @NonNull
-  private MappingInfo lookupMappingInfo(@InCallButtonIds int button) {
+  public MappingInfo lookupMappingInfo(@InCallButtonIds int button) {
     MappingInfo info = mapping.get(button);
     if (info == null) {
       throw new IllegalArgumentException(
@@ -154,6 +154,8 @@
   @AutoValue
   abstract static class MappingInfo {
 
+    public static final int NO_MUTUALLY_EXCLUSIVE_BUTTON_SET = -1;
+
     /** The Ui slot into which a given button desires to be placed. */
     public abstract int getSlot();
 
@@ -171,11 +173,20 @@
      */
     public abstract int getConflictOrder();
 
+    /**
+     * Returns an integer representing a button for which the given button conflicts. Defaults to
+     * {@link NO_MUTUALLY_EXCLUSIVE_BUTTON_SET}.
+     *
+     * <p>If the mutually exclusive button is chosen, the associated button should never be chosen.
+     */
+    public abstract @InCallButtonIds int getMutuallyExclusiveButton();
+
     static Builder builder(int slot) {
       return new AutoValue_MappedButtonConfig_MappingInfo.Builder()
           .setSlot(slot)
           .setSlotOrder(Integer.MAX_VALUE)
-          .setConflictOrder(Integer.MAX_VALUE);
+          .setConflictOrder(Integer.MAX_VALUE)
+          .setMutuallyExclusiveButton(NO_MUTUALLY_EXCLUSIVE_BUTTON_SET);
     }
 
     /** Class used to build instances of {@link MappingInfo}. */
@@ -187,6 +198,8 @@
 
       public abstract Builder setConflictOrder(int conflictOrder);
 
+      public abstract Builder setMutuallyExclusiveButton(@InCallButtonIds int button);
+
       public abstract MappingInfo build();
     }
   }
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_add_call.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_ic_add_call.xml
deleted file mode 100644
index 4daf052..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_add_call.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_addcall_white"/>
-</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_dialpad.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_ic_dialpad.xml
deleted file mode 100644
index 091142b..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_dialpad.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/quantum_ic_dialpad_white_36"/>
-</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_manage.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_ic_manage.xml
deleted file mode 100644
index a48e4c4..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_manage.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/quantum_ic_group_white_36"/>
-</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_merge.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_ic_merge.xml
deleted file mode 100644
index 61d7555..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_merge.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/quantum_ic_call_merge_white_36"/>
-</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_pause.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_ic_pause.xml
deleted file mode 100644
index 6aa8ab8..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_ic_pause.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/quantum_ic_pause_white_36"/>
-</selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_default.xml b/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_default.xml
deleted file mode 100644
index 6a55b35..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_default.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape
-      android:innerRadius="0dp"
-      android:shape="ring"
-      android:thickness="2dp"
-      android:useLevel="false">
-      <solid android:color="@android:color/darker_gray"/>
-    </shape>
-  </item>
-</layer-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_selected.xml b/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_selected.xml
deleted file mode 100644
index fc673c6..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/tab_indicator_selected.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape
-      android:innerRadius="0dp"
-      android:shape="ring"
-      android:thickness="4dp"
-      android:useLevel="false">
-      <solid android:color="@color/background_dialer_white"/>
-    </shape>
-  </item>
-</layer-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/drawable/tab_selector.xml b/java/com/android/incallui/incall/impl/res/drawable/tab_selector.xml
deleted file mode 100644
index 303a49b..0000000
--- a/java/com/android/incallui/incall/impl/res/drawable/tab_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/tab_indicator_selected"
-    android:state_selected="true"/>
-  <item android:drawable="@drawable/tab_indicator_default"/>
-</selector>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/layout/call_composer_data_fragment.xml b/java/com/android/incallui/incall/impl/res/layout/call_composer_data_fragment.xml
deleted file mode 100644
index 335ac8a..0000000
--- a/java/com/android/incallui/incall/impl/res/layout/call_composer_data_fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-  <TextView
-    android:id="@+id/subject"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:padding="8dp"
-    android:textSize="24sp"
-    android:textColor="@color/primary_text_color"
-    android:background="@color/background_dialer_white"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
index 4443141..c06f709 100644
--- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -62,7 +77,7 @@
         android:layout_height="match_parent"/>
     </LinearLayout>
 
-    <com.android.incallui.incall.impl.LockableViewPager
+    <com.android.dialer.widget.LockableViewPager
       android:id="@+id/incall_pager"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
diff --git a/java/com/android/incallui/incall/impl/res/values-af/strings.xml b/java/com/android/incallui/incall/impl/res/values-af/strings.xml
index fd632fb..64529a5 100644
--- a/java/com/android/incallui/incall/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-af/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video-oproep"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Hou aan"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Voeg oproep by"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Demp"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Beëindig oproep"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Sleutelblok"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Luidspreker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is aan"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is af"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Voeg saam"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Bestuur"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Bestuur bellers"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Verwissel"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Klank"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota is gestuur"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-am/strings.xml b/java/com/android/incallui/incall/impl/res/values-am/strings.xml
index 9dfd0e6..66a3868 100644
--- a/java/com/android/incallui/incall/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-am/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"የቪዲዮ ጥሪ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ይዘህ ቆይ"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ጥሪ ያክሉ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ድምፀ-ከል አድርግ"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ጥሪ ጨርስ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ቁልፍ ሰሌዳ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"የድምጽ ማጉያ"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"፣ በርቷል"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"፣ ጠፍቷል"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"አዋህድ"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"አስተዳድር"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ደዋዮችን ያስተዳድሩ"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"አገላብጥ"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ድምፅ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ማስታወሻ ተልኳል"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
index a5f448a..e4dbfe4 100644
--- a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"مكالمة فيديو"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"انتظار"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"إضافة مكالمة"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"كتم"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"إنهاء المكالمة"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"لوحة مفاتيح"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"مكبر الصوت"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، مشغل"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، غير مشغل"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"دمج"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"إدارة"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"إدارة المتصلين"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"تبديل"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"الصوت"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"تم إرسال الملاحظة"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-az/strings.xml b/java/com/android/incallui/incall/impl/res/values-az/strings.xml
index 5f1f8cb..9a1f7f8 100644
--- a/java/com/android/incallui/incall/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-az/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video zəng"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Xətdə axlayın"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Zəng əlavə edin"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Susdurun"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Zəngi bitirin"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatura"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Dinamik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktivdir"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", deaktivdir"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Birləşdir"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"İdarə edin"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Zəng edənləri idarə edin"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Dəyişdirin"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Səs"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Qeyd göndərildi"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
index bff7ed0..02d6b7c 100644
--- a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video poziv"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Na čekanje"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Isključi zvuk"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Završi poziv"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatura"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Zvučnik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključen"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključen"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Objedini"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Upravljaj"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljajte pozivaocima"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Zameni"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvuk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Beleška je poslata"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-be/strings.xml b/java/com/android/incallui/incall/impl/res/values-be/strings.xml
index 394c7c8..45e1e10 100644
--- a/java/com/android/incallui/incall/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-be/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Відэавыклік"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Утрымліваць"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Дадаць выклік"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Адключыць мікрафон"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Сконч. выкл."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавіятура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Вонк.дынамік"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", уключана"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", выключана"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Аб\'яднаць"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Кіраваць"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Кіраваць выклікаючымі абанентамі"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Пераключыць"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Гук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Нататка адпраўлена"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
index 4f5933b..c339d3b 100644
--- a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видеообажд."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Задържане"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Ново обажд."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Без звук"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Затваряне"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавиатура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Високоговорител"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"е включено"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"е изключено"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Обединяване"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Управление"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управление на обаждащите се"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Размяна"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Звук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Бележката е изпратена"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
index 9453e14..ca5837b 100644
--- a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ভিডিও কল"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ধরে থাকুন"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"কল যোগ করুন"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"নিঃশব্দ করুন"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"কল শেষ করুন"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"কীপ্যাড"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"স্পিকার"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", চালু রয়েছে"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", বন্ধ রয়েছে"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"মার্জ করুন"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"পরিচালনা করুন"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"কলারদের পরিচালনা করুন"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"অদল বদল করুন"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"শব্দ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"নোট পাঠানো হয়েছে"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
index 4b47964..26b44ea 100644
--- a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videopoziv"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Na čekanju"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Isključi"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Prekini poziv"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Telefonska tastatura"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Zvučnik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključen"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključen"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Spoji"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Upravljaj"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljanje pozivaocima"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Zamijeni"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvuk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Bilješka je poslana"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
index e10b7bd..9c76a3a 100644
--- a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videotrucada"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Posa en espera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Afeg. trucada"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Silencia"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Penja"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclat"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altaveu"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activat"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivat"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Combina"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gestiona"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestiona les persones que truquen"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Canvia"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"So"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"La nota s\'ha enviat"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
index a00c105..69f3e53 100644
--- a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videohovor"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Podržet"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Přidat hovor"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Vyp. mikrof."</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Zavěsit"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klávesnice"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Reproduktor"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"– zapnuto"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"– vypnuto"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Sloučit"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Spravovat"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Spravovat volající"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Přepnout"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvuk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Poznámka byla odeslána"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-da/strings.xml b/java/com/android/incallui/incall/impl/res/values-da/strings.xml
index 08b5cbb..d9328af 100644
--- a/java/com/android/incallui/incall/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-da/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videoopkald"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Parkér"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Tilføj opkald"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Slå lyden fra"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Slut opkald"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Højttaler"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", er til"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", er fra"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Flet"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrer opkaldere"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Byt"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Lyd"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Noten blev sendt"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-de/strings.xml b/java/com/android/incallui/incall/impl/res/values-de/strings.xml
index 5f3f8c1..30eae96 100644
--- a/java/com/android/incallui/incall/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-de/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videoanruf"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Halten"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Hinzufügen"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Stumm"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Beenden"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Wähltasten"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Lautsprecher"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ist an"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ist aus"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Zusammenf."</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Verwalten"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Anrufer verwalten"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Wechseln"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Audio"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Notiz gesendet"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-el/strings.xml b/java/com/android/incallui/incall/impl/res/values-el/strings.xml
index 0f5a142..b45314f 100644
--- a/java/com/android/incallui/incall/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-el/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Βιντεοκλήση"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Αναμονή"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Προσθ. κλήσ."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Σίγαση"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Τερματισμός"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Πληκτρολόγιο"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Ηχείο"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ενεργό"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ανενεργό"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Συγχώνευση"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Διαχείριση"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Διαχείριση καλούντων"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Ανταλλαγή"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ήχος"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Η σημείωση εστάλη"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
index 89b72df..34323f5 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sound"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
index 89b72df..34323f5 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sound"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
index 89b72df..34323f5 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sound"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
index fe9374c..0dd1dc7 100644
--- a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videollamada"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Retener"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Agregar llamada"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Silenciar"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar llamada"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altavoz"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Administrar"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrar números"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sonido"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Se envió la nota"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-es/strings.xml b/java/com/android/incallui/incall/impl/res/values-es/strings.xml
index f2dd09b..db5a7e6 100644
--- a/java/com/android/incallui/incall/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-es/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videollamada"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Retener"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Añadir"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Silenciar"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altavoz"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gestionar"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrar llamadas"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sonido"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-et/strings.xml b/java/com/android/incallui/incall/impl/res/values-et/strings.xml
index 03fa7de..f4587ad 100644
--- a/java/com/android/incallui/incall/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-et/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videokõne"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Ootele"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Lisa kõne"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Vaigista"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Lõpeta kõne"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatuur"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Kõlar"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", on sees"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", on väljas"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Ühenda"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Halda"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Helistajate haldamine"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Vaheta"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Heli"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Märge on saadetud"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
index 51d300e..28d78a7 100644
--- a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Bideo-deia"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Utzi zain"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Gehitu deia"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Des. audioa"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Amaitu deia"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teklatua"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Bozgorailua"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktibatuta"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desaktib."</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Bateratu"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Kudeatu"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Kudeatu deitzaileak"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Aldatu"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Soinua"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Bidali da oharra"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
index a070116..a26ac75 100644
--- a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"تماس ویدئویی"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"درحال انتظار"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"افزودن تماس"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"بی‌صدا کردن"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"پایان تماس"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"صفحه کلید"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"بلندگو"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، فعال است"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، غیرفعال است"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ادغام"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"مدیریت"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"مدیریت تماس‌گیرندگان"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"جابه‌جایی"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"صدا"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"یادداشت ارسال شد"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
index d81bfbf..9ae5348 100644
--- a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videopuhelu"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Pitoon"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Lisää puhelu"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Mykistä"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Päätä puhelu"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Näppäimistö"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Kaiutin"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", käytössä"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ei käytössä"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Yhdistä"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Hallinnoi"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hallinnoi soittajia"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Vaihda"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ääni"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Muistiinpano lähetettiin."</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
index 1278bce..cff6745 100644
--- a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Appel vidéo"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"En attente"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Autre appel"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Couper son"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Raccrocher"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Clavier"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Haut-parleur"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activé"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", désactivé"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Fusionner"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gérer"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gérer les appels"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Permuter"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Son"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Note envoyée"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
index 5532032..14e92be 100644
--- a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Appel vidéo"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"En attente"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Autre appel"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Couper micro"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Raccrocher"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Clavier"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Haut-parleur"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activé"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", désactivé"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Fusionner"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gérer"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gérer les appelants"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Permuter"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Son"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Note envoyée"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
index ec99b7c..4b399f4 100644
--- a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videochamada"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"En espera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Eng. chamada"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Ignorar"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar chamada"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altofalante"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"activado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desactivado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Xestionar"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Xestionar emisores de chamadas"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Son"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Enviouse a nota"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
index fb3999c..438f0f3 100644
--- a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"વિડિઓ કૉલ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"હોલ્ડ કરો"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"કૉલ ઉમેરો"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"મ્યૂટ કરો"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"કૉલ સમાપ્ત કરો"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"કીપેડ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"સ્પીકર"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ચાલુ છે"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", બંધ છે"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"મર્જ કરો"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"સંચાલિત કરો"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"કૉલર્સને સંચાલિત કરો"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"સ્વેપ કરો"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ધ્વનિ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"નોંધ મોકલી"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-h385dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-h385dp/dimens.xml
index aac42c5..ba728d5 100644
--- a/java/com/android/incallui/incall/impl/res/values-h385dp/dimens.xml
+++ b/java/com/android/incallui/incall/impl/res/values-h385dp/dimens.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
   <dimen name="incall_avatar_size">64dp</dimen>
-  <dimen name="incall_avatar_marginBottom">8dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml
deleted file mode 100644
index 1f37cd5..0000000
--- a/java/com/android/incallui/incall/impl/res/values-h580dp/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <dimen name="incall_avatar_size">88dp</dimen>
-</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml
new file mode 100644
index 0000000..904aed2
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/values-h600dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+<resources>
+  <dimen name="incall_avatar_size">88dp</dimen>
+</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml b/java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml
similarity index 100%
rename from java/com/android/incallui/incall/impl/res/values-h580dp/styles.xml
rename to java/com/android/incallui/incall/impl/res/values-h650dp/styles.xml
diff --git a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
index 6a7538d..39e6e6b 100644
--- a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"वीडियो कॉल"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड करें"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"कॉल जोड़ें"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"म्यूट करें"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"कॉल समाप्त करें"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"कीपैड"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"स्‍पीकर"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", चालू है"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बंद है"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"एक बनाएं"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"प्रबंधित करें"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कॉलर प्रबंधित करें"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"स्वैप करें"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ध्वनि"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"नोट भेज दिया गया है"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
index fc431b3..e440028 100644
--- a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videopoziv"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Pauziraj"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Isklj. zvuk"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Prekini poziv"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tipkovnica"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Zvučnik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključeno"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključeno"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Spoji"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Upravljanje"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljaj pozivateljima"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Zamijeni"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvuk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Bilješka je poslana"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
index 194c348..e63ce59 100644
--- a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videohívás"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Várakoztatás"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Hívás felv."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Némítás"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Hívás vége"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Billentyűzet"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Hangszóró"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", be"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ki"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Egyesítés"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Kezelés"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hívók kezelése"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Csere"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Hang"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Üzenet elküldve"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
index 0e8054e..ce395e7 100644
--- a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Տեսազանգ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Պահել զանգը"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Ավելացնել զանգ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Անջատել"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Ավարտել զանգը"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Ստեղնաշար"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Բարձրախոս"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", միացած է"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", անջատած է"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Միավորել"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Կառավարել"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Զանգողների կառավարում"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Փոխարկել"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ձայն"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Գրառումն ուղարկվեց"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-in/strings.xml b/java/com/android/incallui/incall/impl/res/values-in/strings.xml
index f429cb4..e9d738a 100644
--- a/java/com/android/incallui/incall/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-in/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Tahan"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Tambahkan panggilan"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Bisukan"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Akhiri panggilan"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktif"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Nonaktif"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Gabungkan"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Kelola"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Kelola penelepon"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Tukar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Suara"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Catatan telah dikirim"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-is/strings.xml b/java/com/android/incallui/incall/impl/res/values-is/strings.xml
index 9c3bf89..f262e3f 100644
--- a/java/com/android/incallui/incall/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-is/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Myndsímtal"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Setja í bið"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Bæta við"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Hljóð af"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Ljúka"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Talnaborð"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Hátalari"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", kveikt"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", slökkt"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Sameina"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Stjórna"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hafa umsjón með hringjendum"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Skipta milli"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Hljóð"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Glósa send"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-it/strings.xml b/java/com/android/incallui/incall/impl/res/values-it/strings.xml
index 1cfb0be..f29a702 100644
--- a/java/com/android/incallui/incall/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-it/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videochiamata"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"In attesa"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Aggiungi chiamata"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Disattiva"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Termina chiamata"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastierino"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altoparlante"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", attivo"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", non attivo"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Unisci"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gestisci"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestisci chiamanti"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Scambia"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Audio"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota inviata"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
index 2426fc8..bf08e3b 100644
--- a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"שיחת וידאו"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"המתנה"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"הוסף שיחה"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"השתק"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"סיום השיחה"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"לוח חיוג"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"רמקול"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", מופעל"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", מושבת"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"מזג"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"נהל"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ניהול המתקשרים"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"החלף"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"צלילים"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ההערה נשלחה"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
index 9e313a0..b78ee20 100644
--- a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ビデオ通話"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"通話を追加"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ミュート"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"通話を終了"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"キーパッド"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"スピーカー"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"がオンです"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"がオフです"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"統合"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"発信者を管理"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"切り替え"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"音声"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"メモを送信しました"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
index d33af5a..f6926f3 100644
--- a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ვიდეოზარი"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"შეყოვნება"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ზარის დამატ."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"დადუმება"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ზარის დასრ."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"კლავიატურა"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"სპიკერი"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ჩართულია"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", გამორთულია"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"გაერთიანება"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"მართვა"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"აბონენტების მართვა"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"შენაცვლება"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ხმა"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ჩანიშვნა გაიგზავნა"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
index db9c4f6..8da9982 100644
--- a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Бейне қоңырау"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Күттіру"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Қоңырау қосу"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Дыбысын өшіру"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Қоңырауды аяқтау"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Пернетақта"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Динамик"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", қосулы"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", өшірулі"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Біріктіру"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Басқару"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Қоңырау шалушыларды басқару"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Ауыстыру"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Дыбыс"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Ескертпе жіберілді"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-km/strings.xml b/java/com/android/incallui/incall/impl/res/values-km/strings.xml
index 6596bdf..88e356a 100644
--- a/java/com/android/incallui/incall/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-km/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ហៅ​ជា​វីដេអូ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"រង់ចាំ"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"បន្ថែម​ការ​ហៅ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"បិទ​សំឡេង"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"បញ្ចប់​ការ​ហៅ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"បន្ទះ​​ចុច​លេខ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ឧបករណ៍​បំពង​សំឡេង"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", បាន​បើក"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", បានបិទ"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"បញ្ចូលគ្នា"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"គ្រប់គ្រង"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"គ្រប់គ្រងអ្នក​ហៅ"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"ប្ដូរ"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"សំឡេង"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"បានផ្ញើចំណាំ"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
index c03ec09..ad29b6d 100644
--- a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ಕರೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ಮ್ಯೂಟ್ ಮಾಡಿ"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ಕೀಪ್ಯಾಡ್‌"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ಸ್ಪೀಕರ್‌"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ಆನ್ ಆಗಿದೆ"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ಆಫ್ ಆಗಿದೆ"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ವಿಲೀನಗೊಳಿಸು"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"ನಿರ್ವಹಿಸು"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ಕರೆದಾತರನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"ಸ್ವ್ಯಾಪ್‌ ಮಾಡು"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ಧ್ವನಿ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ಟಿಪ್ಪಣಿ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
index e701e77..f9bb20f 100644
--- a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"화상 통화"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"대기"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"통화 추가"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"음소거"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"통화 종료"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"키패드"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"스피커"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", 켜짐"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", 꺼짐"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"병합"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"관리"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"발신자 관리"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"전환"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"소리"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"메모가 전송되었습니다."</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
index e51d4c5..f00264d 100644
--- a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видео чалуу"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Күттүрүү"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Чалууну кошуу"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Үнүн өчүрүү"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Чалууну бүтүрүү"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Ном. тергич"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Катуу сүйлөткүч"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", күйүк"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", өчүк"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Бириктирүү"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Башкаруу"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Чалуучуларды башкаруу"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Алмаштыруу"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Добуш"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Билдирүү жөнөтүлдү"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
index 52de3ff..2382f32 100644
--- a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ໂທດ້ວຍວິດີໂອ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ເພີ່ມການໂທ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ປີດສຽງ"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ວາງສາຍ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ແປ້ນກົດ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ລຳໂພງ"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ເປີດຢູ່"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ປິດຢູ່"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ຮວມສາຍ"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"ຈັດການ"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ຈັດການຜູ້ໂທ"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"ສະຫຼັບສາຍ"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ສຽງ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ສົ່ງບັນທຶກແລ້ວ"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
index 4cd0356..1a10884 100644
--- a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Vaizdo skambutis"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Sulaikyti"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Pr. skambutį"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Nutildyti"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Baig. skamb."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatūra"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Garsiakalbis"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", įjungtas"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", išjungtas"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Sujungti"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Tvarkyti"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Tvarkyti skambintojus"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Sukeisti"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Garsas"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Užrašas išsiųstas"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
index 48f9ae0..c19e7c0 100644
--- a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videozvans"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Aizturēt"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Pievienot zvanu"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Izslēgt"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Beigt zvanu"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Cipartast."</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Skaļrunis"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ieslēgts"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", izslēgts"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Apvienot"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Pārvaldīt"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Pārvaldīt zvanītājus"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Pārslēgt"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Skaņa"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Piezīme nosūtīta"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
index 5a61de5..610a308 100644
--- a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видеоповик"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"На чекање"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Додај повик"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Исклучи звук"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Заврши повик"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Тастатура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Звучник"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", е вклучен"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", е исклучен"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Спои"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Управувај"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управувајте со повикувачите"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Замени"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Звук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Белешката е испратена"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
index 00586ff..83c2989 100644
--- a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"വീഡിയോ കോള്‍"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ഹോള്‍ഡുചെയ്യുക"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"കോൾ ചേർക്കുക"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"മ്യൂട്ടുചെയ്യുക"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"കീപാഡ്"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"സ്പീക്കർ"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ഓണാണ്"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ഓഫാണ്"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ലയിപ്പിക്കുക"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"മാനേജുചെയ്യുക"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"കോൾ ചെയ്യുന്നവരെ മാനേജുചെയ്യുക"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"സ്വാപ്പുചെയ്യുക"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ശബ്‌ദം"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"കുറിപ്പ് അയച്ചു"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
index 085a405..9427d86 100644
--- a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видео хурал"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Саатуулах"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Дуудлага нэмэх"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Дууг хаах"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Дуудлагыг таслах"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Товчлуур"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Чанга яригч"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", асаатай"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", унтраатай"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Нэгтгэх"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Удирдах"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Залгагчдыг удирдах"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Солих"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Дуу"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Тэмдэглэлийг илгээсэн"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
index 8419233..194c192 100644
--- a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"व्हिडिओ कॉल"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड करा"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"कॉल जोडा"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"नि:शब्द करा"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"कॉल समाप्त करा"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"कीपॅड"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"स्पीकर"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", सुरू आहे"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बंद आहे"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"विलीन करा"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"व्यवस्थापित करा"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कॉलर व्यवस्थापित करा"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"अदलाबदल करा"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ध्वनी"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"टीप पाठविली"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
index c9db832..a918ded 100644
--- a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Pgln video"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Tunda"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Tambah pgln"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Redam"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Tamatkn pgln"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Pad kekunci"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Pmbsr suara"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", dihidupkan"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Dimatikan"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Gabung"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Urus"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Urus pemanggil"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Silih"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Bunyi"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota dihantar"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-my/strings.xml b/java/com/android/incallui/incall/impl/res/values-my/strings.xml
index e0bfb8c..8007029 100644
--- a/java/com/android/incallui/incall/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-my/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ခဏရပ်ထားရန်"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ထပ်ခေါ်ရန်"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"အသံပိတ်ရန်"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ဖုန်းချရန်"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ခလုတ်ခုံ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"စပီကာ"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"၊ ပွင့်နေသည်"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"၊ ပိတ်နေသည်"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ပေါင်းရန်"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"စီမံရန်"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ခေါ်ဆိုသူများကို စီမံခန့်ခွဲရန်"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"ဖလှယ်ရန်"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"အသံ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"မှတ်စုပို့ပြီးပါပြီ"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
index 7520086..704384e 100644
--- a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtale"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Sett på vent"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Nytt anrop"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Ignorer"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Avslutt samtalen"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Høyttaler"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"er på"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"er av"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Slå sammen"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Håndter innringere"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Bytt"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Lyd"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Notatet er sendt"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
index 6bcfb6d..beffa3e 100644
--- a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"भिडियो कल"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड गर्ने"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"कल थप्नुहोस्"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"म्यूट गर्ने"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"कल अन्त्य गर्ने"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"किप्याड"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"स्पिकर"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", खुला छ"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बन्द छ"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"मर्ज गर्ने"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"प्रबन्ध गर्ने"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कल गर्ने व्यक्तिहरूलाई व्यवस्थित गर्नुहोस्"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"साट्नुहोस्"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"आवाज"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"टिपोट पठाइयो"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
index 63f1ebd..e3c919e 100644
--- a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videogespr."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"In wacht"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Oproep toev."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Dempen"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Oproep beëindigen"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Toetsenblok"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Luidspreker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is aan"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is uit"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Samenvoegen"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Beheren"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Bellers beheren"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Wisselen"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Geluid"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Notitie verzonden"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-no/strings.xml b/java/com/android/incallui/incall/impl/res/values-no/strings.xml
index 7520086..704384e 100644
--- a/java/com/android/incallui/incall/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-no/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtale"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Sett på vent"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Nytt anrop"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Ignorer"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Avslutt samtalen"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Høyttaler"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"er på"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"er av"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Slå sammen"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Håndter innringere"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Bytt"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Lyd"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Notatet er sendt"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
index 10a2865..d7e74ed 100644
--- a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ਰੋਕ ਕੇ ਰੱਖੋ"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ਮਿਊਟ ਕਰੋ"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ਕਾਲ ਖਤਮ ਕਰੋ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ਕੀਪੈਡ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ਸਪੀਕਰ"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ਚਾਲੂ ਹੈ"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ਬੰਦ ਹੈ"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ਰਲਗੱਡ ਕਰੋ"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ਕਾਲਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"ਅਦਲੋ-ਬਦਲੋ"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ਧੁਨੀ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ਨੋਟ-ਕਥਨ ਭੇਜਿਆ ਗਿਆ"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
index 4bf6a58..9971d75 100644
--- a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Rozmowa wid."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Wstrzymaj"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poł."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Wycisz"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Zakończ"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klawiatura"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Głośnik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"– włączony"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"– wyłączony"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Scal"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Zarządzaj"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Zarządzaj rozmówcami"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Przełącz"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Dźwięk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Notatka wysłana"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
index 7ca6b6b..538c20c 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videocham."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Adic chamada"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Desativar"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Encerrar"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Alto-falante"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"ativado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desativado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Mesclar"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gerenciar"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerenciar os autores das chamadas"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Trocar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Som"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
index 750e57e..e3b98bb 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videochamada"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Adic. cham."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Desativ. som"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Terminar chamada"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altifalante"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ativado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desativado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Unir"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gerir"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerir autores das chamadas"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Alternar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Som"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
index 7ca6b6b..538c20c 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videocham."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Adic chamada"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Desativar"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Encerrar"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Alto-falante"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"ativado"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desativado"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Mesclar"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gerenciar"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerenciar os autores das chamadas"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Trocar"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Som"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
index 1f93da9..81dcdf3 100644
--- a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Apel video"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"În așteptare"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Încă un apel"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Dezactivați"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Încheiați"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatură"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Difuzor"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", e activat"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", dezactivat"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Îmbinați"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Gestionați"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestionați apelanții"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Schimbați"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sunet"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Nota a fost trimisă"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
index 89192c3..274f8ff 100644
--- a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видеовызов"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Удерживать"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Добавить вызов"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Выкл. звук"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Завершить вызов"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавиатура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Динамик"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", включен"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", отключен"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Объединить"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Управление"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управление абонентами"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Переключить"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Звук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Сообщение отправлено"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-si/strings.xml b/java/com/android/incallui/incall/impl/res/values-si/strings.xml
index 209bb77..a600c21 100644
--- a/java/com/android/incallui/incall/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-si/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"වීඩියෝ ඇමතුම"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"රඳවා ගන්න"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"ඇමතුම එක් ක."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"නිහඬ කරන්න"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"ඇමතුම නිම ක."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"යතුරු පුවරුව"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ස්පීකරය"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", සක්‍රියයි"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", අක්‍රියයි"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ඒකාබද්ධ කර."</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"කළමනාකරණය ක."</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"අමතන්නන් කළමනාකරණය කරන්න"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"මාරු කරන්න"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"හඬ"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"සටහන යවන ලදී"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
index 4e06aee..d74d19e 100644
--- a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videohovor"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Podržať"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Pridať hovor"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Vypnúť zvuk"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Ukonč. hovor"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klávesnica"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Reproduktor"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", je zapnutý"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", je vypnutý"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Zlúčiť"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Spravovať"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Spravovať volajúcich"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Zameniť"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvuk"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Poznámka bola odoslaná"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
index 7cdb6c8..782ce44 100644
--- a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videoklic"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Zadrži"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj klic"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Izklopi zvok"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Končaj klic"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tipkovnica"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Zvočnik"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", vklopljen"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", izklopljen"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Združi"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Upravljanje"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljanje klicateljev"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Zamenjaj"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Zvok"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Opomba je poslana"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
index 9ba18b5..a0fca36 100644
--- a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video tel."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Në pritje"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Shto telef."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Hiqi zërin"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Mbyll tel."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Blloku i tasteve"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Altoparlant"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", është aktiv"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", është joaktiv"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Shkri"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Menaxho"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Menaxho telefonuesit"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Shkëmbe"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Tingulli"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Shënimi u dërgua"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
index 56a9684..ec70451 100644
--- a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Видео позив"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"На чекање"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Додај позив"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Искључи звук"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Заврши позив"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Тастатура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Звучник"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", укључен"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", искључен"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Обједини"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Управљај"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управљајте позиваоцима"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Замени"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Звук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Белешка је послата"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
index 27d83b7..ded4522 100644
--- a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtal"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Parkera"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Lägg t samt."</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Ljud av"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Avsl. samtal"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Knappsats"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Högtalare"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", är på"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", är av"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Sammanfoga"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Hantera"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hantera uppringare"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Växla"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ljud"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Anteckning skickad"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
index 136fe17..df634f4 100644
--- a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Hangout ya video"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Shikilia"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Ongeza simu"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Zima maikrofoni"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Kata simu"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Vitufe vya Simu"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Spika"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", kimewashwa"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", kimezimwa"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Unganisha"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Dhibiti"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Dhibiti wanaopiga simu"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Badili"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Sauti"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Dokezo limetumwa"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
index 342f8d0..5c94abf 100644
--- a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"வீடியோ கால்"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ஹோல்டில் வை"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"அழைப்பை சேர்"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"முடக்கு"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"அழைப்பை முடி"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"விசைத்தளம்"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ஸ்பீக்கர்"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ஆன்"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ஆஃப்"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"இணை"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"நிர்வகி"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"அழைப்பாளர்களை நிர்வகிக்கும்"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"மாற்று"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"ஒலி"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"குறிப்பு அனுப்பப்பட்டது"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-te/strings.xml b/java/com/android/incallui/incall/impl/res/values-te/strings.xml
index 0048956..0cb3fb8 100644
--- a/java/com/android/incallui/incall/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-te/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"వీడియో కాల్"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"హోల్డ్ చేయి"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"కాల్ జోడించు"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"మ్యూట్ చేయి"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"కాల్ ముగించు"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"కీప్యాడ్"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"స్పీకర్"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ఆన్‌లో ఉంది"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ఆఫ్‌లో ఉంది"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"విలీనం చేయి"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"నిర్వహించు"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"కాలర్‌లను నిర్వహిస్తుంది"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"మార్చు"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"శబ్దం"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"గమనిక పంపబడింది"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-th/strings.xml b/java/com/android/incallui/incall/impl/res/values-th/strings.xml
index a740288..0929cfc 100644
--- a/java/com/android/incallui/incall/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-th/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"แฮงเอาท์วิดีโอ"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"พักสาย"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"เพิ่มการโทร"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"ปิดเสียง"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"วางสาย"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"ปุ่มกด"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"ลำโพง"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"เปิดอยู่"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"ปิดอยู่"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"รวม"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"จัดการ"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"จัดการผู้โทร"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"สลับ"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"เสียง"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"ส่งโน้ตแล้ว"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
index 46ff797..1ac2ef8 100644
--- a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"I-hold"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Mag-add: tawag"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"I-mute"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Tapusin ang tawag"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">",ay On"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ay Off"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"I-merge"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Pamahalaan"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Pamahalaan ang mga tumatawag"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Pagpalitin"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Tunog"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Naipadala ang tala"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
index 89ca330..241b694 100644
--- a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Görü. görüş."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Beklemeye al"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Çağrı ekle"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Sesi kapat"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Çğryı sonldr"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Tuş takımı"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Hoparlör"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", Açık"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Kapalı"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Birleştir"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Yönet"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Arayanları yönetin"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Değiştir"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ses"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Not gönderildi"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
index 516bcb7..1821556 100644
--- a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Відеодзвінок"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Утримувати"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Дод. виклик"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Без звуку"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Завер. викл."</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавіатура"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Динамік"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", увімкнено"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", вимкнено"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Об’єднати"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Керувати"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Керувати абонентами"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Поміняти"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Звук"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Нотатку надіслано"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
index 53ba190..fed0af6 100644
--- a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"ویڈیو کال"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"ہولڈ کریں"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"کال شامل کریں"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"خاموش کریں"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"کال ختم کریں"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"کی پیڈ"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"اسپیکر"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، آن ہے"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، آف ہے"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"ضم کریں"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"نظم کریں"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"کالرز کا نظم کریں"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"تبادلہ کریں"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"آواز"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"نوٹ بھیج دیا گیا"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
index 8818489..7d6af27 100644
--- a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Video qo‘n."</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Pauza"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Chaqiruv"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Ovozsiz"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Tugatish"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatura"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Karnay"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", yoniq"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", o‘chiq"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Birlashtir."</string>
+    <string name="incall_label_merge" msgid="720076442985913175">"Birlashtirish"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Boshqarish"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Qo‘ng‘iroq qiluvchilarni boshqarish"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Almashish"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Ovoz"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Qayd yuborildi"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
index 29f85ef..42e320a 100644
--- a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Gọi điện video"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Giữ"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Thêm cuộc gọi"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Tắt tiếng"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Kết thúc cuộc gọi"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Bàn phím"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Loa"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", đang bật"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", đang tắt"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Hợp nhất"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Quản lý"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Quản lý người gọi"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Hoán đổi"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Âm thanh"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Đã gửi ghi chú"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml
deleted file mode 100644
index e73eb93..0000000
--- a/java/com/android/incallui/incall/impl/res/values-w260dp-h520dp/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <dimen name="incall_button_horizontal_padding">16dp</dimen>
-  <dimen name="incall_button_vertical_padding">16dp</dimen>
-  <dimen name="incall_labeled_button_size">64dp</dimen>
-  <dimen name="tools_button_height">92dp</dimen>
-</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml
new file mode 100644
index 0000000..1572bb9
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/values-w260dp-h580dp/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources>
+  <dimen name="incall_button_vertical_padding">16dp</dimen>
+  <dimen name="incall_labeled_button_size">64dp</dimen>
+  <dimen name="tools_button_height">92dp</dimen>
+</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml
deleted file mode 100644
index 502ae72..0000000
--- a/java/com/android/incallui/incall/impl/res/values-w300dp-h540dp/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <dimen name="incall_button_horizontal_padding">32dp</dimen>
-  <dimen name="incall_button_vertical_padding">32dp</dimen>
-</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml b/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml
new file mode 100644
index 0000000..7592812
--- /dev/null
+++ b/java/com/android/incallui/incall/impl/res/values-w300dp-h620dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources>
+  <dimen name="incall_button_vertical_padding">32dp</dimen>
+</resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
index ec64045..f0cca90 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"视频通话"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"保持"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"添加通话"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"静音"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"结束通话"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"拨号键盘"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"免提"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已开启"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已关闭"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"合并"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理来电者"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"切换"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"声音"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"已发送备注"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
index 63cd6d8..c38ef35 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"視像通話"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"新增通話"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"靜音"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"結束通話"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"小鍵盤"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"揚聲器"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已開啟"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已關閉"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"合併"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理來電者"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"切換"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"音效"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"已傳送筆記"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
index be3103b..c04b830 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"視訊通話"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"新增通話"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"靜音"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"結束通話"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"撥號鍵盤"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"擴音模式"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已開啟"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已關閉"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"合併"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理來電者"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"切換"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"音訊"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"備註已送出"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
index df3f794..a23a1d5 100644
--- a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="incall_label_videocall" msgid="2208755440134676113">"Ikholi yevidiyo ye-Hangout"</string>
     <string name="incall_label_hold" msgid="4223472584896867896">"Bamba"</string>
     <string name="incall_label_add_call" msgid="5641663436373994915">"Engeza ikholi"</string>
     <string name="incall_label_mute" msgid="2180667027331706737">"Thulisa"</string>
+    <string name="incall_label_end_call" msgid="5434079261446614887">"Qeda ikholi"</string>
     <string name="incall_label_dialpad" msgid="8609779533654156550">"Ikhiphedi"</string>
-    <string name="incall_label_speaker" msgid="8100402799687856933">"Isipikha"</string>
     <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ivuliwe"</string>
     <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ivaliwe"</string>
     <string name="incall_label_merge" msgid="720076442985913175">"Hlanganisa"</string>
     <string name="incall_label_manage" msgid="2175471192903568159">"Phatha"</string>
     <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Phatha abashayi"</string>
     <string name="incall_label_swap" msgid="10458642864243507">"Shintsha"</string>
-    <string name="incall_label_audio" msgid="8616473242030174797">"Umsindo"</string>
     <string name="incall_note_sent" msgid="4524130323127388367">"Inothi lithunyelwe"</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml
index 72602e3..076a7d7 100644
--- a/java/com/android/incallui/incall/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 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
+  -->
+
 <resources>
   <dimen name="incall_button_label_margin">8dp</dimen>
   <dimen name="incall_button_elevation">0dp</dimen>
   <dimen name="incall_end_call_spacing">116dp</dimen>
   <dimen name="incall_button_padding">4dp</dimen>
-  <dimen name="incall_button_horizontal_padding">8dp</dimen>
   <dimen name="incall_button_vertical_padding">8dp</dimen>
   <dimen name="incall_avatar_size">0dp</dimen>
-  <dimen name="incall_avatar_marginBottom">0dp</dimen>
   <dimen name="incall_labeled_button_size">48dp</dimen>
   <dimen name="tools_button_height">76dp</dimen>
   <dimen name="incall_window_margin_horizontal">24dp</dimen>
diff --git a/java/com/android/incallui/incall/impl/res/values/strings.xml b/java/com/android/incallui/incall/impl/res/values/strings.xml
index 054ca96..2b30dfa 100644
--- a/java/com/android/incallui/incall/impl/res/values/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values/strings.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
 <resources>
 
   <!-- Button shown during a phone call to upgrade to video.
@@ -17,14 +32,14 @@
      [CHAR LIMIT=12] -->
   <string name="incall_label_mute">Mute</string>
 
+  <!-- Button shown during a phone call to end the call.
+     [CHAR LIMIT=12] -->
+  <string name="incall_label_end_call">End call</string>
+
   <!-- Button shown during a phone call to show the dialpad.
      [CHAR LIMIT=12] -->
   <string name="incall_label_dialpad">Keypad</string>
 
-  <!-- Button shown during a phone to route audio from earpiece to speaker phone.
-     [CHAR LIMIT=12] -->
-  <string name="incall_label_speaker">Speaker</string>
-
   <!-- Talkback text for speaker button status. [CHAR LIMIT=12] -->
   <string name="incall_talkback_speaker_on">, is on</string>
 
@@ -45,12 +60,9 @@
      [CHAR LIMIT=12] -->
   <string name="incall_label_swap">Swap</string>
 
-  <!-- Button shown during a phone to switch the audio route.
-     [CHAR LIMIT=12] -->
-  <string name="incall_label_audio">Sound</string>
 
   <!-- Used to inform the user that the note associated with an outgoing call has been sent.
        [CHAR LIMIT=32] -->
   <string name="incall_note_sent">Note sent</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java b/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
index 98c3e0f..c491eab 100644
--- a/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
+++ b/java/com/android/incallui/incall/protocol/InCallScreenDelegate.java
@@ -16,8 +16,6 @@
 
 package com.android.incallui.incall.protocol;
 
-import android.graphics.drawable.Drawable;
-
 /** Callbacks from the module out to the container. */
 public interface InCallScreenDelegate {
 
@@ -40,6 +38,4 @@
   void onInCallScreenResumed();
 
   void onInCallScreenPaused();
-
-  Drawable getDefaultContactPhotoDrawable();
 }
diff --git a/java/com/android/incallui/incall/protocol/PrimaryCallState.java b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
index 2ae6a18..fe80276 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryCallState.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
@@ -17,13 +17,33 @@
 package com.android.incallui.incall.protocol;
 
 import android.graphics.drawable.Drawable;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import android.telecom.DisconnectCause;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
 import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.videotech.utils.SessionModificationState;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Locale;
 
 /** State of the primary call. */
 public class PrimaryCallState {
+
+  /**
+   * Button state that will be invisible if not supported, visible but invalid if disabled, or
+   * visible if enabled.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ButtonState.NOT_SUPPORT, ButtonState.DISABLED, ButtonState.ENABLED})
+  public @interface ButtonState {
+    int NOT_SUPPORT = 0;
+    int DISABLED = 1;
+    int ENABLED = 2;
+  }
+
   public final int state;
   public final boolean isVideoCall;
   @SessionModificationState public final int sessionModificationState;
@@ -44,11 +64,20 @@
   public final boolean isVoiceMailNumber;
   public final boolean isRemotelyHeld;
   public final boolean isBusinessNumber;
+  public final boolean supportsCallOnHold;
+  public final @ButtonState int swapToSecondaryButtonState;
+  public final boolean isAssistedDialed;
+  @Nullable public final String customLabel;
 
   // TODO: Convert to autovalue. b/34502119
   public static PrimaryCallState createEmptyPrimaryCallState() {
+    return createEmptyPrimaryCallStateWithState(DialerCall.State.IDLE, null);
+  }
+
+  public static PrimaryCallState createEmptyPrimaryCallStateWithState(
+      int state, String customLabel) {
     return new PrimaryCallState(
-        DialerCall.State.IDLE,
+        state,
         false, /* isVideoCall */
         SessionModificationState.NO_REQUEST,
         new DisconnectCause(DisconnectCause.UNKNOWN),
@@ -67,7 +96,11 @@
         0,
         false /* isVoiceMailNumber */,
         false /* isRemotelyHeld */,
-        false /* isBusinessNumber */);
+        false /* isBusinessNumber */,
+        true /* supportsCallOnHold */,
+        ButtonState.NOT_SUPPORT /* swapToSecondaryButtonState */,
+        false /* isAssistedDialed */,
+        customLabel);
   }
 
   public PrimaryCallState(
@@ -90,7 +123,11 @@
       long connectTimeMillis,
       boolean isVoiceMailNumber,
       boolean isRemotelyHeld,
-      boolean isBusinessNumber) {
+      boolean isBusinessNumber,
+      boolean supportsCallOnHold,
+      @ButtonState int swapToSecondaryButtonState,
+      boolean isAssistedDialed,
+      @Nullable String customLabel) {
     this.state = state;
     this.isVideoCall = isVideoCall;
     this.sessionModificationState = sessionModificationState;
@@ -111,6 +148,13 @@
     this.isVoiceMailNumber = isVoiceMailNumber;
     this.isRemotelyHeld = isRemotelyHeld;
     this.isBusinessNumber = isBusinessNumber;
+    this.supportsCallOnHold = supportsCallOnHold;
+    this.swapToSecondaryButtonState = swapToSecondaryButtonState;
+    this.isAssistedDialed = isAssistedDialed;
+    if (!TextUtils.isEmpty(customLabel)) {
+      Assert.checkArgument(state == State.CALL_PENDING);
+    }
+    this.customLabel = customLabel;
   }
 
   @Override
diff --git a/java/com/android/incallui/incall/protocol/PrimaryInfo.java b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
index c170950..7fe0a0f 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryInfo.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
@@ -41,6 +41,7 @@
   // Used for consistent LetterTile coloring.
   @Nullable public final String contactInfoLookupKey;
   @Nullable public final MultimediaData multimediaData;
+  public final boolean showInCallButtonGrid;
   public final int numberPresentation;
 
   // TODO: Convert to autovalue. b/34502119
@@ -61,6 +62,7 @@
         false,
         null,
         null,
+        true,
         -1);
   }
 
@@ -80,6 +82,7 @@
       boolean shouldShowLocation,
       @Nullable String contactInfoLookupKey,
       @Nullable MultimediaData multimediaData,
+      boolean showInCallButtonGrid,
       int numberPresentation) {
     this.number = number;
     this.name = name;
@@ -96,6 +99,7 @@
     this.shouldShowLocation = shouldShowLocation;
     this.contactInfoLookupKey = contactInfoLookupKey;
     this.multimediaData = multimediaData;
+    this.showInCallButtonGrid = showInCallButtonGrid;
     this.numberPresentation = numberPresentation;
   }
 
@@ -104,13 +108,14 @@
     return String.format(
         Locale.US,
         "PrimaryInfo, number: %s, name: %s, location: %s, label: %s, "
-            + "photo: %s, photoType: %d, isPhotoVisible: %b",
+            + "photo: %s, photoType: %d, isPhotoVisible: %b, MultimediaData: %s",
         LogUtil.sanitizePhoneNumber(number),
         LogUtil.sanitizePii(name),
         LogUtil.sanitizePii(location),
         label,
         photo,
         photoType,
-        isContactPhotoShown);
+        isContactPhotoShown,
+        multimediaData);
   }
 }
diff --git a/java/com/android/incallui/maps/impl/AndroidManifest.xml b/java/com/android/incallui/maps/impl/AndroidManifest.xml
index 4ad0b3b..bc921e9 100644
--- a/java/com/android/incallui/maps/impl/AndroidManifest.xml
+++ b/java/com/android/incallui/maps/impl/AndroidManifest.xml
@@ -19,6 +19,7 @@
   package="com.android.incallui.maps.impl">
 
   <application>
+
     <meta-data
       android:name="com.google.android.gms.version"
       android:value="@integer/google_play_services_version"/>
diff --git a/java/com/android/incallui/res/anim/activity_open_enter.xml b/java/com/android/incallui/res/anim/activity_open_enter.xml
deleted file mode 100644
index 71cc096..0000000
--- a/java/com/android/incallui/res/anim/activity_open_enter.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shareInterpolator="false"
-  android:zAdjustment="top">
-  <alpha
-    android:duration="300"
-    android:fillAfter="true"
-    android:fillBefore="false"
-    android:fillEnabled="true"
-    android:fromAlpha="0.0"
-    android:interpolator="@anim/decelerate_cubic"
-    android:toAlpha="1.0"/>
-  <scale
-    android:duration="300"
-    android:fillAfter="true"
-    android:fillBefore="false"
-    android:fillEnabled="true"
-    android:fromXScale=".8"
-    android:fromYScale=".8"
-    android:interpolator="@anim/decelerate_cubic"
-    android:pivotX="50%p"
-    android:pivotY="50%p"
-    android:toXScale="1.0"
-    android:toYScale="1.0"/>
-</set>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/anim/activity_open_exit.xml b/java/com/android/incallui/res/anim/activity_open_exit.xml
deleted file mode 100644
index 9b36bb3..0000000
--- a/java/com/android/incallui/res/anim/activity_open_exit.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-  android:background="#ff000000"
-  android:zAdjustment="normal">
-  <alpha
-    android:duration="300"
-    android:fillAfter="true"
-    android:fillBefore="false"
-    android:fillEnabled="true"
-    android:fromAlpha="1.0"
-    android:interpolator="@anim/decelerate_quint"
-    android:toAlpha="0.0"/>
-</set>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/anim/decelerate_cubic.xml b/java/com/android/incallui/res/anim/decelerate_cubic.xml
deleted file mode 100644
index c2f4159..0000000
--- a/java/com/android/incallui/res/anim/decelerate_cubic.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, 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.
-*/
--->
-
-<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-  android:factor="1.5"/>
diff --git a/java/com/android/incallui/res/anim/decelerate_quint.xml b/java/com/android/incallui/res/anim/decelerate_quint.xml
deleted file mode 100644
index e55e99c..0000000
--- a/java/com/android/incallui/res/anim/decelerate_quint.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2010, 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.
-*/
--->
-
-<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-  android:factor="2.5"/>
diff --git a/java/com/android/incallui/res/anim/on_going_call.xml b/java/com/android/incallui/res/anim/on_going_call.xml
deleted file mode 100644
index 3a2e2ba..0000000
--- a/java/com/android/incallui/res/anim/on_going_call.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-  android:oneshot="false">
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_01"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_02"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_03"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_04"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_05"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_06"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_07"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_08"
-    android:duration="200"/>
-  <item
-    android:drawable="@drawable/ic_ongoing_phone_24px_09"
-    android:duration="200"/>
-</animation-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/color/ota_title_color.xml b/java/com/android/incallui/res/color/ota_title_color.xml
deleted file mode 100644
index bf36f56..0000000
--- a/java/com/android/incallui/res/color/ota_title_color.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#FFA6C839"/>
-</selector>
-
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 1e9294c..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_block_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index 757d339..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_call_end_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 9ab350e..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_close_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 7c281c3..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_location_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index 185d033..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png
deleted file mode 100644
index bd9489c..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_question_mark.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index f3581d1..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/ic_schedule_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_business.png b/java/com/android/incallui/res/drawable-hdpi/img_business.png
deleted file mode 100644
index f706342..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_business.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_conference.png b/java/com/android/incallui/res/drawable-hdpi/img_conference.png
deleted file mode 100644
index 3d9f683..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_conference.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_no_image.png b/java/com/android/incallui/res/drawable-hdpi/img_no_image.png
deleted file mode 100644
index fd0ab32..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_no_image.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_phone.png b/java/com/android/incallui/res/drawable-hdpi/img_phone.png
deleted file mode 100644
index 748312e..0000000
--- a/java/com/android/incallui/res/drawable-hdpi/img_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index edd666b..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_block_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index 17eb482..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_call_end_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 73faf52..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_close_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 933eb51..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_location_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index ec32370..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-mdpi/ic_question_mark.png
deleted file mode 100644
index 594d0b9..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_question_mark.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index 501ee84..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/ic_schedule_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/img_business.png b/java/com/android/incallui/res/drawable-mdpi/img_business.png
deleted file mode 100644
index 90738a7..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/img_business.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/img_conference.png b/java/com/android/incallui/res/drawable-mdpi/img_conference.png
deleted file mode 100644
index 0694dbd..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/img_conference.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/img_no_image.png b/java/com/android/incallui/res/drawable-mdpi/img_no_image.png
deleted file mode 100644
index 014a1c4..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/img_no_image.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-mdpi/img_phone.png b/java/com/android/incallui/res/drawable-mdpi/img_phone.png
deleted file mode 100644
index 41a1d33..0000000
--- a/java/com/android/incallui/res/drawable-mdpi/img_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 36210a8..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_block_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index b00d82e..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_call_end_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index a3896c5..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_close_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 814ca8d..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_location_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index e56481e..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-xhdpi/ic_question_mark.png
deleted file mode 100644
index ec915f6..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_question_mark.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index 2e27936..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/ic_schedule_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_business.png b/java/com/android/incallui/res/drawable-xhdpi/img_business.png
deleted file mode 100644
index 7b04d95..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/img_business.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xhdpi/img_conference.png
deleted file mode 100644
index b0dbcc2..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/img_conference.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_no_image.png b/java/com/android/incallui/res/drawable-xhdpi/img_no_image.png
deleted file mode 100644
index 4022207..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/img_no_image.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_phone.png b/java/com/android/incallui/res/drawable-xhdpi/img_phone.png
deleted file mode 100644
index 2e0ceec..0000000
--- a/java/com/android/incallui/res/drawable-xhdpi/img_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 9f51203..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_block_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index aeabe4a..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_call_end_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 22d7aa5..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_close_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 078b10d..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_location_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index c17dfe0..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_question_mark.png
deleted file mode 100644
index e3f6d28..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_question_mark.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index bfc7273..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/ic_schedule_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_business.png b/java/com/android/incallui/res/drawable-xxhdpi/img_business.png
deleted file mode 100644
index c17e4c9..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/img_business.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png
deleted file mode 100644
index a8dba5e..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_no_image.png b/java/com/android/incallui/res/drawable-xxhdpi/img_no_image.png
deleted file mode 100644
index 2cf7f23..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/img_no_image.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_phone.png b/java/com/android/incallui/res/drawable-xxhdpi/img_phone.png
deleted file mode 100644
index 4eaaba5..0000000
--- a/java/com/android/incallui/res/drawable-xxhdpi/img_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png
deleted file mode 100644
index 01df2b5..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_block_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png
deleted file mode 100644
index a6e8a7b..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_call_end_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 7d1c061..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_close_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 8bcb6f6..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png
deleted file mode 100644
index e249197..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_person_add_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_question_mark.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_question_mark.png
deleted file mode 100644
index 1a6bf1e..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_question_mark.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/ic_schedule_white_24dp.png b/java/com/android/incallui/res/drawable-xxxhdpi/ic_schedule_white_24dp.png
deleted file mode 100644
index b94f4df..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/ic_schedule_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_business.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_business.png
deleted file mode 100644
index 88f14e9..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/img_business.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png
deleted file mode 100644
index eb42b55..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_no_image.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_no_image.png
deleted file mode 100644
index 2165742..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/img_no_image.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_phone.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_phone.png
deleted file mode 100644
index 7cbfbd7..0000000
--- a/java/com/android/incallui/res/drawable-xxxhdpi/img_phone.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/res/drawable/img_conference_automirrored.xml b/java/com/android/incallui/res/drawable/img_conference_automirrored.xml
deleted file mode 100644
index 78b2876..0000000
--- a/java/com/android/incallui/res/drawable/img_conference_automirrored.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:autoMirrored="true"
-  android:src="@drawable/img_conference"/>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/drawable/img_no_image_automirrored.xml b/java/com/android/incallui/res/drawable/img_no_image_automirrored.xml
deleted file mode 100644
index 9a9ec97..0000000
--- a/java/com/android/incallui/res/drawable/img_no_image_automirrored.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:autoMirrored="true"
-  android:src="@drawable/img_no_image"/>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/drawable/on_going_call.xml b/java/com/android/incallui/res/drawable/on_going_call.xml
new file mode 100644
index 0000000..438ba82
--- /dev/null
+++ b/java/com/android/incallui/res/drawable/on_going_call.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+  android:oneshot="false">
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_01"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_02"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_03"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_04"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_05"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_06"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_07"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_08"
+    android:duration="200"/>
+  <item
+    android:drawable="@drawable/ic_ongoing_phone_24px_09"
+    android:duration="200"/>
+</animation-list>
diff --git a/java/com/android/incallui/res/drawable/spam_notification_icon.xml b/java/com/android/incallui/res/drawable/spam_notification_icon.xml
deleted file mode 100644
index a26e7d4..0000000
--- a/java/com/android/incallui/res/drawable/spam_notification_icon.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2016 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
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item>
-    <shape android:shape="oval">
-      <solid android:color="@color/incall_call_spam_background_color"/>
-      <size
-        android:height="@dimen/notification_large_icon_height"
-        android:width="@dimen/notification_large_icon_width"/>
-    </shape>
-  </item>
-
-  <item
-    android:drawable="@drawable/quantum_ic_report_white_36"
-    android:gravity="center"/>
-
-</layer-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/drawable/unknown_notification_icon.xml b/java/com/android/incallui/res/drawable/unknown_notification_icon.xml
deleted file mode 100644
index 5ab07ec..0000000
--- a/java/com/android/incallui/res/drawable/unknown_notification_icon.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2016 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
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item>
-    <shape android:shape="oval">
-      <solid android:color="@color/unknown_number_color"/>
-      <size
-        android:height="@dimen/notification_large_icon_height"
-        android:width="@dimen/notification_large_icon_width"/>
-    </shape>
-  </item>
-
-  <item
-    android:drawable="@drawable/ic_question_mark"
-    android:gravity="center"/>
-
-</layer-list>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml
index 3a6773d..4f4b2f0 100644
--- a/java/com/android/incallui/res/layout/caller_in_conference.xml
+++ b/java/com/android/incallui/res/layout/caller_in_conference.xml
@@ -113,7 +113,7 @@
     android:clickable="true"
     android:contentDescription="@string/conference_caller_disconnect_content_description"
     android:scaleType="center"
-    android:src="@drawable/ic_call_end_white_24dp"
+    android:src="@drawable/quantum_ic_call_end_white_24"
     android:tint="@color/conference_call_manager_icon_color"/>
 
 </LinearLayout>  <!-- End of single list element -->
diff --git a/java/com/android/incallui/res/values-af/strings.xml b/java/com/android/incallui/res/values-af/strings.xml
index 5dacaaa..04e989c 100644
--- a/java/com/android/incallui/res/values-af/strings.xml
+++ b/java/com/android/incallui/res/values-af/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Foon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferensie-oproep"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Oproep is ontkoppel"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Stuur die volgende tone?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Stuur luitone\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Stuur"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nee"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Vervang die plekhouerkarakter met"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferensie-oproep <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Stemboodskapnommer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Bel"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Gemiste oproep vanaf <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Oproep aan die gang"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Voortdurende werkoproep"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Voortdurende Wi-Fi-oproep"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Voortdurende Wi-Fi-werkoproep"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Deurlopend <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Inkomende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-oproep"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi-werkoproep"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrike inkomende oproep met foto, boodskap en ligging"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrike inkomende oproep met aanhegsels"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende werkoproep"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende Wi-Fi-oproep"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende Wi-Fi-werkoproep"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende verdagte strooipos-oproep"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkomende videoversoek"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Geen diens nie"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Gekose netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie beskikbaar nie"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Lui af"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Stem"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aanvaar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Wys af"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Voortgesette oproep op \'n ander toestel"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Voortgesette video-oproep on \'n ander toestel"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Neem oproep"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Neem video-oproep"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Om \'n oproep te maak, skakel eers vliegtuigmodus af."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nie geregistreer op netwerk nie."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sellulêre netwerk nie beskikbaar nie."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan nie bel nie."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begin MMI-volgorde…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Diens word nie gesteun nie."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan nie oproepe wissel nie."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan nie oproep skei nie."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan nie deurskakel nie."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Kan nie konferensieoproep maak nie."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan nie oproep verwerp nie."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan nie oproep(e) vrystel nie."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Noodoproep"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Skakel tans radio aan…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Geen sein nie. Probeer tans weer …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Kan nie bel nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan nie bel nie. Skakel \'n noodnommer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Gebruik sleutelbord om te bel"</string>
-    <string name="player_started" msgid="9177182657338033086">"Speler begin"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Speler gestop"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera is nie gereed nie"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera is gereed"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Onbekende oproepsessiegebeurtenis"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ander oproepinstellings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"gaan privaat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kies kontak"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Luitoon en vibreer"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Bestuur konferensie-oproep"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Noodnommer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Onlangse boodskappe"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Besigheidinligting"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> myl ver"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km ver"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Maak môre om <xliff:g id="OPEN_TIME">%s</xliff:g> oop"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Maak vandag om <xliff:g id="OPEN_TIME">%s</xliff:g> oop"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Maak om <xliff:g id="CLOSE_TIME">%s</xliff:g> toe"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Het vandag om <xliff:g id="CLOSE_TIME">%s</xliff:g> toegemaak"</string>
-    <string name="open_now" msgid="5897306702060039512">"Nou oop"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Nou gesluit"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Ken jy <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> strooipos?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeer en oproep is as strooipos aangegee."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Oproep vanaf <xliff:g id="NUMBER">%1$s</xliff:g> is as nie strooipos nie aangegee."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tik om by kontakte te voeg of strooiposnommer te blokkeer."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dit is die eerste keer wat hierdie nommer jou bel. As hierdie oproep strooipos was, kan jy hierdie nommer blokkeer en dit aangee."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tik om as NIE STROOIPOS NIE aan te gee, of dit te blokkeer."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Ons vermoed dit was \'n strooiposser. As hierdie oproep nie strooipos was nie, tik NIE STROOIPOS NIE om ons fout aan te gee."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokkeer en gee aan"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Voeg kontak by"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nie strooipos nie"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokkeer nommer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Voeg by kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokkeer en gee strooipos aan"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nie strooipos nie"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Geen SIM of SIM-fout"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beëindig oproep"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferensie-oproep"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Besig met oproep"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Gaan voort met oproep deur sellulêre data te gebruik …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video-oproep sal op sellulêre netwerk bly. Standaard datakoste kan dalk geld."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gaan voort met oproep deur mobiele data te gebruik ..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video-oproep sal op mobiele netwerk bly. Standaard datakoste kan dalk geld."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Moenie dit weer wys nie"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-am/strings.xml b/java/com/android/incallui/res/values-am/strings.xml
index 249447f..e2e209e 100644
--- a/java/com/android/incallui/res/values-am/strings.xml
+++ b/java/com/android/incallui/res/values-am/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ስልክ"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"የስብሰባ ጥሪ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ጥሪው ተቋርጧል።"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"የሚከተሉትንድምፆች ላክ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ድምፆች በመላክ ላይ \n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ላክ"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"አዎ"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"አይ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"የልቅ ምልክት ተካ በ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"የስብሰባ ጥሪ<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"የድምፅ መልዕክት ቁጥር"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"በመደወል ላይ"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"ያልተመለሰ ጥሪ ከ<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"እየተካሄደ ያለ ጥሪ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"በሂደት ላይ ያለ የሥራ ጥሪ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"በሂደት ላይ ያለ የWi-Fi ጥሪ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"በሂደት ላይ ያለ የWi-Fi የሥራ ጥሪ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"በመካሄድ ላይ ያለ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ገቢ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"የWi-Fi ጥሪ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"የWi‑Fi የሥራ ጥሪ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ያዝናቆይ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ገቢ ጥሪ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ገቢ ጥሪ ከፎቶ ጋር"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ገቢ የሥራ ጥሪ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ገቢ የWi-Fi ጥሪ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ገቢ የWi-Fi የሥራ ጥሪ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"መጪ የተጠረጠረ የአይፈለጌ መልዕክት ጥሪ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ገቢ የቪዲዮ ጥያቄ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ምንም አገልግሎት የለም"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"የተመረጠ አውታረመረብ(<xliff:g id="OPERATOR_NAME">%s</xliff:g>) የለም"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"መልስ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ዝጋ"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ቪድዮ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ድምፅ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ተቀበል"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"አትቀበል"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"በሌላ መሳሪያ ጥሪ በመካሄድ ላይ ነው"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"በሌላ መሣሪያ ላይ እየተካሄደ ያለ የቪዲዮ ጥሪ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ጥሪ ውሰድ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"የቪዲዮ ጥሪ ውሰድ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ለመደወል፣ መጀመሪያየአውሮፕላኑን ሁነታ አጥፋ።"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"አንድ ጥሪ ለማድረግ የሚሰራ ቁጥር ያስገቡ።"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"መደወል አልተቻለም።"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"የMMI sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"አገልግሎት አይደገፍም።"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ጥሪዎችን መቀያየር አልተቻለም።"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ጥሪን መለየት አልተቻለም።"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ማስተላለፍ አልተቻለም።"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"የጉባዔ ጥሪ ማድረግ አልተቻለም።"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ጥሪውን መዝጋት አልተቻለም።"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ጥሪ(ዎች)ን መልቀቅ አልተቻለም።"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"የአደጋ ጊዜ ጥሪ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ሬዲዮ ክፈት"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ምንም አገልግሎት የለም። ዳግም በመሞከር ላይ…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"መደወል አይቻልም። <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአስቸኳይ አደጋ ቁጥር አይደለም።"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"መደወል አልተቻለም። ወደ የአስቸኳይ አደጋ ቁጥር ይደውሉ።"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ለመደወል የሰሌዳ ቁልፍ ተጠቀም"</string>
-    <string name="player_started" msgid="9177182657338033086">"አጫዋች ጀምሯል"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"አጫዋች ቆሟል"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ካሜራ ዝግጁ አይደለም"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ካሜራ ዝግጁ ነው"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"ያልታወቀ የጥሪ ክፍለጊዜ ክስተት"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ሌላ ጥሪ ቅንብሮች"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ወደ ብሕታዊነት ሂድ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ዕውቂያ ምረጥ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"የጥሪ ቅላፄ እና ንዝረት"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"የስብሰባ ስልክ ጥሪ አደራጅ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"የአደጋ ጊዜ ቁጥር"</string>
     <string name="child_number" msgid="3398257437107259682">"በ<xliff:g id="CHILD_NUMBER">%s</xliff:g> በኩል"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"የቅርብ ጊዜ መልዕክቶች"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"የንግድ መረጃ"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> ማይል ርቀት ላይ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> ኪሜ ርቀት ላይ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>፣ <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>፣ <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"ነገ <xliff:g id="OPEN_TIME">%s</xliff:g> ላይ ይከፈታል"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ዛሬ <xliff:g id="OPEN_TIME">%s</xliff:g> ላይ ይከፈታል"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> ላይ ይዘጋል"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ዛሬ <xliff:g id="CLOSE_TIME">%s</xliff:g> ላይ ተዘግቷል"</string>
-    <string name="open_now" msgid="5897306702060039512">"አሁን ክፍት ነው"</string>
-    <string name="closed_now" msgid="3962291301467974921">"አሁን ዝግ ነው"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g>ን ያውቃሉ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> አይፈለጌ ነው?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ታግደዋል ጥሪውም እንደ አይፈለጌ መልዕክት ሪፖርት ተደርጓል።"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"ከ<xliff:g id="NUMBER">%1$s</xliff:g> የመጣው ጥሪ አይፈለጌ እንዳልሆነ ሪፖርት ተደርጓል።"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"እውቂያዎችን ለማከል ወይም አይፈለጌ ቁጥር ለማገድ መታ ያድርጉ።"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ይህ ቁጥር ሲደውልልዎ ይህ የመጀመሪያ ጊዜ ነው። ይህ ጥሪ አይፈለጌ ነበር፣ ይህን ቁጥር ማገድ እና ሪፖርት ማድረግ ይችላሉ።"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"አይፈለጌ እንዳልሆነ ሪፖርት ለማድረግ ወይም ለማገድ መታ ያድርጉ።"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ይህ አይፈለጌ ለቃቂ እንደሆነ ጠርጥረናል። ይህ ጥሪ አይፈለጌ ያልነበረ ከሆነ፣ «አይፈለጌ አይደለም» ላይ መታ ያድርጉ እና ስህተታችንን ይንገሩን።"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"አግድ እና ሪፖርት አድርግ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"እውቅያዎች አክል"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"አይፈለጌ መልእክት አይደለም"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ቁጥርን አግድ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"ወደ እውቂያዎች ያክሉ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"አግድ እና አይፈለጌ ሪፖርት አድርግ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"አይፈለጌ መልዕክት አይደለም"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ምንም SIM ፣ ወይም የSIM ስህተት የለም"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ጥሪ ጨርስ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"የስብሰባ ጥሪ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"በጥሪ ላይ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ሴሉላር ውሂብ በመጠቀም ጥሪውን በመቀጠል ላይ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም።"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"የቪዲዮ ጥሪ በሴሉላር አውታረመረቡ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"የተንቀሳቃሽ ስልክ ውሂብን በመጠቀም ጥሪውን በመቀጠል ላይ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"የቪዲዮ ጥሪ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ይህን በድጋሚ አታሳይ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ar/strings.xml b/java/com/android/incallui/res/values-ar/strings.xml
index 7c3585c..3134d5b 100644
--- a/java/com/android/incallui/res/values-ar/strings.xml
+++ b/java/com/android/incallui/res/values-ar/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"الهاتف"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"مكالمة جماعية"</string>
-    <string name="call_lost" msgid="2082971531689406145">"تم قطع المكالمة"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"هل تريد إرسال النغمات التالية؟\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"إرسال النغمات\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"إرسال"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"نعم"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"لا"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"استبدال حرف البدل بـ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"مكالمة جماعية <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"رقم البريد الصوتي"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"جارٍ الطلب"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"مكالمة فائتة من <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"مكالمة حالية"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"مكالمة عمل جارية"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏اتصال جارٍ عبر Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏مكالمة عمل جارية عبر اتصال Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> جارية"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> واردة"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏مكالمة عبر Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏مكالمة عمل عبر Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"معلقة"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"مكالمة واردة"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"مكالمة واردة مع صورة"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"مكالمة واردة مهمة مع صورة ورسالة وموقع"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"مكالمة واردة مهمة مع مرفقات"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"مكالمة عمل واردة"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏اتصال وارد عبر Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏مكالمة عمل واردة عبر اتصال Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"مكالمة واردة يشتبه في كونها غير مرغوب فيها"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"طلب فيديو وارد"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"لا خدمة"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"الشبكة المحددة (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) غير متاحة"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"رد"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"قطع الاتصال"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"فيديو"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"الصوت"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"قبول"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"رفض"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"مكالمة جارية على جهاز آخر"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"مكالمة فيديو جارية على جهاز آخر"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"الرد على مكالمة"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"الرد على مكالمة فيديو"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"لإجراء مكالمة، أوقف تشغيل وضع الطائرة أولاً."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"غير مسجل على الشبكة."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"شبكة الجوّال غير متاحة."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"يتعذر الاتصال."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏جارٍ بدء تسلسل MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"الخدمة ليست متوفرة."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"يتعذر تبديل المكالمات."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"يتعذر فصل المكالمة."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"يتعذر النقل."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"يتعذر إجراء مكالمة جماعية."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"يتعذر رفض المكالمة."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"يتعذر تحرير المكالمات."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"مكالمة الطوارئ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"جارٍ تشغيل اللاسلكي..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"لا تتوفر خدمة. جارٍ إعادة المحاولة…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"يتعذر الاتصال. لا يعد <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> رقم طوارئ."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"يتعذر الاتصال. يمكنك طلب رقم طوارئ."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"استخدام لوحة المفاتيح للطلب"</string>
-    <string name="player_started" msgid="9177182657338033086">"تم بدء المشغّل"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"تم إيقاف المشغّل"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"الكاميرا غير جاهزة"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"الكاميرا جاهزة"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"حدث جلسة اتصال غير معروف"</string>
-    <string name="other_settings" msgid="2537377721890761197">"اعدادات المكالمات الاخرى"</string>
     <string name="goPrivate" msgid="5269514638004595378">"انتقال إلى مكالمة خاصة"</string>
-    <string name="selectContact" msgid="1703433172800564849">"تحديد جهة اتصال"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"نغمة الرنين والاهتزاز"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"إدارة مكالمة جماعية"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"رقم الطوارئ"</string>
     <string name="child_number" msgid="3398257437107259682">"عبر <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"الرسائل الأخيرة"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"معلومات النشاط التجاري"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"على بُعد <xliff:g id="DISTANCE">%.1f</xliff:g> ميل"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"على بُعد <xliff:g id="DISTANCE">%.1f</xliff:g> كم"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>، <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>، <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"مفتوح غدًا في <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"مفتوح اليوم في <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"مغلق في <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"مغلق اليوم في <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"مفتوح الآن"</string>
-    <string name="closed_now" msgid="3962291301467974921">"مغلق الآن"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"هل تعرف <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"هل <xliff:g id="NUMBER">%1$s</xliff:g> غير مرغوب فيه؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g> والإبلاغ عن المكالمة باعتبرها غير مرغوب فيها."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"تم الإبلاغ عن أن مكالمة <xliff:g id="NUMBER">%1$s</xliff:g> ليست من النوع غير المرغوب فيه."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"انقر للإضافة إلى جهات الاتصال أو لحظر الرقم غير المرغوب فيه."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"هذه هي المرة الأولى التي تتلقى فيها اتصالاً من هذا الرقم. إذا كانت هذه المكالمة غير مرغوب فيها، يمكنك حظر هذا الرقم والإبلاغ عنه."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"انقر للإبلاغ عن المكالمة باعتبارها غير مرغوب فيها أو حظرها."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"لدينا شك في أن هذا المتصل من النوع غير المرغوب فيه. إذا لم تكن هذه المكالمة من النوع غير المرغوب فيه، اضغط \"ليس رقمًا غير مرغوب فيه \" للإبلاغ عن خطأنا."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"حظر وإبلاغ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"إضافة جهة اتصال"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ليس رقمًا غير مرغوب فيه"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"حظر الرقم"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"إضافة إلى جهات الاتصال"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"حظر الرقم والإبلاغ عنه كرقم غير مرغوب فيه"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ليس رقمًا غير مرغوب فيه"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"‏لا تتوفر شريحة SIM أو حدث خطأ في البطاقة"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"إنهاء الاتصال"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"مكالمة جماعية"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"قيد الاتصال"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"جارٍ استكمال المكالمة باستخدام بيانات الجوّال…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏تعذر التبديل إلى شبكة Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ستظل مكالمة الفيديو على شبكة الجوّال. قد يتم فرض رسوم على البيانات القياسية للشبكة."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"جارٍ استكمال المكالمة باستخدام بيانات الجوّال…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏تعذر التبديل إلى شبكة Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ستظل مكالمة الفيديو جارية على شبكة الجوال. قد يتم تطبيق رسوم قياسية على استخدام البيانات."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"عدم إظهار هذا مرة أخرى"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-az/strings.xml b/java/com/android/incallui/res/values-az/strings.xml
index dc43014..a3a0fec 100644
--- a/java/com/android/incallui/res/values-az/strings.xml
+++ b/java/com/android/incallui/res/values-az/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konfrans zəngi"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Zəng bitdi"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Aşağıdakı tonlar göndərilsin?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Tonlar göndərilir\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Göndər"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Bəli"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Xeyr"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Joker simvolları əvəz edin"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konfrans zəngi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Səsli poçt nömrəsi"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Nömrə yığılır"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> tərəfindən zəng buraxılıb"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Davam edən zəng"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Davam edən iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Davam edən Wi-Fi zəngi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Davam edən Wi-Fi iş çağrısı"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Davam edən <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gələn <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi zəngi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi iş zəngi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gözləmə mövqeyində"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gələn zəng"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Foto ilə gələn zəng"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Foto, mesaj və məkan ilə gələn vacib zəng"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Qoşma ilə gələn vacib zəng"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Daxil olan iş çağrısı"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gələn Wi-Fi zəngi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Daxil olan Wi-Fi iş çağrısı"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Şübhəli spam zəngi"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gələn video çağrı"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Xidmət yoxdur"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Seçilmiş (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) şəbəkə əlçatmazdır"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Cavab"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Dəstəyi qoyun"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videolar"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Səs"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Qəbul edin"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"İmtina edin"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Digər cihazda davam etməkdə olan zəng"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Digər cihazda davam etməkdə olan video zəng"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Zəngə cavab verin"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video Zəngə cavab verin"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Zəng etmək üçün ilk olaraq Uçuş Rejimini söndürün."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Şəbəkədə qeydə alınmayıb."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobil şəbəkə əlçatan deyil"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Zəngi yerləşdirmək üçün düzgün nömrə daxil edin."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Zəng etmək mümkün deyil."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI başlanma ardıcıllığı…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Xidmət dəstəklənmir."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Zəngləri keçirmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Zəngi ayırmaq mümkün deyil."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Ötürmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konfrans keçirmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Zəngi rədd etmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Zəngləri buraxmaq mümkün deyil."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Təcili zəng"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Radio yandırılır ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Xidmət yoxdur. Yenidən cəhd edilir…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Zəng etmək mümkün deyil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> fövqəladə nömrə deyil."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Zəng etmək mümkün deyil. Fövqəladə nömrəni yığ."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Yığmaq üçün klaviatura istifadə edin"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pleyer Başladıldı"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pleyer Dayandırıldı"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera hazır deyil"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera hazırdır"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Naməlum zəng sessiyası"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Digər zəng parametrləri"</string>
     <string name="goPrivate" msgid="5269514638004595378">"şəxsi rejimə keçin"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kontakt seçin"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Zəng səsi və Vibrasiya"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Konfrans çağrısını idarə edin"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Təcili nömrə"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> vasitəsilə"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Son mesajlar"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Biznes məlumatı"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzaqlıqda"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzaqlıqda"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Sabah saat <xliff:g id="OPEN_TIME">%s</xliff:g> açılır"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Bu gün saat <xliff:g id="OPEN_TIME">%s</xliff:g> açılır"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Saat <xliff:g id="CLOSE_TIME">%s</xliff:g> bağlanır"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Bu gün saat <xliff:g id="CLOSE_TIME">%s</xliff:g> bağlanıb"</string>
-    <string name="open_now" msgid="5897306702060039512">"İndi açın"</string>
-    <string name="closed_now" msgid="3962291301467974921">"İndi bağlandı"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> bilirsiniz?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> spamdır?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blok edilib və zəng spam olaraq qeyd edilib."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsindən gələn zəng spam olaraq qeyd edilib."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Kontaktlara əlavə edin və spam nömrə kimi blok edin."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"İlk dəfədir ki, bu nömrə Sizə zəng edir. Bu zəng spamdırsa, nömrəni blok edə və ya şikayət edə bilərsiniz."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"SPAM DEYİL seçiminə basın və ya blok edin."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Biz bunun spam olduğundan şübhələnirik. Əgər bu zəng spam deyildirsə, səhvimizi bildirmək üçün SPAM DEYİL seçiminə basın."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blok edin və ya xəbər verin"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Kontakt əlavə edin"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Spam deyil"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Nömrəni blok edin"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Kontaktlara əlavə edin"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Spamı blok edin və ya bildirin"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Spam deyil"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM və ya SIM xətası yoxdur"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zəngi sonlandırın"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konfrans zəngi"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Çağrıda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Mobil data istifadə edərək zəng davam edir…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi şəbəkəsinə qoşulmaq olmadı"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video zəng mobil şəbəkə üzərində qalacaq. Standart data rüsumları tətbiq oluna bilər."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Mobil data istifadə edərək zəngə davam edin…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi şəbəkəsinə qoşulmaq olmadı"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video zəng mobil şəbəkədə qalacaq. Standard data xərcləri tətbiq edilə bilər."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bi rdaha göstərməyin"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
index 3dddf65..5b57559 100644
--- a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferencijski poziv"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Poziv je prekinut"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Želite li da pošaljete sledeće tonove?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Tonovi slanja\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Pošalji"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zamenite džoker znak sa"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Broj govorne pošte"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Poziva se"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušten poziv od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktuelni poziv"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Tekući poziv za Work"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Tekući Wi-Fi poziv"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Tekući poziv za Work preko Wi-Fi-ja"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> je u toku"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi poslovni poziv"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv sa slikom"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan dolazni poziv sa slikom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv sa prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poziv za Work"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni poziv za Work preko Wi-Fi-ja"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Sumnja na nepoželjan dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtev za dolazni video poziv"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema usluge"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Izabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nije dostupna"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Glasovni"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prihvati"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbij"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Poziv je u toku na drugom uređaju"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Video poziv je u toku na drugom uređaju"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Preuzmi poziv"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzmi video poziv"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Da biste uputili poziv, prvo isključite režim rada u avionu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrovano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Da biste uputili poziv, unesite važeći broj."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Poziv nije uspeo."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Zamena poziva nije uspela."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Razdvajanje poziva nije uspelo."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Prebacivanje nije uspelo."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferencijski poziv nije uspeo."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Odbijanje poziva nije uspelo."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Uspostavljanje poziva nije uspelo."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hitan poziv"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Uključivanje radija…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nema mreže. Ponovni pokušaj…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Poziv nije uspeo. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne slučajeve."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Poziv nije uspeo. Pozovite broj za hitne slučajeve."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Koristite tastaturu za pozivanje"</string>
-    <string name="player_started" msgid="9177182657338033086">"Plejer je pokrenut"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Plejer je zaustavljen"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nije spremna"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera je spremna"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nepoznat događaj sesije poziva"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Druga podešavanja poziva"</string>
     <string name="goPrivate" msgid="5269514638004595378">"idi na privatno"</string>
-    <string name="selectContact" msgid="1703433172800564849">"izaberite kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konferencijskim pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj za hitne slučajeve"</string>
     <string name="child_number" msgid="3398257437107259682">"na <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedavne poruke"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacije o preduzeću"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Udaljenost je <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Udaljenost je <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Otvara se sutra u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Otvara se danas u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zatvara se u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zatvorilo se danas u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Trenutno otvoreno"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Trenutno zatvoreno"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznat vam je broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Da li je <xliff:g id="NUMBER">%1$s</xliff:g> nepoželjan?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Blokirali ste <xliff:g id="NUMBER">%1$s</xliff:g>, a poziv ste prijavili kao nepoželjan."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Prijavili ste da poziv sa <xliff:g id="NUMBER">%1$s</xliff:g> nije nepoželjan."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Dodirnite da biste dodali kontakte ili blokirali nepoželjan broj."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Prvi put ste primili poziv sa ovog broja. Ako je nepoželjan, možete da ga blokirate i prijavite."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Dodirnite da biste prijavili da poziv NIJE NEPOŽELJAN ili blokirajte broj."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sumnjamo da je ovaj poziv nepoželjan. Ako nije, dodirnite NIJE NEPOŽELJNO da biste prijavili grešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokiraj i prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nije nepoželjan"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokiraj i prijavi nepoželjan poziv"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nije nepoželjan"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM kartice ili postoji greška na njoj"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Završite poziv"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"U pozivu"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije uspelo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video poziv će ostati na mobilnoj mreži. Mogu da važe standardne naknade za prenos podataka."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi‑Fi mrežu nije uspelo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video poziv će ostati na mobilnoj mreži. Važe standardne naknade za prenos podataka."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ovo ponovo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-be/strings.xml b/java/com/android/incallui/res/values-be/strings.xml
index 46b5d39..0e55959 100644
--- a/java/com/android/incallui/res/values-be/strings.xml
+++ b/java/com/android/incallui/res/values-be/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Тэлефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Канферэнц-выклік"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Выклік абарваўся"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Адправіць наступныя тоны?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Адпраўка сігналаў\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Адправiць"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Так"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Замяніце выпадковы сімвал:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Канферэнц-выклік <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Нумар галасавой пошты"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Набор нумара"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Прапушчаны выклiк ад <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Бягучы выклік"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Бягучы выклік па працы"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Бягучы выклік праз Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Бягучы выклік па працы праз Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Бягучы выклік праз <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Уваходны выклік праз <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Выклік праз Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Выклік па працы праз Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"У чаканні"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Уваходны выклік"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Уваходны выклік з фота"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важны выклік з фота, паведамленнем і месцам"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важны ўваходны выклік з далучэннямі"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Уваходны выклік па працы"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Уваходны выклік праз Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Уваходны выклік па працы праз Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Уваходны выклiк ад абанента, якога падазраваюць у спаме"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запыт уваходнага відэавыкліку"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Не абслугоўваецца"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Выбраная сетка (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недаступная"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Адказаць"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Скончыць размову"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Відэа"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Галасавы"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Прыняць"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Адхіліць"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Бягучы выклік на іншай прыладзе"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Бягучы відэавыклік на іншай прыладзе"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Прыняць выклік"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прыняць відэавыклік"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Каб зрабіць выклік, спачатку выключыце рэжым \"У самалёце\"."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не зарэгістраваны ў сетцы."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мабільная сетка недаступная."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Каб зрабіць выклік, увядзіце сапраўдны нумар."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Выклік немагчымы."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Пачатак паслядоўнасці MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Служба не падтрымліваецца."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Немагчыма пераключыць выклікі."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Немагчыма аддзяліць выклік."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Немагчыма перадаць выклік."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Немагчыма зрабіць канферэнц-выклік."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Немагчыма адхіліць выклік."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Немагчыма скончыць выклік(і)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Экстраны выклік"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Уключэнне радыё..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Не абслугоўваецца. Паўтор спробы..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Выклік немагчымы. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не з\'яўляецца нумарам экстраннай службы."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Выклік немагчымы. Набраць нумар экстраннай службы."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Выкарыстоўвайце клавіятуру, каб набраць нумар"</string>
-    <string name="player_started" msgid="9177182657338033086">"Прайгравальнік запушчаны"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Прайгравальнік спынены"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера не гатовая"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера гатовая"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Невядомая падзея сеансу выкліку"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Іншыя налады выкліку"</string>
     <string name="goPrivate" msgid="5269514638004595378">"перайсці да прыватнай гаворкі"</string>
-    <string name="selectContact" msgid="1703433172800564849">"выбраць кантакт"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Рынгтон і вiбрацыя"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Кіраванне канферэнц-выклікам"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Нумар экстраннай службы"</string>
     <string name="child_number" msgid="3398257437107259682">"праз <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Апошнія паведамленні"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Бізнес-інфармацыя"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Адлеглаць у мілях: <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Адлеглаць <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Адкрываецца заўтра ў <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Адкрываецца сёння ў <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Закрываецца ў <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Закрыта сёння ў <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Адкрыць зараз"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Закрыта зараз"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Вы ведаеце нумар <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> спамерскі?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> заблакіраваны, а выклік быў заяўлены як спамерскі."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Выклік з нумара <xliff:g id="NUMBER">%1$s</xliff:g> заяўлены як няспамерскі."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Дакраніцеся, каб дадаць да кантактаў ці заблакіраваць спамерскі нумар."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"З гэтага нумара вас выклікалі ўпершыню. Калі гэта быў спамерскі выклік, вы можаце заблакіраваць гэты нумар і паведаміць аб гэтым."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Дакраніцеся, каб заявіць гэты нумар як НЯСПАМЕРСКІ, або заблакіраваць яго."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Мы падазраём, што гэта быў спамер. Калі гэты выклік быў няспамерскім, дакраніцеся да кнопкі \"НЕ СПАМ\", каб паведаміць аб нашай памылцы."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Заблак. і паведаміць"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Дадаць кантакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Заблакіраваць нумар"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Дадаць у кантакты"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Заблакіраваць і паведаміць пра спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Не спам"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Няма SIM-карты або памылка яе чытання"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завяршыць выклік"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Канферэнц-выклік"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"У выкліку"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Працягваецца выклік з выкарыстаннем сотавай перадачы даных…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Немагчыма пераключыцца на сетку Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Працягваецца выклік з выкарыстаннем мабільнай перадачы даных…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Немагчыма пераключыцца на сетку Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больш не паказваць"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bg/strings.xml b/java/com/android/incallui/res/values-bg/strings.xml
index 84bffa0..310eee2 100644
--- a/java/com/android/incallui/res/values-bg/strings.xml
+++ b/java/com/android/incallui/res/values-bg/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конферентно обаждане"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Обаждането бе прекъснато"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Да се изпратят ли следните мелодии? \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Мелодиите се изпращат\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Изпращане"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Замяна на заместващия символ със:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конферентно обаждане<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Номер за гласова поща"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Набира се"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуснато обаждане от <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущо обаждане"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущо служебно обаждане"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текущо обаждане през Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущо служебно обаждане през Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Текущо <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Входящо <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"обаждане през Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"служебно обаждане през Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вх. обаждане"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящо обаждане със снимка"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важно обаждане с местоположение, снимка, съобщение"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важно входящо обаждане с прикачени файлове"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящо служебно обаждане"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящо обаждане през Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящо служебно обаждане през Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящо обаждане – възможен спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входяща заявка за видеовръзка"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Няма покритие"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Избраната мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) не е налична"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Отговор"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Затваряне"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видеообаждане"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Гласово обаждане"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Приемам"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Отхвърляне"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Текущо обаждане на друго устройство"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Текущо видеообаждане на друго устройство"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Приемане на обаждането"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Приемане на видеообаждането"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Първо изключете самолетния режим, за да може да осъществите обаждане."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Няма регистрация в мрежата."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Няма достъп до клетъчната мрежа."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"За да извършите обаждане, въведете валиден номер."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Не може да се извърши обаждане."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Стартира се последователността MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услугата не се поддържа."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Обажданията не могат да се превключат."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Обаждането не може да се отдели."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Не може да се прехвърли."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Не може да се извърши конферентно обаждане."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Обаждането не може да се отхвърли."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Обаждането или съответно обажданията не могат да се освободят."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Спешно обаждане"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Радиото се включва…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Няма услуга. Извършва се нов опит…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Не може да се извърши обаждане. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е номер за спешни случаи."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Не може да се извърши обаждане. Наберете номер за спешни случаи."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Използвайте клавиатурата за набиране"</string>
-    <string name="player_started" msgid="9177182657338033086">"Плейърът е стартиран"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Плейърът е спрян"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камерата не е в готовност"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камерата е в готовност"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Неизвестно събитие в сесията на обаждане"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Други настройки за обаждане"</string>
     <string name="goPrivate" msgid="5269514638004595378">"към частно"</string>
-    <string name="selectContact" msgid="1703433172800564849">"избиране на контакта"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Мелодия и вибриране"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Управление на конф. обаждане"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Спешен номер"</string>
     <string name="child_number" msgid="3398257437107259682">"чрез <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Скорошни съобщения"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Бизнес информация"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"На <xliff:g id="DISTANCE">%.1f</xliff:g> мили"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"На <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>; <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Отваря утре в <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Отваря днес в <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Затваря в <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Затворено днес в <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"В момента работи"</string>
-    <string name="closed_now" msgid="3962291301467974921">"В момента не работи"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> известен ли ви е?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> спам ли е?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Блокирахте <xliff:g id="NUMBER">%1$s</xliff:g> и за обаждането бе подаден сигнал, че е спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"За обаждането от <xliff:g id="NUMBER">%1$s</xliff:g> бе подаден сигнал, че не е спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Докоснете, за да добавите към контактите или да блокирате номера със спам."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"За първи път ви се обаждат от този номер. Ако обаждането е било спам, можете да блокирате номера и да подадете сигнал за него."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Докоснете за подаване на сигнал „НЕ Е СПАМ“ или за блокиране."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Предполагахме, че това е разпространител на спам. Ако обаждането не е било спам, докоснете „НЕ Е СПАМ“, за да сигнализирате за грешката ни."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Блокиране и сигнал"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Добавяне на контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Не е спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Блокиране на номера"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Добавяне към контактите"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Блокиране и подаване на сигнал за спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Не е спам"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Няма SIM карта или грешка в SIM картата"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Край на обаждането"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конферентно обаждане"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"В разговор"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Обаждането продължава през мобилната връзка за данни…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Превключването към Wi-Fi мрежа не бе възможно"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Обаждането продължава през мобилната връзка за данни…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Превключването към Wi-Fi мрежа не бе възможно"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Това да не се показва отново"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bn/strings.xml b/java/com/android/incallui/res/values-bn/strings.xml
index fc93830..bbbb875 100644
--- a/java/com/android/incallui/res/values-bn/strings.xml
+++ b/java/com/android/incallui/res/values-bn/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ফোন"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"কনফারেন্স কল"</string>
-    <string name="call_lost" msgid="2082971531689406145">"কল সমাপ্ত হয়েছে"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"নিম্নলিখিত টোনগুলি পাঠাবেন?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"টোনগুলি পাঠানো হচ্ছে\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"পাঠান"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"হ্যাঁ"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"না"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ওয়াইল্ড অক্ষরগুলিকে এর মাধ্যমে প্রতিস্থাপিত করুন"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"কনফারেন্স কল <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ভয়েসমেল নম্বর"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ডায়াল করা হচ্ছে"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> এর থেকে মিসড কল"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"চালু থাকা কল"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"চলমান কাজের কল"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"চলমান ওয়াই-ফাই কল"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"চলমান ওয়াই-ফাই কাজের কল"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> চালু আছে"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ইনকামিং <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ওয়াই-ফাই কল"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"অফিসের ওয়াই-ফাই কল"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ইনকামিং কল"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ফটো সহ ইনকামিং কল"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ফটো, বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"সংযুক্তিগুলি সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"আগত কাজের কল"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"আগত ওয়াই-ফাই কল"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"আগত ওয়াই-ফাই কাজের কল"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"আগত সন্দেহভাজন স্প্যাম কল"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"আগত ভিডিও অনুরোধ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"কোনো পরিষেবা নেই"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"নির্বাচিত নেটওয়ার্ক (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) অনুপলব্ধ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"উত্তর"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"কল নামিয়ে রাখুন"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ভিডিও"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ভয়েস"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"স্বীকার করুন"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"প্রত্যাখ্যান"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"অন্য ডিভাইসে চালু থাকা কল"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"অন্য ডিভাইসে চালু থাকা ভিডিও কল"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"কলটি নিন"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ভিডিও কলটি নিন"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"একটি কল করতে, প্রথমে বিমান মোড বন্ধ করুন৷"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"নেটওয়ার্কে নিবন্ধিত নয়৷"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"সেলুলার নেটওয়ার্ক উপলব্ধ নয়।"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"কোনো কল স্থাপন করতে, একটি বৈধ নম্বর লিখুন৷"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"কল করা যাবে না৷"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ক্রম চালু হচ্ছে…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"পরিষেবা সমর্থিত নয়৷"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"কলগুলি স্যুইচ করা যাবে না৷"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"কল আলাদা করা যাবে না৷"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"হস্তান্তর করা যাবে না৷"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"কনফারেন্স করা যাবে না৷"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"কল প্রত্যাখ্যান কলা যাবে না৷"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"কল(গুলি) কাটা যাবে না৷"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"জরুরি কল"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"রেডিও চালু করা হচ্ছে…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"কোন পরিষেবা নেই৷ আবার চেষ্টা করা হচ্ছে..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"কল করা যাবে না৷ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> কোনো জরুরী নম্বর নয়৷"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"কল করা যাবে না৷ কোনো জরুরী নম্বর ডায়াল করুন৷"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ডায়াল করতে কীবোর্ড ব্যবহার করুন"</string>
-    <string name="player_started" msgid="9177182657338033086">"প্লেয়ার শুরু হয়েছে"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"প্লেয়ার বন্ধ হয়ে গেছে"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ক্যামেরা প্রস্তুত নেই"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ক্যামেরা প্রস্তুত"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"অজ্ঞাত কল অধিবেশনের ইভেন্ট"</string>
-    <string name="other_settings" msgid="2537377721890761197">"অন্যান্য কল সেটিংস"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ব্যক্তিগতভাবে কাজ করুন"</string>
-    <string name="selectContact" msgid="1703433172800564849">"পরিচিতি নির্বাচন করুন"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"রিংটোন ও কম্পন"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"কনফারেন্স কল পরিচালনা করুন"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"জরুরি নম্বর"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> এর মাধ্যমে"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"সাম্প্রতিক বার্তাগুলি"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ব্যবসার তথ্য"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> মাইল দূরে"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> কিলোমিটার দূরে"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"আগামীকাল <xliff:g id="OPEN_TIME">%s</xliff:g>\'টায় খুলবে"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"আজ <xliff:g id="OPEN_TIME">%s</xliff:g>\'টায় খুলবে"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>\'টায় বন্ধ হয়"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"আজ <xliff:g id="CLOSE_TIME">%s</xliff:g>\'টায় বন্ধ হয়েছে"</string>
-    <string name="open_now" msgid="5897306702060039512">"এখন খোলা রয়েছে"</string>
-    <string name="closed_now" msgid="3962291301467974921">"এখন বন্ধ রয়েছে"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি জানেন?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি কি স্প্যাম?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরুদ্ধ করা হয়েছে এবং কলটিকে স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে৷"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> থেকে আসা কলটিকে স্প্যাম হিসাবে প্রতিবেদন করা হয়েছে৷"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"পরিচিতিগুলিতে যোগ করার জন্য আলতো চাপুন অথবা স্প্যাম নম্বর অবরুদ্ধ করুন৷"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"এই প্রথমবার এই নম্বর থেকে আপনাকে কল করা হয়েছে৷ যদি এই কলটি স্প্যাম হয় তবে আপনি এই নম্বরটিকে অবরুদ্ধ করুন এবং এটিকে প্রতিবেদন করুন৷"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"স্প্যাম নয় হিসাবে প্রতিবেদন করতে আলতো চাপুন অথবা এটিকে অবরুদ্ধ করুন৷"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"এটি কোনো স্প্যামার হতে পারে বলে আমাদের মনে হচ্ছে৷ যদি এটি স্প্যাম না হয়, তবে আমাদের ভুল প্রতিবেদন করতে \'স্প্যাম নয়\' এ আলতো চাপুন৷"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"অবরুদ্ধ ও অভিযোগ করুন"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"পরিচিতি যোগ করুন"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"স্প্যাম নয়"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"নম্বর অবরুদ্ধ করুন"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"পরিচিতিগুলিতে যোগ করুন"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"অবরুদ্ধ ও স্প্যাম হিসাবে অভিযোগ করুন"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"স্প্যাম নয়"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"কোনো সিম নেই বা সিম ত্রুটি"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"কল কেটে দিন"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"কনফারেন্স কল"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"কলে থাকাকালীন"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"সেলুলার ডেটা ব্যবহার করে কল করা চালিয়ে যান…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi নেটওয়ার্কে পাল্টানো গেল না"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ভিডিও কল সেলুলার নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড চার্জ প্রযোজ্য হতে পারে৷"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"মোবাইল ডেটা ব্যবহার করে কল করা চালিয়ে যান…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ওয়াই-ফাই নেটওয়ার্কে পাল্টানো গেল না"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ভিডিও কল মোবাইল নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড ডেটা চার্জ প্রযোজ্য হতে পারে৷"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"এটি আমাকে আর দেখাবেন না"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bs/strings.xml b/java/com/android/incallui/res/values-bs/strings.xml
index c695080..1001869 100644
--- a/java/com/android/incallui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/res/values-bs/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferencijski poziv"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Poziv je prekinut"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Poslati sljedeće tonove?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Slanje tonova\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Pošalji"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zamijeni zamjenski znak sa"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Broj govorne pošte"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Poziva se"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušteni poziv od kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u toku"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u toku"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi poziv u toku"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi poslovni poziv u toku"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv u toku"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazni <xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi poslovni poziv"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni Wi-Fi poslovni poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtjev za dolazni videopoziv"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema mreže"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je nedostupna"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videopoziv"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Glasovni"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prihvati"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbij"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Poziv u toku na drugom uređaju"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videopoziv je u toku na drugom uređaju"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Primi poziv"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Primi videopoziv"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Da uputite poziv, isključite Način rada u avionu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Da uputite poziv, upišite važeći broj."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nije moguće pozvati."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence u toku…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nije moguće prebacivanje poziva."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nije moguće odvojiti poziv."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Prijenos nije moguć."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferencijski poziv nije uspio."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nije moguće odbiti poziv."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nije moguće uputiti poziv(e)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hitni poziv"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Uključivanje radija u toku…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nema mreže. Novi pokušaj u toku…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nije moguće pozvati. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za htine slučajeve."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nije moguće pozvati. Birajte broj za hitne slučajeve."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Koristi tastaturu za biranje"</string>
-    <string name="player_started" msgid="9177182657338033086">"Plejer je pokrenut"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Plejer je zaustavljen"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nije spremna"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera je spremna"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nepoznati događaj sesije poziva"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ostale postavke poziva"</string>
     <string name="goPrivate" msgid="5269514638004595378">"idi na privatno"</string>
-    <string name="selectContact" msgid="1703433172800564849">"odaberi kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konf. pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj za hitne slučajeve"</string>
     <string name="child_number" msgid="3398257437107259682">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedavne poruke"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacije o preduzeću"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Udaljenost u miljama: <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Udaljenost u km: <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Otvara se sutra u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Otvara se danas u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zatvara se u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zatvoreno danas u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Otvoreno sad"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Zatvoreno sada"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznajete <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni poziv?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran i poziv je prijavljen kao neželjen."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> je prijavljen kao neželjen."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Dodirnite da biste dodali u kontakte ili blokirani neželjeni broj."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Ovo je prvi poziv koji ste primili s ovog broja. Ako je poziv neželjen, možete blokirati ovaj broj i prijaviti ga."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJEN ili ga blokirajte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sumnjamo da se radi o neželjenom pozivu. Ako nije neželjeni poziv, dodirnite NIJE NEŽELJEN da biste prijavili našu grešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokiraj i prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ovo nije neželjeni sadržaj"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokiraj i prijavi neželjeni poziv"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ovo nije neželjeni sadržaj"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM kartice ili postoji greška sa SIM karticom"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekini poziv"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u toku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nastavak poziva prijenosom mobilnih podataka…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml
index 5148db5..a2d99b1 100644
--- a/java/com/android/incallui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/res/values-ca/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telèfon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Trucada de conferència"</string>
-    <string name="call_lost" msgid="2082971531689406145">"La trucada s\'ha interromput."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Voleu enviar els codis següents?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"S\'estan enviant els tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Envia"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substitueix el caràcter comodí per"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Trucada de conferència <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número de la bústia de veu"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"S\'està marcant"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Trucada en procés"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trucada de feina en curs"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Trucada Wi-Fi en curs"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trucada de feina per Wi-Fi en curs"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"En curs: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Entrant: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Trucada per Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Trucada de feina per Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Trucada entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Trucada entrant amb foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Trucada entrant important amb foto, missatge i ubicació"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Trucada entrant important amb fitxers adjunts"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Trucada de feina entrant"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Trucada Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Trucada de feina per Wi-Fi entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Presumpta trucada brossa entrant"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sol·licitud de vídeo entrant"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sense servei"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"La xarxa seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no està disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Respon"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Penja"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Veu"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepta"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rebutja"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Trucada en curs en un altre dispositiu"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videotrucada en curs en un altre dispositiu"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Accepta la trucada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Accepta la videotrucada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Per fer una trucada, primer apagueu el mode d\'avió."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"No registrat a la xarxa."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"La xarxa mòbil no està disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Per realitzar una trucada, introdueix un número vàlid."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"No es pot trucar."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"S\'està iniciant la seqüència MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"El servei no és compatible."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"No es pot canviar de trucada."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"No es pot separar la trucada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"No es poden realitzar transferències."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"No es pot establir la conferència."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"No es pot rebutjar la trucada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"No es poden alliberar trucades."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Trucada d\'emergència"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"S\'està activant el senyal mòbil..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No hi ha servei. S\'està tornant a provar..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"No es pot trucar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"No es pot trucar. Marca un número d\'emergència."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilitzeu el teclat per marcar"</string>
-    <string name="player_started" msgid="9177182657338033086">"S\'ha iniciat el reproductor"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"S\'ha aturat el reproductor"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"La càmera no està preparada"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"La càmera està preparada"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Esdeveniment de sessió de trucada desconeguda"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Altres opcions de trucades"</string>
     <string name="goPrivate" msgid="5269514638004595378">"passa a privat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"selecciona el contacte"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"So i vibració"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestiona la conferència"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número d\'emergència"</string>
     <string name="child_number" msgid="3398257437107259682">"mitjançant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Missatges recents"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informació de l\'empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> mi de distància"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km de distància"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Obre demà a les <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Obre avui a les <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Tanca a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Avui ha tancat a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Obert ara"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Ara tancat"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Coneixes el <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"El <xliff:g id="NUMBER">%1$s</xliff:g> és un número brossa?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"El <xliff:g id="NUMBER">%1$s</xliff:g> s\'ha bloquejat i la trucada es marcarà com a brossa."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"S\'ha indicat que la trucada del <xliff:g id="NUMBER">%1$s</xliff:g> no és brossa."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toca per afegir el número als contactes o bé per marcar-lo com a brossa i bloquejar-lo."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"És la primera vegada que aquest número t\'ha trucat. Si era una trucada brossa, pots bloquejar aquest número i informar-ne."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toca per informar que NO ÉS BROSSA o per bloquejar-lo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Segons les nostres sospites, l\'autor de la trucada és un emissor de contingut brossa. Si ens equivoquem, toca NO ÉS BROSSA per informar-nos-en."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloqueja i marca"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Afegeix un contacte"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No és contingut brossa"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloqueja el número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Afegeix als contactes"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloqueja i marca com a brossa"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"No és una trucada brossa"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Cap SIM o error de la SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalitza la trucada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferència"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En una trucada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'apliquin càrrecs de dades estàndard."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videotrucada continuarà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No ho tornis a mostrar"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-cs/strings.xml b/java/com/android/incallui/res/values-cs/strings.xml
index 9d69cfa..8026e79 100644
--- a/java/com/android/incallui/res/values-cs/strings.xml
+++ b/java/com/android/incallui/res/values-cs/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferenční hovor"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Volání zrušeno"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Odeslat následující tóny?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Odesílání tónů\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Odeslat"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ano"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Nahradit zástupné znaky jinými znaky"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferenční hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Číslo hlasové schránky"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Vytáčení"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Zmeškaný hovor od volajícího <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Probíhající hovor"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Probíhající pracovní hovor"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Probíhající volání přes Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Probíhající pracovní hovor (Wi-Fi)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Probíhající <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Příchozí <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"hovor přes Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"pracovní hovor přes Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Příchozí hovor"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Příchozí hovor s fotkou"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Důležitý přích. hovor s fotkou, zprávou a polohou"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Důležitý příchozí hovor s přílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Příchozí pracovní hovor"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Příchozí volání přes Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Příchozí pracovní hovor (Wi-Fi)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"U příchozího hovoru máme podezření, že se jedná o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Příchozí žádost o videohovor"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Žádný signál"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Vybraná síť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) není k dispozici"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Přijmout"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Zavěsit"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Hlasový hovor"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Přijmout"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odmítnout"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Probíhá hovor na jiném zařízení"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Probíhá videohovor na jiném zařízení"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Převést hovor sem"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Převést videohovor sem"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Chcete-li telefonovat, vypněte nejprve režim Letadlo."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Přihlášení k síti nebylo úspěšné."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilní síť je nedostupná."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Chcete-li uskutečnit hovor, zadejte platné telefonní číslo."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Hovor nelze uskutečnit."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Spouštění sekvence MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Služba není podporována."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Hovory nelze přepnout."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Hovor nelze rozdělit."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Hovor nelze předat."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferenční hovor nelze uskutečnit."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Hovor nelze odmítnout."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Hovor nelze ukončit."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Tísňové volání"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Zapínání rádia..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Služba je nedostupná. Probíhá další pokus…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Hovor nelze uskutečnit. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo tísňového volání."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Hovor nelze uskutečnit. Vytočte číslo tísňového volání."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Číslo vytočíte pomocí klávesnice."</string>
-    <string name="player_started" msgid="9177182657338033086">"Přehrávač spuštěn"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Přehrávač zastaven"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Fotoaparát není připraven"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Fotoaparát je připraven"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Neznámá událost relace volání"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Další nastavení hovorů"</string>
     <string name="goPrivate" msgid="5269514638004595378">"přepnout na soukromé"</string>
-    <string name="selectContact" msgid="1703433172800564849">"vybrat kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Vyzváněcí tón a vibrace"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Spravovat konferenční hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Číslo tísňové linky"</string>
     <string name="child_number" msgid="3398257437107259682">"pomocí čísla <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nejnovější zprávy"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informace o firmě"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Vzdálenost: <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Vzdálenost: <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Zítra otevírá v <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Dnes otevírá v <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zavírá v <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Dnes zavřeno od <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Nyní otevřeno"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Nyní zavřeno"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Znáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bylo zablokováno a hovor byl nahlášen jako spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Bylo nahlášeno, že hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> nebyl spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Klepnutím číslo přidáte do kontaktů nebo zablokujete jako spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Toto číslo vám volalo poprvé. Pokud se jednalo o spam, můžete číslo zablokovat a nahlásit."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Klepnutím nahlásíte, že toto číslo NENÍ SPAM, nebo jej zablokujete."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Máme podezření, že tento hovor byl spam. Pokud se nejednalo o spam, klepněte na NENÍ SPAM a nahlaste nám tak omyl."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokovat a nahlásit"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Přidat kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Není spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Zablokovat číslo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Přidat do kontaktů"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Zablokovat a nahlásit spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nešlo o spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta chybí nebo nefunguje."</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončit hovor"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenční hovor"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Probíhá hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Hovor pokračuje přes mobilní data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Přepnutí na síť Wi-Fi se nezdařilo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hovor pokračuje přes mobilní data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Přepnutí na síť Wi-Fi se nezdařilo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tuto zprávu příště nezobrazovat"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-da/strings.xml b/java/com/android/incallui/res/values-da/strings.xml
index 19de783..7517333 100644
--- a/java/com/android/incallui/res/values-da/strings.xml
+++ b/java/com/android/incallui/res/values-da/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Opkald"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonmøde"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Opkaldet blev droppet."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send følgende toner?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sender toner\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nej"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Erstat jokertegnet med"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Telefonsvarernummer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Ringer op"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Ubesvaret opkald fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Igangværende opkald"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Igangværende opkald i forbindelse med arbejde"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Igangværende opkald via Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Igangværende Wi-Fi-opkald i forbindelse med arbejde"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Igangværende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Indgående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-opkald"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-opkald i forbindelse med arbejde"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ventende"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Indgående opkald"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Indgående opkald med billede"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Vigtigt opkald med billede, besked og placering"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Vigtigt indgående opkald med vedhæftede filer"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Indgående opkald i forbindelse med arbejde"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Indgående opkald via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Indgående Wi-Fi-opkald i forbindelse med arbejde"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Indgående formodet spamopkald"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Indgående videoanmodning"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen dækning"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Læg på"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Tale"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Besvar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Afvis"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Igangværende opkald på en anden enhed"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Igangværende opkald på en anden enhed"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Besvar opkald"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Besvar videoopkald"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Slå Flytilstand fra først for at foretage et opkald."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registreret på netværk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnetværket er ikke tilgængeligt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Indtast et gyldigt nummer for at foretage et opkald."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe op."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starter MMI-sekvens ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten er ikke understøttet."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan ikke skifte opkald."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan ikke adskille opkald."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan ikke overføre."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Kan ikke oprette telefonmøde."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan ikke afvise opkaldet."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan ikke frigive et eller flere opkald."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Nødopkald"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Tænder for radio ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ingen tjeneste. Prøver igen..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Der kan ikke ringes op. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et alarmnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan ikke ringe op. Ring til et alarmnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Brug tastatur til at ringe op"</string>
-    <string name="player_started" msgid="9177182657338033086">"Afspilleren er startet"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Afspilleren er stoppet"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kameraet er ikke klar"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kameraet er klar"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Ukendt opkaldsbegivenhed"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Andre indstillinger for opkald"</string>
     <string name="goPrivate" msgid="5269514638004595378">"gør privat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"vælg kontaktperson"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringetone og vibration"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer telefonmøde"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Seneste beskeder"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Virksomhedsoplysninger"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil væk"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km væk"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>-<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Åbner i morgen kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Åbner i dag kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Lukker kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Lukkede i dag kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Åbent nu"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Lukket for i dag"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kender du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Er <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blev blokeret, og opkaldet blev rapporteret som spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Opkaldet fra <xliff:g id="NUMBER">%1$s</xliff:g> blev ikke registreret som spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tryk for at føje til kontaktpersoner eller for at blokere nummeret som spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dette er første gang, at dette nummer har ringet til dig. Hvis det var et spamopkald, kan du blokere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tryk for at rapportere som IKKE SPAM, eller bloker det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Hvis har mistanke om, at dette er en spammer. Hvis opkaldet ikke er spam, skal du trykke på IKKE SPAM for at rapportere vores mistanke."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloker og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Tilføj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ikke spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloker nummer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Føj til kontaktpersoner"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloker, og rapportér spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ikke spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Afslut opkald"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøde"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Opkald i gang"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsætter opkaldet med mobildata…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Der kan ikke skiftes til Wi-Fi-netværk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Opkaldet fortsættes med mobildata…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Du kunne ikke skifte til Wi-Fi-netværk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vis ikke dette igen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-de/strings.xml b/java/com/android/incallui/res/values-de/strings.xml
index a5f9602..85d7592 100644
--- a/java/com/android/incallui/res/values-de/strings.xml
+++ b/java/com/android/incallui/res/values-de/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"Anruf-UI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonkonferenz"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Verbindung unterbrochen"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Folgende Töne senden?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Töne werden gesendet.\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Senden"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nein"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Platzhalter ersetzen durch"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonkonferenz <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Mailboxnummer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Rufaufbau"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Verpasster Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktueller Anruf"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktueller geschäftlicher Anruf"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Aktiver WLAN-Anruf"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktueller geschäftlicher WLAN-Anruf"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Aktiver <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Eingehender <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WLAN-Anruf"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"geschäftlicher WLAN-Anruf"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Eingehender Anruf"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Eingehender Anruf mit Foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Wichtiger eingehender Anruf mit Foto, Nachricht und Standort"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Wichtiger eingehender Anruf mit Anhängen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Eingehender geschäftlicher Anruf"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Eingehender WLAN-Anruf"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Eingehender geschäftlicher WLAN-Anruf"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Verdacht auf eingehenden Spam-Anruf"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Eingehende Videoanfrage"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"kein Dienst"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Ausgewähltes Netzwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nicht verfügbar"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Annehmen"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Beenden"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoanruf"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Nur Audio"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Akzeptieren"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Ablehnen"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Aktiver Anruf auf anderem Gerät"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Aktiver Videoanruf auf anderem Gerät"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Anruf übernehmen"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videoanruf übernehmen"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Deaktiviere zunächst den Flugmodus, um einen Anruf zu tätigen."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nicht in Netzwerk registriert."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilfunknetz nicht verfügbar"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Gib eine gültige Nummer ein."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Anruf nicht möglich."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-Sequenz wird gestartet..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Dienst wird nicht unterstützt."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Anruf kann nicht gewechselt werden."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Anruf kann nicht getrennt werden."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Anruf kann nicht übergeben werden."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferenzschaltung nicht möglich."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Anruf kann nicht abgelehnt werden."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Anrufe können nicht freigegeben werden."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Notruf"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Mobilfunkverbindung wird aktiviert..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Kein Service. Erneuter Versuch..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Anruf nicht möglich. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Anruf nicht möglich. Wähle eine Notrufnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Zum Wählen Tastatur verwenden"</string>
-    <string name="player_started" msgid="9177182657338033086">"Videoübertragung gestartet"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Videoübertragung gestoppt"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nicht bereit"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera bereit"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Unbekanntes Ereignis während eines Anrufs"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Sonstige Anrufeinstellungen"</string>
     <string name="goPrivate" msgid="5269514638004595378">"privat sprechen"</string>
-    <string name="selectContact" msgid="1703433172800564849">"Kontakt wählen"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Klingelton und Vibrieren"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Telefonkonferenz verwalten"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Notrufnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"über <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Zuletzt eingegangene Nachrichten"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Geschäftsinformationen"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> Meilen entfernt"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> Kilometer entfernt"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> bis <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Öffnet morgen um <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Öffnet heute um <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Schließt um <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Hat heute um <xliff:g id="CLOSE_TIME">%s</xliff:g> geschlossen"</string>
-    <string name="open_now" msgid="5897306702060039512">"Jetzt geöffnet"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Jetzt geschlossen"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kennst du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Ist <xliff:g id="NUMBER">%1$s</xliff:g> Spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> wurde blockiert und der Anruf wurde als Spam gemeldet."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Anruf von <xliff:g id="NUMBER">%1$s</xliff:g> wurde als \"Kein Spam\" gemeldet."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tippe, um die Nummer zu Kontakten hinzuzufügen oder eine Spam-Nummer zu blockieren."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Du wurdest das erste Mal von dieser Nummer angerufen. Wenn dieser Anruf Spam war, kannst Du die Nummer blockieren und melden."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tippe, um die Nummer als KEIN SPAM zu melden oder sie zu blockieren."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Dies ist vermutlich Spam. Wenn der Anruf kein Spam war, tippe auf KEIN SPAM, um den Fehler zu melden."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blockieren &amp; melden"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Kontakt hinzufügen"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Kein Spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Nummer blockieren"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Zu Kontakten hinzufügen"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blockieren und Spam melden"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Kein Spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Keine SIM-Karte oder SIM-Kartenfehler"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Anruf beenden"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonkonferenz"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Anruf"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Anruf wird über Mobildaten fortgesetzt…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wechseln zu WLAN nicht möglich"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Anruf wird über mobile Daten fortgesetzt…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wechseln zu WLAN nicht möglich"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Meldung nicht mehr anzeigen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-el/strings.xml b/java/com/android/incallui/res/values-el/strings.xml
index 8ff6d2f..dadec69 100644
--- a/java/com/android/incallui/res/values-el/strings.xml
+++ b/java/com/android/incallui/res/values-el/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Τηλέφωνο"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Κλήση συνδιάσκεψης"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Η κλήση απορρίφθηκε"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Αποστολή των παρακάτω τόνων;\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Τόνοι αποστολής\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Αποστολή"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ναι"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Όχι"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Αντικατάσταση του χαρακτήρα μπαλαντέρ με"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Κλήση συνδιάσκεψης <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Αριθμός αυτόματου τηλεφωνητή"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Κλήση"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Αναπάντητη κλήση από <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Κλήση σε εξέλιξη"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Κλήση εργασίας σε εξέλιξη"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Κλήση Wi-Fi σε εξέλιξη"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Κλήση εργασίας μέσω Wi-Fi σε εξέλιξη"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Σε εξέλιξη <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Εισερχόμενη <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"κλήση μέσω Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"κλήση εργασίας μέσω Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Σε αναμονή"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Εισερχόμενη κλήση"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Εισερχόμενη κλήση με φωτογραφία"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Σημαντική εισερχ. κλήση με φωτο, μήνυμα, τοποθεσία"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Σημαντική εισερχόμενη κλήση με συνημμένα"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Εισερχόμενη κλήση εργασίας"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Εισερχόμενη κλήση μέσω Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Εισερχόμενη κλήση εργασίας μέσω Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Πιθανώς ανεπιθύμητη εισερχόμενη κλήση"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Αίτημα εισερχόμενου βίντεο"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Δίκτυο μη διαθέσιμο"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Επιλεγμένο δίκτυο (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) μη διαθέσιμο"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Απάντηση"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Τερματισμός κλήσης"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Βίντεο"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Φωνητική κλήση"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Αποδοχή"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Απόρριψη"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Κλήση σε εξέλιξη σε άλλη συσκευή"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Τρέχουσα βιντεοκλήση σε άλλη συσκευή"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Λήψη κλήσης"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Λήψη βιντεοκλήσης"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Για να πραγματοποιήσετε μια κλήση, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Δεν έχετε εγγραφεί στο δίκτυο."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Για να πραγματοποιήσετε μια κλήση, εισαγάγετε έναν έγκυρο αριθμό."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Δεν είναι δυνατή η κλήση."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Έναρξη ακολουθίας MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Η υπηρεσία δεν υποστηρίζεται."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Δεν είναι δυνατή η εναλλαγή κλήσεων."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Δεν είναι δυνατός ο διαχωρισμός της κλήσης."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Δεν είναι δυνατή η μεταφορά."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Δεν είναι δυνατή η συνδιάσκεψη."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Δεν είναι δυνατή η απόρριψη της κλήσης."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Δεν είναι δυνατή η πραγματοποίηση κλήσεων."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Κλήσεις επείγουσας ανάγκης"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ενεργοποίηση πομπού..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Δεν υπάρχει υπηρεσία. Νέα προσπάθεια…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Δεν είναι δυνατή η κλήση. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Δεν είναι δυνατή η κλήση. Πληκτρολογήστε έναν αριθμό έκτακτης ανάγκης."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
-    <string name="player_started" msgid="9177182657338033086">"Το πρόγραμμα αναπαραγωγής βίντεο ξεκίνησε"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Το πρόγραμμα αναπαραγωγής βίντεο διακόπηκε"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Η κάμερα δεν είναι έτοιμη"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Η κάμερα είναι έτοιμη"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Άγνωστο συμβάν περιόδου σύνδεσης κλήσης"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Άλλες ρυθμίσεις κλήσης"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ιδιωτική χρήση"</string>
-    <string name="selectContact" msgid="1703433172800564849">"επιλογή επαφής"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ήχος κλήσης και δόνηση"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Διαχείριση κλήσης συνδιάσκεψης"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Αριθμός έκτακτης ανάγκης"</string>
     <string name="child_number" msgid="3398257437107259682">"μέσω <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Πρόσφατα μηνύματα"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Πληροφορίες επιχείρησης"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> μίλια μακριά"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> χιλιόμετρα μακριά"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ανοίγει αύριο στις <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Ανοίγει σήμερα στις <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Κλείνει στις <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Έκλεισε σήμερα στις <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ανοιχτό τώρα"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Κλειστό τώρα"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Γνωρίζετε τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Είναι ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> ανεπιθύμητος;"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε και η κλήση αναφέρθηκε ως ανεπιθύμητη."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Η κλήση από τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g> αναφέρθηκε ως μη ανεπιθύμητη."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Πατήστε για προσθήκη στις επαφές ή αποκλεισμό."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Αυτή είναι η πρώτη φορά που σας καλεί αυτός ο αριθμός. Αν η κλήση αυτή ήταν ανεπιθύμητη, μπορείτε να αποκλείσετε αυτόν τον αριθμό και να τον αναφέρετε."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Πατήστε για αναφορά ως ΜΗ ΑΝΕΠΙΘΥΜΗΤΗΣ ή για αποκλεισμό της."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Υποψιαστήκαμε ότι πρόκειται για ανεπιθύμητο καλούντα. Εάν η κλήση δεν ήταν ανεπιθύμητη, πατήστε ΜΗ ΑΝΕΠΙΘΥΜΗΤΗ για να αναφέρετε το λάθος μας."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Αποκλ. και αναφορά"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Προσθήκη επαφής"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Μη ανεπιθύμητος"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Αποκλεισμός αριθμού"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Προσθήκη στις επαφές"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Αποκλεισμός και αναφορά ως ανεπιθύμητης"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Μη ανεπιθύμητη"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Τερματισμός κλήσης"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Κλήση συνδιάσκεψης"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Σε κλήση"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Συνέχεια κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Συνέχιση κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Να μην εμφανιστεί ξανά αυτό"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rAU/strings.xml b/java/com/android/incallui/res/values-en-rAU/strings.xml
index 5e0d207..7384519 100644
--- a/java/com/android/incallui/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-en-rAU/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conference call"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Call dropped"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sending tones\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Replace wild character with"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Voicemail number"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Can\'t switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Can\'t separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Can\'t transfer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Can\'t conference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Can\'t reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Can\'t release call(s)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Emergency call"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No service. Trying again…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Can\'t call. Dial an emergency number."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use keyboard to dial"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player Started"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player Stopped"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera not ready"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera ready"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Unknown call session event"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Other call settings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="selectContact" msgid="1703433172800564849">"select contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringtone &amp; vibrate"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Recent messages"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Business info"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi away"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km away"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Opens tomorrow at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Opens today at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Closes at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Closed today at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Open now"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Closed now"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"We suspected this of being a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Not spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rGB/strings.xml b/java/com/android/incallui/res/values-en-rGB/strings.xml
index 5e0d207..7384519 100644
--- a/java/com/android/incallui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-en-rGB/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conference call"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Call dropped"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sending tones\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Replace wild character with"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Voicemail number"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Can\'t switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Can\'t separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Can\'t transfer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Can\'t conference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Can\'t reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Can\'t release call(s)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Emergency call"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No service. Trying again…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Can\'t call. Dial an emergency number."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use keyboard to dial"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player Started"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player Stopped"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera not ready"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera ready"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Unknown call session event"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Other call settings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="selectContact" msgid="1703433172800564849">"select contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringtone &amp; vibrate"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Recent messages"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Business info"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi away"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km away"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Opens tomorrow at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Opens today at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Closes at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Closed today at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Open now"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Closed now"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"We suspected this of being a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Not spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rIN/strings.xml b/java/com/android/incallui/res/values-en-rIN/strings.xml
index 5e0d207..7384519 100644
--- a/java/com/android/incallui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-en-rIN/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conference call"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Call dropped"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sending tones\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Replace wild character with"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Voicemail number"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Can\'t switch calls."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Can\'t separate call."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Can\'t transfer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Can\'t conference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Can\'t reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Can\'t release call(s)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Emergency call"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Turning on radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No service. Trying again…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Can\'t call. Dial an emergency number."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use keyboard to dial"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player Started"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player Stopped"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera not ready"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera ready"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Unknown call session event"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Other call settings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="selectContact" msgid="1703433172800564849">"select contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringtone &amp; vibrate"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Recent messages"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Business info"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi away"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km away"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Opens tomorrow at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Opens today at <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Closes at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Closed today at <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Open now"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Closed now"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"We suspected this of being a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Not spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es-rUS/strings.xml b/java/com/android/incallui/res/values-es-rUS/strings.xml
index d016711..18538f1 100644
--- a/java/com/android/incallui/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-es-rUS/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Llamada en conferencia"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Se interrumpió la llamada."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"¿Deseas enviar los siguientes tonos?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Enviando tono\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Reemplazar el carácter comodín con"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Llamada en conferencia <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Correo de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Marcando"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Llamada por Wi-Fi en curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada de trabajo con Wi-Fi en curso"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Llamar con Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Llamada de trabajo con Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada por Wi-Fi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada de trabajo con Wi-Fi entrante"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Posible llamada entrante de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sin servicio"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video:"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rechazar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Llamada en curso en otro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videollamada en curso en otro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Atender llamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"No registrado en la red."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Red móvil no disponible"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar una llamada, ingresa un número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"No se puede realizar la llamada."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciar la secuencia de MMI"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servicio no admitido"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"No se puede cambiar llamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"No se puede desviar la llamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"No se puede transferir."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"No se puede realizar la conferencia."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"No se puede rechazar la llamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"No se puede liberar llamadas."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Llamada de emergencia"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Encendiendo radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No hay servicio. Vuelve a intentarlo."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"No se puede realizar la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"No se puede realizar la llamada. Marca un número de emergencia."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilizar teclado para marcar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Se inició el reproductor."</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Se detuvo el reproductor."</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"La cámara no está lista."</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Cámara lista"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sesión de llamada desconocido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Otras configuraciones de llamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"pasar a modo privado"</string>
-    <string name="selectContact" msgid="1703433172800564849">"seleccionar contacto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Tono y vibración"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrar conferencia"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergencia"</string>
     <string name="child_number" msgid="3398257437107259682">"a través del <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensajes recientes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Información de la empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> millas"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g> y <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre mañana a la hora <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoy a la hora <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Cierra a la hora <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Cerró hoy a la hora <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Abierto ahora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Cerrado ahora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"¿Sabes quién es <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"¿<xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado. La llamada se marcó como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Se indicó que la llamada de <xliff:g id="NUMBER">%1$s</xliff:g> no es spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Presiona para agregar a los contactos o para bloquear el número marcado como spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Esta es la primera vez que este número te llama. Si la llamada fue spam, puedes bloquear este número y denunciarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Presiona para informar que NO ES SPAM o para bloquearlo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sospechamos que era spam. Si la llamada no fue spam, presiona NO ES SPAM para informarnos de nuestro error."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear y denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Agregar contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No es spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Agregar a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear y marcar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"No es spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No se encuentra la tarjeta SIM o se produjo un error relacionado con ella."</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando la llamada con datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No se pudo cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con datos móviles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se pudo cambiar a la red Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar esto"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es/strings.xml b/java/com/android/incallui/res/values-es/strings.xml
index 472ea99..f6a954b 100644
--- a/java/com/android/incallui/res/values-es/strings.xml
+++ b/java/com/android/incallui/res/values-es/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conferencia telefónica"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Llamada perdida"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"¿Quieres enviar los siguientes tonos?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Enviando tonos\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Sustituir el carácter comodín por"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conferencia telefónica<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número del buzón de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Llamando"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Llamada Wi-Fi en curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Llamada Wi-Fi de trabajo en curso"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Llamada Wi‑Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Llamada de trabajo por Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Llamada Wi-Fi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Llamada Wi-Fi de trabajo entrante"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Llamada entrante sospechosa de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sin servicio"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible."</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rechazar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Llamada activa en otro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videollamada activa en otro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Atender llamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"No se ha podido conectar a la red"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"La red móvil no está disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar una llamada, introduce un número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"No se puede establecer la llamada."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando secuencia MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servicio no admitido."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"No se pueden intercambiar llamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"No se pueden separar llamadas."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"No se puede transferir."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"No se puede establecer la conferencia."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"No se puede rechazar la llamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"No se pueden hacer llamadas."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Llamada de emergencia"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Activando señal móvil…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Sin servicio. Reintentado…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"No se puede establecer la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"No se puede establecer la llamada. Marca un número de emergencia."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilizar teclado para marcar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Reproductor iniciado"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Reproductor detenido"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Cámara no preparada"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Cámara preparada"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sesión de llamada desconocido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Otras opciones de llamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"llamada privada"</string>
-    <string name="selectContact" msgid="1703433172800564849">"seleccionar contacto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Tono de llamada y vibración"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrar conferencia"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergencia"</string>
     <string name="child_number" msgid="3398257437107259682">"a través de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensajes recientes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Información de la empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre mañana a las <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoy a las <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Cierra hoy a las <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Cerrado hoy a las <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Abierto ahora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Cerrado ahora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"¿Conoces el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"¿El número <xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"El número <xliff:g id="NUMBER">%1$s</xliff:g> se ha bloqueado y la llamada se ha marcado como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Llamada del <xliff:g id="NUMBER">%1$s</xliff:g> marcada como No es spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toca para añadirlo a los contactos o bloquea el número de spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Es la primera vez que recibes una llamada de este número. Si se trata de spam, puedes bloquear el número y denunciarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toca para marcarlo como NO ES SPAM o bloquéalo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sospechamos que es un spammer. Si la llamada no es spam, toca NO ES SPAM para informarnos de nuestro error."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear y denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Añadir contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No es spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Añadir a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear y marcar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"No es spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"No hay tarjeta SIM o se ha producido un error relacionado con la misma."</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En una llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando la llamada con datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No se ha podido cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videollamada seguirá mediante la red móvil. Es posible que se apliquen cargos por uso de datos."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con los datos móviles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se ha podido cambiar a la red Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada seguirá a través de la red móvil. Es posible que se apliquen cargos por el uso de datos."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-et/strings.xml b/java/com/android/incallui/res/values-et/strings.xml
index 9eaa65f..5983fae 100644
--- a/java/com/android/incallui/res/values-et/strings.xml
+++ b/java/com/android/incallui/res/values-et/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konverentskõne"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Kõne katkes"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Kas saata järgmised toonid?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Toonide saatmine\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Saada"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Jah"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ei"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Pane metamärgi asemele"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konverentskõne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Kõnepostinumber"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Valimine"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Vastamata kõne helistajalt <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Käimasolev kõne"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käimasolev töökõne"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pooleliolev WiFi-kõne"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käimasolev töökõne WiFi kaudu"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Käimasolev <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Sissetulev <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WiFi-kõne"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"WiFi-töökõne"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ootel"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sissetulev kõne"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Sissetulev kõne koos fotoga"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tähtis sisset. kõne koos foto, sõnumi ja asukohaga"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tähtis sissetulev kõne koos manustega"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Sissetulev töökõne"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sissetulev WiFi-kõne"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Sissetulev töökõne WiFi kaudu"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Arvatav sissetulev rämpskõne"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sissetulev videotaotlus"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Teenus puudub"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Valitud võrk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) pole saadaval"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Vastamine"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Lõpeta kõne"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Hääl"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Nõustu"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Keeldu"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Pooleliolev kõne teise seadmes"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Pooleliolev videokõne teises seadmes"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Alusta helistamist"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Alusta videokõnet"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Helistamiseks lülitage lennurežiim välja."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ei ole võrku registreeritud."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobiilsidevõrk pole saadaval."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Helistamiseks sisestage kehtiv number."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Ei saa helistada."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-jada alustamine ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Teenust ei toetata."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kõnesid ei saa vahetada."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kõnet ei saa eraldada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Ei saa üle kanda."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konverentskõnet ei saa pidada."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kõnet ei saa tagasi lükata."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kõnet (kõnesid) ei saa vabastada."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hädaabikõne"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Raadioside sisselülitamine ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Teenus puudub. Uuesti proovimine ..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Ei saa helistada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hädaabinumber."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Ei saa helistada. Valige hädaabinumber."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Kasutage valimiseks klaviatuuri"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pleier käivitati"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pleier peatati"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kaamera pole valmis"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kaamera on valmis"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Tundmatu kõneseansi sündmus"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Muud kõneseaded"</string>
     <string name="goPrivate" msgid="5269514638004595378">"aktiveeri privaatrežiim"</string>
-    <string name="selectContact" msgid="1703433172800564849">"vali kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Helin ja vibratsioon"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Halda konverentskõnet"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Hädaabinumber"</string>
     <string name="child_number" msgid="3398257437107259682">"numbri <xliff:g id="CHILD_NUMBER">%s</xliff:g> kaudu"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Viimased sõnumid"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Ettevõtte teave"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> miili kaugusel"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km kaugusel"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Avatakse homme kell <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Avatakse täna kell <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Suletakse kell <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Suleti täna kell <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Praegu avatud"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Praegu suletud"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kas teate numbrit <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Kas number <xliff:g id="NUMBER">%1$s</xliff:g> saadab rämpsposti?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Number <xliff:g id="NUMBER">%1$s</xliff:g> blokeeriti ja kõne liigitati rämpspostiks."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Kõnet numbrilt <xliff:g id="NUMBER">%1$s</xliff:g> ei liigitatud rämpspostiks."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Puudutage kontaktide lisamiseks või rämpsposti saatva numbri blokeerimiseks."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Teile helistati sellelt numbrilt esimest korda. Kui see kõne oli rämpspost, saate selle numbri blokeerida ja meid sellest teavitada."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Puudutage, kui see POLE RÄMPSPOST, või blokeerige see."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Kahtlustame, et see on rämpsposti saatja. Kui see kõne polnud rämpspost, puudutage valikut POLE RÄMPSPOST, et meid veast teavitada."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokeeri ja teavita"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Lisa kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Pole rämpssisu"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokeeri number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Lisa kontaktidesse"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokeeri ja teavita rämpspostist"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Pole rämpskõne"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM-kaart puudub või SIM-kaardi viga"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kõne lõpetamine"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konverentskõne"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Pooleliolev kõne"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Kõne jätkatakse mobiilse andmeside kaudu …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ei saanud WiFi-võrgule lülitada"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmetasud."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kõnet jätkatakse mobiilse andmeside kaudu …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"WiFi-võrgule ei saanud lülituda"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmesidetasud."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ära seda enam näita"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-eu/strings.xml b/java/com/android/incallui/res/values-eu/strings.xml
index 4db9e10..3309a2a 100644
--- a/java/com/android/incallui/res/values-eu/strings.xml
+++ b/java/com/android/incallui/res/values-eu/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefonoa"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferentzia-deia"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Deia eten da"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ondorengo tonuak bidali?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Tonuak bidaltzen\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Bidali"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Bai"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ez"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Ordeztu komodina honekin:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferentzia-deiaren iraupena: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Erantzungailuaren zenbakia"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Deitzen"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Deitzaile honen dei bat galdu duzu: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Abian den deia"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Laneko dei bat abian da"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi deia abian"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi bidezko laneko dei bat abian da"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Abian den <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Jasotako <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi bidezko deia"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi bidezko laneko deia"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zain"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Sarrerako deia"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Jasotako deia, argazkia duena"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Jasotako dei garrant., arg., mez. eta kok. dituena"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Jasotako dei garrantzitsua, eranskinak dituena"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Laneko dei bat jaso da"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Sarrerako Wi-Fi deia"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi bidezko laneko dei bat jaso da"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ustezko spam-deia jaso duzu"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sarrerako bideo-eskaera"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ez dago zerbitzurik"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Hautatutako sarea (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ez dago erabilgarri"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Erantzun"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Amaitu deia"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Bideoa"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Ahotsa"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Onartu"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Baztertu"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Dei bat abian da beste gailu batean"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Bideo-dei bat abian da beste gailu batean"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Erantzun deiari"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Erantzun bideo-deiari"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Dei bat egiteko, Hegaldi modua desaktibatu behar duzu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ez dago sarean erregistratuta."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sare mugikorra ez dago erabilgarri."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Deitzeko, idatzi balio duen zenbaki bat."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Ezin da deitu."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI sekuentzia hasten…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Ez da onartzen."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Ezin da deiz aldatu."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Ezin da deia bereizi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Ezin da transferitu."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Ezin da konferentzia-deirik egin."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Ezin da deia baztertu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Ezin dira deiak bereizi."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Larrialdi-deia"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Irratia pizten…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ez dago zerbitzurik. Berriro saiatzen…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Ezin da deitu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ez da larrialdietarako zenbakia."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Ezin da deitu. Markatu larrialdietarako zenbakia."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Erabili teklatua markatzeko"</string>
-    <string name="player_started" msgid="9177182657338033086">"Abian da erreproduzigailua"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Gelditu da erreproduzigailua"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Ez dago prest kamera"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Prest dago kamera"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Dei-saioko gertaera ezezaguna"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Deien beste ezarpen batzuk"</string>
     <string name="goPrivate" msgid="5269514638004595378">"bihurtu pribatu"</string>
-    <string name="selectContact" msgid="1703433172800564849">"hautatu kontaktua"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Tonua eta dardara"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Kudeatu konferentzia-deia"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Larrialdietarako zenbakia"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> zenbakitik"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Azken mezuak"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Enpresaren informazioa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Hemendik <xliff:g id="DISTANCE">%.1f</xliff:g> miliara"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Hemendik <xliff:g id="DISTANCE">%.1f</xliff:g> km-ra"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"<xliff:g id="OPEN_TIME">%s</xliff:g> da biharko irekitze-ordua"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"<xliff:g id="OPEN_TIME">%s</xliff:g> da gaurko irekitze-ordua"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da ixte-ordua"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da gaurko itxiera-ordua"</string>
-    <string name="open_now" msgid="5897306702060039512">"Irekita dago"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Itxita dago"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Ezagutzen duzu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Spama da <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Blokeatu da <xliff:g id="NUMBER">%1$s</xliff:g>, eta spama dela salatu da."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Ez-spam gisa markatu da <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Sakatu kontaktuetan gehitzeko edo blokeatu spam zenbakia."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Zenbaki honek deitu dizun lehenengo aldia izan da. Spama bada zenbaki hau, blokeatu eta salatu egin dezakezu."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Sakatu EZ DA SPAMA gisa markatzeko, edo blokea ezazu."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Spam-igorle baten deia izan dela susmatu dugu. Dei hau ez bada spama izan, sakatu EZ DA SPAMA gure akatsaren berri emateko."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokeatu eta salatu"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Gehitu kontaktua"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ez da spama"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokeatu zenbakia"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Gehitu kontaktuetan"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokeatu eta salatu spama dela"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ez da spama"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ez dago SIM txartelik edo SIM txartelaren errore bat gertatu da"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Amaitu deia"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferentzia-deia"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Deia abian da"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Datu-konexioren bidez jarraitzen ari da deia egiten…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ezin izan da aldatu Wi-Fi sarera"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Datu mugikorren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Datu-konexiora aldatzen…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ezin izan da aldatu Wi-Fi sarera"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Datu-konexioaren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ez erakutsi berriro"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fa/strings.xml b/java/com/android/incallui/res/values-fa/strings.xml
index f816bd0..bcd9283 100644
--- a/java/com/android/incallui/res/values-fa/strings.xml
+++ b/java/com/android/incallui/res/values-fa/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"تلفن"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"تماس کنفرانسی"</string>
-    <string name="call_lost" msgid="2082971531689406145">"تماس قطع شد"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"صداهای زیر ارسال شود؟\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"تون‌های ارسالی\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ارسال"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"بله"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"نه"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"جایگزینی نویسه عمومی با"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"تماس کنفرانسی <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"شماره پست صوتی"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"شماره‌گیری"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"تماس بی‌پاسخ از <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"تماس جاری"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"تماس کاری خروجی"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏تماس از طریق Wi-Fi در حال انجام است"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏تماس کاری Wi-Fi خروجی"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> درحال انجام"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ورودی"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏تماس ازطریق Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏تماس کاری ازطریق Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"در انتظار"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"تماس ورودی"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تماس ورودی به همراه عکس"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تماس ورودی مهم به همراه عکس، پیام و مکان"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"تماس ورودی مهم به همراه پیوست"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"تماس کاری ورودی"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏تماس Wi-Fi ورودی"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏تماس کاری Wi-Fi ورودی"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"تماس هرزنامه احتمالی ورودی"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"درخواست تماس ویدئویی ورودی"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"بدون سرویس"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"شبکه انتخابی (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) قابل دسترس نیست"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"پاسخ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"قطع تماس"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ویدئو"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"صدا"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"پذیرفتن"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"نپذیرفتن"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"تماس در حال انجام در دستگاهی دیگر"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"تماس ویدئویی در حال انجام در دستگاهی دیگر"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"انتقال تماس"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"انتقال تماس ویدئویی"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"برای برقراری یک تماس، ابتدا حالت هواپیما را خاموش کنید."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"در شبکه ثبت نشده است."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"شبکه تلفن همراه در دسترس نیست."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"برای برقراری تماس، یک شماره معتبر وارد کنید."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"نمی‌توانید تماس بگیرید."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏شروع ترتیب MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"سرویس پشتیبانی نمی‌شود."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"نمی‌توانید بین تماس‌ها جابجا شوید."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"نمی‌توانید تماس را جدا کنید."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"نمی‌توانید انتقال دهید."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"نمی‌توانید کنفرانس برگزار کنید."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"نمی‌توانید تماس را رد کنید."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"نمی‌توانید تماس(ها) را آزاد کنید."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"تماس اضطراری"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"در حال روشن کردن رادیو..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"تماس ممکن نیست. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> شماره اضطراری نیست."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"نمی‌ توانید تماس بگیرید. یک شماره اضطراری را شماره‌گیری کنید."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"استفاده از صفحه‌کلید برای شماره گیری"</string>
-    <string name="player_started" msgid="9177182657338033086">"پخش‌کننده راه‌اندازی شد"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"پخش‌کننده متوقف شد"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"دوربین آماده نیست"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"دوربین آماده است"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"رویداد جلسه تماس ناشناس"</string>
-    <string name="other_settings" msgid="2537377721890761197">"سایر تنظیمات تماس"</string>
     <string name="goPrivate" msgid="5269514638004595378">"رفتن به خصوصی"</string>
-    <string name="selectContact" msgid="1703433172800564849">"انتخاب حساب"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"آهنگ زنگ و لرزش"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"مدیریت تماس کنفرانسی"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"شماره اضطراری"</string>
     <string name="child_number" msgid="3398257437107259682">"از طریق <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"پیام‌های جدید"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"اطلاعات کسب و کار"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> مایل دورتر"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> کیلومتر دورتر"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>،‫ <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> تا <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>، <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"فردا ساعت <xliff:g id="OPEN_TIME">%s</xliff:g> باز می‌شود"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"امروز ساعت <xliff:g id="OPEN_TIME">%s</xliff:g> باز می‌شود"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"ساعت <xliff:g id="CLOSE_TIME">%s</xliff:g> بسته می‌شود"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"امروز ساعت <xliff:g id="CLOSE_TIME">%s</xliff:g> بسته شد"</string>
-    <string name="open_now" msgid="5897306702060039512">"اکنون باز است"</string>
-    <string name="closed_now" msgid="3962291301467974921">"اکنون بسته است"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> را می‌شناسید؟"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> هرزنامه است؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شد و تماس به‌عنوان هرزنامه گزارش شد."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"تماس از <xliff:g id="NUMBER">%1$s</xliff:g> به‌عنوان غیرهرزنامه گزارش شد."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"برای افزودن مخاطبین یا مسدود کردن شماره هرزنامه، ضربه بزنید."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"اولین بار است که این شماره با شما تماس گرفته است. اگر این تماس هرزنامه است می‌توانید شماره را مسدود کنید و آن را گزارش کنید."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"برای گزارش به‌عنوان «غیرهرزنامه» ضربه بزنید یا آن را مسدود کنید."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"مشکوک هستیم که هرزنامه باشد. اگر این تماس هرزنامه نیست، روی «غیرهرزنامه» ضربه بزنید تا اشتباه ما را گزارش کنید."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"مسدود کردن و گزارش کردن"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"افزودن مخاطب"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"هرزنامه نیست"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"مسدود کردن شماره"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"افزودن به مخاطبین"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"مسدود کردن و گزارش هرزنامه"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"هرزنامه نیست"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"فاقد سیم، یا خطای سیم"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"پایان تماس"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"تماس کنفرانسی"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"در تماس"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ادامه تماس با استفاده از داده شبکه تلفن همراه..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏به شبکه Wi-Fi جابه‌جا نشد"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"تماس ویدئویی همچنان از شبکه تلفن همراه استفاده می‌کند. هزینه‌های داده استاندارد اعمال می‌شود."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ادامه تماس با استفاده از داده شبکه همراه…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏جابجایی به شبکه Wi-Fi انجام نشد"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"تماس ویدیویی همچنان ازطریق شبکه تلفن همراه انجام می‌شود. ممکن است هزینه‌های استاندارد داده اعمال شود."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"دوباره نشان داده نشود"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fi/strings.xml b/java/com/android/incallui/res/values-fi/strings.xml
index 995e7a3..0b6fd6f 100644
--- a/java/com/android/incallui/res/values-fi/strings.xml
+++ b/java/com/android/incallui/res/values-fi/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Puhelin"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"Puhelutunnus"</string>
-    <string name="confCall" msgid="36560628097626181">"Puhelinneuvottelu"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Puhelu katkaistu"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Lähetäänkö seuraavat äänet?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Lähetetään ääniä\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Lähetä"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Kyllä"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ei"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Muuta jokerimerkiksi"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Puhelinneuvottelu <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Puhelinvastaajan numero"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Soitetaan"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Vastaamaton puhelu: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Käynnissä oleva puhelu"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käynnissä oleva työpuhelu"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Käynnissä oleva Wi-Fi-puhelu"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Käynnissä oleva Wi-Fi-työpuhelu"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Käynnissä oleva <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Saapuva <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-puhelu"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi-työpuhelu"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Pidossa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Saapuva puhelu"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Kuvan sisältävä saapuva puhelu"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Saapuva työpuhelu"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Saapuva Wi-Fi-puhelu"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Saapuva Wi-Fi-työpuhelu"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Tämä puhelu saattaa olla häirikköpuhelu."</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Saapuva videopyyntö"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Katvealueella"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Valittu verkko (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ei käytettävissä."</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Vastaa"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Katkaise puhelu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Äänipuhelu"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Hyväksy"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Hylkää"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Puhelu on kesken toisella laitteella."</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videopuhelu on kesken toisella laitteella."</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Vastaa puheluun"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Vastaa videopuheluun"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Poista lentokonetila käytöstä ennen puhelun soittamista."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ei rekisteröity verkkoon."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Matkapuhelinverkko ei ole käytettävissä."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Soita antamalla kelvollinen numero."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Puhelua ei voi soittaa."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Aloitetaan MMI-koodisekvenssiä..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Yhteyttä ei tueta."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Puhelua ei voi vaihtaa."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Puhelua ei voi erottaa."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Puhelua ei voi siirtää."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Puheluja ei voi yhdistää."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Puhelua ei voi hylätä."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Puheluja ei voi vapauttaa."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hätäpuhelu"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Käynnistetään radiota…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ei yhteyttä. Yritetään uudelleen…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Puhelua ei voi soittaa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Puhelua ei voi soittaa. Valitse hätänumero."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Valitse numero näppäimistöstä"</string>
-    <string name="player_started" msgid="9177182657338033086">"Soitin käynnistyi"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Soitin pysähtyi"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera ei ole valmis."</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera on valmis."</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Tuntematon puheluistunnon tapahtuma"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Muut puheluasetukset"</string>
     <string name="goPrivate" msgid="5269514638004595378">"muuta yksityiseksi"</string>
-    <string name="selectContact" msgid="1703433172800564849">"valitse yhteystieto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Soittoääni ja värinä"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Hallinnoi puhelinneuvottelua"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Hätänumero"</string>
     <string name="child_number" msgid="3398257437107259682">"nron <xliff:g id="CHILD_NUMBER">%s</xliff:g> kautta"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Viimeisimmät viestit"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Yrityksen tiedot"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Etäisyys: <xliff:g id="DISTANCE">%.1f</xliff:g> mailia"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Etäisyys: <xliff:g id="DISTANCE">%.1f</xliff:g> kilometriä"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Aukeaa huomenna kello <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Aukeaa tänään kello <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Sulkeutuu tänään kello <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Sulkeutui tänään kello <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Auki nyt"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Suljettu nyt"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> sinulle tuttu?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> häirikkönumero?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> estettiin ja puhelu ilmoitettiin häirikköpuheluksi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Numerosta <xliff:g id="NUMBER">%1$s</xliff:g> saapunut puhelu ei ole häirikköpuhelu."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Lisää yhteystietoihin tai estä häirikkönumero napauttamalla."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Tästä numerosta soitettiin sinulle ensimmäisen kerran. Jos kyseessä oli häirikköpuhelu, voit estää numeron ja ilmoittaa siitä."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Valitse tilaksi Ei HÄIRIKKÖSOITTAJA tai estä numero napauttamalla."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Kyseessä saattoi olla häirikkösoittaja. Jos näin ei ole, napauta EI HÄIRIKKÖSOITTAJA ja ilmoita meille virheestä."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Estä ja ilmoita"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Lisää yhteystieto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ei roskasisältöä"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Estä numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Lisää yhteystietoihin"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Estä ja ilmoita häirikkösoittajaksi"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ei ole häirikkösoittaja"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ei SIM-korttia tai SIM-korttivirhe"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Päätä puhelu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Puhelinneuvottelu"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Puhelu käynnissä"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Jatketaan puhelua mobiilitiedonsiirron avulla…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Siirtyminen Wi-Fi-verkkoon epäonnistui."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopuhelu soitetaan matkapuhelinverkon kautta. Operaattori voi veloittaa tiedonsiirrosta hinnastonsa mukaan."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Jatketaan puhelua mobiilidatayhteydellä…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Vaihto Wi-Fi-verkkoon epäonnistui."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopuhelu soitetaan mobiilidatayhteyden kautta. Operaattori voi veloittaa tiedonsiirrosta."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Älä näytä tätä uudelleen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/res/values-fr-rCA/strings.xml
index 6f4d8da..ad7951a 100644
--- a/java/com/android/incallui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Téléphone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"Interface d\'appel"</string>
-    <string name="confCall" msgid="36560628097626181">"Conférence téléphonique"</string>
-    <string name="call_lost" msgid="2082971531689406145">"L\'appel a été interrompu"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Envoyer les tonalités suivantes?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Envoi des tonalités\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Envoyer"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Oui"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Remplacer le caractère générique par"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conférence téléphonique <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"N° messagerie vocale"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Composition..."</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel en cours - travail"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Appel Wi-Fi en cours"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi en cours - travail"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en cours"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrant"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Appel Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Appel professionnel Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel entrant - travail"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi entrant - travail"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"L\'appel entrant est suspect"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Aucun service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Répondre"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Raccrocher"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Vocal"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Appel en cours sur un autre appareil"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Appel vidéo en cours sur un autre appareil"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Répondre à l\'appel"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Veuillez désactiver le mode Avion avant de passer un appel."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non enregistré sur le réseau"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Réseau cellulaire non disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pour faire un appel, entrez un numéro valide."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossible d\'appeler."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Lancement de la séquence IHM..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service non pris en charge."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Impossible de faire des appels."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Impossible de séparer les appels."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Impossible de transférer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Impossible de créer la conférence."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Impossible de libérer l\'appel ou les appels."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Appel d\'urgence"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Activation du signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Aucun service. Nouvel essai en cours..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Appel impossible. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Appel impossible. Composez un numéro d\'urgence."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilisez le clavier pour composer un numéro."</string>
-    <string name="player_started" msgid="9177182657338033086">"Le lecteur a démarré"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Le lecteur a arrêté"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"L\'appareil photo n\'est pas prêt"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"L\'appareil photo est prêt"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Événement inconnu de séance d\'appel"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Autres paramètres d\'appel"</string>
     <string name="goPrivate" msgid="5269514638004595378">"mode privé"</string>
-    <string name="selectContact" msgid="1703433172800564849">"sélectionner un contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Sonnerie et vibration"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gérer la conférence"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numéro d\'urgence"</string>
     <string name="child_number" msgid="3398257437107259682">"au moyen du <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Messages récents"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Renseignements sur l\'entreprise"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"À <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"À <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> à <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ouvre demain à <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Ouvre aujourd\'hui à <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Ferme à <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"A fermé aujourd\'hui à <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ouvert"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fermé"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Connaissez-vous le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> est-il un pourriel?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué, et l\'appel a été signalé comme pourriel."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été signalé comme n\'étant pas un pourriel."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Appuyez pour ajouter aux contacts, ou bloquez le numéro source de pourriel."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"C\'est la première fois que ce numéro vous appelle. Si cet appel était un pourriel, vous pouvez le signaler et bloquer le numéro."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Appuyez pour signaler que l\'appel N\'EST PAS UN POURRIEL, ou bloquez le numéro."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Cet appel nous semblait suspect. Le cas échéant, appuyez sur N\'EST PAS UN POURRIEL pour signaler notre erreur."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquer et signaler"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Ajouter un contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"N\'est pas indésirable"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquer le numéro"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Ajouter aux contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquer le numéro et signaler le pourriel"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"N\'est pas un pourriel"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Aucune carte SIM ou erreur de carte SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poursuite de l\'appel à l\'aide de données cellulaires en cours…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossible de passer à un réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel utilisant des données mobiles en cours…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer à un réseau Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr/strings.xml b/java/com/android/incallui/res/values-fr/strings.xml
index c77fc19..cf306ce 100644
--- a/java/com/android/incallui/res/values-fr/strings.xml
+++ b/java/com/android/incallui/res/values-fr/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Téléphone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conférence téléphonique"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Appel interrompu."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Envoyer les tonalités suivantes ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Envoi des tonalités\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Envoyer"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Oui"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Remplacer le caractère générique par"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conférence téléphonique à <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"N° messagerie vocale"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Appel…"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel professionnel en cours"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Appel Wi-Fi en cours"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi professionnel en cours"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en cours"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrant"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Appel Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Appel professionnel Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel professionnel entrant"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi professionnel entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Appel entrant indésirable suspecté"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Aucun service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Répondre"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Raccrocher"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voix"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Appel en cours sur un autre appareil"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Appel vidéo en cours sur un autre appareil"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Répondre"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Veuillez d\'abord désactiver le mode Avion, afin d\'effectuer un appel."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non enregistré sur le réseau."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Réseau mobile non disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pour émettre un appel, veuillez saisir un numéro valide."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossible d\'émettre l\'appel."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Lancement de la séquence IHM..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service non compatible."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Impossible de changer d\'appel."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Impossible d\'isoler l\'appel."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Transfert impossible."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Impossible de lancer une conférence téléphonique."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Impossible de lancer les appels."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Appel d\'urgence"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Activation du signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Aucun service disponible. Nouvelle tentative en cours…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Impossible d\'émettre l\'appel. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Impossible d\'émettre l\'appel. Veuillez composer un numéro d\'urgence."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilisez le clavier pour composer un numéro."</string>
-    <string name="player_started" msgid="9177182657338033086">"Le lecteur a démarré."</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Le lecteur s\'est arrêté."</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"L\'appareil photo n\'est pas prêt."</string>
-    <string name="camera_ready" msgid="4312684554501216898">"L\'appareil photo est prêt."</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Événement de session d\'appel inconnu"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Autres paramètres d\'appel"</string>
     <string name="goPrivate" msgid="5269514638004595378">"mode privé"</string>
-    <string name="selectContact" msgid="1703433172800564849">"sélectionner un contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Sonnerie et vibreur"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gérer conférence téléphonique"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numéro d\'urgence"</string>
     <string name="child_number" msgid="3398257437107259682">"via le <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Messages récents"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informations sur l\'établissement"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"À <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"À <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ouvre demain à <xliff:g id="OPEN_TIME">%s</xliff:g>."</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Ouvre aujourd\'hui à <xliff:g id="OPEN_TIME">%s</xliff:g>."</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Ferme à <xliff:g id="CLOSE_TIME">%s</xliff:g>."</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Fermé aujourd\'hui à <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ouvert"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fermé"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Vous connaissez le propriétaire du <xliff:g id="NUMBER">%1$s</xliff:g> ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont-ils indésirables ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué et l\'appel a été signalé comme indésirable."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont signalés comme fiables."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Appuyez pour ajouter le numéro à vos contacts ou pour le bloquer s\'il s\'agit d\'un numéro indésirable."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"C\'est la première fois que vous recevez un appel de ce numéro. S\'il s\'agit d\'un appel indésirable, vous pouvez bloquer le numéro et signaler ce dernier."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Appuyez pour signaler ce numéro comme FIABLE ou pour le bloquer."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Selon nos informations, il pouvait s\'agir d\'un spammeur. Si l\'appel n\'était pas indésirable, appuyez sur \"Non-spam\" pour signaler notre erreur."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquer et signaler"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Ajouter un contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Non-spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquer le numéro"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Ajouter aux contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquer et signaler comme indésirable"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Numéro fiable"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Aucune carte SIM ou erreur de carte SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuer l\'appel en utilisant les données mobiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossible de passer au réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"L\'appel vidéo va continuer sur le réseau mobile. Des frais standard liés à la consommation de données peuvent être facturés."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel via les données mobiles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer au réseau Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo va continuer sur le réseau mobile. Des frais standards liés à la consommation de données peuvent être facturés."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gl/strings.xml b/java/com/android/incallui/res/values-gl/strings.xml
index 53278e5..206c175 100644
--- a/java/com/android/incallui/res/values-gl/strings.xml
+++ b/java/com/android/incallui/res/values-gl/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conferencia telefónica"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Chamada interrompida"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os seguintes tons?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Enviando tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Si"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substituír carácter comodín por"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conferencia telefónica ás <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número de correo de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Marcando"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada en curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de traballo saínte"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada wifi saínte"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada wifi de traballo saínte"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por wifi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de traballo por wifi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada entrante"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada entrante con foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada entrante importante con foto, mensaxe e localización"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada entrante importante con anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de traballo entrante"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada wifi entrante"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada wifi de traballo entrante"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada entrante sospeitosa de spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitude de vídeo entrante"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sen servizo"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rede seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non dispoñible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rexeitar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Chamada en curso noutro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada en curso noutro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Responder á chamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Responder á videochamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para facer unha chamada, primeiro desactiva o modo avión."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Sen rexistro na rede"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rece móbil non dispoñible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar unha chamada, introduce un número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Non se pode chamar."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando secuencia MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servizo non compatible."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Non se poden cambiar as chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Non se pode separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Non se pode transferir."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Non se pode establecer a conferencia."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Non se pode rexeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Non se poden desconectar as chamadas."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Chamada de emerxencia"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Activando radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Sen servizo. Tentando de novo…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Non se pode realizar a chamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Non se pode chamar. Marcar un número de emerxencia."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utiliza o teclado para chamar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Iniciouse o reprodutor"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Detívose o reprodutor"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"A cámara non está preparada"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"A cámara está preparada"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sesión de chamada descoñecido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Outras configuracións de chamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"activar o modo privado"</string>
-    <string name="selectContact" msgid="1703433172800564849">"seleccionar contacto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ton de chamada e vibración"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Xestionar confer. telefónica"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emerxencia"</string>
     <string name="child_number" msgid="3398257437107259682">"a través do <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensaxes recentes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Información da empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> mi de distancia"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km de distancia"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre mañá ás <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoxe ás <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Pecha ás <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Pechou hoxe ás <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Aberto agora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Pechado agora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Coñeces o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"É spam o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Bloqueouse o <xliff:g id="NUMBER">%1$s</xliff:g> e informouse de que a chamada era spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Informouse de que a chamada do <xliff:g id="NUMBER">%1$s</xliff:g> non era spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toca para engadir o número a contactos ou bloquéao se é spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"É a primeira vez que te chama este número. Se a chamada era spam, podes bloquear o número e marcalo como inadecuado."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toca para informar de que NON É SPAM ou bloquéao."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sospeitamos que se trata dun xerador de spam. Se esta chamada non era spam, toca NON É SPAM para informar do noso erro."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear e informar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Engadir contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Non é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Engadir a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear e informar de spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Non é spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Non hai SIM ou hai un erro na SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Chamada en curso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada con datos móbiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Non se puido cambiar á rede wifi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada permanecerá na rede móbil. É posible que o operador aplique tarifas de datos estándar."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando a chamada con datos móbiles…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Non se puido cambiar á rede wifi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada permanecerá na rede móbil. É posible que se apliquen tarifas de datos estándar."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrar de novo"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gu/strings.xml b/java/com/android/incallui/res/values-gu/strings.xml
index 8b1ebe8..1e26129 100644
--- a/java/com/android/incallui/res/values-gu/strings.xml
+++ b/java/com/android/incallui/res/values-gu/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ફોન"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"કોન્ફરન્સ કૉલ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"કૉલ છૂટ્યો"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"નીચે આપેલ ટોન્સ મોકલીએ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ટોન્સ મોકલી રહ્યાં છે\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"મોકલો"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"હા"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"નહીં"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"પહોળા વર્ણને આની સાથે બદલો"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"કોન્ફરન્સ કૉલ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"વૉઇસમેઇલ નંબર"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ડાયલ કરી રહ્યાં છે"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> નો કૉલ ચૂકી ગયાં"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ચાલી રહેલ કૉલ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ચાલી રહેલ કાર્ય કૉલ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ચાલુ Wi-Fi કૉલ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ચાલી રહેલ Wi-Fi કાર્ય કૉલ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ચાલી રહેલ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ઇનકમિંગ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"વાઇ-ફાઇ કૉલ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"વાઇ-ફાઇ કાર્ય કૉલ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"હોલ્ડ પર"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ઇનકમિંગ કૉલ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ફોટો સાથે ઇનકમિંગ કૉલ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ફોટો, સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"જોડાણો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ઇનકમિંગ કાર્ય કૉલ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ઇનકમિંગ Wi-Fi કૉલ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ઇનકમિંગ Wi-Fi કાર્ય કૉલ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ઇનકમિંગ શંકાસ્પદ સ્પામ કૉલ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"આવનાર વિડિઓ વિનંતી"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"કોઈ સેવા નથી"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"પસંદ કરેલ નેટવર્ક (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) અનુપલબ્ધ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"જવાબ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"સમાપ્ત કરો"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"વિડિઓ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"અવાજ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"સ્વીકારો"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"નકારો"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"અન્ય ઉપકરણ પર ચાલી રહેલ કૉલ"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"અન્ય ઉપકરણ પર ચાલી રહેલ વિડિઓ કૉલ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"કૉલ લો"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"વિડિઓ કૉલ લો"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"નેટવર્ક પર નોંધણી કરાયેલ નથી."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"સેલ્યુલર નેટવર્ક ઉપલબ્ધ નથી."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"કૉલ કરવા માટે, માન્ય નંબર દાખલ કરો."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"કૉલ કરી શકાતો નથી."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI અનુક્રમ પ્રારંભ કરી રહ્યાં છે…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"સેવા સમર્થિત નથી."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"કૉલ્સ સ્વિચ કરી શકાતા નથી."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"અલગ કૉલ કરી શકાતો નથી."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"સ્થાનાંતર કરી શકાતું નથી."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"કોન્ફરન્સ કરી શકાતી નથી."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"કૉલ નકારી શકાતો નથી."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"કૉલ(લ્સ) રિલીઝ કરી શકતા નથી."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"કટોકટીનો કૉલ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"રેડિઓ ચાલુ કરી રહ્યાં છે…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"કોઈ સેવા નથી. ફરી પ્રયાસ કરી રહ્યાં છે…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"કૉલ કરી શકાતો નથી. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> એ કટોકટીનો નંબર નથી."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"કૉલ કરી શકાતો નથી. કટોકટીનો નંબર ડાયલ કરો!"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ડાયલ કરવા માટે કીબોર્ડનો ઉપયોગ કરો"</string>
-    <string name="player_started" msgid="9177182657338033086">"પ્લેયર પ્રારંભ કર્યું"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"પ્લેયર બંધ કર્યું"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"કૅમેરો તૈયાર નથી"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"કૅમેરો તૈયાર"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"અજાણી કૉલ સત્ર ઇવેન્ટ"</string>
-    <string name="other_settings" msgid="2537377721890761197">"અન્ય કૉલ સેટિંગ્સ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ખાનગી જાઓ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"સંપર્ક પસંદ કરો"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"રિંગટોન અને વાઇબ્રેટ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"કોન્ફરન્સ કૉલ સંચાલિત કરો"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"કટોકટીનો નંબર"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> મારફતે"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"તાજેતરનાં સંદેશા"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"વ્યવસાયની માહિતી"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> માઇલ દૂર"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> કિમી દૂર"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"આવતીકાલે <xliff:g id="OPEN_TIME">%s</xliff:g> વાગ્યે ખુલશે"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"આજે <xliff:g id="OPEN_TIME">%s</xliff:g> વાગ્યે ખુલશે"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> વાગ્યે બંધ થશે"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"આજે <xliff:g id="CLOSE_TIME">%s</xliff:g> વાગ્યે બંધ થયેલું"</string>
-    <string name="open_now" msgid="5897306702060039512">"હમણાં ખોલો"</string>
-    <string name="closed_now" msgid="3962291301467974921">"અત્યારે બંધ કર્યું"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> ને જાણો છો?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"શું <xliff:g id="NUMBER">%1$s</xliff:g> સ્પામ છે?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> અવરોધિત કર્યો અને કૉલની સ્પામ તરીકે જાણ કરવામાં આવી."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> ના કૉલની સ્પામ નથી તરીકે જાણ કરવામાં આવી."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"સંપર્કોમાં ઉમેરવા માટે ટૅપ કરો અથવા સ્પામ નંબરને અવરોધિત કરો."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"આ નંબરથી તમને પહેલી વાર કૉલ કરવામાં આવ્યો છે. જો આ કૉલ સ્પામ હોય, તો તમે આ નંબરને અવરોધિત કરી અને તેની જાણ કરી શકો છો."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"સ્પામ નથી તરીકે જાણ કરવા માટે ટૅપ કરો અથવા તેને અવરોધિત કરો."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"અમને આ સ્પામર હોવાની શંકા છે. જો આ કૉલ સ્પામ ન હોય, તો અમારી ભૂલની જાણ કરવા માટે સ્પામ નથી ટૅપ કરો."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"અવરોધિત કરો અને જાણ કરો"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"સંપર્ક ઉમેરો"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"સ્પામ નથી"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"નંબર અવરોધિત કરો"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"સંપર્કોમાં ઉમેરો"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"અવરોધિત કરો અને સ્પામ તરીકે જાણ કરો"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"સ્પામ નથી"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"કોઈ SIM નથી અથવા SIM ભૂલ"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"કૉલ સમાપ્ત કરો"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"કૉન્ફરન્સ કૉલ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"કૉલમાં"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"સેલ્યુલર ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"વિડિઓ કૉલ સેલ્યુલર નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"મોબાઇલ ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"વિડિઓ કૉલ, મોબાઇલ નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"આ ફરીથી બતાવશો નહીં"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hi/strings.xml b/java/com/android/incallui/res/values-hi/strings.xml
index 09563df..57ab166 100644
--- a/java/com/android/incallui/res/values-hi/strings.xml
+++ b/java/com/android/incallui/res/values-hi/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फ़ोन"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"कॉन्फ़्रेंस कॉल"</string>
-    <string name="call_lost" msgid="2082971531689406145">"कॉल कट गया"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"निम्न टोन भेजें?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"भेजने वाली टोन\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"भेजें"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"हां"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"नहीं"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"वाइल्ड वर्ण को इससे बदलें:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"कॉन्फ़्रेंस कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ध्‍वनिमेल नबंर"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"डायल किया जा रहा है"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> के छूटे कॉल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"चल रही कॉल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"कार्यस्थल की जारी कॉल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"चल रहा वाई-फ़ाई कॉल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"कार्यस्थल की जारी वाई-फ़ाई कॉल"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"जारी <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"इनकमिंग <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"वाई‑फ़ाई कॉल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"कार्य संबंधी वाई-फ़ाई कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"इनकमिंग कॉल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फ़ोटो के साथ इनकमिंग कॉल"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"अटैचमेंट के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"कार्यस्थल की आवक कॉल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"इनकमिंग वाई-फ़ाई कॉल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"कार्यस्थल की वाई-फ़ाई आवक कॉल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"संदिग्ध आवक स्पैम कॉल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"इनकमिंग वीडियो अनुरोध"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"कोई सेवा नहीं"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"चयनित नेटवर्क (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) अनुपलब्ध"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"समाप्त करें"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"वीडियो"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ध्वनि"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकार करें"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"अस्वीकार करें"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"दूसरे डिवाइस पर चल रहा कॉल"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"दूसरे डिवाइस पर चल रहा वीडियो कॉल"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"कॉल लें"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"वीडियो कॉल लें"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"कॉल करने के लिए, पहले विमान मोड बंद करें."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्क पर पंजीकृत नहीं."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेल्युलर नेटवर्क उपलब्ध नहीं."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"कॉल करने के लिए, मान्‍य नंबर डालें."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"कॉल नहीं किया जा सकता."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI अनुक्रम प्रारंभ हो रहा है…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित नहीं है."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"कॉल स्‍विच नहीं किए जा सकते."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"कॉल अलग नहीं किया जा सकता."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ट्रांसफर नहीं किया जा सकता."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"कॉन्‍फ़्रेंस नहीं की जा सकती."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"कॉल अस्‍वीकार नहीं किया जा सकता."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"कॉल रिलीज़ नहीं किया जा सकता (किए जा सकते)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"आपातकालीन कॉल"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"रेडियो चालू कर रहा है..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"कोई सेवा नहीं. पुन: प्रयास किया जा रहा है…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"कॉल नहीं किया जा सकता. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> एक आपातकालीन नंबर नहीं है."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"कॉल नहीं किया जा सकता. आपातकालीन नबर डायल करें."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"डायल करने के लिए कीबोर्ड का उपयोग करें"</string>
-    <string name="player_started" msgid="9177182657338033086">"प्‍लेयर प्रारंभ हो गया"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"प्‍लेयर रुक गया"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"कैमरा तैयार नहीं है"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"कैमरा तैयार है"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"अज्ञात कॉल सत्र इवेंट"</string>
-    <string name="other_settings" msgid="2537377721890761197">"अन्य कॉल सेटिंग"</string>
     <string name="goPrivate" msgid="5269514638004595378">"निजी हो जाएं"</string>
-    <string name="selectContact" msgid="1703433172800564849">"संपर्क को चुनें"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"रिंगटोन और कंपन"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आपातकालीन नंबर"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> के द्वारा"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"हाल ही के संदेश"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"व्यवसाय जानकारी"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> मील दूर"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> किमी दूर"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"कल <xliff:g id="OPEN_TIME">%s</xliff:g> बजे खुलता है"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"आज <xliff:g id="OPEN_TIME">%s</xliff:g> बजे खुलता है"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> बजे बंद होता है"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"आज <xliff:g id="CLOSE_TIME">%s</xliff:g> बजे बंद हो गया"</string>
-    <string name="open_now" msgid="5897306702060039512">"अभी खुला है"</string>
-    <string name="closed_now" msgid="3962291301467974921">"अभी बंद है"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> को जानें?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> स्पैम है?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> को अवरुद्ध कर दिया गया है और कॉल को स्पैम के रूप में रिपोर्ट किया गया."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> के कॉल की रिपोर्ट स्पैम के रूप में नहीं की गई है."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"संपर्कों में जोड़ने या स्पैम नंबर अवरुद्ध करने के लिए टैप करें."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"इस नंबर से आपको पहली बार कॉल किया गया है. यदि यह कॉल स्पैम था, तो आप इस नंबर को अवरुद्ध कर सकते हैं और उसकी रिपोर्ट कर सकते हैं."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"स्पैम नहीं के रूप में रिपोर्ट करने के लिए टैप करें, या उसे अवरुद्ध करें."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"हमें आशंका थी कि यह कोई स्पैमर था. यदि यह कॉल स्पैम नहीं था, तो हमारी गलती की रिपोर्ट करने के लिए स्पैम नहीं टैप करें."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"अवरुद्ध करें/रिपोर्ट करें"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"संपर्क जोड़ें"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"स्पैम नहीं है"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"नंबर अवरुद्ध करें"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"संपर्कों में जोड़ें"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"अवरुद्ध करें और स्पैम की रिपोर्ट करें"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"स्पैम नहीं है"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"कोई सिम नहीं या सिम गड़बड़ी"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करें"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"कॉन्फ़्रेंस कॉल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल में"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"सेल्युलर डेटा का उपयोग करके कॉल जारी रखा जा रहा है…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"वाई-फ़ाई नेटवर्क में नहीं बदला जा सका"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"वीडियो कॉल सेल्यूलर नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा का उपयोग करके कॉल जारी रखा जा रहा है…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi नेटवर्क पर स्विच नहीं कर सका"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"वीडियो कॉल मोबाइल नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"इसे दोबारा न दिखाएं"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hr/strings.xml b/java/com/android/incallui/res/values-hr/strings.xml
index 7af1613..b37e213 100644
--- a/java/com/android/incallui/res/values-hr/strings.xml
+++ b/java/com/android/incallui/res/values-hr/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"Korisničko sučelje Poziva u tijeku"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferencijski poziv"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Poziv je prekinut"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Poslati sljedeće tonove?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Slanje tonova\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Pošalji"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zamijeni zamjenski znak s"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Broj govorne pošte"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Biranje broja"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušten poziv kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u tijeku"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u tijeku"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi poziv u tijeku"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Poslovni Wi-Fi poziv u tijeku"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"U tijeku: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazno: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi poslovni poziv"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s privicima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni poslovni Wi-Fi poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dolazni zahtjev za videopoziv"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema usluge"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je onemogućena"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videozapis"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Glasovno"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prihvaćam"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbijanje"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Poziv u tijeku na drugom uređaju"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"U tijeku je videopoziv na drugom uređaju"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Preuzimanje poziva"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzimanje videopoziva"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Da biste uspostavili poziv, prvo isključite način rada u zrakoplovu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Unesite važeći broj da biste uspostavili poziv."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Pozivanje nije moguće."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Prebacivanje poziva nije moguće."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Odvajanje poziva nije moguće."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Prijenos nije moguć."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferencijski poziv nije moguć."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Odbijanje poziva nije moguće."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Prekidanje poziva nije moguće."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hitni poziv"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Uključivanje radija…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nema usluge. Pokušavamo ponovo…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Pozivanje nije moguće. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj hitne službe."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Pozivanje nije moguće. Nazovite broj hitne službe."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Birajte pomoću tipkovnice"</string>
-    <string name="player_started" msgid="9177182657338033086">"Igrač je pokrenuo"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Igrač je prekinuo"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Fotoaparat nije spreman"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Fotoaparat je spreman"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nepoznati događaj sesije poziva"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ostale postavke poziva"</string>
     <string name="goPrivate" msgid="5269514638004595378">"na privatno"</string>
-    <string name="selectContact" msgid="1703433172800564849">"odabir kontakta"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konf. pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj hitne službe"</string>
     <string name="child_number" msgid="3398257437107259682">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedavne poruke"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacije o tvrtki"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi udaljenosti"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km udaljenosti"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Otvara se sutra u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Otvara se danas u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zatvara se u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zatvoreno danas u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Trenutačno otvoreno"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Trenutačno zatvoreno"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznajete li broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni broj?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> blokiran je, a poziv je prijavljen kao neželjeni."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> prijavljen je kao željeni."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Dodirnite za dodavanje kontakata ili blokiranje neželjenih brojeva."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Prvi put ste primili poziv s tog broja. Ako je poziv bio neželjen, broj možete blokirati i prijaviti ga."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJENI ili ga blokirajte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sumnjamo da je ovo neželjeni poziv. Ako ovaj poziv nije neželjeni, dodirnite NIJE NEŽELJENI da biste prijavili našu pogrešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokiranje i prijava"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nije neželjeni broj"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokiranje broja"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokiranje i prijava neželjenog poziva"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nije neželjeni broj"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM-a ili SIM ima pogrešku"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekid poziva"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u tijeku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovno"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hu/strings.xml b/java/com/android/incallui/res/values-hu/strings.xml
index 08d374b..a929515 100644
--- a/java/com/android/incallui/res/values-hu/strings.xml
+++ b/java/com/android/incallui/res/values-hu/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferenciahívás"</string>
-    <string name="call_lost" msgid="2082971531689406145">"A hívás megszakadt"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Elküldi a következő hangjelzéseket?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Hangjelzések küldése\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Küldés"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Igen"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nem"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Helyettesítő karakter lecserélése a következővel:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferenciahívás: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Hangposta száma"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Tárcsázás"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Nem fogadott hívás: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Hívás folyamatban"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Folyamatban lévő munkahelyi hívás"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Folyamatban lévő Wi-Fi-hívás"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Folyamatban lévő munkahelyi hívás Wi-Fin keresztül"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Folyamatban lévő <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Bejövő <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-hívás"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"munkahelyi Wi‑Fi-hívás"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Bejövő hívás"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Bejövő hívás fotóval"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fontos bejövő hívás fotóval, üzenettel és hellyel"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Fontos bejövő hívás mellékletekkel"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Bejövő munkahelyi hívás"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Beérkező Wi-Fi-hívás"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Bejövő munkahelyi hívás Wi-Fin keresztül"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Bejövő gyanús spamhívás"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Bejövő videokérés"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nincs szolgáltatás"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"A kiválasztott hálózat (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nem érhető el"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Fogadás"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hívás befejezése"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videó"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Hang"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Elfogadás"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Elutasítás"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Folyamatban lévő hívás egy másik eszközön"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Folyamatban lévő videohívás egy másik eszközön"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Hívás fogadása"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videohívás fogadása"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Híváskezdeményezéshez kapcsolja ki a Repülőgép üzemmódot."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nincs regisztrálva a hálózaton."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"A mobilhálózat nem érhető el."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Hívásindításhoz adjon meg egy érvényes számot."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"A hívás sikertelen."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-sorozat indítása..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"A szolgáltatás nem támogatott."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"A hívások közötti váltás sikertelen."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"A híváselkülönítés sikertelen."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Az átirányítás sikertelen."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"A konferenciahívás sikertelen."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"A híváselutasítás sikertelen."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"A tartásban lévő hívás(ok) folytatása sikertelen."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Segélyhívás"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Rádió bekapcsolása..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nincs szolgáltatás. Újrapróbálkozás folyamatban…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"A hívás sikertelen. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> szám nem segélyhívószám."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"A hívás sikertelen. Tárcsázzon segélyhívószámot."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"A tárcsázáshoz használja a billentyűzetet"</string>
-    <string name="player_started" msgid="9177182657338033086">"A lejátszó elindult"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"A lejátszó leállt"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"A kamera nem áll készen"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"A kamera készen áll"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Ismeretlen hívási esemény"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Egyéb hívásbeállítások"</string>
     <string name="goPrivate" msgid="5269514638004595378">"magánbeszélgetés"</string>
-    <string name="selectContact" msgid="1703433172800564849">"névjegy kijelölése"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Csengőhang és rezgés"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferenciahívás kezelése"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Segélyhívó szám"</string>
     <string name="child_number" msgid="3398257437107259682">"a következő számon keresztül: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Legutóbbi üzenetek"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Cég adatai"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mérföldre"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> kilométerre"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Holnap ekkor nyit: <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Ma ekkor nyit: <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Ekkor zár: <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zárva ma ekkor: <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Jelenleg nyitva van"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Jelenleg zárva van"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Ismeri a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Spam ez a szám: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Letiltotta a(z) <xliff:g id="NUMBER">%1$s</xliff:g> számot, és bejelentette a hívást spamként."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"A(z) <xliff:g id="NUMBER">%1$s</xliff:g> számról érkező hívást bejelentette nem spamként."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Koppintson a névjegyekhez való hozzáadáshoz vagy a spamszám letiltásához."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Ez az első alkalom, hogy erről a számról hívása érkezett. Ha a hívás spam, letilthatja és bejelentheti a számot."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Koppintson a nem spamként való bejelentéshez vagy a letiltáshoz."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Azt gyanítottuk, hogy ez egy spamszám. Ha a hívás nem spam volt, koppintson a NEM SPAM elemre a hiba bejelentéséhez."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Tiltás és bejelentés"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Névjegy hozzáadása"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nem spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Szám letiltása"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Hozzáadás a névjegyekhez"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Letiltás és spam bejelentése"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nem spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Hiányzó vagy hibás SIM kártya"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Hívás befejezése"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenciahívás"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Hívásban"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Hívás folytatása mobil-adatkapcsolaton keresztül…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nem sikerült Wi-Fi-hálózatra váltani"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hívás folytatása mobil-adatkapcsolaton keresztül…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nem sikerült Wi-Fi-hálózatra váltani"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne jelenjen meg többé"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hy/strings.xml b/java/com/android/incallui/res/values-hy/strings.xml
index f6496d1..61130e4 100644
--- a/java/com/android/incallui/res/values-hy/strings.xml
+++ b/java/com/android/incallui/res/values-hy/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Հեռախոս"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Կոնֆերանս զանգ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Զանգը դադարեցվեց"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ուղարկե՞լ հետևյալ ձայներանգները:\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Ձայներանգների առաքում\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Ուղարկել"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Այո"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ոչ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Փոխարինել կոպիտ գրանշանը"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Կոնֆերանս զանգ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Ձայնային փոստի համարը"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Համարը հավաքվում է"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Բաց թողնված զանգ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ից"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ընթացիկ զանգը"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ընթացիկ աշխատանքային զանգ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ընթացիկ զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ընթացիկ աշխատանքային Wi-Fi զանգ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ընթացիկ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Մուտքային <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Զանգ Wi-Fi-ի միջոցով"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Աշխատանքային զանգ Wi-Fi-ի միջոցով"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Սպասում"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Մուտքային զանգ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Մուտքային զանգ՝ լուսանկարով"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Մուտքային աշխատանքային զանգ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Մուտքային զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Մուտքային աշխատանքային Wi-Fi զանգ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Մուտքային զանգը հավանաբար լցոն է"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Մուտքային տեսազանգի հայցում"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ծառայություններ չկան"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Ընտրված ցանցը (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) անհասանելի է"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Պատասխանել"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Վայր դնել"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Տեսազանգ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Ձայնային"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Ընդունել"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Մերժել"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ընթացիկ զանգ այլ սարքում"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ընթացիկ տեսազանգ այլ սարքում"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Ընդունել զանգը"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Ընդունել տեսազանգը"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Զանգի կատարման համար նախ անջատեք թռիչքային ռեժիմը:"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ցանցում գրանցված չէ:"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Բջջային ցանցն անհասանելի է:"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Զանգ կատարելու համար մուտքագրեք ճիշտ համար:"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Հնարավոր չէ զանգել:"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Մեկնարկում է MMI հաջորդականությունը..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Ծառայությունը չի աջակցվում:"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Հնարավոր չէ փոխանջատել զանգը:"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Հնարավոր չէ առանձնացնել զանգը:"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Հնարավոր չէ փոխանցել:"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Հնարավոր չէ խմբային զանգ կատարել:"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Հնարավոր չէ մերժել զանգը:"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Հնարավոր չէ անջատել զանգ(եր)ը:"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Շտապ կանչ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ռադիոն միացվում է..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի որևէ համար:"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Օգտագործեք ստեղնաշարը՝ համարհավաքման համար"</string>
-    <string name="player_started" msgid="9177182657338033086">"Նվագարկիչը մեկնարկել է"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Նվագարկիչը դադարեցվել է"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Տեսախցիկը պատրաստ չէ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Տեսախցիկը պատրաստ է"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Զանգի աշխատաշրջանի անհայտ իրադարձություն"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Այլ զանգերի կարգավորումներ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"Անցնել անձնականի"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ընտրել կոնտակտ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Զանգերանգ և թրթռոց"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Կառավարել կոնֆերանս զանգը"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Արտակարգ իրավիճակների հեռախոսահամար"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-ի միջոցով"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Վերջին հաղորդագրությունները"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Բիզնես տեղեկատվություն"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> մղոն հեռու"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> կմ հեռու"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Բացվում է վաղը ժամը <xliff:g id="OPEN_TIME">%s</xliff:g>-ին"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Բացվում է այսօր ժամը <xliff:g id="OPEN_TIME">%s</xliff:g>-ին"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Փակվում է ժամը <xliff:g id="CLOSE_TIME">%s</xliff:g>-ին"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Փակվել է այսօր ժամը <xliff:g id="CLOSE_TIME">%s</xliff:g>-ին"</string>
-    <string name="open_now" msgid="5897306702060039512">"Հիմա բաց է"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Հիմա փակ է"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը ծանո՞թ է:"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը լցո՞ն է:"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> համարն արգելափակվեց, և զանգը նշվեց որպես լցոն:"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից ստացված զանգը նշվեց որպես ոչ լցոն:"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Հպեք՝ կոնտակտներում ավելացնելու համար կամ արգելափակեք լցոնային համարը:"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Այս համարից առաջին անգամ եք զանգ ստանում: Եթե այս զանգը լցոն էր. դուք կարող եք արգելափակել այս համարը և նշել այն որպես լցոն:"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ համարը որպես ոչ լցոն նշելու համար, կամ արգելափակեք այն:"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Կասկածներ կան, որ այս զանգը լցոնողից էր: Եթե այն լցոն չէր, ապա հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ սխալմունքի մասին մեզ հայտնելու համար:"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Արգելափակել և նշել լցոն"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Ավելացնել կոնտակտ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Լցոն չէ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Արգելափակել համարը"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Ավելացնել կոնտակտներում"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Արգելափակել և նշել որպես լցոն"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Լցոն չէ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM- բացակայում է կամ SIM քարտի սխալ"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ավարտել զանգը"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Կոնֆերանս զանգ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Զանգ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Զանգն այժմ բջջային ինտերնետով է ընթանում…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Չհաջողվեց միանալ Wi-Fi ցանցին"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Զանգն այժմ բջջային ինտերնետով է ընթանում…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Չհաջողվեց միանալ Wi-Fi ցանցին"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Այլևս ցույց չտալ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-in/strings.xml b/java/com/android/incallui/res/values-in/strings.xml
index 279e72d..8b6439b 100644
--- a/java/com/android/incallui/res/values-in/strings.xml
+++ b/java/com/android/incallui/res/values-in/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telepon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telewicara"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Panggilan terputus"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Kirimkan nada berikut?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Mengirimkan nada\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Kirim"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ya"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Tidak"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Ganti karakter acak dengan"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telewicara <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nomor kotak pesan"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Memanggil"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Panggilan tak terjawab dari <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan yang sedang berlangsung"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan telepon kerja yang sedang berlangsung"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Panggilan Wi-Fi keluar"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggilan Wi-Fi kerja yang sedang berlangsung"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> sedang berlangsung"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> masuk"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Panggilan Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Panggilan kerja Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditangguhkan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan penting dengan foto, pesan, dan lokasi"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan telepon kerja yang masuk"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan telepon Wi-Fi kerja yang masuk"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Panggilan masuk yang diduga spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Tidak ada layanan"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Jaringan yang dipilih (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Jawab"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Akhiri"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Suara"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Terima"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Tolak"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Panggilan yang berlangsung di perangkat lain"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Video call yang berlangsung di perangkat lain"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Panggil"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Lakukan Video Call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Untuk melakukan panggilan, pertama-tama matikan mode Pesawat."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tidak terdaftar pada jaringan."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Jaringan seluler tidak tersedia."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Untuk melakukan panggilan telepon, masukkan nomor yang valid."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Tidak dapat menelepon."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Memulai urutan MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Layanan tidak didukung."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Tidak dapat berganti panggilan telepon."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Tidak dapat memisahkan panggilan telepon."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Tidak dapat mentransfer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Tidak dapat melakukan konferensi."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Tidak dapat menolak panggilan telepon."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Tidak dapat melepas panggilan telepon."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Panggilan darurat"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Menghidupkan radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Tidak ada layanan. Mencoba lagi…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Tidak dapat menelepon. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Tidak dapat menelepon. Panggil nomor darurat."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Gunakan keyboard untuk memanggil"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pemutar Dimulai"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pemutar Dihentikan"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera tidak siap"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera siap"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Sesi panggilan tidak dikenal"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Setelan panggilan lainnya"</string>
     <string name="goPrivate" msgid="5269514638004595378">"aktifkan pribadi"</string>
-    <string name="selectContact" msgid="1703433172800564849">"pilih kontak"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Nada Dering &amp; Getaran"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Kelola telewicara"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nomor darurat"</string>
     <string name="child_number" msgid="3398257437107259682">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Pesan terbaru"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Info bisnis"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Buka jam <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Hari ini buka jam <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Tutup pukul <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Hari ini tutup pukul <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Buka sekarang"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Sekarang tutup"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Tahu nomor <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Apakah nomor <xliff:g id="NUMBER">%1$s</xliff:g> termasuk spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> diblokir dan panggilan dilaporkan sebagai spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Panggilan dari <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Ketuk untuk menambahkan ke kontak atau memblokir nomor spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Nomor ini baru pertama kali menghubungi Anda. Jika panggilan termasuk spam, Anda dapat memblokir nomor ini dan melaporkannya."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Ketuk untuk melaporkan sebagai BUKAN SPAM, atau blokir."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Kami menduga nomor ini berasal dari pelaku spam. Jika panggilan ini bukan spam, ketuk BUKAN SPAM untuk melaporkan kesalahan kami."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokir &amp; laporkan"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Tambahkan kontak"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Bukan spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokir nomor"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Tambahkan ke kontak"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokir &amp; laporkan sebagai spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Bukan spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Tidak ada SIM atau kesalahan SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Akhiri panggilan"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telewicara"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Sedang menelepon"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Melanjutkan panggilan menggunakan data seluler..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Tidak dapat beralih ke jaringan Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call akan tetap di jaringan seluler. Biaya data standar mungkin berlaku."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Melanjutkan panggilan menggunakan data seluler..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke jaringan Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call akan tetap di jaringan seluler. Tarif data standar mungkin berlaku."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tampilkan ini lagi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-is/strings.xml b/java/com/android/incallui/res/values-is/strings.xml
index 795e952..a25c2ce 100644
--- a/java/com/android/incallui/res/values-is/strings.xml
+++ b/java/com/android/incallui/res/values-is/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Sími"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Símafundur"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Símtali slitið"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Senda eftirfarandi tóna?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sendir tóna\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Senda"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Já"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Skipta algildisstaf út fyrir"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Símafundur <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Talhólfsnúmer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Hringir"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Ósvarað símtal frá <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Samtal í gangi"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vinnusímtal í gangi"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi símtal stendur yfir"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vinnusímtal í gangi um Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> í gangi"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> berst"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi símtal"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi vinnusímtal"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Í bið"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Móttekið símtal"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Móttekið símtal með mynd"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mikilvægt móttekið símtal með viðhengjum"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Vinnusímtal berst"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi símtal berst"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Vinnusímtal berst um Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Símtal sem berst er hugsanlega úr ruslnúmeri"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Myndbeiðni berst"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ekkert símasamband"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Valið símkerfi (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ekki tiltækt"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Svara"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Leggja á"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Myndskeið"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Tal"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Samþykkja"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Hafna"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Símtal í gangi í öðru tæki"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Myndsímtal í gangi í öðru tæki"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Þiggja símtal"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Þiggja myndsímtal"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Til að hringja símtal þarftu fyrst að slökkva á flugstillingu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ekki skráð á símkerfi."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Farsímakerfi ekki til staðar."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Sláðu inn gilt númer til að hringja símtal."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Ekki hægt að hringja."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Ræsir MMI-runu…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Þjónustan er ekki studd."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Ekki hægt að skipta milli símtala."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Ekki hægt að aðskilja símtal."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Ekki hægt að flytja."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Ekki hægt að halda símafund."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Ekki hægt að hafna símtali."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Ekki hægt að leggja á."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Neyðarsímtal"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Kveikir á loftneti…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ekkert samband. Reynir aftur…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Getur ekki hringt. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ekki neyðarsímanúmer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Ekki hægt að hringja. Hringdu í neyðarnúmer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Notaðu lyklaborðið til að hringja"</string>
-    <string name="player_started" msgid="9177182657338033086">"Spilari ræstur"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Spilari stöðvaður"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Myndavél ekki tilbúin"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Myndavél tilbúin"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Óþekkt atvik símtalslotu"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Aðrar símtalsstillingar"</string>
     <string name="goPrivate" msgid="5269514638004595378">"tala í einrúmi"</string>
-    <string name="selectContact" msgid="1703433172800564849">"velja tengilið"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Hringitónn og titringur"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Stjórna símafundi"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Neyðarnúmer"</string>
     <string name="child_number" msgid="3398257437107259682">"úr <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nýleg skilaboð"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Fyrirtækjaupplýsingar"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"í <xliff:g id="DISTANCE">%.1f</xliff:g> míl. fjarlægð"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"í <xliff:g id="DISTANCE">%.1f</xliff:g> km fjarlægð"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Opið á morgun frá kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Opið í dag frá kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Lokunartími kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Var lokað í dag kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Opið núna"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Lokað núna"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Þekkirðu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Er <xliff:g id="NUMBER">%1$s</xliff:g> ruslnúmer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> var sett á bannlista og tilkynnt."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Símtal frá <xliff:g id="NUMBER">%1$s</xliff:g> var ekki tilkynnt."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Ýttu til að bæta í tengiliði eða setja á bannlista."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Þetta er í fyrsta sinn sem hringt er í þig úr þessu númeri. Ef þetta símtal var úr ruslnúmeri geturðu sett það á bannlista og tilkynnt það."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Ýttu til að tilkynna sem EKKI RUSLNÚMER eða settu það á bannlista."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Okkur grunaði að þetta símtal væri úr ruslnúmeri. Ef það var ekki raunin skaltu ýta á EKKI RUSLNÚMER til að tilkynna okkur um þessi mistök."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Banna og tilkynna"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Bæta tengilið við"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ekki rusl"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Setja á bannlista"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Bæta við tengiliði"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Banna og tilkynna sem ruslnúmer"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ekki rusl"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ekkert SIM-kort eða villa á SIM-korti"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ljúka símtali"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Símafundur"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Í símtali"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Símtal heldur áfram og notar farsímagögn…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Símtal heldur áfram og notar farsímagögn…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ekki birta þetta aftur"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-it/strings.xml b/java/com/android/incallui/res/values-it/strings.xml
index 836b934..5a88b4f 100644
--- a/java/com/android/incallui/res/values-it/strings.xml
+++ b/java/com/android/incallui/res/values-it/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefono"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Audioconferenza"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Chiamata persa"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Inviare i numeri successivi?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Invio toni\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Invia"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sì"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Sostituisci carattere jolly con"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Audioconferenza <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Numero segreteria"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Chiamata in corso"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Chiamata senza risposta da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chiamata in corso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiamata di lavoro in corso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiamata Wi-Fi in corso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiamata di lavoro tramite Wi-Fi in corso"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> in corso"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> in arrivo"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chiamata Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chiamata Wi-Fi di lavoro"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In attesa"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chiamata in arrivo"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chiamata in arrivo con foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chiamata importante in arrivo con foto, messaggio e posizione"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chiamata importante in arrivo con allegati"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chiamata di lavoro in arrivo"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chiamata Wi-Fi in arrivo"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chiamata di lavoro in arrivo tramite Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chiamata di presunto spam in arrivo"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Richiesta video in arrivo"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nessun servizio"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rete selezionata (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponibile"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Rispondi"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Riaggancia"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voce"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accetta"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rifiuta"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Chiamata in corso su un altro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videochiamata in corso su un altro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Ricevi chiamata"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Ricevi videochiamata"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Per fare una telefonata, disattiva la modalità aereo."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non registrato sulla rete."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rete cellulare non disponibile."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Per effettuare una chiamata, inserisci un numero valido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossibile chiamare."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Inizio sequenza MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servizio non supportato."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Impossibile cambiare chiamata."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Impossibile separare la chiamata."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Impossibile trasferire."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Impossibile fare una chiamata in conferenza."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Impossibile rifiutare la chiamata."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Impossibile riagganciare."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Chiamata di emergenza"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Attivazione segnale cellulare..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nessun servizio. Nuovo tentativo…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Impossibile chiamare. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Impossibile chiamare. Componi un numero di emergenza."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Usa tastiera"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player avviato"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player interrotto"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"La fotocamera non è pronta"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Fotocamera pronta"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento sessione chiamata sconosciuto"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Altre impostazioni chiamate"</string>
     <string name="goPrivate" msgid="5269514638004595378">"Privato"</string>
-    <string name="selectContact" msgid="1703433172800564849">"seleziona contatto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Suoneria e vibrazione"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestisci audioconferenza"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numero di emergenza"</string>
     <string name="child_number" msgid="3398257437107259682">"tramite <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Messaggi recenti"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informazioni sull\'attività commerciale"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Distante <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Distante <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Apre domani alle ore <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Apre oggi alle ore <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Chiude alle ore <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Ha chiuso oggi alle ore <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Aperto ora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Ora chiuso"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Conosci <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> è spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> è stato bloccato e la chiamata è stata segnalata come spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"La chiamata da <xliff:g id="NUMBER">%1$s</xliff:g> è stata segnalata come non spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tocca per aggiungere ai contatti o per bloccare il numero come spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"È la prima volta che vieni chiamato da questo numero. Se la chiamata era spam, puoi bloccare il numero e segnalarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tocca per segnalare il numero come NON SPAM o per bloccarlo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Avevamo il sospetto che si trattasse di uno spammer. Se la chiamata non era spam, tocca NON SPAM per segnalare l\'errore."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blocca e segnala"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Aggiungi contatto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Non spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blocca numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Aggiungi ai contatti"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blocca e segnala spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Non spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nessuna SIM o errore della SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Termina chiamata"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Audioconferenza"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Chiamata in corso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Proseguimento della chiamata utilizzando la rete dati…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossibile passare alla rete Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videochiamata rimarrà sulla rete cellulare. Potrebbero essere applicati costi standard per il traffico dati."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Proseguimento della chiamata utilizzando i dati mobili…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossibile passare alla rete Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videochiamata rimarrà sulla rete mobile. Potrebbero essere applicati costi standard per il traffico dati."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrare più questo messaggio"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-iw/strings.xml b/java/com/android/incallui/res/values-iw/strings.xml
index 195cb0f..a58605d 100644
--- a/java/com/android/incallui/res/values-iw/strings.xml
+++ b/java/com/android/incallui/res/values-iw/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"טלפון"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"שיחת ועידה"</string>
-    <string name="call_lost" msgid="2082971531689406145">"השיחה נותקה"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"לשלוח את הצלילים הבאים?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"שולח צלילים\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"שלח"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"כן"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"לא"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"החלף את התו הכללי ב"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"שיחת ועידה <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"המספר של הדואר הקולי"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"מחייג"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"שיחה שלא נענתה מאת <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"שיחה פעילה"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"שיחת עבודה פעילה"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏שיחת Wi-Fi מתבצעת"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏שיחת עבודה פעילה ברשת WiFi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> פעילה"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> נכנסת"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏שיחת Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏שיחת עבודה ברשת Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"בהמתנה"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"שיחה נכנסת"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"שיחה נכנסת עם תמונה"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"שיחה נכנסת חשובה עם תמונה, הודעה ומיקום"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"שיחה נכנסת חשובה עם קבצים מצורפים"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"שיחת עבודה נכנסת"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏שיחת Wi-Fi נכנסת"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏שיחת עבודה נכנסת ברשת WiFi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"השיחה הנכנסת חשודה כספאם"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"בקשת וידאו נכנסת"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"אין שירות"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"הרשת שנבחרה (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) לא זמינה"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"ענה"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"נתק"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"סרטון"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"קול"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"קבל"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"דחה"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"באחד מהמכשירים האחרים מתבצעת שיחה"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"באחד מהמכשירים האחרים מתבצעת שיחת וידאו"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"קבל את השיחה"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"קבל את שיחת הווידאו"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"כדי להתקשר, כבה תחילה את מצב טיסה."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"לא רשום ברשת."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"רשת סלולרית אינה זמינה."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"כדי להתקשר, הזן מספר טלפון חוקי."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"לא ניתן להתקשר."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏מתחיל רצף MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"שירות לא נתמך."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"לא ניתן לעבור בין שיחות."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"לא ניתן להפריד שיחה."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"לא ניתן להעביר."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"לא ניתן לבצע שיחת ועידה."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"לא ניתן לדחות שיחה."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"לא ניתן לשחרר שיחות."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"שיחת חירום"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"מפעיל את הרדיו…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"אין שירות. מנסה שוב..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"לא ניתן להתקשר. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"לא ניתן להתקשר. חייג למספר חירום."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"השתמש במקלדת כדי לחייג"</string>
-    <string name="player_started" msgid="9177182657338033086">"הנגן הופעל"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"הנגן הפסיק"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"המצלמה לא מוכנה"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"המצלמה מוכנה"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"אירוע הפעלת שיחה לא ידוע"</string>
-    <string name="other_settings" msgid="2537377721890761197">"הגדרות שיחה אחרות"</string>
     <string name="goPrivate" msgid="5269514638004595378">"עבור לשיחה פרטית"</string>
-    <string name="selectContact" msgid="1703433172800564849">"בחר איש קשר"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"רינגטון ורטט"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"נהל שיחת ועידה"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"מספר חירום"</string>
     <string name="child_number" msgid="3398257437107259682">"דרך <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"הודעות אחרונות"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"פרטי עסק"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"במרחק <xliff:g id="DISTANCE">%.1f</xliff:g> מייל"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"במרחק <xliff:g id="DISTANCE">%.1f</xliff:g> ק\"מ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"ייפתח מחר ב-<xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"נפתח היום ב-<xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"נסגר ב-<xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"נסגר היום ב-<xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"פתוח עכשיו"</string>
-    <string name="closed_now" msgid="3962291301467974921">"סגור עכשיו"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"האם <xliff:g id="NUMBER">%1$s</xliff:g> מוכר לך?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"האם <xliff:g id="NUMBER">%1$s</xliff:g> הוא ספאם?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> נחסם והשיחה דווחה כספאם."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"השיחה מ-<xliff:g id="NUMBER">%1$s</xliff:g> דווחה שהיא אינה ספאם."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"הקש כדי להוסיף את המספר לאנשי הקשר או לחסום אותו כספאם."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"זוהי הפעם הראשונה שמתקשרים אליך מהמספר הזה. אם השיחה הזו הייתה ספאם, תוכל לחסום את המספר הזה ולדווח עליו."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"הקש כדי לדווח שזהו לא ספאם או כדי לחסום את המספר."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"חשדנו שהשיחה הזו היא ספאם. אם היא לא ספאם, הקש על \'לא ספאם\' כדי לדווח על הטעות שלנו."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"חסום ודווח"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"הוסף איש קשר"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"לא ספאם"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"חסום מספר"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"הוסף לאנשי הקשר"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"חסום ודווח כספאם"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"לא ספאם"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"‏אין SIM או שגיאת SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"סיים שיחה"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"שיחת ועידה"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"בשיחה"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ממשיך את השיחה באמצעות הרשת הסלולרית..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏לא ניתן לעבור לרשת Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על ידי הספק הסלולרי בגין צריכת נתונים."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ממשיך את השיחה באמצעות הרשת הסלולרית…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏לא ניתן לעבור לרשת Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על שימוש בנתונים."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"אל תציג זאת שוב"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ja/strings.xml b/java/com/android/incallui/res/values-ja/strings.xml
index 0e186fa..a3b0eb1 100644
--- a/java/com/android/incallui/res/values-ja/strings.xml
+++ b/java/com/android/incallui/res/values-ja/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"グループ通話"</string>
-    <string name="call_lost" msgid="2082971531689406145">"通話が遮断されました"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"次の番号を送信しますか？\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"番号送信\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"送信"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"はい"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"いいえ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ワイルド文字を置換:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"グループ通話 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ボイスメールの番号"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"発信中"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> さんからの不在着信"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"仕事の通話中"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi通話を発信中"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"仕事の Wi-Fi 通話中"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g>を進行中"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g>を着信中"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 経由で通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 経由で仕事の通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留中"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"通話着信"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"着信（写真あり）"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"重要な着信（写真、メッセージ、位置情報あり）"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"重要な着信（添付ファイルあり）"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"仕事の通話が着信中"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi通話が着信中"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"仕事の Wi-Fi 通話が着信中"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"迷惑電話の疑いがある通話を着信しています"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ビデオハングアウトリクエスト着信"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"通信サービスなし"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"選択したネットワーク（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）が利用できません"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"電話に出る"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"通話終了"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ビデオ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"音声"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"同意する"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"拒否"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"別の端末で通話中"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"別の端末でビデオハングアウト中"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"通話を引き継ぐ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ビデオハングアウトを引き継ぐ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"機内モードをOFFにしてから発信してください。"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ご加入の通信サービスがありません"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"モバイルネットワークが利用できません。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"発信するには、有効な番号を入力してください。"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"発信できません。"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMIシーケンスを開始中..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"サービスはサポートされていません。"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"通話を切り替えられません。"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"通話を分割できません。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"転送できません。"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"グループ通話できません。"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"着信を拒否できません。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"通話を解放できません。"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"緊急通報"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"無線通信をONにしています..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"通信サービスはありません。もう一度お試しください…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> は緊急通報番号ではありません。"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"発信できません。緊急通報番号におかけください。"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"キーボードで番号を入力してください"</string>
-    <string name="player_started" msgid="9177182657338033086">"プレーヤーを開始しました"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"プレーヤーを停止しました"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"カメラが準備できていません"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"カメラが準備できました"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"不明な通話セッションイベントです"</string>
-    <string name="other_settings" msgid="2537377721890761197">"その他の通話設定"</string>
     <string name="goPrivate" msgid="5269514638004595378">"個別通話に切り替え"</string>
-    <string name="selectContact" msgid="1703433172800564849">"連絡先を選択"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"着信音とバイブレーション"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"グループ通話オプション"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急通報番号"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>に着信"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"最近のメッセージ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ビジネス情報"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g>マイル圏内"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g>km圏内"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>、<xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>～<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>、<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"明日 <xliff:g id="OPEN_TIME">%s</xliff:g> に営業開始"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"本日 <xliff:g id="OPEN_TIME">%s</xliff:g> に営業開始"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> に営業終了"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"本日 <xliff:g id="CLOSE_TIME">%s</xliff:g> に営業終了"</string>
-    <string name="open_now" msgid="5897306702060039512">"現在営業中"</string>
-    <string name="closed_now" msgid="3962291301467974921">"営業終了"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"発信者（<xliff:g id="NUMBER">%1$s</xliff:g>）をご存知ですか？"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"「<xliff:g id="NUMBER">%1$s</xliff:g>」は迷惑電話ですか？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"「<xliff:g id="NUMBER">%1$s</xliff:g>」をブロックして、迷惑電話として報告しました。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"「<xliff:g id="NUMBER">%1$s</xliff:g>」からの通話は迷惑電話ではないと報告しました。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"タップして連絡先に追加するか、迷惑電話としてこの番号をブロックできます。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"この番号からの通話を着信したのはこれが初めてです。迷惑電話だった場合は、この番号をブロックして報告してください。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"タップして「迷惑電話ではない」と報告するか、この番号をブロックできます。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"この電話は迷惑電話として検出されました。この通話が迷惑電話ではなかった場合は、[迷惑電話ではない] をタップして、誤検知であることを報告してください。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ブロックして報告"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"連絡先を追加"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"迷惑メールではない"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"番号をブロック"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"連絡先に追加"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ブロックして迷惑電話として報告"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"迷惑電話ではない"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIMがない、またはSIMエラー"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"通話を終了"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"グループ通話"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"モバイルデータを使用して通話を継続しています…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ネットワークに切り替えることができませんでした"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"引き続きモバイル ネットワークを使用してビデオ通話を続行します。通常のデータ通信料が適用される場合があります。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"モバイルデータを使用して通話を継続しています…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ネットワークに切り替えることができませんでした"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"引き続きモバイル ネットワークを使用してビデオハングアウトを続行します。通常のデータ通信料が適用される場合があります。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"今後このメッセージを表示しない"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ka/strings.xml b/java/com/android/incallui/res/values-ka/strings.xml
index 6c46bd0..5a0252e 100644
--- a/java/com/android/incallui/res/values-ka/strings.xml
+++ b/java/com/android/incallui/res/values-ka/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ტელეფონი"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"საკონფერენციო ზარი"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ზარი შეწყვეტილია"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"გსურთ შემდეგი ტონების გაგზავნა?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ტონების გაგზავნა\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"გაგზავნა"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"დიახ"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"არა"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ჩანაცვლების სიმბოლო ჩანაცვლდეს შემდეგით:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"საკონფერენციო ზარი: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ხმოვანი ფოსტის ნომერი"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"მიმდინარეობს აკრეფა"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"გამოტოვებული ზარი <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ისგან"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"მიმდინარე ზარი"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"მიმდინარე ზარი (სამსახური)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"მიმდინარე Wi-Fi ზარი"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"მიმდინარე Wi-Fi ზარი (სამსახური)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"მიმდინარე <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"შემომავალი <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi ზარი"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi სამსახურებრივი ზარი"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"შეყოვნების რეჟიმში"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"შემომავალი ზარი"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"შემომავალი ზარი ფოტოთი"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"მნიშვნელოვანი შემომავალი ზარი დანართებით"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"შემომავალი ზარი (სამსახური)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"შემომავალი Wi-Fi ზარი"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"შემომავალი Wi-Fi ზარი (სამსახური)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"შემომავალი ზარი - სავარაუდოდ სპამი"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"შემომავალი ვიდეოს მოთხოვნა"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"სერვისი არ არის"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ხელმისაწვდომია არჩეული ქსელი (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"პასუხი"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"გათიშვა"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ვიდეო"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ხმა"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"მიღება"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"უარყოფა"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"სხვა მოწყობილობაზე მიმდინარე ზარი"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"მიმდინარე ვიდეო ზარი სხვა მოწყობილობაზე"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ზარის მიღება"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take ვიდეო ზარი"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ზარის განსახორციელებლად, ჯერ თვითმფრინავის რეჟიმი უნდა გამორთოთ."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ქსელში რეგისტრირებული არ არის."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ფიჭური ქსელი მიუწვდომელია"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ზარის განხორციელებისათვის, შეიყვანეთ მოქმედი ნომერი."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"არ ირეკება."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI თანმიმდევრობის დაწყება…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"მომსახურება არ არის მხარდაჭერილი."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ვერ ხორციელდება ზარების გადართვა."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ვერ ხორციელდება ზარის გამოყოფა."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"გადაცემა ვერ ხორციელდება."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"კონფერენცია ვერ სრულდება."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ზარის უარყოფა ვერ ხორციელდება."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ვერ ხერხდება ზარ(ებ)ის გაშვება."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"გადაუდებელი ზარი"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"გადამცემის ჩართვა…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"მომხსახურება არ არის. სცადეთ ხელხლა..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"დარეკვა ვერ ხერხდება. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> არ არის გადაუდებელი დახმარების ნომერი."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"დარეკვა ვერ ხორციელდება. აკრიფეთ საგანგებო ნომერი."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"კლავიატურის გამოყენება დასარეკად"</string>
-    <string name="player_started" msgid="9177182657338033086">"დამკვრელი ჩაირთო"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"დამკვრელი გამოირთო"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"კამერა არ არის მზად"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"კამერა მზადაა"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"უცნობი ზარის სეანსი"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ზარის სხვა პარამეტრები"</string>
     <string name="goPrivate" msgid="5269514638004595378">"პირადი რეჟიმი"</string>
-    <string name="selectContact" msgid="1703433172800564849">"კონტაქტის არჩევა"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ზარი და ვიბრაცია"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"საკონფერენციო ზარის მართვა"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"გადაუდებელი დახმარების ნომერი"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-დან"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ბოლო შეტყობინებები"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ბიზნეს-ინფორმაცია"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> მილში"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> კმ-ში"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"იხსნება ხვალ <xliff:g id="OPEN_TIME">%s</xliff:g>-ზე"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"იხსნება დღეს <xliff:g id="OPEN_TIME">%s</xliff:g>-ზე"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"იკეტება <xliff:g id="CLOSE_TIME">%s</xliff:g>-ზე"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"დაიკეტა დღეს <xliff:g id="CLOSE_TIME">%s</xliff:g>-ზე"</string>
-    <string name="open_now" msgid="5897306702060039512">"ახლა ღიაა"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ახლა დაკეტილია"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> ნაცნობია?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> სპამია?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> დაიბლოკა და ზარი სპამად მოინიშნა."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g>-დან ზარზე გაიგზავნა სპამის გაუქმების შეტყობინება."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"შეეხეთ კონტაქტებში დასამატებლად ან სპამის ნომრის დასაბლოკად."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ამ ნომრიდან პირველად დაგირეკეს. თუ ეს ზარი სპამი იყო, შეგიძლიათ დაბლოკოთ ეს ნომერი და შეგვატყობინოთ."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"შეეხეთ, რათა გვაცნობოთ, რომ „სპამი არ არის“, ან დაბლოკოთ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ვვარაუდობთ, რომ ეს სპამია. თუ ეს ზარი სპამი არ არის, შეეხეთ „სპამი არ არის“, რათა შეგვატყობინოთ ჩვენი შეცდომის შესახებ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"დაბლოკვა და შეტყობ."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"კონტაქტის დამატება"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"არ არის სპამი"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ნომრის დაბლოკვა"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"კონტაქტებში დამატება"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"დაბლოკვა და სპამის შესახებ შეტყობინება"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"არ არის სპამი"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM არ არის, ან SIM-ის შეცდომაა"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ზარის დასრულება"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"საკონფერენციო ზარი"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"მონაწილეობს ზარში"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ქსელზე გადართვა ვერ მოხერხდა"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ვიდეოზარი ფიჭურ ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული ფასის გადახდა."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ქსელზე გადართვა ვერ მოხერხდა"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ვიდეოზარი მობილური ინტერნეტის ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული საფასურის გადახდა."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"აღარ მაჩვენო"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kk/strings.xml b/java/com/android/incallui/res/values-kk/strings.xml
index 310ba4d..e7ab76d 100644
--- a/java/com/android/incallui/res/values-kk/strings.xml
+++ b/java/com/android/incallui/res/values-kk/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Мәжіліс қоңырауы"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Қоңырау үзілді"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Келесі әуендер жіберілсін бе?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Жіберу әуендері\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Жіберу"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Иә"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Жоқ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Ерекше таңбаны келесі таңбамен алмастыру"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"<xliff:g id="CONF_CALL_TIME">%s</xliff:g> мәжіліс қоңырауы"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Дауыстық пошта нөмірі"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Терілуде"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> қоңырауы өткізіп алынған"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ағымдағы қоңырау"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ағымдағы жұмыс қоңырауы"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ағымдық Wi-Fi қоңырауы"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ағымдағы Wi-Fi жұмыс қоңырауы"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> қазіргі қоңырауы"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> кіріс қоңырауы"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi қоңырауы"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi жұмыс қоңырауы"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтуде"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Келген қоңырау"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сурет тіркелген кіріс қоңырау"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сурет, хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тіркемелері бар маңызды кіріс қоңырау"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Кіріс жұмыс қоңырауы"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кіріс Wi-Fi қоңырауы"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Кіріс Wi-Fi жұмыс қоңырауы"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Кіріс қоңырауы спам болуы мүмкін"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Кіріс бейне сұрау"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Қызмет көрсетілмейді"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Таңдалған (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) желісі қол жетімсіз"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Жауап"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Қоңырауды аяқтау"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Бейне"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Дауыс"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Қабылдау"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Қабылдамау"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Қоңырау басқа құрылғыдан шалынуда"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Басқа құрылғыда бейне қоңырау шалынуда"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Қоңырауды бері бұру"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Бейне қоңырауды бері бұру"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Қоңырау шалу үшін алдымен Ұшақ режимін өшіріңіз."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Желіде тіркелмеген."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Ұялы желі қол жетімді емес."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Қоңырау шалу мүмкін емес."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI қатарын бастау…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Қызметке қолдау көрсетілмейді."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Қоңырауларды ауыстыру мүмкін емес."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Қоңырауды бөлу мүмкін емес."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Тасымалдау мүмкін емес."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Конференция мүмкін емес."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Қоңырауды қабылдамау мүмкін емес."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Қоңырау(лар)ды босату мүмкін емес."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Төтенше қоңырау"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Радионы қосуда…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Қызмет жоқ. Әрекет қайталануда…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Қоңырау шалу мүмкін емес. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> төтенше нөмір емес."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Қоңырау шалу мүмкін емес. Жедел нөмірді теріңіз."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Теру үшін пернетақтаны қолдану"</string>
-    <string name="player_started" msgid="9177182657338033086">"Ойнатқыш іске қосылды"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Ойнатқыш тоқтатылды"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера дайын емес"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера дайын"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Белгісіз қоңырау сеансы оқиғасы"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Басқа қоңырау параметрлері"</string>
     <string name="goPrivate" msgid="5269514638004595378">"жеке қоңырауға ауысу"</string>
-    <string name="selectContact" msgid="1703433172800564849">"контакт таңдау"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Қоңырау әуені және діріл"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Конференциялық қоңырауды басқару"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Төтенше жағдай нөмірі"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> арқылы"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Жақындағы хабарлар"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Іскери ақпарат"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> миля қашықтықта"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> км қашықтықта"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ертең <xliff:g id="OPEN_TIME">%s</xliff:g> уақытында ашылады"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Бүгін <xliff:g id="OPEN_TIME">%s</xliff:g> уақытында ашылады"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> уақытында жабылады"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Бүгін <xliff:g id="CLOSE_TIME">%s</xliff:g> уақытында жабық"</string>
-    <string name="open_now" msgid="5897306702060039512">"Қазір ашық"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Қазір жабық"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> нөмірін білесіз бе?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> нөмірі спам ба?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> нөмірі бөгеліп, қоңырау туралы спам деп есеп берілді."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> қоңырауы спам емес деп есеп берілді."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Контактілерге қосу немесе спам нөмірді бөгеу үшін түртіңіз."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Бұл нөмір сізге алғаш рет қоңырау шалып тұр. Егер қоңырау спам болса, нөмірді бөгеп, спам деп есеп беруге болады."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"СПАМ ЕМЕС деп есеп беру үшін түртіңіз немесе оны бөгеңіз."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Біз бұл қоңырауды спаммер деп күдіктендік. Спам болмаса, біздің қатеміз туралы есеп беру үшін \"СПАМ ЕМЕС\" түймесін түртіңіз."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Бөгеу және есеп беру"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Байланыс қосу"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Спам емес"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Нөмірді бөгеу"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Контактілерге қосу"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Бөгеу және спам туралы есеп беру"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Спам емес"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM жоқ немесе SIM қателігі"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Қоңырауды аяқтау"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Мәжіліс қоңырауы"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Бос емес"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Қоңырау ұялы дерек арқылы жалғасады..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi желісіне қосылу мүмкін болмады"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Бейне қоңырау ұялы байланыс желісінде қалады. Стандартты деректер ақысы алынуы мүмкін."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Қоңырау мобильдік желі арқылы жалғасуда…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi желісіне қосылу мүмкін болмады"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Бейне қоңырау мобильдік желіде қалады. Стандартты мобильдік байланыс ақысы алынуы мүмкін."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Мұны қайтадан көрсетпеу"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-km/strings.xml b/java/com/android/incallui/res/values-km/strings.xml
index 4fbafef..70bad6a 100644
--- a/java/com/android/incallui/res/values-km/strings.xml
+++ b/java/com/android/incallui/res/values-km/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ទូរស័ព្ទ"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"ការ​ហៅ​ជា​សន្និសីទ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ការហៅទូរស័ព្ទបានដាក់ចុះ"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ផ្ញើ​សំឡេង​ដូច​ខាងក្រោម?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ផ្ញើ​សំឡេង \n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ផ្ញើ"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"បាទ/ចាស"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"ទេ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ជំនួស​តួ​អក្សរ​ជំនួស​ដោយ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"ការ​ហៅ​ជា​សន្និសីទ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"លេខ​សារ​ជា​សំឡេង"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"កំពុងហៅ"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"ខកខាន​ទទួល​ពី <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"កំពុង​បន្ត​ការ​ហៅ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ការហៅពីកន្លែងការងារកំពុងដំណើរការ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ការហៅតាម Wi-Fi កំពុងបន្ត"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ការហៅតាម Wi-Fi ពីកន្លែងការងារកំពុងដំណើរការ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> កំពុង​បន្ត"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ចូល"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ហៅតាម Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ការហៅ​តាម Wi‑Fi ពី​កន្លែង​ការងារ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"រង់ចាំ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ការ​ហៅ​ចូល"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ការហៅ​ចូល​​ដែល​មាន​រូបថត"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត សារ និង​ទីតាំង"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ការហៅ​​ចូល​ដែល​សំខាន់​មាន​ឯកសារ​ភ្ជាប់"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"កំពុងហៅចូលពីកន្លែងការងារ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"មានការហៅចូលមកតាម Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"កំពុងហៅចូលពីកន្លែងការងារតាម Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ការ​ហៅ​បន្លំ​​ចូល​​​ដែល​សង្ស័យ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"សំណើ​ការ​ហៅ​ជា​វីដេអូ​ចូល"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"គ្មាន​សេវា"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"បណ្ដាញ​ដែល​បាន​ជ្រើស ( <xliff:g id="OPERATOR_NAME">%s</xliff:g> ) មិន​អាច​ប្រើ​បាន​ទេ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"ឆ្លើយតប"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"បញ្ចប់​ការ​សន្ទនា"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"វីដេអូ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"សំឡេង"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ព្រម​ទទួល"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"បដិសេធ"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"ការ​ហៅ​កំពុង​ដំណើរការ​លើ​ឧបករណ៍​ផ្សេង"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"ការ​ហៅ​ជាវីដេអូ​កំពុង​ដំណើរការ​នៅលើឧបករណ៍ផ្សេងទៀត"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ទទួលយកការហៅ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ទទួល​យក​ការ​ហៅ​វីដេអូ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ដើម្បី​កំណត់​ការ​ហៅ ដំបូង​ត្រូវ​បិទ​របៀប​នៅ​ពេល​ជិះ​យន្តហោះ។"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"មិន​បាន​ចុះ​ឈ្មោះ​នៅ​លើ​បណ្ដាញ។"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន។"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ដើម្បីធ្វើការហៅ បញ្ចូលលេខដែលមានសុពលភាព។"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"មិនអាចហៅបានទេ។"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"កំពុង​ចាប់ផ្ដើម​លំដាប់ MMI ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"សេវាកម្មមិនត្រូវបានគាំទ្រទេ។"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"មិនអាចឆ្លាស់ការហៅបានទេ។"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"មិនអាចបំបែកការហៅបានទេ។"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"មិនអាចផ្ទេរបានទេ។"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"មិនអាចទំនាក់ទំនងបានទេ។"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"មិនអាចបដិសេធការហៅបានទេ។"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"មិនអាចបញ្ចេញការហៅបានទេ។"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"ការ​ហៅ​នៅ​ពេល​មាន​អាសន្ន"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"កំពុង​បើក​វិទ្យុ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"គ្មានសេវាទេ។ ព្យាយាមម្តង…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"មិនអាចហៅបានទេ។ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> មិនមែនជាលេខអាសន្នទេ"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"មិនអាចហៅបានទេ។ ចុចហៅលេខអាសន្ន។"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ប្រើ​​ក្ដារចុច​ដើម្បី​ចុច​លេខ"</string>
-    <string name="player_started" msgid="9177182657338033086">"អ្នកលេងបានចាប់ផ្តើម"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"អ្នកលេងបានឈប់"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"កាមេរ៉ាមិនទាន់ត្រៀមទេ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"កាមេរ៉ាត្រៀមស្រេចហើយ"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"ព្រឹត្តិការណ៍សម័យនៃការហៅមិនស្គាល់"</string>
-    <string name="other_settings" msgid="2537377721890761197">"​កំណត់​ការ​​ហៅ​ផ្សេងទៀត"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ទៅ​កាន់​ឯកជន"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ជ្រើស​ទំនាក់ទំនង"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"សំឡេងរោទ៍ &amp; ញ័រ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"គ្រប់គ្រងការហៅជាក្រុម"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"លេខ​ពេល​អាសន្ន"</string>
     <string name="child_number" msgid="3398257437107259682">"តាមរយៈ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"សារថ្មីៗ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ព័ត៌មានធុរកិច្ច"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"ចម្ងាយ <xliff:g id="DISTANCE">%.1f</xliff:g> ម៉ាយល៍"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"ចម្ងាយ <xliff:g id="DISTANCE">%.1f</xliff:g> គម"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"បើកថ្ងៃស្អែកនៅម៉ោង <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"បើកថ្ងៃនេះនៅម៉ោង <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"បិទនៅម៉ោង <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"បានបិទថ្ងៃនេះនៅម៉ោង <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"បើកឥឡូវនេះ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"បិទឥឡូវនេះ"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"ស្គាល់ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"តើ <xliff:g id="NUMBER">%1$s</xliff:g> ជា​សារ​ឥត​បាន​ការ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"បាន​បិទ <xliff:g id="NUMBER">%1$s</xliff:g> និង​បាន​រាយការណ៍​ការ​ហៅ​ថា​ជា​សារ​ឥត​បានការ។"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"ការ​ហៅ​ពី <xliff:g id="NUMBER">%1$s</xliff:g> បាន​រាយការណ៍​ថា​មិន​មែន​ជា​សារ​ឥត​បានការ។"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"ប៉ះ​​ដើម្បី​បន្ថែម​ទំនាក់ទំនង ឬ​​ទប់ស្កាត់​លេខ​ដែល​ជា​សារ​ឥត​បាន​​ការ។"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"នេះ​គឺ​ជា​លើក​ដំបូង​ហើយ​ដែល​លេខ​នេះ​បាន​ហៅ​មក​អ្នក។ បើ​ការ​ហៅ​នេះ​ជា​សារ​ឥត​បានការ អ្នក​អាច​ទប់ស្កាត់​លេខ​​នេះ និង​រាយការណ៍​វា។"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"ប៉ះ​ដើម្បី​រាយការណ៍​​ថា​មិន​មែន​ជា​សារ​ឥត​បានការ ឬ​ទប់ស្កាត់​វា។"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"យើង​សង្ស័យ​​ថា​វា​​ជា​សារ​ឥត​បាន​ការ។ បើ​ការ​ហៅ​នេះ​មិន​មែន​សារ​ឥត​បានការ សូម​ប៉ះ​មិន​មែន​សារ​ឥត​បានការ​ដើម្បី​រាយការណ៍​កំហុស​របស់​យើង។"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ទប់ស្កាត់ &amp; រាយការណ៍"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"បន្ថែម​ទំនាក់ទំនង"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"មិនមែន​សារ​ឥតបានការ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ទប់ស្កាត់​លេខ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"បន្ថែម​ទៅ​ទំនាក់ទំនង"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ទប់ស្កាត់ &amp; រាយការណ៍​សារ​ឥត​បានការ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"មិនមែន​សារ​ឥតបានការ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"គ្មាន​ស៊ីមកាត ឬ​កំហុស​ស៊ីមកាត"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"បញ្ចប់ការហៅ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ហៅជា​សន្និសីទ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ស្ថិត​​ក្នុង​ការ​ហៅ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"កំពុង​បន្ត​ហៅ​ទូរស័ព្ទ​ដោយ​ប្រើ​ទិន្នន័យ​ទូរស័ព្ទ​ចល័ត..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ការហៅ​ជា​វីដេអូ​នឹង​នៅ​តែ​​ស្ថិត​លើ​បណ្ដាញ​ទូរសព្ទ​ចល័ត។ អាច​​នឹង​​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​​ស្តង់ដារ។"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"កំពុង​បន្ត​ការហៅ​ទូរសព្ទ​ ដោយ​ប្រើប្រាស់​ទិន្នន័យទូរសព្ទ​ចល័ត…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi បាន​ទេ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ការហៅ​តាម​វីដេអូ​នឹង​នៅតែ​មាន​នៅ​លើ​បណ្ដាញ​ទូរសព្ទចល័ត។ អាច​នឹង​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​ស្តង់ដារ។"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"កុំ​បង្ហាញ​វា​ម្ដង​ទៀត"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kn/strings.xml b/java/com/android/incallui/res/values-kn/strings.xml
index 5d47c7e..269e530 100644
--- a/java/com/android/incallui/res/values-kn/strings.xml
+++ b/java/com/android/incallui/res/values-kn/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ಫೋನ್"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ಕರೆಯನ್ನು ಬಿಡಲಾಗಿದೆ"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ಕೆಳಗಿನ ಟೋನ್‌ಗಳನ್ನು ಕಳುಹಿಸುವುದೇ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ಟೋನ್‌ಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ಕಳುಹಿಸು"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ಹೌದು"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"ಇಲ್ಲ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ಇದರೊಂದಿಗೆ ವಿಶೇಷ ಅಕ್ಷರಗಳನ್ನು ಸ್ಥಳಾಂತರಿಸು"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ಮಿಸ್ಡ್ ಕಾಲ್"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕರೆ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ಒಳಬರುವ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ವೈ‑ಫೈ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ಒಳಬರುವ ಕರೆ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ಒಳಬರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ಒಳಬರುವ ವೈ-ಫೈ ಕೆಲಸದ ಕರೆ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ಒಳಬರುವ ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ಒಳಬರುವ ವೀಡಿಯೊ ವಿನಂತಿ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ಯಾವುದೇ ಸೇವೆಯಿಲ್ಲ"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ಆಯ್ಕೆಮಾಡಿದ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"ಉತ್ತರ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ಹ್ಯಾಂಗ್ ಅಪ್ ಮಾಡಿ"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ವೀಡಿಯೊ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ಧ್ವನಿ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ಸಮ್ಮತಿಸು"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ನಿರಾಕರಿಸಿ"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ವೀಡಿಯೊ ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಇನ್ನೂ ನೋಂದಣಿಯಾಗಿಲ್ಲ."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ಕರೆಯನ್ನು ಮಾಡಲು, ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ಅನುಕ್ರಮ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ಸೇವೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ಕರೆಯನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"ಕಾನ್ಫರೆನ್ಸ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ಕರೆ(ಗಳು) ಬಿಡುಗಡೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"ತುರ್ತು ಕರೆಗಳು"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ರೇಡಿಯೋ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ತುರ್ತು ಸಂಖ್ಯೆಯಲ್ಲ."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ತುರ್ತು ಸಂಖ್ಯೆಯನ್ನು ಡಯಲ್ ಮಾಡಿ."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
-    <string name="player_started" msgid="9177182657338033086">"ಪ್ಲೇಯರ್‌ ಪ್ರಾರಂಭವಾಗಿದೆ"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"ಪ್ಲೇಯರ್‌ ನಿಲ್ಲಿಸಲಾಗಿದೆ"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ಕ್ಯಾಮರಾ ಸಿದ್ಧವಾಗಿಲ್ಲ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ಕ್ಯಾಮರಾ ಸಿದ್ಧವಾಗಿದೆ"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"ಅಪರಿಚಿತ ಕರೆಯ ಸೆಶನ್‌ ಈವೆಂಟ್‌"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ಇತರ ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ಖಾಸಗಿಯಾಗಿ ಹೋಗಿ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ಸಂಪರ್ಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ರಿಂಗ್‌ಟೋನ್ ಮತ್ತು ವೈಬ್ರೇಟ್‌"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ತುರ್ತು ಸಂಖ್ಯೆ"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ಮೂಲಕ"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳು"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ವ್ಯಾಪಾರ ಮಾಹಿತಿ"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> ಮೈಲು ದೂರ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> ಕಿಮೀ ದೂರ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"ನಾಳೆ <xliff:g id="OPEN_TIME">%s</xliff:g> ಗಂಟೆಗೆ ತೆರೆಯುತ್ತದೆ"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ಇಂದು <xliff:g id="OPEN_TIME">%s</xliff:g> ಗಂಟೆಗೆ ತೆರೆಯುತ್ತದೆ"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> ಗಂಟೆಗೆ ಮುಚ್ಚಲಾಗಿದೆ"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ಇಂದು <xliff:g id="CLOSE_TIME">%s</xliff:g> ಗಂಟೆಗೆ ಮುಚ್ಚಲಾಗಿದೆ"</string>
-    <string name="open_now" msgid="5897306702060039512">"ಇದೀಗ ತೆರೆಯಲಾಗಿದೆ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ಇದೀಗ ಮುಚ್ಚಲಾಗಿದೆ"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> ತಿಳಿದಿದೆಯೇ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> ಸ್ಪ್ಯಾಮ್ ಆಗಿದೆಯೇ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಮತ್ತು ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿಂದ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿಮಾಡಲಾಗಿದೆ."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಲು ಅಥವಾ ಸ್ಪ್ಯಾಮ್ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ಇದೇ ಮೊದಲ ಬಾರಿಗೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ನಿಮಗೆ ಕರೆ ಮಾಡಲಾಗಿದೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಎನಿಸಿದರೆ, ನೀವು ಈ ಕರೆಯನ್ನು ನಿರ್ಬಂಧಿಸಬಹುದು ಮತ್ತು ವರದಿ ಮಾಡಿ."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಇದನ್ನು ನಿರ್ಬಂಧಿಸಿ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ನಾವು ಈ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮರ್‌ ಎಂದು ಶಂಕಿಸಿದ್ದೇವೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ಭಾವಿಸಿದರೆ, ನಮ್ಮ ತಪ್ಪಾದ ವರದಿಗೆ NOT SPAM ಎಂದು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ವರದಿ ಮಾಡಿ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸು"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ವರದಿ ಮಾಡಿ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ಯಾವುದೇ ಸಿಮ್‌ ಇಲ್ಲ ಅಥವಾ ಸಿಮ್‌ ದೋಷ"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ಕರೆಯಲ್ಲಿ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ವೀಡಿಯೊ ಕರೆ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ವೀಡಿಯೊ ಕರೆ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ಮತ್ತೆ ಇದನ್ನು ತೋರಿಸಬೇಡ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ko/strings.xml b/java/com/android/incallui/res/values-ko/strings.xml
index 44c5338..9928858 100644
--- a/java/com/android/incallui/res/values-ko/strings.xml
+++ b/java/com/android/incallui/res/values-ko/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"휴대전화"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"다자간 통화"</string>
-    <string name="call_lost" msgid="2082971531689406145">"연락되지 않음"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"다음 톤을 보내시겠습니까?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"신호음 보내기\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"전송"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"예"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"아니요"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"와일드 문자를 다음으로 바꿈:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"다자간 통화 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"음성사서함 번호"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"전화 거는 중"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>의 부재중 전화"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"현재 통화"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"발신 업무 전화"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi 발신 전화"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"발신 Wi-Fi 업무 전화"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"진행 중인 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"수신 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 통화"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 업무 통화"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"대기 중"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"수신전화"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"사진이 있는 수신 전화"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"사진, 메시지, 위치가 있는 중요한 수신 전화"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"첨부파일이 있는 중요한 수신 전화"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"수신 업무 전화"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 수신 전화"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"수신 Wi-Fi 업무 전화"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"의심스러운 스팸 발신자로부터 온 전화"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"수신 동영상 요청"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"서비스 불가"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"선택한 네트워크(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)를 사용할 수 없음"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"통화"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"전화 끊기"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"동영상"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"음성"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"수락"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"거부"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"다른 기기에서 진행 중인 통화"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"다른 기기에서 진행 중인 화상 통화"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"전화 받기"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"화상 통화 받기"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"전화를 걸려면 먼저 비행기 모드를 해제하세요."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"네트워크에서 등록되지 않았습니다."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"사용 가능한 이동통신망이 없습니다."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"전화를 걸려면 올바른 번호를 입력하세요."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"전화를 걸 수 없습니다."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI 시퀀스 시작 중..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"서비스가 지원되지 않습니다."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"통화를 전환할 수 없습니다."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"통화를 분리할 수 없습니다."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"통화를 전환할 수 없습니다."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"컨퍼런스 콜을 이용할 수 없습니다."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"통화를 거절할 수 없습니다."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"통화를 끊을 수 없습니다."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"긴급 전화"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"무선을 켜는 중..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"서비스를 사용할 수 없습니다. 다시 시도 중..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"전화를 걸 수 없습니다. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아닙니다."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"전화를 걸 수 없습니다. 긴급 번호를 사용하세요."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"키보드를 사용하여 전화걸기"</string>
-    <string name="player_started" msgid="9177182657338033086">"플레이어가 시작되었습니다."</string>
-    <string name="player_stopped" msgid="5040965200339765956">"플레이어가 중지되었습니다."</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"카메라가 준비되지 않았습니다."</string>
-    <string name="camera_ready" msgid="4312684554501216898">"카메라가 준비되었습니다."</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"알 수 없는 통화 세션 이벤트"</string>
-    <string name="other_settings" msgid="2537377721890761197">"기타 통화 설정"</string>
     <string name="goPrivate" msgid="5269514638004595378">"비공개로 실행"</string>
-    <string name="selectContact" msgid="1703433172800564849">"연락처 선택"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"벨소리 및 진동"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"다자간 통화 관리"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"비상 전화번호"</string>
     <string name="child_number" msgid="3398257437107259682">"수신 번호: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"최근 메시지"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"비즈니스 정보"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g>mi 거리"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g>km 거리"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>~<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"내일 <xliff:g id="OPEN_TIME">%s</xliff:g>에 영업 시작"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"오늘 <xliff:g id="OPEN_TIME">%s</xliff:g>에 영업 시작"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>에 영업 종료"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"오늘 <xliff:g id="CLOSE_TIME">%s</xliff:g>에 영업 종료됨"</string>
-    <string name="open_now" msgid="5897306702060039512">"영업 중"</string>
-    <string name="closed_now" msgid="3962291301467974921">"영업 종료"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g>이(가) 아시는 전화번호인가요?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g>이(가) 스팸인가요?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g>을(를) 차단하고 스팸으로 신고했습니다."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g>에서 걸려온 전화는 스팸이 아닌 것으로 신고했습니다."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"탭하여 주소록에 추가하거나 스팸 전화번호를 차단합니다."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"이 번호에서 처음으로 걸려온 전화입니다. 이 전화가 스팸이라면 이 전화번호를 차단하고 신고할 수 있습니다."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"탭하여 스팸이 아닌 것으로 신고하거나 차단합니다."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"스팸 발송자로 의심됩니다. 이 전화가 스팸이 아니었다면 \'스팸 아님\'을 탭하여 실수였음을 보고합니다."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"차단 및 신고"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"연락처 추가"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"스팸 해제"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"번호 차단"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"주소록에 추가"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"스팸 차단/신고"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"스팸 해제"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM이 없거나 SIM에 오류가 있습니다."</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"통화 종료"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"다자간 통화"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"통화 중"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"모바일 데이터를 사용하여 계속 통화 중…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi 네트워크로 전환할 수 없습니다."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"화상 통화가 모바일 네트워크에서 유지됩니다. 표준 데이터 요금이 부과될 수 있습니다."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"모바일 데이터를 사용하여 통화를 계속합니다…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi 네트워크로 전환할 수 없습니다."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"화상 통화가 모바일 네트워크에서 계속됩니다. 표준 데이터 요금이 부과될 수 있습니다."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"다시 표시하지 않음"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ky/strings.xml b/java/com/android/incallui/res/values-ky/strings.xml
index 0f8ee3c..f9fb7e6 100644
--- a/java/com/android/incallui/res/values-ky/strings.xml
+++ b/java/com/android/incallui/res/values-ky/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конференц-чалуу"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Чалуу үзүлдү"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Төмөнкү номер жөнөтүлсүнбү?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Тоналдык жөнөтүү болууда \n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Жөнөтүү"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ооба"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Жок"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Атайын белгини муну менен алмаштыр"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конференц-чалуу <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Үн почтасынын номери"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Терилүүдө"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> дегенден кабыл алынбаган чалуу"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Учурдагы чалуу"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Учурда болуп жаткан чалуу (жумуш боюнча)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Аткаруудагы Wi-Fi чалуу"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Учурда болуп жаткан Wi-Fi чалуу (жумуш боюнча)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Учурдагы <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Кирүүчү <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi чалуу"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"жумуш боюнча Wi-Fi чалуу"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Күтүлүүдө"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Кирүүчү чалуу"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сүрөтү бар кирүүчү чалуу"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сүрөт, билдирүү жана жайгашкан жер бар маанилүү чалуу"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тиркемелери бар маанилүү кирүүчү чалуу"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Жумуш боюнча келип жаткан чалуу"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Кирүүчү Wi-Fi чалуу"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Жумуш боюнча келип жаткан Wi-Fi чалуу"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Келип жаткан чалуу спам окшойт"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Келип жаткан видео сурамы"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Байланыш жок"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Тандалган тармак (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) жеткиликсиз"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Жооп берүү"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Телефонду коюу"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Үн"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Кабыл алуу"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Четке кагуу"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Башка түзмөктө сүйлөшүп жатасыз"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Башка түзмөктөгү видео чалууда да катышып жатасыз"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Чалууну кабыл алуу"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Видео чалууну кабыл алуу"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Чалуу үчүн, адегенде учак режимин өчүрүңүз."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Тармакта катталган эмес."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобилдик тармак жеткиликтүү эмес."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Чалынбай жатат."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI кезеги башталууда…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Кызмат колдоого алынбайт."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Чалуулар которуштурулбай жатат."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Чалуу бөлүнбөй жатат."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Өткөрүлбөй жатат."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Конференц-байланышы түзүлбөй жатат."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Чалуу четке кагылбай жатат."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Чалуу(лар) бошотулбай жатат."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Шашылыш чалуу"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Радио күйгүзүлүүдө…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Кызмат жок. Кайра аракет кылууда…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Чалынбай жатат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> өзгөчө кырдаал номери эмес."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Чалынбай жатат. Өзгөчө кырдаал номерин териңиз."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Баскычтоп менен териңиз"</string>
-    <string name="player_started" msgid="9177182657338033086">"Ойноткуч башталды"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Ойноткуч токтотулду"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера даяр эмес"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера даяр"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Чалуу сеансынын окуясы белгисиз"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Башка чалуу жөндөөлөрү"</string>
     <string name="goPrivate" msgid="5269514638004595378">"купуя режимине өтүү"</string>
-    <string name="selectContact" msgid="1703433172800564849">"байланыш тандоо"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Шыңгыроо жана дирилдөө"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Конференц-чалууну башкаруу"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Куткаруучулардын номуру"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> аркылуу"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Акыркы билдирүүлөр"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Ишкердик маалыматы"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> миля алыста"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> км алыста"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Эртең саат <xliff:g id="OPEN_TIME">%s</xliff:g> ачылат"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Бүгүн саат <xliff:g id="OPEN_TIME">%s</xliff:g> ачылат"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Саат <xliff:g id="CLOSE_TIME">%s</xliff:g> жабылат"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Бүгүн саат <xliff:g id="CLOSE_TIME">%s</xliff:g> жабылды"</string>
-    <string name="open_now" msgid="5897306702060039512">"Эми ачылды"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Эми жабылды"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Тааныйсызбы <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> спамбы?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлдү жана бул чалуу спам деп кабарланды."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> номеринен келген чалуу спам эмес деп кабарланды."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Номерди байланыштарга кошуу үчүн тийип коюңуз же спам деп бөгөттөп салыңыз."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Бул номер сизге биринчи жолу чалып жатат. Ал спам болсо, номерди бөгөттөп жана ал жөнүндө кабарлап койсоңуз болот."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"СПАМ ЭМЕС деп кабарлоо үчүн тийип коюңуз же аны бөгөттөңүз."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Бул спам окшойт. Эгер спам эмес десеңиз, СПАМ ЭМЕС дегенди басып бизге кабарлап коюңуз."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Бөгөттөө жана кабарлоо"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Байланыш кошуу"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Спам эмес"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Номурду бөгөттөө"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Байланыштарга кошуу"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Бөгөттөө жана спам тууралуу кабарлоо"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Спам эмес"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM-карта жок же анда ката кетти"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Чалууну бүтүрүү"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-чалуу"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Чалууда"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Уюлдук дайындарды пайдалануу менен чалууну улантууда..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi тармагына туташа албай койдук"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео чалуу уюлдук тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобилдик дайындарды пайдалануу менен чалууну улантууда…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi тармагына туташа албай койдук"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео чалуу мобилдик тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Экинчи көрсөтүлбөсүн"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lo/strings.xml b/java/com/android/incallui/res/values-lo/strings.xml
index 56335d4..c253d5e 100644
--- a/java/com/android/incallui/res/values-lo/strings.xml
+++ b/java/com/android/incallui/res/values-lo/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ໂທລະສັບ"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"ປະຊຸມສາຍ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ສາຍ​ຫຼຸດ​ແລ້ວ"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ສົ່ງໂທນສຽງຕໍ່ໄປນີ້ບໍ່?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ກຳລັງສົ່ງໂທນສຽງ\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ສົ່ງ"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ຕົກລົງ"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"ບໍ່"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ແທນທີ່ \"ໂຕອັກສອນທົດແທນ\" ດ້ວຍ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"ປະຊຸມສາຍ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ເບີຂໍ້ຄວາມສຽງ"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ກຳລັງໂທ"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"ສາຍບໍ່ໄດ້ຮັບຈາກ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ສາຍທີ່ກຳລັງໂທອອກ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ສາຍໂທອອກຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ການ​ໂທ Wi​-Fi ທີ່ດໍາເນີນຢູ່"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ສາຍໂທອອກ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ກຳລັງໂທ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ສາຍໂທເຂົ້າ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ການໂທ Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ສາຍວຽກ Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ສາຍໂທເຂົ້າ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມໄຟລ໌ແນບ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ສາຍໂທເຂົ້າຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ສາຍໂທເຂົ້າ Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ສາຍໂທເຂົ້າ Wi-Fi ຈາກບ່ອນເຮັດວຽກ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ມີການໂທທີ່ຄາດວ່າເປັນສະແປມໂທເຂົ້າມາ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"​ຄຳ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ​ເຂົ້າ​ມາ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ບໍ່ມີບໍລິການ"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ບໍ່ສາມາດໃຊ້ເຄືອຂ່າຍທີ່ເລືອກ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ໄດ້"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"ຄໍາ​ຕອບ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ວາງສາຍ"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ວິດີໂອ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ສຽງ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ຍອມຮັບ"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ປະຕິເສດ"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"ສາຍທີ່ກຳລັງໂທອອກໃນອຸປະກອນອື່ນ"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"ສາຍວິດີໂອທີ່ກຳລັງໂທອອກໃນເຄື່ອງອື່ນ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ຮັບສາຍ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ຮັບສາຍວິດີໂອ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ເພື່ອໂທລະສັບ, ໃຫ້ປິດໂໝດຢູ່ເທິງຍົນກ່ອນ."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ບໍ່ໄດ້ລົງທະບຽນໃນເຄືອຂ່າຍ."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ບໍ່​ມີ​ເຄືອ​ຂ່າຍ​ມື​ຖື​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ເພື່ອ​ທີ່​ຈະ​ໂທ, ປ້ອນ​ເບີ​ໂທ​ທີ່​ໃຊ້​ໄດ້​ເຂົ້າ​ໄປ."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"ກຳລັງເລີ່ມຕົ້ນລຳດັບ MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ບໍ່​ສາ​ມາດ​ສະ​ຫຼັບ​ສາ​ຍ​ໂທ​ໄດ້."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ບໍ່​ສາ​ມາດ​ແຍກ​ສາຍ​ໂທ​ໄດ້."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ບໍ່​ສາ​ມາດ​ໂອນ​ໄດ້."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"ບໍ່​ສາ​ມາດ​ປະ​ຊຸມ​ໄດ້."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ບໍ່​ສາ​ມາດ​ປະ​ຕິ​ເສດ​ສາຍ​ໂທ​ໄດ້."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ບໍ່​ສາ​ມາດ​ປ່ອຍ​ສາຍ​ໂທ​ໄດ້."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"ໂທສຸກເສີນ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ກຳລັງເປີດໃຊ້ວິທະຍຸ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ບໍ່​ມີ​ການ​ບໍ​ລິ​ການ. ກຳ​ລັງ​ລອງ​ໃໝ່​ອີກ…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"ບໍ່ສາມາດໂທໄດ້. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ບໍ່ແມ່ນເບີໂທສຸກເສີນ."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້. ກົດ​ເບີ​ໂທ​ສຸກ​ເສີນ."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ໃຊ້ແປ້ນພິມເພື່ອກົດໂທ"</string>
-    <string name="player_started" msgid="9177182657338033086">"ຜູ້​ຫຼິ້ນ​ເລີ່ມ​ຕົ້ນ​ແລ້ວ"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"ຜູ້​ຫຼິ້ນ​ຢຸດ​ແລ້ວ"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ກ້ອງ​ຖ່າຍ​ຮູບ​ບໍ່​ພ້ອມ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ກ້ອງ​ຖ່າຍ​ຮູບ​ພ້ອມ​ແລ້ວ"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"ເຫດ​ການ​ເຊ​ສ​ຊັນ​ການ​ໂທ​ບໍ່​ຮູ້​ຈັກ"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ການຕັ້ງຄ່າການໂທອື່ນໆ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ໃຊ້ແບບສ່ວນໂຕ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ເລືອກລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ຮິງໂທນ ແລະ ການສັ່ນ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"ຈັດ​ການ​ການ​ປະ​ຊຸມ​ທາງໂທລະສັບ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ເບີໂທສຸກເສີນ"</string>
     <string name="child_number" msgid="3398257437107259682">"ຜ່ານ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ຂໍ້​ຄວາມ​ບໍ່​ດົນ​ມາ​ນີ້"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ຂໍ້​ມູນ​ທຸ​ລະ​ກິດ"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> ໄມ​ລ໌​ ຫ່າງ​ອອກ​ໄປ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> ກມ ຫ່າງ​ອອກ​ໄປ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"ເປີດມື້ອື່ນເວລາ <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ເປີດມື້ນີ້ເວລາ <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"ປິດເວລາ <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ປິດແລ້ວມື້ນີ້ເວລາ <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"ດຽວ​ນີ້​ເປີດ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ດຽວ​ນີ້​ປິດ​ແລ້ວ"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"ຮູ້ຈັກ <xliff:g id="NUMBER">%1$s</xliff:g> ບໍ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> ແມ່ນສະແປມບໍ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"ບລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ແລະ ລາຍງານການໂທວ່າເປັນສະແປມແລ້ວ."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"ໝາຍການໂທຈາກ <xliff:g id="NUMBER">%1$s</xliff:g> ວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"ແຕະເພື່ອເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່ ຫຼື ບລັອກເບີໂທສະແປມ."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ນີ້ເປັນເທື່ອທຳອິດທີ່ເບີນີ້ໂທຫາທ່ານ. ຫາກນີ້ເປັນການໂທສະແປມ, ທ່ານສາມາດບລັອກເບີນີ້ ແລະ ລາຍງານມັນໄດ້."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"ແຕະເພື່ອລາຍງານວ່າບໍ່ແມ່ນສະແປມ ຫຼື ບລັອກມັນ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ພວກເຮົາສົງໄສວ່ານີ້ເປັນສະແປມ. ຫາກມັນບໍ່ແມ່ນສະແປມ, ໃຫ້ແຕະໃສ່ ບໍ່ແມ່ນສະແປມ ເພື່ອລາຍງານຄວາມຜິດພາດຂອງພວກເຮົາ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ບລັອກ ແລະ ລາຍງານ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"ເພີ່ມລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ບໍ່ແມ່ນສະແປມ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ບລັອກເບີໂທ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"ເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ບລັອກ ແລະ ລາຍງານສະແປມ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ບໍ່ແມ່ນສະແປມ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ບໍ່ມີ​ SIM ຫຼື SIM ຜິດພາດ"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ວາງສາຍ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ການປະຊຸມທາງໂທລະສັບ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ຢູ່ໃນສາຍ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ສືບຕໍ່ການໂທໂດຍໃຊ້ອິນເຕີເນັດມືຖື…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ການໂທດ້ວຍວິດີໂອຈະຍັງໃຊ້ຜ່ານເຄືອຂ່າຍມືຖືຢູ່ ໂດຍອາດມີການຮຽກເກັບຄ່າບໍລິການຕາມປົກກະຕິ."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ກຳລັງສືບຕໍ່ສາຍໂດຍໃຊ້ອິນເຕີເນັດມືຖື…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ການໂທວິດີໂອຈະຍັງຄົງຢູ່ໃນເຄືອຂ່າຍມືຖືຕໍ່ໄປ. ອາດມີການຮຽກເກັບຄ່າບໍລິການມາດຕະຖານ."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ບໍ່ຕ້ອງສະແດງຂໍ້ຄວາມນີ້ອີກ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lt/strings.xml b/java/com/android/incallui/res/values-lt/strings.xml
index 4d4a0c0..f3ec6ed 100644
--- a/java/com/android/incallui/res/values-lt/strings.xml
+++ b/java/com/android/incallui/res/values-lt/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefonas"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferencinis skambutis"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Skambutis atmestas"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Siųsti šiuo tonus?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Siunčiami tonai\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Siųsti"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Taip"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Pakaitos simbolį pakeisti"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferencinis skambutis <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Balso pašto numeris"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Renkamas numeris"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Praleistas skambutis nuo <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Vykstantis pokalbis"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vykstantis darbo skambutis"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Vykstantis „Wi-Fi“ skambutis"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vykstantis „Wi-Fi“ darbo skambutis"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Vykstantis <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gaunamasis <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"„Wi-Fi“ skambutis"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"„Wi‑Fi“ darbo skambutis"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gaunamasis skambutis"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Gaunamasis skambutis su nuotrauka"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Svarbus gaunam. skamb. su nuotr., praneš. ir viet."</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarbus gaunamasis skambutis su priedais"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gaunamasis darbo skambutis"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gaunamasis „Wi-Fi“ skambutis"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gaunamasis „Wi-Fi“ darbo skambutis"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Gaunamasis įtartinas šlamšto skambutis"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gaunama vaizdo skambučio užklausa"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nėra paslaugos"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Pasirinktas tinklas (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) negalimas"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atsakyti"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Padėti ragelį"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vaizdo skambutis"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Balsas"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vaizdo skam."</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Atsiliepti"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Atmesti"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Kitame įrenginyje vykstantis skambutis"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Kitame įrenginyje vykstantis vaizdo skambutis"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Atlikti skambutį"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atlikti vaizdo skambutį"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Jei norite skambinti, išjunkite lėktuvo režimą."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Neregistruota tinkle."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Korinis tinklas nepasiekiamas"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Kad galėtumėte paskambinti, įveskite tinkamą numerį."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nepavyko paskambinti."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Paleidžiama MMI seka..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Paslauga nepalaikoma."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nepavyko perjungti skambučių."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nepavyko atskirti skambučio."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nepavyko peradresuoti."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Nepavyko sukurti konferencijos."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nepavyko atmesti skambučio."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nepavyko atjungti skamb."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Skambutis pagalbos numeriu"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Įjungiamas radijas…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nėra ryšio. Bandoma dar kartą…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nepavyko paskambinti. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nepavyko paskambinti. Surinkite pagalbos numerį."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Naudokite klaviatūrą ir rinkite numerius"</string>
-    <string name="player_started" msgid="9177182657338033086">"Leistuvė paleista"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Leistuvė sustabdyta"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Fotoaparatas neparuoštas"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Fotoaparatas paruoštas"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nežinomas skambučio sesijos įvykis"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Kiti skambučio nustatymai"</string>
     <string name="goPrivate" msgid="5269514638004595378">"naudoti privatų režimą"</string>
-    <string name="selectContact" msgid="1703433172800564849">"pasirinkti kontaktą"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Skambėjimo tonas ir vibravimas"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Tvarkyti konferencinį skambutį"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Pagalbos numeris"</string>
     <string name="child_number" msgid="3398257437107259682">"naudojant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Naujausi pranešimai"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Verslo informacija"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Už <xliff:g id="DISTANCE">%.1f</xliff:g> myl."</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Už <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Rytoj atidaroma <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Šiandien atidaroma <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Uždaroma <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Šiandien uždaryta <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Dabar atidaryta"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Dabar uždaryta"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Pažįstate numerį <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Ar numeris <xliff:g id="NUMBER">%1$s</xliff:g> yra šlamšto siuntėjas?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Numeris <xliff:g id="NUMBER">%1$s</xliff:g> užblokuotas ir apie skambutį buvo pranešta kaip apie šlamštą."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Apie skambutį iš numerio <xliff:g id="NUMBER">%1$s</xliff:g> buvo pranešta kaip ne apie šlamštą."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Palieskite, kad pridėtumėte prie kontaktų arba blokuotumėte numerį kaip šlamšto siuntėją."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Tai pirmas kartas, kai jums buvo skambinama iš šio numerio. Jei šis skambutis buvo šlamštas, galite užblokuoti šį numerį ir apie jį pranešti."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Palieskite, kad praneštumėte kaip apie NE ŠLAMŠTĄ arba užblokuotumėte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Įtarėme, kad tai yra šlamšto siuntėjas. Jei šis skambutis nebuvo šlamštas, palieskite NE ŠLAMŠTAS, kad praneštumėte apie mūsų klaidą."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokuoti ir pranešti"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Pridėti kontaktą"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ne šlamštas"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokuoti numerį"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Pridėti prie kontaktų"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokuoti ir pranešti apie šlamštą"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ne šlamštas"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nėra SIM kortelės arba įvyko SIM kortelės klaida"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Baigti skambutį"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencinis skambutis"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Skambinant"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nepavyko prisijungti prie „Wi-Fi“ tinklo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepavyko prisijungti prie „Wi-Fi“ tinklo"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Daugiau to nerodyti"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lv/strings.xml b/java/com/android/incallui/res/values-lv/strings.xml
index 9be46c4..8fa4165 100644
--- a/java/com/android/incallui/res/values-lv/strings.xml
+++ b/java/com/android/incallui/res/values-lv/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Tālrunis"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferences zvans"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Zvans tika pārtraukts."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Vai sūtīt tālāk norādītos signālus?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sūtīšanas signāli\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Sūtīt"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Jā"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nē"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Aizstāt aizstājējzīmi ar:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferences zvans <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Balss pasta numurs"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Notiek numura sastādīšana"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Neatbildēts zvans no: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pašreizējā saruna"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Notiekošs darba zvans"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Notiekošs Wi-Fi zvans"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Notiekošs darba Wi-Fi zvans"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Notiekošs <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Ienākošs <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi zvans"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi darba zvans"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ienākošais zvans"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ienākošais zvans ar fotoattēlu"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarīgs ienākošais zvans ar pielikumiem"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ienākošs darba zvans"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ienākošs Wi-Fi zvans"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ienākošs darba Wi-Fi zvans"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ienākošs, iespējams, nevēlams zvans"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ienākošs video pieprasījums"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nav pakalpojuma"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Atlasītais tīkls (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nav pieejams"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atbildēt"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Pārtraukt"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Balss"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Pieņemt"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Noraidīt"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Notiekošs zvans citā ierīcē"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Notiekošs videozvans citā ierīcē"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Pārsūtīt zvanu"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Pārsūtīt videozvanu"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Lai veiktu zvanu, vispirms izslēdziet lidojuma režīmu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tīklā nav reģistrēts."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilais tīkls nav pieejams."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Lai veiktu zvanu, ievadiet derīgu numuru."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nevar veikt zvanu."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Notiek MMI secības startēšana…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Pakalpojums netiek atbalstīts."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nevar pārslēgt zvanus."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nevar nošķirt zvanu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nevar pāradresēt."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Nevar veikt konferences zvanu."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nevar noraidīt zvanu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nevar pārtraukt zvanu(-us)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Ārkārtas zvans"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Notiek radio ieslēgšana..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nav pakalpojuma. Notiek atkārtots mēģinājums…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nevar veikt zvanu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas numurs."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nevar veikt zvanu. Zvaniet ārkārtas numuram."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Izmantojiet tastatūru, lai sastādītu numuru."</string>
-    <string name="player_started" msgid="9177182657338033086">"Sākta atskaņošana"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Atskaņošana apturēta"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nav gatava"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera gatava"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nezināms zvana sesijas notikums"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Citi zvanu iestatījumi"</string>
     <string name="goPrivate" msgid="5269514638004595378">"pārslēgt uz privāto režīmu"</string>
-    <string name="selectContact" msgid="1703433172800564849">"atlasīt kontaktpersonu"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Zvana signāls un vibrācija"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Pārvaldīt konferences zvanu"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Ārkārtas numurs"</string>
     <string name="child_number" msgid="3398257437107259682">"no numura <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Pēdējie ziņojumi"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informācija par uzņēmumu"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> jūdzes(-džu) attālumā"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km attālumā"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Tiks atvērts rīt plkst. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Tiks atvērts šodien plkst. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Tiks slēgts plkst. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Tika slēgts šodien plkst. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Atvērts"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Slēgts"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Vai saglabāt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Vai numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir nevēlams?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir bloķēts, un zvans tika atzīmēts kā nevēlams."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Zvans no numura <xliff:g id="NUMBER">%1$s</xliff:g> netika atzīmēts kā nevēlams."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Pieskarieties, lai pievienotu kontaktpersonām vai bloķētu nevēlamu numuru."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Šis jums ir pirmais zvans no šī numura. Ja šis zvans bija nevēlams, varat bloķēt šo numuru un ziņot par to."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Pieskarieties, lai atzīmētu, ka tas NAV NEVĒLAMS NUMURS, vai lai bloķētu to."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Šķiet, ka šis bija nevēlams zvanītājs. Ja šis zvans nebija nevēlams, pieskarieties vienumam “NAV NEVĒLAMS NUMURS”, lai ziņotu mums par kļūdu."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloķēt un ziņot"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Pievienot kontaktpersonu"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nav nevēlams numurs"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloķēt numuru"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Pievienot kontaktpersonām"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloķēt numuru/ziņot par to"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nav nevēlams"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nav SIM, vai SIM kļūda"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beigt zvanu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferences zvans"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Notiek zvans"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Zvans tiek turpināts, izmantojot mobilos datus…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nevarēja pārslēgt uz Wi-Fi tīklu"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Zvans tiek turpināts, izmantojot mobilos datus…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nevarēja pārslēgt uz Wi-Fi tīklu"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vairs nerādīt šo ziņojumu"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml
new file mode 100644
index 0000000..f848352
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-oproep"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-werkoproep"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml
new file mode 100644
index 0000000..0250240
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"የWLAN ጥሪ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"የWLAN የሥራ ጥሪ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml
new file mode 100644
index 0000000..4c4b4ed
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏مكالمة عبر WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏مكالمة عمل عبر WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml
new file mode 100644
index 0000000..d01e265
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Zəngi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN iş zəngi"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..3454e37
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN poslovni poziv"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml
new file mode 100644
index 0000000..36f4a9b
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Выклік праз WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Выклік па працы праз WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml
new file mode 100644
index 0000000..d45f7e1
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"обаждане през WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"служебно обаждане през WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml
new file mode 100644
index 0000000..b944a66
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN কল"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"অফিসের WLAN কল"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml
new file mode 100644
index 0000000..3454e37
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN poslovni poziv"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml
new file mode 100644
index 0000000..46f20b5
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Trucada per WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Trucada de feina per WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml
new file mode 100644
index 0000000..a8a1ef2
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"hovor přes WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"pracovní hovor přes WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml
new file mode 100644
index 0000000..d3b3496
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-opkald"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-opkald i forbindelse med arbejde"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml
new file mode 100644
index 0000000..310aec1
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-Anruf"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"geschäftlicher WLAN-Anruf"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml
new file mode 100644
index 0000000..f89873c
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"κλήση μέσω WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"κλήση εργασίας μέσω WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml
new file mode 100644
index 0000000..bf6a82d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml
new file mode 100644
index 0000000..bf6a82d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml
new file mode 100644
index 0000000..bf6a82d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml
new file mode 100644
index 0000000..3de910d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Llamada por WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Llamada de trabajo por WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml
new file mode 100644
index 0000000..3de910d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Llamada por WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Llamada de trabajo por WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml
new file mode 100644
index 0000000..31ad4d9
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-kõne"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-töökõne"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml
new file mode 100644
index 0000000..9becf5f
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN bidezko deia"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN bidezko laneko deia"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml
new file mode 100644
index 0000000..a289576
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏تماس ازطریق WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏تماس کاری ازطریق WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml
new file mode 100644
index 0000000..f23d4fe
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-puhelu"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-työpuhelu"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml
new file mode 100644
index 0000000..13a2f0a
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Appel WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Appel professionnel WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml
new file mode 100644
index 0000000..641d810
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Appel Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Appel professionnel Wi-Fi"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml
new file mode 100644
index 0000000..7fa63a6
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de traballo por WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml
new file mode 100644
index 0000000..409a0d3
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN કૉલ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN કાર્ય કૉલ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml
new file mode 100644
index 0000000..322bd62
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कॉल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"कार्य संबंधी WLAN कॉल"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml
new file mode 100644
index 0000000..b00306c
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Poziv putem WLAN-a"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Poslovni poziv putem WLAN-a"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml
new file mode 100644
index 0000000..fc6b949
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-hívás"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"munkahelyi WLAN-hívás"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml
new file mode 100644
index 0000000..95b745b
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Զանգ WLAN ցանցով"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Աշխատանքային զանգ WLAN ցանցով"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml
new file mode 100644
index 0000000..043fc52
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Panggilan WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Panggilan kerja WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml
new file mode 100644
index 0000000..8511209
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-símtal"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-vinnusímtal"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml
new file mode 100644
index 0000000..81ac11a
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chiamata WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chiamata WLAN di lavoro"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml
new file mode 100644
index 0000000..6d1ca9a
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"שיחה ברשת אלחוטית"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"שיחת עבודה ברשת אלחוטית"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml
new file mode 100644
index 0000000..a1b3152
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"無線 LAN 経由で通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"無線 LAN 経由で仕事の通話"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml
new file mode 100644
index 0000000..58fd2a5
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ზარი"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN სამსახურებრივი ზარი"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml
new file mode 100644
index 0000000..1c8b6d1
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN қоңырауы"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN жұмыс қоңырауы"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml
new file mode 100644
index 0000000..abbbeeb
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"ការហៅ​តាម WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ការហៅ​តាម WLAN ពី​កន្លែងការងារ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml
new file mode 100644
index 0000000..d89f535
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ಕರೆ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ಕೆಲಸದ ಕರೆ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml
new file mode 100644
index 0000000..7babf35
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 통화"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 업무 통화"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml
new file mode 100644
index 0000000..a5080e2
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN чалуу"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN чалуу (жумуш боюнча)"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml
new file mode 100644
index 0000000..9826e73
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"ສາຍ WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ສາຍວຽກ WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml
new file mode 100644
index 0000000..9025b8a
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN skambutis"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN darbo skambutis"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml
new file mode 100644
index 0000000..b7ced72
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN zvans"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN darba zvans"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml
new file mode 100644
index 0000000..f8766b7
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Повик преку WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Работен повик преку WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml
new file mode 100644
index 0000000..7dea8a4
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN കോൾ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ഔദ്യോഗിക കോൾ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml
new file mode 100644
index 0000000..09af655
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Дуудлага"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ажлын дуудлага"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml
new file mode 100644
index 0000000..78f59da
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कॉल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN कार्य कॉल"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml
new file mode 100644
index 0000000..06af11d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Panggilan WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Panggilan WLAN daripada tempat kerja"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml
new file mode 100644
index 0000000..bca5415
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ခေါ်ဆိုမှု"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml
new file mode 100644
index 0000000..8338451
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-anrop"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbanrop"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml
new file mode 100644
index 0000000..e0d4adc
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN मार्फत कामबाट आएको कल"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml
new file mode 100644
index 0000000..d4b3605
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Bellen via WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Zakelijk bellen via WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml
new file mode 100644
index 0000000..8338451
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-anrop"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbanrop"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml
new file mode 100644
index 0000000..03b3edf
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ਕਾਲ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ਕਾਰਜ-ਸਥਾਨ ਤੋਂ ਆਈ WLAN ਕਾਲ"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml
new file mode 100644
index 0000000..8df7f73
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"połączenie przez WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"połączenie służbowe przez WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml
new file mode 100644
index 0000000..46e5be4
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho por WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml
new file mode 100644
index 0000000..89f41e7
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml
new file mode 100644
index 0000000..46e5be4
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho por WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml
new file mode 100644
index 0000000..f9a940e
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Apel WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Apel de serviciu prin WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml
new file mode 100644
index 0000000..73124ab
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"звонок по сети WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"звонок по сети WLAN (работа)"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml
new file mode 100644
index 0000000..02baa02
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ඇමතුම"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN කාර්යාල ඇමතුම"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml
new file mode 100644
index 0000000..26554a0
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"hovor cez WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"pracovný hovor cez WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml
new file mode 100644
index 0000000..9418180
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"klic prek omrežja WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"delovni klic prek omrežja WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml
new file mode 100644
index 0000000..25f6af4
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Telefonatë me WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Telefonatë pune me WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml
new file mode 100644
index 0000000..2d431a0
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN позив"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN пословни позив"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml
new file mode 100644
index 0000000..0361853
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-samtal"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbsamtal"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml
new file mode 100644
index 0000000..b3ae92d
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Simu ya WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Simu ya kazi ya WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml
new file mode 100644
index 0000000..8d45067
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN அழைப்பு"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN அழைப்பு (பணி)"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml
new file mode 100644
index 0000000..35c2fea
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN కాల్"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN కార్యాలయ కాల్"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml
new file mode 100644
index 0000000..78e93ef
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"การโทรผ่าน WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"สายจากที่ทำงานผ่าน WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml
new file mode 100644
index 0000000..f25f86f
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Pagtawag gamit ang WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Pagtawag sa trabaho gamit ang WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml
new file mode 100644
index 0000000..a6114d8
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Üzerinden Çağrı"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN üzerinden, işle ilgili çağrı"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml
new file mode 100644
index 0000000..bafc5cb
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"дзвінок через WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"робочий дзвінок через WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml
new file mode 100644
index 0000000..7e9a09f
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏WLAN کال"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏کام سے متعلق WLAN کال"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml
new file mode 100644
index 0000000..4dc3382
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN qo‘ng‘iroq"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN qo‘ng‘iroq (ish)"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml
new file mode 100644
index 0000000..cc4f036
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Cuộc gọi qua WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Cuộc gọi về công việc qua WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml
new file mode 100644
index 0000000..033fc75
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通话"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 工作通话"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml
new file mode 100644
index 0000000..5ac46d1
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 工作通話"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml
new file mode 100644
index 0000000..0684598
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 公司通話"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml
new file mode 100644
index 0000000..96a648a
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Ikholi ye-WLAN"</string>
+    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Ikholi yomsebenzi ye-WLAN"</string>
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml
new file mode 100644
index 0000000..f218282
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 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
+  -->
+<!-- Specific brand names for mcc262-mnc01. See b/35614024 -->
+<resources>
+  <!-- "Brand name" for WiFi calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_brand">WLAN Call</string>
+
+  <!-- "Brand name" for WiFi work calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_work_brand">WLAN work call</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml
new file mode 100644
index 0000000..f575520
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2013 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
+   -->
+
+<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02/strings.xml
new file mode 100644
index 0000000..75b3004
--- /dev/null
+++ b/java/com/android/incallui/res/values-mcc262-mnc02/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 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
+  -->
+
+<!-- Specific brand names for mcc262-mnc02. See b/64487733 -->
+<resources>
+  <!-- "Brand name" for WiFi calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_brand" translatable="false">Wi\u2011Fi call</string>
+
+  <!-- "Brand name" for WiFi work calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_work_brand" translatable="false">Wi\u2011Fi work call</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values-mk/strings.xml b/java/com/android/incallui/res/values-mk/strings.xml
index 03be1d9..bfce34b 100644
--- a/java/com/android/incallui/res/values-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mk/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конференциски повик"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Повикот е испуштен"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Испрати ги следниве тонови?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Испраќање тонови\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Испрати"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Замени резервен знак со"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конференциски повик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Број на говорна пошта"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Бирање"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуштен повик од <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Тековен повик"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Тековен работен повик"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Појдовен повик преку Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Тековен работен повик преку Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Тековен <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Дојдовен <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Повик преку Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Работен повик преку Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекање"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Дојдовен повик"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Дојдовен повик со фотографија"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важен дојдовен повик со фото., порака и локација"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важен дојдовен повик со прилози"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Дојдовен работен повик"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Дојдовен повик преку Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Дојдовен работен повик преку Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Дојдовниот повик може да е спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Дојдовно побарување за видео"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема услуга"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Одбраната мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) е недостапна"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Одговори"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Спушти"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Гласовен"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Прифати"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Одбиј"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Повик во тек на друг уред"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Видеоповик во тек на друг уред"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Прифатете повик"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прифатете видеоповик"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"За да воспоставите повик, прво исклучете режим на работа во авион."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не е регистриран на мрежа."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Не е достапна мобилна мрежа."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"За да повикате, внесете важечки број."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Не може да повика."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Започнува MMI низа..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услугата не е поддржана."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Не може да префрли повици."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Не може да оддели повик."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Не може да пренесе."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Не може да влезе во конференција."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Не може да отфрли повик."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Не може да реализира повик(ци)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Повик за итни случаи"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Вклучување радио..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Нема услуга. Се обидува повторно…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Не може да се повика. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е број за итни повици."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Не може да повика. Бирајте го бројот за итни повици."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Користи тастатурата за бирање"</string>
-    <string name="player_started" msgid="9177182657338033086">"Плеерот започна"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Плеерот запре"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камерата не е подготвена"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камерата е подготвена"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Непознат настан на сесија на повик"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Други поставки на повици"</string>
     <string name="goPrivate" msgid="5269514638004595378">"префли на приватно"</string>
-    <string name="selectContact" msgid="1703433172800564849">"избери контакт"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Мелодија и вибрации"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Управувај со конференциски повик"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Број за итни случаи"</string>
     <string name="child_number" msgid="3398257437107259682">"преку <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Скорешни пораки"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Бизнис информации"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Оддалечено <xliff:g id="DISTANCE">%.1f</xliff:g> ми"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Оддалчено <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Отвора утре во <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Отвора денес во <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Затвора во <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Затвори денес во <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Сега е отворено"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Сега е затворено"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Го знаете <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Дали <xliff:g id="NUMBER">%1$s</xliff:g> е спам?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> е блокиран и повикот е пријавен како спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Повикот од <xliff:g id="NUMBER">%1$s</xliff:g> е пријавен дека не е спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Допрете за додавање контакти или блокирање спам број."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"За првпат добивте повик од бројов. Ако повикот е спам, бројот може да го блокирате и да го пријавите."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Допрете за да пријавите дека НЕ Е СПАМ или за да го блокирате."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Се сомневавме дека повиков е спам. Ако не е, допрете НЕ Е СПАМ за да ја пријавите нашата грешка."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Блокирај и пријави"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Додај контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Не е спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Блокирајте го бројот"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Додајте во контакти"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Блокирајте и пријавете спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Не е спам"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Нема SIM или грешка на SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршете го повикот"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференциски повик"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Повик во тек"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Повикот ќе продолжи преку мобилен интернет…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не можеше да се префрли на Wi-Fi-мрежа"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за интернет-сообраќај."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Повикот ќе продолжи преку мобилен интернет…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не можеше да се префрли на Wi-Fi-мрежа"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за мобилен интернет."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не го прикажувај ова повторно"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ml/strings.xml b/java/com/android/incallui/res/values-ml/strings.xml
index e207ccd..028dd59 100644
--- a/java/com/android/incallui/res/values-ml/strings.xml
+++ b/java/com/android/incallui/res/values-ml/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ഫോണ്‍"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"കോൺഫറൻസ് കോൾ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"കോൾ വിട്ടു"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ഇനിപ്പറയുന്ന ടോണുകൾ അയയ്‌ക്കണോ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ടോണുകൾ അയയ്‌ക്കുന്നു\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"അയയ്‌ക്കുക"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"വേണം"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"വേണ്ട"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"വൈൽഡ് പ്രതീകം ഇതുപയോഗിച്ച് മാറ്റിസ്ഥാപിക്കുക"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"കോൺഫറൻസ് കോൾ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"വോയ്‌സ്‌മെയിൽ നമ്പർ"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ഡയൽ ചെയ്യുന്നു"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> എന്നതിൽ നിന്നുള്ള മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"കോൾ സജീവമാണ്"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ഓൺഗോയിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ഓൺഗോയിംഗ് വൈഫൈ കോൾ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ഓൺഗോയിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"തുടർന്നുകൊണ്ടിരിക്കുന്ന <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ഇൻകമിംഗ് <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"വൈഫൈ കോൾ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ഹോള്‍ഡിലാണ്"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ഇന്‍കമിംഗ് കോള്‍"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ഫോട്ടോ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ഇൻകമിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ഇൻകമിംഗ് വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"സംശയാസ്‌പദമായ ഇൻകമിംഗ് സ്‌പാം കോൾ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ഇൻകമിംഗ് വീഡിയോ അഭ്യർത്ഥന"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"സേവനമില്ല"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ലഭ്യമല്ല"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"മറുപടി"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ഹാംഗ് അപ്പ് ചെയ്യുക"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"വീഡിയോ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"വോയ്‌സ്"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"അംഗീകരിക്കുക"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"നിരസിക്കുക"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന കോൾ"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"കോൾ എടുക്കുക"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"വീഡിയോ കോൾ അറ്റൻഡ് ചെയ്യുക"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ഒരു കോൾ വിളിക്കാൻ, ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫുചെയ്യുക."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"നെറ്റ്‌വർക്കിൽ രജിസ്റ്റർ ചെയ്‌തിട്ടില്ല."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ഒരു കോൾ ചെയ്യുന്നതിന്, സാധുതയുള്ള നമ്പർ നൽകുക."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"കോൾ ചെയ്യാനായില്ല."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI സീക്വൻസ് ആരംഭിക്കുന്നു…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"സേവനം പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"കോളുകൾ മാറാനാവില്ല."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"കോൾ വേർതിരിക്കാനാവില്ല."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"കൈമാറ്റം ചെയ്യാനാവില്ല."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"കോൺഫറൻസ് കോൾ ചെയ്യാനാവില്ല."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"കോൾ നിരസിക്കാനാവില്ല."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"കോൾ (കോളുകൾ) വിളിക്കാനാവില്ല."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"അടിയന്തര കോൾ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"റേഡിയോ ഓൺ ചെയ്യുന്നു…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"സേവനമൊന്നുമില്ല. വീണ്ടും ശ്രമിക്കുന്നു…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"കോൾ ചെയ്യാനാവില്ല. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> എന്നത് ഒരു അടിയന്തിര നമ്പറല്ല."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"കോൾ ചെയ്യാനാവില്ല. ഒരു അടിയന്തിര കോൾ നമ്പർ ഡയൽചെയ്യുക."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ഡയൽ ചെയ്യാൻ കീബോർഡ് ഉപയോഗിക്കുക"</string>
-    <string name="player_started" msgid="9177182657338033086">"പ്ലെയർ ആരംഭിച്ചു"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"പ്ലേയർ നിർത്തി"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ക്യാമറ തയ്യാറായില്ല"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ക്യാമറ തയ്യാറായി"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"അജ്ഞാത കോൾ സെഷൻ ഇവന്റ്"</string>
-    <string name="other_settings" msgid="2537377721890761197">"മറ്റ് കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"സ്വകാര്യം എന്നതിലേക്ക് പോകുക"</string>
-    <string name="selectContact" msgid="1703433172800564849">"കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"റിംഗ്ടോണും വൈബ്രേറ്റും"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"അടിയന്തര നമ്പർ"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> വഴി"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ഏറ്റവും പുതിയ സന്ദേശങ്ങൾ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ബിസിനസ്സ് വിവരം"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> മൈൽ അകലെ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> കിലോമീറ്റർ അകലെ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"നാളെ <xliff:g id="OPEN_TIME">%s</xliff:g>-ന് തുറക്കുന്നു"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ഇന്ന് <xliff:g id="OPEN_TIME">%s</xliff:g>-ന് തുറക്കുന്നു"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>-ന് അടയ്ക്കുന്നു"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ഇന്ന് <xliff:g id="CLOSE_TIME">%s</xliff:g>-ന് അടച്ചു"</string>
-    <string name="open_now" msgid="5897306702060039512">"ഇപ്പോൾ തുറന്നിരിക്കുന്നു"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ഇപ്പോൾ അടച്ചിരിക്കുന്നു"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> അറിയാമോ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> സ്‌പാം ആണോ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്‌ത്, കോൾ സ്‌പാം ആയി റിപ്പോർട്ടുചെയ്‌തു."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> എന്ന നമ്പറിൽ നിന്നുള്ള കോളിനെ സ്‌പാം അല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കാനോ സ്‌പാം നമ്പർ ബ്ലോക്കുചെയ്യാനോ ടാപ്പുചെയ്യുക."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ഈ നമ്പറിൽ നിന്ന് ആദ്യമായാണ് നിങ്ങൾക്ക് കോൾ വരുന്നത്. ഈ കോൾ സ്‌പാം ആയിരുന്നെങ്കിൽ, ഈ നമ്പർ ബ്ലോക്കുചെയ്‌ത് റിപ്പോർട്ടുചെയ്യാനാകും."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"സ്‌പാം അല്ല എന്ന് റിപ്പോർട്ടുചെയ്യാൻ ടാപ്പുചെയ്യുക, അല്ലെങ്കിൽ അത് ബ്ലോക്കുചെയ്യുക."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ഇത് ഒരു സ്‌പാമർ ആണെന്ന് ഞങ്ങൾക്ക് സംശയമുണ്ടായിരുന്നു. ഈ കോൾ ഒരു സ്‌പാം ആയിരുന്നില്ലെങ്കിൽ, ഞങ്ങളുടെ തെറ്റ് റിപ്പോർട്ടുചെയ്യാൻ സ്‌പാം അല്ല എന്നതിൽ ടാപ്പുചെയ്യുക."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ബ്ലോക്കുചെയ്‌ത്, റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"സ്പാം അല്ല"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"കോൺടാക്റ്റുകളിൽ ചേർക്കുക"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ബ്ലോക്കുചെയ്‌ത്, സ്‌പാമെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"സ്പാം അല്ല"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"സിം ഇല്ല അല്ലെങ്കിൽ സിം പിശക്"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"കോൺഫറൻസ് കോൾ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"കോളിലാണ്"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"സെല്ലുലാർ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"സെല്ലുലാർ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"വൈഫൈ നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"മൊബൈൽ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ഇത് വീണ്ടും കാണിക്കരുത്"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mn/strings.xml b/java/com/android/incallui/res/values-mn/strings.xml
index 0e26917..864628f 100644
--- a/java/com/android/incallui/res/values-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mn/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Утас"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Утсан хурал"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Дуудлага таслагдсан"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Дараах аяуудыг илгээх үү?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Аяуудыг илгээж байна\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Илгээх"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Тийм"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Үгүй"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Үсгийг дараахаар солих"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Утсан хурал <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Дуут шуудангийн дугаар"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Залгаж байна"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-н аваагүй дуудлага"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Хийгдэж буй дуудлага"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Залгаж буй албаны дуудлага"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ярьж буй Wi-Fi дуудлага"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Залгаж буй Wi-Fi албаны дуудлага"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Үргэлжилж буй <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Орж ирсэн <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi дуудлага"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi ажлын дуудлага"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Хүлээлгэнд"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ирж буй дуудлага"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Зураг бүхий орж ирсэн дуудлага"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Зураг, зурвас, байршилтай орж ирсэн чухал дуудлага"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Хавсралт бүхий орж ирсэн чухал дуудлага"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ирж буй албаны дуудлага"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Орж ирсэн Wi-Fi дуудлага"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ирж буй Wi-Fi албаны дуудлага"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Орж ирсэн сэжигтэй спам дуудлага"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ирж буй видео хүсэлт"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Үйлчилгээ байхгүй"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Сонгосон сүлжээ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ашиглах боломжгүй"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Хариулах"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Таслах"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Хоолой"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Зөвшөөрөх"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Татгалзах"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Өөр төхөөрөмж дээр хийгдэж буй дуудлага"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Өөр төхөөрөмж дээрх үргэлжилж байгаа видео дуудлага"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Дуудлага авах"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Видео дуудлага авах"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Дуудлага хийхийн тулд юуны өмнө Нислэгийн төлвийг идэвхгүйжүүлнэ үү."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Сүлжээнд бүртгэгдээгүй."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Үүрэн сүлжээ байхгүй."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Дуудлага хийх боломжгүй байна."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI дарааллыг эхлүүлж байна…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Дэмжигдээгүй үйлчилгээ байна."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Дуудлагыг солих боломжгүй байна."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Дуудлагыг салгаж чадахгүй байна."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Шилжүүлэх боломжгүй байна."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Конференц дуудлага хийх боломжгүй байна."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Дуудлага татгалзах боломжгүй байна."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Дуудлага чөлөөлөх боломжгүй байна."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Ослын дуудлага"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Радиог асааж байна…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ажиллагаагүй байна. Дахин оролдоно уу..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Залгах боломжгүй. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> нь яаралтай дугаар биш байна."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Дуудлага хийх боломжгүй. Түргэн тусламжийн дугаар луу залга."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Залгахдаа гар ашиглах"</string>
-    <string name="player_started" msgid="9177182657338033086">"Тоглуулагч эхэлсэн"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Тоглуулагч зогссон"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камер бэлэн бус байна"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камер бэлэн"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Үл мэдэгдэх дуудлагын үе"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Бусад дуудлагын тохиргоо"</string>
     <string name="goPrivate" msgid="5269514638004595378">"хувийн яриа"</string>
-    <string name="selectContact" msgid="1703433172800564849">"харилцагч сонгох"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Хонхны ая, Чичиргээ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Хурлын дуудлага удирдах"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Яаралтай дугаар"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-аар"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Саяхны зурвас"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Бизнес мэдээлэл"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> милийн зайтай"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> км-н зайтай"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Маргааш <xliff:g id="OPEN_TIME">%s</xliff:g>-с нээнэ"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Өнөөдөр <xliff:g id="OPEN_TIME">%s</xliff:g>-с нээнэ"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>-с хаадаг"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Өнөөдөр <xliff:g id="CLOSE_TIME">%s</xliff:g>-с хаасан"</string>
-    <string name="open_now" msgid="5897306702060039512">"Одоо нээлттэй"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Одоо хаалттай"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g>-г мэдэх үү?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> спам уу?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g>-г хориглож, дуудлагыг спам гэж мэдээлсэн."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g>-с ирсэн дуудлагыг спам гэж мэдээлсэн."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Харилцагчдад нэмэх буюу спам дугаарыг хориглох бол товшино уу."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Энэ дугаараас танд анх удаа дуудлага ирсэн. Хэрэв энэ дуудлага спам бол та энэ дугаарыг хориглож, спамаар мэдээлэх боломжтой."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"СПАМ БИШ гэж мэдээлэх буюу хориглох бол товшино уу."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Бид энийг спам гэж сэжиглэж байна. Хэрэв спам байгаагүй бол СПАМ БИШ гэснийг товшиж бидний алдааг мэдээлнэ үү."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Хориглож, мэдээлэх"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Харилцагч нэмэх"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Спам биш"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Дугаар хориглох"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Харилцагчдад нэмэх"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Хориглож, спам гэж мэдээлэх"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Спам биш"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM байхгүй эсхүл SIM алдаатай"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Дуудлагыг таслах"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Хурлын дуудлага"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Ярьж байна"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Үүрэн дата ашиглан дуудлагыг үргэлжлүүлж байна..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi сүлжээ рүү сэлгэж чадсангүй"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео дуудлага үүрэн сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобайл дата ашиглан дуудлагыг үргэлжлүүлж байна…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi сүлжээ рүү сэлгэж чадсангүй"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео дуудлага мобайл сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Үүнийг дахин бүү үзүүл"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mr/strings.xml b/java/com/android/incallui/res/values-mr/strings.xml
index c56c610..637e736 100644
--- a/java/com/android/incallui/res/values-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mr/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फोन"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"परिषद कॉल"</string>
-    <string name="call_lost" msgid="2082971531689406145">"कॉल सोडला"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"खालील टोन पाठवायचे?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"टोन पाठवित आहे\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"पाठवा"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"होय"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"नाही"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"खराब वर्णास यासह पुनर्स्‍थित करा"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"परिषद कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"व्हॉइसमेल नंबर"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"डायल करीत आहे"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> कडील सुटलेला कॉल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"सुरू असलेला कॉल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"सुरु असलेला कार्य कॉल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"सुरु असलेला वाय-फाय कॉल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"सुरु असलेला वाय-फाय कार्य कॉल"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"चालू असलेले <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"येणारे <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"वाय-फाय कॉल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"वाय-फाय कार्य कॉल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड वर"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"येणारा कॉल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फोटोसह येणारा कॉल"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"संलग्नकांसह महत्त्वाचा येणारा कॉल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"येणारा कार्य कॉल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"येणारा वाय-फाय कॉल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"येणारा वाय-फाय कार्य कॉल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"येणारा संशयित स्पॅम कॉल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"येणारी व्हिडिओ विनंती"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"सेवा नाही"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"निवडलेले नेटवर्क (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) अनुपलब्‍ध"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"हँग अप"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"व्हिडिओ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"व्हॉइस"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकारा"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"नकार द्या"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"दुसऱ्या डिव्हाइसवर सुरु असलेला कॉल"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"दुसऱ्या डिव्हाइसवर सुरु असलेला व्हिडिओ कॉल"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"कॉल घ्या"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"व्हिडिओ कॉल घ्या"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्कवर नोंदणीकृत नाही."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेल्युलर नेटवर्क उपलब्ध नाही."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"कॉल करण्यासाठी, एक वैध नंबर प्रविष्ट करा."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"कॉल करू शकत नाही."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI क्रम प्रारंभ करीत आहे..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित नाही."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"कॉल स्विच करू शकत नाही."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"कॉल विभक्त करू शकत नाही."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"हस्तांतर करू शकत नाही."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"कॉन्फरन्स घेऊ शकत नाही."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"कॉल नाकारू शकत नाही."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"कॉल रिलीज करू शकत नाही."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"आणीबाणीचा कॉल"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"रेडिओ चालू करीत आहे..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"सेवा नाही. पुन्हा प्रयत्न करत आहे…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"कॉल करू शकत नाही. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> हा आणीबाणी नंबर नाही."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"कॉल करू शकत नाही. आणीबाणी नंबर डायल करा."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"डायल करण्‍यासाठी कीबोर्डचा वापर करा"</string>
-    <string name="player_started" msgid="9177182657338033086">"प्लेअर प्रारंभ झाले"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"प्लेअर थांबले"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"कॅमेरा तयार नाही"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"कॅमेरा तयार"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"अज्ञात कॉल सत्र इव्‍हेंट"</string>
-    <string name="other_settings" msgid="2537377721890761197">"इतर कॉल सेटिंग्ज"</string>
     <string name="goPrivate" msgid="5269514638004595378">"खाजगी जा"</string>
-    <string name="selectContact" msgid="1703433172800564849">"संपर्क निवडा"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"रिंगटोन आणि कंपन"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"परिषद कॉल व्यवस्थापित करा"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आणीबाणीचा नंबर"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> द्वारा"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"अलीकडील संदेश"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"व्‍यवसाय माहिती"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> मैल दूर"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> किमी दूर"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"उद्या <xliff:g id="OPEN_TIME">%s</xliff:g> वाजता उघडेल"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"आज <xliff:g id="OPEN_TIME">%s</xliff:g> उघडेल"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"आज <xliff:g id="CLOSE_TIME">%s</xliff:g> वाजता बंद होईल"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"आज <xliff:g id="CLOSE_TIME">%s</xliff:g> वाजता बंद केले"</string>
-    <string name="open_now" msgid="5897306702060039512">"आता उघडा"</string>
-    <string name="closed_now" msgid="3962291301467974921">"आता बंद केले आहे"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> माहित आहे?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> स्पॅम आहे?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> अवरोधित केला आणि कॉलचा स्पॅम म्हणून अहवाल दिला."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> वरील कॉलचा स्पॅम नाही म्हणून अहवाल दिला."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"संपर्कांमध्ये जोडण्यासाठी किंवा स्पॅम नंबर अवरोधित करण्यासाठी टॅप करा."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"आपल्याला प्रथमच या नंबरवरून कॉल केला. हा कॉल स्पॅम असल्यास, आपण हा नंबर अवरोधित करू शकता आणि त्याचा अहवाल देऊ शकता."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"स्पॅम नाही म्हणून अहवाल देण्यासाठी किंवा तो अवरोधित करण्यासाठी टॅप करा."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"हा स्पॅमर असल्याचा आम्हाला संशय आला. हा कॉल स्पॅम नसल्यास, आमच्या चुकीचा अहवाल देण्यासाठी स्पॅम नाही टॅप करा."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"अवरोधित करा आणि अहवाल द्या"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"संपर्क जोडा"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"स्पॅम नाही"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"नंबर अवरोधित करा"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"संपर्कांमध्ये जोडा"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"अवरोधित करा आणि स्पॅमचा अहवाल द्या"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"स्पॅम नाही"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"सिम नाही किंवा सिम त्रुटी"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करा"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"परिषद कॉल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल मध्ये"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"मोबाइल डेटा वापरून कॉल सुरू ठेवत आहेत…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"व्हिडिओ कॉल मोबाईल नेटवर्कवर असेल. मानक डेटा शुल्क लागू होऊ शकतात."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा वापरून कॉल करणे सुरु ठेवत आहे..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"व्हिडिओ कॉल मोबाइल नेटवर्कवर असेल. मानक डेटा शुल्क लागू शकतात."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"हे पुन्हा दर्शवू नका"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ms/strings.xml b/java/com/android/incallui/res/values-ms/strings.xml
index a5be593..cf599e8 100644
--- a/java/com/android/incallui/res/values-ms/strings.xml
+++ b/java/com/android/incallui/res/values-ms/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Panggilan sidang"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Panggilan diputuskan"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Hantar nada berikut?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Menghantar nada\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Hantar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ya"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Tidak"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Gantikan aksara bebas dengan"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Panggilan sidang <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nombor mel suara"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Mendail"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Panggilan tidak dijawab daripada <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan sedang berjalan"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan sedang berlangsung daripada tempat kerja"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Panggilan Wi-Fi sedang berlangsung"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Panggian Wi-Fi sedang berlangsung daripada tempat kerja"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> sedang berlangsung"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> masuk"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Panggilan Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Panggilan Wi‑Fi daripada tempat kerja"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan masuk penting dengan foto, mesej dan lokasi"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan masuk daripada tempat kerja"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Panggilan Wi-Fi masuk"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Panggilan masuk melalui Wi-Fi daripada tempat kerja"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Disyaki panggilan spam masuk"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Tiada perkhidmatan"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rangkaian pilihan (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Jawapan"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Letakkan gagang"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video dalam strim"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Suara"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Terima"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Tolak"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Panggilan sedang berlangsung pada peranti lain"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Panggilan video sedang berlangsung pada peranti lain"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Jawab Panggilan"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Jawab Panggilan Video"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Untuk membuat panggilan, matikan mod Pesawat terlebih dahulu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tidak didaftarkan pada rangkaian."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rangkaian selular tidak tersedia."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Untuk membuat panggilan, masukkan nombor yang sah."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Tidak dapat memanggil."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Memulakan jujukan MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Perkhidmatan tidak disokong."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Tidak dapat menukar panggilan."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Tidak dapat mengasingkan panggilan."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Tidak dapat memindahkan panggilan."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Tidak dapat membuat panggilan persidangan."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Tidak dapat menolak panggilan."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Tidak dapat melepaskan panggilan."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Panggilan kecemasan"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Menghidupkan radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Tiada perkhidmatan. Mencuba lagi..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Tidak dapat memanggil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Tidak dapat memanggil. Dail nombor kecemasan."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Gunakan papan kekunci untuk mendail"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pemain Dimulakan"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pemain Dihentikan"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera tidak bersedia"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera bersedia"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Acara sesi panggilan tidak diketahui"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Tetapan panggilan lain"</string>
     <string name="goPrivate" msgid="5269514638004595378">"jadi tertutup"</string>
-    <string name="selectContact" msgid="1703433172800564849">"pilih kenalan"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Nada Dering &amp; Getaran"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Urus panggilan sidang"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nombor kecemasan"</string>
     <string name="child_number" msgid="3398257437107259682">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mesej terbaru"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Maklumat perniagaan"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> batu dari sini"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km dari sini"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Dibuka esok pada pukul <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Dibuka hari ini pada pukul <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Tutup pada pukul <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Ditutup hari ini pada pukul <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Dibuka sekarang"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Ditutup sekarang"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Anda mengenali <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Adakah <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> disekat dan panggilan telah dilaporkan sebagai spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Panggilan daripada <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Ketik untuk menambahkan nombor pada kenalan atau sekat nombor spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Ini merupakan kali pertama nombor ini memanggil anda. Jika panggilan ini spam, anda boleh menyekat nombor ini dan melaporkannya."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Ketik untuk melaporkan sebagai BUKAN SPAM atau sekat."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Kami mengesyaki panggilan ini adalah spam. Jika panggilan ini bukan spam, ketik BUKAN SPAM untuk melaporkan kesilapan kami."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Sekat &amp; lapor"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Tambah kenalan"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Bukan spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Sekat nombor"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Tambah pada kenalan"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Sekat &amp; laporkan spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Bukan spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Tiada SIM atau ralat SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tamatkan panggilan"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Panggilan sidang"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Dalam panggilan"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Meneruskan panggilan menggunakan data selular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Tidak dapat beralih ke rangkaian Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Panggilan video akan menggunakan rangkaian selular. Caj data standard boleh dikenakan."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Meneruskan panggilan menggunakan data mudah alih…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke rangkaian Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Panggilan video akan menggunakan rangkaian mudah alih. Caj data standard boleh dikenakan."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tunjukkan ini lagi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-my/strings.xml b/java/com/android/incallui/res/values-my/strings.xml
index 5cca498..9e44f34 100644
--- a/java/com/android/incallui/res/values-my/strings.xml
+++ b/java/com/android/incallui/res/values-my/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ဖုန်း"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"ကွန်းဖရင့်ခေါ်ဆိုမှု"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ဖုန်းလိုင်းကျသွား၏"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"အောက်ပါ တီးလုံးများကို ပို့မလား?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"အသံ ပို့နေစဉ်\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ပို့ပါ"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"wildစာလုံးကို အစားထိုးရန်မှာ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"ကွန်းဖရင့် ခေါ်ဆိုမှု <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"အသံစာပို့စနစ်နံပါတ်"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ခေါ်ဆိုနေသည်"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> မှလွတ်သွားသော ခေါ်ဆိုမှု"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ခေါ်နေဆဲ အလုပ်မှ ခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ခေါ်နေဆဲ ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ခေါ်နေဆဲ Wi-Fi အလုပ်မှ ခေါ်ဆိုမှု"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"လက်ရှိပြောနေခြင်း <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"အဝင်ခေါ်ဆိုမှု <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi ခေါ်ဆိုမှု"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ခဏ ကိုင်ထားစဉ်"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ဓာတ်ပုံဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ဓာတ်ပုံ၊မက်ဆေ့ဂျ်၊တည်နေရာဖြင့် အရေးကြီးခေါ်ဆိုမှု"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ပူးတွဲပါဖိုင်များဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"အဝင် ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ဝင်လာသော ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi အလုပ်မှ အဝင် ခေါ်ဆိုမှု"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ခေါ်နေသော မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုမှု"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ဝန်ဆောင်မှု မရှိပါ"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ရွေးချယ်ထားသော ကွန်ရက် (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) မရရှိနိုင်ပါ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"အဖြေ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ဖုန်းချလိုက်ပါပြီ"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ဗီဒီယို"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"အသံ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"လက်ခံရန်"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ငြင်းပယ်ရန်"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"အခြားကိရိယာတွင် လက်ရှိခေါ်ဆိုနေမှု"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"အခြားကိရိယာရှိ လက်ရှိဗီဒီယိုခေါ်ဆိုမှု"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ဖုန်းခေါ်ဆိုမှုလွှဲယူပါ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ဗီဒီယိုခေါ်ဆိုမှုလွှဲယူပါ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ဖုန်းခေါ်ဆိုမှုပြုရန်, လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်ကို ပိတ်ပါ"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ဆဲလ်လူလာ ကွန်ရက် မရှိပါ။"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"မခေါ်ဆိုနိုင်ပါ။"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI အမှတ်စဉ်ကို စတင်နေပါသည်…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ဖုန်းခေါ်ခြင်းများကြား မကူးပ​ြောင်းနိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ဖုန်းခေါ်ခြင်းအား မခွဲထုတ်နိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"မလွှဲပြောင်းနိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"ကွန်းဖရန့်စ် မလုပ်နိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ဖုန်းခေါ်ခြင်းအား မငြင်းဆိုနိုင်ပါ။"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ဖုန်းခေါ်ခြင်း(များ)အား လွှတ်မပေးနိုင်ပါ။"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"အရေးပေါ်ခေါ်ဆိုမှု"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ရေဒီယို ဖွင့်နေစဉ်…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ဝန်ဆောင်မှု မရှိပါ။ ထပ်မံကြိုးစားပါ…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"ခေါ်ဆို၍မရနိုင်ပါ။ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> သည်အရေးပေါ်နံပါတ်တစ်ခု မဟုတ်ပါ။"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"မခေါ်ဆိုနိုင်ပါ။ အရေးပေါ်နံပါတ်အား ခေါ်ဆိုပါ။"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player စတင်ခဲ့သည်"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player ရပ်တန့်ခဲ့သည်"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ကင်မရာအဆင်သင့် မဖြစ်သေးပါ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ကင်မရာအဆင်သင့်"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"အမည်မသိခေါ်ဆိုမှု ဆက်ရှင်ဖြစ်ရပ်"</string>
-    <string name="other_settings" msgid="2537377721890761197">"တခြားခေါ်ဆိုမှုဆိုင်ရာ ဆက်တင်"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ပရိုက်ဗိတ်သို့ သွားပါ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"လိပ်စာရွေးပါ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ဖုန်းမြည်သံနှင့် တုန်ခါမှု"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"အစည်းအဝေးခေါ်ဆိုမှုကို စီမံခန့်ခွဲပါ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"အရေးပေါ်နံပါတ်"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>မှတစ်ဆင့်"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"မကြာမီက စာတိုများ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"စီးပွားရေး အချက်အလက်"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi အကွာ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km အကွာ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>၊ <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>၊ <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"မနက်ဖြန် <xliff:g id="OPEN_TIME">%s</xliff:g> ၌ဖွင့်မည်"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ယနေ့ <xliff:g id="OPEN_TIME">%s</xliff:g> ၌ဖွင့်မည်"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> ၌ပိတ်မည်"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ယနေ့ <xliff:g id="CLOSE_TIME">%s</xliff:g> ၌ပိတ်ခဲ့သည်"</string>
-    <string name="open_now" msgid="5897306702060039512">"ယခုဖွင့်ရန်"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ယခုပိတ်ရန်"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို သိပါသလား။"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> က စပမ်းလား။"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ပိတ်ဆို့လိုက်ပြီး ခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပြီးပါပြီ။"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> ထံမှခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပြီးပါပြီ။"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"အဆက်အသွယ်များသို့ ထည့်ရန် (သို့) စပမ်းနံပါတ်ကို ပိတ်ဆို့ရန် နှိပ်ပါ"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ဤနံပါတ်သည် သင့်ထံသို့ ပထမဆုံးခေါ်ဖူးခြင်းဖြစ်သည်။ ဤခေါ်ဆိုမှုသည် စပမ်းဖြစ်ပါက ဤနံပါတ်ကို ပိတ်ဆို့၍ သတင်းပို့နိုင်ပါသည်။"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"စပမ်းမဟုတ်ကြောင်း သတင်းပို့ရန် နှိပ်ပါ၊ သို့မဟုတ် ၎င်းကို ပိတ်ဆို့ပါ။"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ဤသည်ကို စပမ်မာဟု ကျွန်ုပ်တို့ သံသယရှိပါသည်။ ဤခေါ်ဆိုမှုသည် စပမ်းမဟုတ်ပါက ကျွန်ုပ်တို့၏မှားယွင်းမှုကို သတင်းပို့ရန် \"စပမ်းမဟုတ်ပါ\" ကို နှိပ်ပါ။"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"လိပ်စာထပ်ထည့်ပါ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"စပမ်းမဟုတ်ပါ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"နံပါတ်ကို ပိတ်ဆို့ပါ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"အဆက်အသွယ်များထဲသို့ ထည့်ပါ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"စပမ်းကို ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"စပမ်းမဟုတ်ပါ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ဆင်းမ်ကဒ်မရှိ သို့မဟုတ် ဆင်းမ်ကဒ်အမှား"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ခေါ်ဆိုမှုအပြီးသတ်ရန်"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"အစည်းအဝေးခေါ်ဆိုမှု"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ဖုန်းပြောနေသည်"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ဆယ်လူလာဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ဗီဒီယိုခေါ်ဆိုမှုသည် ဆယ်လူလာကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"မိုဘိုင်းဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ဗီဒီယိုခေါ်ဆိုမှုသည် မိုဘိုင်းကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ဤသည်ကို ထပ်မပြပါနှင့်"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nb/strings.xml b/java/com/android/incallui/res/values-nb/strings.xml
index d0883a2..19e5056 100644
--- a/java/com/android/incallui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/res/values-nb/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonmøte"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Samtale droppet"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send disse tonene?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sendetoner\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Erstatt jokertegn med"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonmøte <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nummer til talepostkasse"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-anrop"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Innkommende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-anrop"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbanrop"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjeneste"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Valgt nettverk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgjengelig"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Legg på"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Google Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Godta"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Avslå"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Samtale pågår på en annen enhet"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"En videosamtale pågår på en annen enhet"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Svar på anropet"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"For å ringe, slå av flymodus først."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registrert på nettverket."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnettverket er ikke tilgjengelig."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begynner MMI-sekvens…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten håndteres ikke."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan ikke bytte samtaler."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan ikke splitte opp samtale."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan ikke overføre."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Kan ikke opprette konferanse."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan ikke avvise anropet."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan ikke frigjøre samtale(r)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Nødanrop"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Slår på radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ingen tjeneste. Prøver på nytt …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Kan ikke ringe. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan ikke ringe. Ring et nødnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Bruk tastaturet for å ringe"</string>
-    <string name="player_started" msgid="9177182657338033086">"Avspilleren har startet"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Avspilleren har stoppet"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kameraet er ikke klart"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kameraet er klart"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Ukjent anrop"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Andre ringeinnstillinger"</string>
     <string name="goPrivate" msgid="5269514638004595378">"aktiver privat samtale"</string>
-    <string name="selectContact" msgid="1703433172800564849">"velg kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringelyd og vibrering"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer konferansesamtale"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nylige meldinger"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informasjon om bedriften"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> engelske mil unna"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km unna"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Åpner i morgen kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Åpner i dag kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Stenger kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Stengte i dag kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Åpent nå"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Stengt nå"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokkér og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Legg til kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ikke nettsøppel"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokkér nummeret"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Legg til i kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokkér og rapportér som useriøst"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ikke useriøs"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kan ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalen blir værende på mobilnettet. Standard datakostnader kan påløpe."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ne/strings.xml b/java/com/android/incallui/res/values-ne/strings.xml
index b589479..eaa70e5 100644
--- a/java/com/android/incallui/res/values-ne/strings.xml
+++ b/java/com/android/incallui/res/values-ne/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फोन"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"सम्मेलन कल"</string>
-    <string name="call_lost" msgid="2082971531689406145">"कल ड्रप गरियो"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"निम्न टोनहरू पठाउने? \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"टोनहरू \n पठाउँदै"</string>
-    <string name="send_button" msgid="6976782353456252579">"पठाउनुहोस्"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"हो"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"होइन"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"यससँग वाइल्ड अक्षर बदल्नुहोस्"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"सम्मेलन कल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"भ्वाइसमेल नम्बर"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"डायल गर्दै"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> बाट आएको छुटेको कल"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"चलिरहेको कल"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"चालू रहेको कार्यको कल"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"चालु रहेको WI-Fi कल"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"चालू रहेको Wi-Fi कार्यको कल"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"चलिरहेको <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"आगमन <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi कल"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi मार्फत कामबाट आएको कल"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"होल्डमा"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"आगमन कल"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"तस्बिरसहितको आगमन कल"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"तस्बिर, सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"समावेश गरिएको वस्तुसहितको महत्त्वपूर्ण आगमन कल"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"आगमन कार्यको कल"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"आगमन Wi-Fi कल"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"आगमन Wi-Fi कार्यको कल"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"शंकास्पद आगमन स्प्याम कल"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"आगमन भिडियो अनुरोध"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"सेवा छैन"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"चयन गरिएको नेटवर्क ( <xliff:g id="OPERATOR_NAME">%s</xliff:g> ) अनुपलब्ध"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"छुटाउनुहोस्"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"भिडियो"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"आवाज"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकार्नुहोस्"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"अस्वीकार गर्नुहोस्"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"अर्को यन्त्रमा चलिरहेको कल"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"अर्को यन्त्रमा चलिरहेको भिडियो कल"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"कल लिनुहोस्"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"भिडियो कल लिनुहोस्"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"कल राख्नका लागि, पहिले हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"नेटवर्कमा दर्ता भएको छैन।"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"सेलुलर सञ्जाल उपलब्ध छैन।"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"कल गर्न सक्दैन।"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI अनुक्रम सुरु गर्दै..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित छैन।"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"कल स्विच गर्न सक्दैन।"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"कल अलग गर्न सक्दैन।"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"हस्तान्तरण गर्न सक्दैन।"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"सम्मेलन गर्न सक्दैन।"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"कल अस्वीकार गर्न सक्दैन।"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"कल (हरू) जारी गर्न सकिँदैन ।"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"आपतकालीन कल"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"रेडियो खोल्दै..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"कुनै सेवा छैन। फेरि प्रयास गर्दै ..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"कल गर्न सकिंदैन। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> आपतकालीन नम्बर होइन।"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"कल गर्न सकिँदैन। आपतकालीन नम्बर डायल गर्नुहोस्।"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"डायल गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
-    <string name="player_started" msgid="9177182657338033086">"प्लेयर सुरु भयो"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"प्लेयर रोकियो"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"क्यामेरा तयार छैन"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"क्यामेरा तयार"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"अज्ञात कल सत्र घटना"</string>
-    <string name="other_settings" msgid="2537377721890761197">"अन्य कल सेटिङहरू"</string>
     <string name="goPrivate" msgid="5269514638004595378">"निजी जानुहोस्"</string>
-    <string name="selectContact" msgid="1703433172800564849">"सम्पर्क चयन गर्नुहोस्"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"रिङ्गटोन र कम्पन"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"सम्मेलन कलको प्रबन्ध मिलाउनहोस्"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आपतकालीन नम्बर"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> बाट"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"भर्खरैका सन्देशहरू"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"व्यवसाय जानकारी"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> माइल टाढा"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> किलोमिटर टाढा"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"भोलि <xliff:g id="OPEN_TIME">%s</xliff:g> खुल्छ"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"आज <xliff:g id="OPEN_TIME">%s</xliff:g> खुल्छ"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"आज <xliff:g id="CLOSE_TIME">%s</xliff:g> बन्द हुन्छ"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"आज <xliff:g id="CLOSE_TIME">%s</xliff:g> बन्द भयो"</string>
-    <string name="open_now" msgid="5897306702060039512">"अहिले खुला छ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"अब बन्द भयो"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> लाई चिन्नुहुन्छ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> स्प्याम हो?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> लाई रोक लगाइयो र कललाई स्प्याम भनी रिपोर्ट गरियो।"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> को कललाई स्प्याम होइन भनी रिपोर्ट गरियो।"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"सम्पर्कहरूमा थप्न वा स्प्याम नम्बरलाई रोक्न ट्याप गर्नुहोस्।"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"यस नम्बरबाट तपाईंलाई कल आएको यो पहिलो पटक हो। यो कल स्प्याम थियो भने तपाईं नम्बरलाई रोक्न र यस बारे रिपोर्ट गर्न सक्नुहुन्छ।"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"स्प्याम होइन भनी रिपोर्ट गर्न ट्याप गर्नुहोस् वा यसलाई रोक्नुहोस्।"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"हामीलाई यो एक स्प्यामर हो भन्ने आशङ्का लाग्यो। यो कल स्प्याम थिएन भने हाम्रो गल्तीको रिपोर्ट गर्न स्प्याम होइनमा ट्याप गर्नुहोस्।"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"रोक लगाउनु र रिपोर्ट गर्नु"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"सम्पर्क थप्नुहोस्"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"स्प्याम होइन"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"नम्बरलाई रोक लगाउनु"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"सम्पर्कहरूमा थप्नुहोस्"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"रोक लगाउनु र स्प्याम भनी रिपोर्ट गर्नु"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"स्प्याम होइन"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM छैन वा SIM त्रुटि"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कल अन्त्य गर्नुहोस्"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"सम्मेलन कल"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"कलमा"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"सेलुलर डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi नेटवर्कमा स्विच गर्न सकिएन"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"भिडियो कल सेलुलर नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi नेटवर्कमा स्विच गर्न सकिएन"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"भिडियो कल मोबाइल नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"यसलाई फेरि नदेखाउनुहोस्"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nl/strings.xml b/java/com/android/incallui/res/values-nl/strings.xml
index 930acdc..1559e10 100644
--- a/java/com/android/incallui/res/values-nl/strings.xml
+++ b/java/com/android/incallui/res/values-nl/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefoon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonische vergadering"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Oproep beëindigd"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"De volgende tonen verzenden?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Nummers verzenden\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Verzenden"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nee"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Jokerteken vervangen door"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonische vergadering <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Voicemailnummer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Kiezen"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Actieve oproep"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Actieve zakelijke oproep"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Actieve wifi-oproep"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Actieve zakelijke oproep via wifi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> wordt uitgevoerd"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ontvangen"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Bellen via wifi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Zakelijk bellen via wifi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrijke oproep met foto, bericht en locatie"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrijke inkomende oproep met bijlagen"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende zakelijke oproep"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende wifi-oproep"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende zakelijke oproep via wifi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende vermoedelijke spamoproep"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Binnenkomend videoverzoek"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Geen service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Geselecteerd netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) niet beschikbaar"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Ophangen"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"InStream-video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Spraak"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepteren"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Weigeren"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Actief gesprek op een ander apparaat"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Actief videogesprek op een ander apparaat"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Gesprek beantwoorden"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Videogesprek beantwoorden"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Als je wilt bellen, moet je eerst de Vliegtuigmodus uitschakelen."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Niet geregistreerd op netwerk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobiel netwerk niet beschikbaar."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Als je wilt bellen, moet je een geldig nummer invoeren."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan niet bellen."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI-reeks starten..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service wordt niet ondersteund."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan niet overschakelen tussen oproepen."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan oproep niet scheiden."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan niet doorschakelen."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Telefonische vergadering niet mogelijk."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan oproep niet weigeren."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan oproep(en) niet vrijgeven."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Noodoproep"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Radio aanzetten..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Geen bereik. Opnieuw proberen…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Kan niet bellen. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan niet bellen. Bel een alarmnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Toetsen gebruiken om te bellen"</string>
-    <string name="player_started" msgid="9177182657338033086">"Speler gestart"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Speler gestopt"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera niet gereed"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera gereed"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Onbekende oproepsessiegebeurtenis"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Andere instellingen voor bellen"</string>
     <string name="goPrivate" msgid="5269514638004595378">"privé"</string>
-    <string name="selectContact" msgid="1703433172800564849">"contact selecteren"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Beltoon en trillen"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Telef. vergadering beheren"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Alarmnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Recente berichten"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Bedrijfsinformatie"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mijl hiervandaan"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km hiervandaan"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Gaat morgen open om <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Gaat vandaag open om <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Sluit om <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Vandaag gesloten vanaf <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Nu geopend"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Nu gesloten"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Ken je <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeerd en de oproep wordt gemeld als spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"De oproep van <xliff:g id="NUMBER">%1$s</xliff:g> wordt niet gemeld als spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tik om contacten toe te voegen of om dit spamnummer te blokkeren."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dit is de eerste keer dat je bent gebeld door dit nummer. Als deze oproep spam is, kun je dit nummer blokkeren en melden."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tik om te melden als GEEN SPAM of om te blokkeren."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"We hebben dit nummer aangemerkt als spam. Als deze oproep geen spam was, tik je op GEEN SPAM om onze fout te melden."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokkeren en melden"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Contact toevoegen"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Geen spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Nummer blokkeren"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Toevoegen aan contacten"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokkeren en spam melden"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Geen spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Geen simkaart of fout met simkaart"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Oproep beëindigen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonische vergadering"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"In gesprek"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Gesprek voortzetten via mobiele data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Overschakelen naar wifi-netwerk mislukt"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gesprek voortzetten via mobiele data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Overschakelen naar wifi-netwerk mislukt"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Dit niet meer weergeven"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-no/strings.xml b/java/com/android/incallui/res/values-no/strings.xml
index d0883a2..19e5056 100644
--- a/java/com/android/incallui/res/values-no/strings.xml
+++ b/java/com/android/incallui/res/values-no/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonmøte"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Samtale droppet"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Send disse tonene?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sendetoner\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Send"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Erstatt jokertegn med"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonmøte <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nummer til talepostkasse"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-anrop"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbanrop via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Innkommende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-anrop"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbanrop"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Innkommende anrop via Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Innkommende jobbanrop via Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjeneste"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Valgt nettverk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgjengelig"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Legg på"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Google Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Godta"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Avslå"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Samtale pågår på en annen enhet"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"En videosamtale pågår på en annen enhet"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Svar på anropet"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"For å ringe, slå av flymodus først."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ikke registrert på nettverket."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilnettverket er ikke tilgjengelig."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan ikke ringe."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begynner MMI-sekvens…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten håndteres ikke."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan ikke bytte samtaler."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan ikke splitte opp samtale."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan ikke overføre."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Kan ikke opprette konferanse."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan ikke avvise anropet."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan ikke frigjøre samtale(r)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Nødanrop"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Slår på radio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ingen tjeneste. Prøver på nytt …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Kan ikke ringe. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan ikke ringe. Ring et nødnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Bruk tastaturet for å ringe"</string>
-    <string name="player_started" msgid="9177182657338033086">"Avspilleren har startet"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Avspilleren har stoppet"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kameraet er ikke klart"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kameraet er klart"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Ukjent anrop"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Andre ringeinnstillinger"</string>
     <string name="goPrivate" msgid="5269514638004595378">"aktiver privat samtale"</string>
-    <string name="selectContact" msgid="1703433172800564849">"velg kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringelyd og vibrering"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer konferansesamtale"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nylige meldinger"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informasjon om bedriften"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> engelske mil unna"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km unna"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Åpner i morgen kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Åpner i dag kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Stenger kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Stengte i dag kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Åpent nå"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Stengt nå"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokkér og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Legg til kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ikke nettsøppel"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokkér nummeret"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Legg til i kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokkér og rapportér som useriøst"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ikke useriøs"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kan ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalen blir værende på mobilnettet. Standard datakostnader kan påløpe."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pa/strings.xml b/java/com/android/incallui/res/values-pa/strings.xml
index 22cd7da..d109c0b 100644
--- a/java/com/android/incallui/res/values-pa/strings.xml
+++ b/java/com/android/incallui/res/values-pa/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ਫੋਨ"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"ਕਾਨਫਰੰਸ ਕਾਲ"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ਕਾਲ ਡ੍ਰੌਪ ਕੀਤੀ"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ਕੀ ਇਹ ਟੋਨਾਂ ਭੇਜਣੀਆਂ ਹਨ?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ਟੋਨਾਂ\n ਭੇਜ ਰਿਹਾ ਹੈ"</string>
-    <string name="send_button" msgid="6976782353456252579">"ਭੇਜੋ"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ਹਾਂ"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"ਨਹੀਂ"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"ਇਸ ਨਾਲ ਵਾਈਲਡ ਅੱਖਰ ਬਦਲੋ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"ਕਾਨਫਰੰਸ ਕਾਲ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"ਵੌਇਸਮੇਲ ਨੰਬਰ"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ਡਾਇਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ਤੋਂ ਖੁੰਝੀ ਹੋਈ ਕਾਲ"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"ਜਾਰੀ ਕਾਲ"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"ਜਾਰੀ Wi-Fi ਕਾਲ"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ Wi-Fi ਕਾਲ"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ਜਾਰੀ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ਆ ਰਹੀ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi ਕਾਲ"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ਕਾਰਜ-ਸਥਾਨ ਤੋਂ ਆਈ Wi‑Fi ਕਾਲ"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ਹੋਲਡ ਤੇ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ਫ਼ੋਟੋ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ ਕਾਲ"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ਇਨਕਮਿੰਗ Wi-Fi ਕਾਲ"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ Wi-Fi ਕਾਲ"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲ ਆ ਰਹੀ ਹੈ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਬੇਨਤੀ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ਚੁਣੇ ਗਏ ਨੈਟਵਰਕ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ਅਣਉਪਲਬਧ"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"ਜਵਾਬ ਦਿਓ"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"ਹੈਂਗ ਅਪ ਕਰੋ"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ਵੀਡੀਓ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"ਵੌਇਸ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ਸਵੀਕਾਰ ਕਰੋ"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਕਾਲ"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ਕਾਲ ਲਓ"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ਵੀਡੀਓ ਕਾਲ ਲਓ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਏਅਰਪਲੇਨ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ਨੈਟਵਰਕ ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤਾ।"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕ ਉਪਲਬਧ ਨਹੀਂ"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ, ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਨੰਬਰ ਦਰਜ ਕਰੋ।"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI ਕੜੀ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ਸੇਵਾ ਸਮਰਥਿਤ ਨਹੀਂ।"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ਕਾਲਾਂ ਸਵਿਚ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ਕਾਲ ਵੱਖ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ਟ੍ਰਾਂਸਫਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"ਕਾਨਫਰੰਸ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ਕਾਲ ਅਸਵੀਕਾਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ਕਾਲ(ਕਾਲਾਂ) ਰਿਲੀਜ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"ਐਮਰਜੈਂਸੀ ਕਾਲ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ਰੇਡੀਓ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ਇੱਕ ਐਮਰਜੈਂਸੀ ਨੰਬਰ ਨਹੀਂ ਹੈ।"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"ਕਾਲ ਨਹੀਂ ਕਰ ਸਕਦਾ। ਇੱਕ ਐਮਰਜੈਂਸੀ ਨੰਬਰ ਡਾਇਲ ਕਰੋ।"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ਡਾਇਲ ਕਰਨ ਲਈ ਕੀ-ਬੋਰਡ ਵਰਤੋ"</string>
-    <string name="player_started" msgid="9177182657338033086">"ਪਲੇਅਰ ਅਰੰਭ ਹੋ ਗਿਆ"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"ਪਲੇਅਰ ਰੁੱਕ ਗਿਆ"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"ਕੈਮਰਾ ਤਿਆਰ ਨਹੀਂ ਹੈ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"ਕੈਮਰਾ ਤਿਆਰ ਹੈ"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"ਅਗਿਆਤ ਕਾਲ ਸੈਸ਼ਨ ਇਵੈਂਟ"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ਹੋਰ ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ਨਿੱਜੀ ਜਾਓ"</string>
-    <string name="selectContact" msgid="1703433172800564849">"ਸੰਪਰਕ ਚੁਣੋ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ਰਿੰਗਟੋਨ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"ਕਾਨਫਰੰਸ ਕਾਲ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ਐਮਰਜੈਂਸੀ ਨੰਬਰ"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ਹਾਲੀਆ ਸੁਨੇਹੇ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ਵਪਾਰ ਜਾਣਕਾਰੀ"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> ਮੀਲ ਦੂਰ"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> ਕਿ.ਮੀ. ਦੂਰ"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"ਕੱਲ੍ਹ <xliff:g id="OPEN_TIME">%s</xliff:g> ਵਜੇ ਖੁੱਲ੍ਹੇਗਾ"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ਅੱਜ <xliff:g id="OPEN_TIME">%s</xliff:g> ਵਜੇ ਖੁੱਲ੍ਹੇਗਾ"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> ਵਜੇ ਬੰਦ ਹੋਵੇਗਾ"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ਅੱਜ <xliff:g id="CLOSE_TIME">%s</xliff:g> ਵਜੇ ਬੰਦ ਹੋਇਆ"</string>
-    <string name="open_now" msgid="5897306702060039512">"ਹੁਣ ਖੁੱਲ੍ਹਾ ਹੈ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ਹੁਣ ਬੰਦ ਹੈ"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਜਾਣਦੇ ਹੋ?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਸਪੈਮ ਹੈ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਅਤੇ ਕਾਲ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ ਸੀ।"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> ਤੋਂ ਕਾਲ ਨੂੰ ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤਾ ਗਿਆ।"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਸਪੈਮ ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ਇਸ ਨੰਬਰ ਤੋਂ ਤੁਹਾਨੂੰ ਪਹਿਲੀ ਵਾਰ ਕਾਲ ਕੀਤੀ ਗਈ, ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਸੀ, ਤੁਸੀਂ ਇਸ ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰਨ ਲਈ, ਜਾਂ ਇਸ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ਸਾਨੂੰ ਇਹ ਕਾਲ ਸਪੈਮਰ ਲੱਗ ਰਹੀ ਸੀ। ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਸੀ, ਸਾਡੀ ਗ਼ਲਤੀ ਦੀ ਰਿਪੋਰਟ ਕਰਨ ਲਈ ਸਪੈਮ ਨਹੀਂ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"ਬਲੌਕ ਕਰੋ ਅਤੇ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ਸਪੈਮ ਨਹੀਂ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"ਬਲੌਕ ਕਰੋ ਅਤੇ ਸਪੈਮ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ਸਪੈਮ ਨਹੀਂ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ਕੋਈ SIM ਨਹੀਂ ਜਾਂ SIM ਅਸ਼ੁੱਧੀ"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ਕਾਲ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"ਕਾਨਫਰੰਸ ਕਾਲ"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ਕਾਲ ਵਿੱਚ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"ਸੈਲਿਊਲਰ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ਵੀਡੀਓ ਕਾਲ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ \'ਤੇ ਰਹੇਗੀ। ਸਧਾਰਨ ਡੈਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ਵੀਡੀਓ ਕਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾਰੀ ਰਹੇਗੀ। ਮਿਆਰੀ ਡੈਟਾ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ਇਸ ਨੂੰ ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pl/strings.xml b/java/com/android/incallui/res/values-pl/strings.xml
index 77c8339..c623ff4 100644
--- a/java/com/android/incallui/res/values-pl/strings.xml
+++ b/java/com/android/incallui/res/values-pl/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Poł. konferencyjne"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Połączenie przerwane"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Wysłać następujące dzwonki?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Wysyłanie sygnałów\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Wyślij"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Tak"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nie"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zastąp symbol wieloznaczny"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Poł. konferencyjne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Numer poczty głosowej"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Wybieranie"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Nieodebrane połączenie od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Trwa połączenie"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trwa połączenie służbowe"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Trwające połączenie przez Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trwa połączenie służbowe przez Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Trwające <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Przychodzące <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"połączenie przez Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"połączenie służbowe przez Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Połączenie"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Połączenie przychodzące ze zdjęciem"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ważne połączenie przychodzące z załącznikami"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ważne połączenie przychodzące z załącznikami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Przychodzące połączenie służbowe"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Przychodzące połączenie przez Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Przychodzące połączenie służbowe przez Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Przychodzące połączenie podejrzanie o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Przychodzące żądanie wideo"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Brak usługi"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Wybrana sieć (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) jest niedostępna"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odbierz"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Rozłącz"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Rozmowa wideo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Głos"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Zaakceptuj"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odrzuć"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Trwająca rozmowa na innym urządzeniu"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Trwająca rozmowa wideo na innym urządzeniu"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Odbierz rozmowę"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Odbierz rozmowę wideo"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Aby rozpocząć połączenie, wyłącz najpierw tryb samolotowy"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nie zarejestrowano w sieci"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sieć komórkowa jest niedostępna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Aby zadzwonić, wybierz prawidłowy numer."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nie można dzwonić."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Rozpoczynanie sekwencji MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usługa nie jest obsługiwana."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nie można przełączyć połączeń."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nie można rozdzielić połączenia."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nie można przekazać."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Nie można nawiązać połączenia konferencyjnego."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nie można odrzucić połączenia."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nie można zwolnić połączeń."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Połączenie alarmowe"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Trwa włączanie sieci bezprzewodowych..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Brak sieci. Próbuję ponownie…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nie można dzwonić. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nie można dzwonić. Wybierz numer alarmowy."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Aby zadzwonić, użyj klawiatury."</string>
-    <string name="player_started" msgid="9177182657338033086">"Odtwarzacz włączony"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Odtwarzacz zatrzymany"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Aparat niegotowy"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Aparat gotowy"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nieznane zdarzenie sesji połączenia"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Inne ustawienia połączeń"</string>
     <string name="goPrivate" msgid="5269514638004595378">"przejdź do rozmowy prywatnej"</string>
-    <string name="selectContact" msgid="1703433172800564849">"wybierz kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Dzwonek i wibracje"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Zarządzaj połączeniem konferencyjnym"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numer alarmowy"</string>
     <string name="child_number" msgid="3398257437107259682">"z <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Ostatnie wiadomości"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacje o firmie"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil(e) stąd"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km stąd"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Otwarte jutro od <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Otwarte dzisiaj od <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zamknięte od <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zamknięte dzisiaj od <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Teraz otwarte"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Teraz zamknięte"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Znasz <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Czy <xliff:g id="NUMBER">%1$s</xliff:g> to spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> został zablokowany, a połączenie zgłoszone jako spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Połączenie z numeru <xliff:g id="NUMBER">%1$s</xliff:g> zostało zgłoszone jako niebędące spamem."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Kliknij, aby dodać do kontaktów lub zablokować jako spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"To pierwsze połączenie z tego numeru. Jeśli to spam, możesz zablokować ten numer i zgłosić go."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Kliknij, aby zgłosić to połączenie jako NIEBĘDĄCE SPAMEM lub zablokować je."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Podejrzewamy, że to spam. Jeśli to połączenie nie było spamem, kliknij TO NIE SPAM, aby zgłosić naszą pomyłkę."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Zablokuj i zgłoś"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"To nie spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Zablokuj numer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodaj do kontaktów"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Zablokuj i zgłoś spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"To nie spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Brak lub błąd karty SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zakończ połączenie"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Połączenie konferencyjne"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"W trakcie rozmowy"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Kontynuuję rozmowę przy użyciu transmisji danych komórkowych…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nie udało się przełączyć na sieć Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Rozmowa wideo pozostanie w sieci komórkowej. Za transfer danych może zostać pobrana opłata."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kontynuuję rozmowę przy użyciu mobilnej transmisji danych…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nie udało się przełączyć na sieć Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Rozmowa wideo będzie nadal prowadzona przez sieć komórkową. Za transfer danych może zostać pobrana opłata."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nie pokazuj ponownie tego komunikatu"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rBR/strings.xml b/java/com/android/incallui/res/values-pt-rBR/strings.xml
index b0e46df..3bd4866 100644
--- a/java/com/android/incallui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rBR/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Teleconferência"</string>
-    <string name="call_lost" msgid="2082971531689406145">"A chamada caiu."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os toques a seguir?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Enviando tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substituir caractere curinga por"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Teleconferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número correio de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Discando"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em andamento"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em andamento"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho por Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sem serviço"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"A rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) não está disponível"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Chamada em andamento em outro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada em andamento em outro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Atender à chamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para fazer uma chamada, primeiro desative o modo avião."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Não registrado na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede celular não disponível."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar uma chamada, digite um número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível realizar chamadas."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando sequência MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Não é possível alternar as chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Não é possível separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Não é possível transferir a chamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Não é possível fazer uma conferência."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Não é possível liberar chamadas."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Chamada de emergência"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ativando o rádio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Sem serviço. Tentando novamente..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Não é possível realizar chamadas. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Não é possível realizar chamadas. Disque um número de emergência."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use o teclado para discar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player iniciado"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player interrompido"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"A câmera não está pronta"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Câmera pronta"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sessão de chamada desconhecido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Outras configurações de chamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"conversar em particular"</string>
-    <string name="selectContact" msgid="1703433172800564849">"selecionar contato"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Toque e vibração"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerenciar teleconferência"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensagens recentes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informações sobre a empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> milhas de distância"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km de distância"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre amanhã às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoje às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Fecha às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Fechou hoje às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Aberto agora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fechado agora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toque para informar que NÃO É SPAM ou bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Adicionar contato"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Adicionar aos contatos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear e denunciar spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Não é spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Sem SIM ou erro de SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada com dados da rede celular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada continuará via rede celular. Sujeito a cobranças por uso de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rPT/strings.xml b/java/com/android/incallui/res/values-pt-rPT/strings.xml
index b42b0e5..7a83b10 100644
--- a/java/com/android/incallui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rPT/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Chamada de conferência"</string>
-    <string name="call_lost" msgid="2082971531689406145">"A chamada caiu"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os seguintes tons?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"A enviar tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substituir o carácter universal por"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Chamada de conferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número do correio de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"A marcar"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada não atendida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em curso"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em curso"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em curso"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada de trabalho por Wi-Fi em curso"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em curso"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"."</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"A receber chamada spam suspeita"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Pedido de vídeo recebido"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nenhum serviço"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) indisponível"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Chamada em curso noutro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Chamada em curso noutro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Aceitar chamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Aceitar videochamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para efectuar uma chamada, desactive primeiro o modo para Avião."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Sem registo na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede móvel não disponível."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para telefonar, introduza um número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível telefonar."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"A iniciar sequência de MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Não é possível alternar chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Não é possível separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Não é possível transferir."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Não é possível efetuar uma conferência."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Não é possível libertar a(s) chamada(s)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Chamada de emergência"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"A ligar o rádio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Sem serviço. A tentar novamente…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Não é possível telefonar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Não é possível telefonar. Marque um número de emergência."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilizar o teclado para marcar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Leitor iniciado"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Leitor interrompido"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"A câmara não está pronta"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Câmara pronta"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sessão de chamada desconhecido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Outras definições de chamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"tornar privado"</string>
-    <string name="selectContact" msgid="1703433172800564849">"seleccionar contacto"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Toque e vibração"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerir conferência"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
     <string name="child_number" msgid="3398257437107259682">"através de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensagens recentes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informações da empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> milhas de distância"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km de distância"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre amanhã às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoje às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Fecha às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Fechou hoje às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Aberto agora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fechado agora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Conhece <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é considerado spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"A chamada de <xliff:g id="NUMBER">%1$s</xliff:g> não é considerada spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toque para adicionar aos contactos ou bloquear um número considerado spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"É a primeira vez que este número lhe liga. Se esta chamada foi considerada spam, pode bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toque para denunciar como NÃO É SPAM ou para bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Suspeitamos que esta chamada seja de um spammer. Se esta chamada não foi considerada spam, toque em NÃO É SPAM para denunciar o nosso erro."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Adicionar contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Adicionar aos contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear e denunciar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Não é spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Sem cartão SIM ou erro do cartão"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Terminar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Chamada de conferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Numa chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"A continuar a chamada com dados móveis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível mudar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"As videochamadas continuarão a ser efetuadas através de rede móvel. Poderão ser aplicados custos de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"A continuar a chamada com dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível mudar para a rede Wi-Fi."</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"As videochamadas irão continuar a ser efetuadas através da rede móvel. Poderão ser aplicados custos de dados padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não voltar a mostrar este aviso"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt/strings.xml b/java/com/android/incallui/res/values-pt/strings.xml
index b0e46df..3bd4866 100644
--- a/java/com/android/incallui/res/values-pt/strings.xml
+++ b/java/com/android/incallui/res/values-pt/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Teleconferência"</string>
-    <string name="call_lost" msgid="2082971531689406145">"A chamada caiu."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os toques a seguir?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Enviando tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substituir caractere curinga por"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Teleconferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número correio de voz"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Discando"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chamada Wi-Fi em andamento"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chamada trabalho por Wi-Fi em andamento"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em andamento"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho por Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Chamada Wi-Fi recebida"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Chamada de trabalho recebida por Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sem serviço"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"A rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) não está disponível"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Chamada em andamento em outro dispositivo"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada em andamento em outro dispositivo"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Atender à chamada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Para fazer uma chamada, primeiro desative o modo avião."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Não registrado na rede."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rede celular não disponível."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Para realizar uma chamada, digite um número válido."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Não é possível realizar chamadas."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iniciando sequência MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Não é possível alternar as chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Não é possível separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Não é possível transferir a chamada."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Não é possível fazer uma conferência."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Não é possível liberar chamadas."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Chamada de emergência"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ativando o rádio…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Sem serviço. Tentando novamente..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Não é possível realizar chamadas. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Não é possível realizar chamadas. Disque um número de emergência."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Use o teclado para discar"</string>
-    <string name="player_started" msgid="9177182657338033086">"Player iniciado"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Player interrompido"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"A câmera não está pronta"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Câmera pronta"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Evento de sessão de chamada desconhecido"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Outras configurações de chamada"</string>
     <string name="goPrivate" msgid="5269514638004595378">"conversar em particular"</string>
-    <string name="selectContact" msgid="1703433172800564849">"selecionar contato"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Toque e vibração"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerenciar teleconferência"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mensagens recentes"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informações sobre a empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> milhas de distância"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km de distância"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Abre amanhã às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Abre hoje às <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Fecha às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Fechou hoje às <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Aberto agora"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fechado agora"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toque para informar que NÃO É SPAM ou bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Adicionar contato"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Adicionar aos contatos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquear e denunciar spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Não é spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Sem SIM ou erro de SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuando a chamada com dados da rede celular…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"A videochamada continuará via rede celular. Sujeito a cobranças por uso de dados."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ro/strings.xml b/java/com/android/incallui/res/values-ro/strings.xml
index db8be10..9015bd9 100644
--- a/java/com/android/incallui/res/values-ro/strings.xml
+++ b/java/com/android/incallui/res/values-ro/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Teleconferință"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Apelul s-a încheiat"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Trimiteți următoarele tonuri?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Se trimit tonuri\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Trimiteți"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nu"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Înlocuiți metacaracterul cu"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Teleconferință <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Număr de mesagerie vocală"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Se apelează"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Apel nepreluat de la <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Apel în desfășurare"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Apel de serviciu în desfășurare"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Apel Wi-Fi în desfășurare"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Apel de serviciu prin Wi-Fi în desfășurare"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> în desfășurare"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Apel primit de la <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Apel Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Apel de serviciu prin Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"În așteptare"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Apel de intrare"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Apel primit cu fotografie"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Apel primit important cu poză, mesaj și locație"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Apel primit important cu atașamente"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Apel de serviciu primit"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Apel prin Wi-Fi primit"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Apel de serviciu prin Wi-Fi primit"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Un apel primit posibil spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitare de trecere la apel video"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Fără serviciu"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rețeaua selectată (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nu este disponibilă"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Răspundeți"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Încheiați apelul"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoclip"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voce"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Acceptați"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Respingeți"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Apel în curs pe alt dispozitiv"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Apel video în curs pe alt dispozitiv"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Preluați apelul"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Preluați apelul video"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Pentru a efectua un apel, mai întâi dezactivați modul Avion."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Neînregistrat în rețea."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rețeaua mobilă nu este disponibilă"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pentru a apela, introduceți un număr valid."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nu se poate apela."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Se pornește secvența MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviciul nu este acceptat."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Apelurile nu pot fi comutate."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Apelul nu poate fi separat."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nu se poate transfera."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Conferința telefonică nu poate fi inițiată."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Apelul nu poate fi respins."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Apelurile nu pot fi eliberate."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Apel de urgență"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Se activează semnalul radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Fără semnal. Se încearcă din nou..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nu se poate apela. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgență."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nu se poate apela. Formați un număr de urgență."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilizați tastatura pentru a forma"</string>
-    <string name="player_started" msgid="9177182657338033086">"Playerul a pornit"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Playerul s-a oprit"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Camera foto nu este pregătită"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Camera foto este pregătită"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Eveniment necunoscut privind o sesiune de apeluri"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Alte setări de apel"</string>
     <string name="goPrivate" msgid="5269514638004595378">"trecerea la modul privat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"selectarea unei persoane din agendă"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ton de apel și vibrare"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestionați conferința telefonică"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Număr de urgență"</string>
     <string name="child_number" msgid="3398257437107259682">"pe <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mesaje recente"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informații despre companie"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi distanță"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km distanță"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Deschide mâine la <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Deschide astăzi la <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Închide la <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"A închis astăzi la <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Acum este deschis"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Acum este închis"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Cunoașteți numărul <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Este <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> a fost blocat și apelul a fost raportat ca spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Apelul primit de la <xliff:g id="NUMBER">%1$s</xliff:g> a fost raportat ca nefiind spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Atingeți pentru a adăuga persoane de contact sau pentru a bloca numărul spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Aceasta este prima dată când ați primit apel de la acest număr. Dacă apelul a fost spam, puteți să blocați numărul și să îl raportați."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Atingeți pentru a raporta ca NU ESTE SPAM sau blocați-l."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Am suspectat acest număr ca fiind autor de spam. Dacă apelul nu a fost spam, atingeți NU ESTE SPAM pentru a raporta greșeala noastră."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blocați și raportați"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Adăugați o persoană în agendă"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nu este spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blocați numărul"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Adăugați în agendă"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blocați și raportați spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nu este spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nu există SIM sau eroare de SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Încheiați apelul"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Teleconferință"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Apel în desfășurare"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Se continuă apelul folosind datele mobile…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nu s-a putut comuta la rețeaua Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Apelul video rămâne în rețeaua mobilă. Se pot aplica tarife standard pentru date."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Se continuă apelul folosind datele mobile…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nu s-a putut comuta la rețeaua Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Apelul video continuă prin rețeaua mobilă. Se pot aplica tarife standard pentru date."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nu mai afișa acest mesaj"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ru/strings.xml b/java/com/android/incallui/res/values-ru/strings.xml
index 8fd924e..18bad92 100644
--- a/java/com/android/incallui/res/values-ru/strings.xml
+++ b/java/com/android/incallui/res/values-ru/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конференц-вызов"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Звонок сброшен"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Отправить следующие тоны?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Отправка тональных сигналов\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Отправить"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Нет"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Заменить универсальный символ на"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конференц-вызов: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Номер голосовой почты"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Набор номера…"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропущенные вызовы от абонента <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущий вызов"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущий звонок (работа)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текущий Wi-Fi-звонок"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текущий Wi-Fi-звонок (работа)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Текущий <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Входящий <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"звонок по Wi‑Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"звонок по Wi‑Fi (работа)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ждет ответа"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Входящий вызов"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящий вызов с фотографией"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важный вызов с фото, сообщением и геоданными"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важный входящий вызов с прикрепленными файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящий звонок (работа)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Входящий Wi-Fi-звонок"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Входящий Wi-Fi-звонок (работа)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящий вызов: подозрение на спам"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входящий видеовызов"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Сеть не найдена"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Выбранная сеть (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна."</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Ответить"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Завершить разговор"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Голосовой вызов"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Принять"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Отклонить"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Вы участвуете в разговоре на другом устройстве"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Вы участвуете в видеовстрече на другом устройстве"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Продолжить на этом устройстве"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Продолжить на этом устройстве"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Перед тем как звонить, отключите режим полета."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Нет регистрации в сети."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобильная сеть недоступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Недействительный номер."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Не удалось позвонить."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Запуск последовательности MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Сервис не поддерживается."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Не удалось переключить вызов."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Не удалось разделить вызов."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Не удалось перенести."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Не удалось выполнить конференц-вызов."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Не удалось отклонить вызов."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Не удалось разъединить."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Экстренный вызов"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Включение радио…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Нет сигнала. Повторная попытка…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Не удалось позвонить. Номер <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не принадлежит экстренным службам."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Не удалось позвонить. Наберите номер экстренных служб."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Используйте клавиатуру для набора номера"</string>
-    <string name="player_started" msgid="9177182657338033086">"Видеоплеер включен"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Видеоплеер отключен"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера недоступна"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера доступна"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Неизвестное событие сеанса связи"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Другие настройки вызовов"</string>
     <string name="goPrivate" msgid="5269514638004595378">"приватная конференция"</string>
-    <string name="selectContact" msgid="1703433172800564849">"выбрать контакт"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Рингтон и вибросигнал"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Настройка конференц-связи"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Экстренная служба"</string>
     <string name="child_number" msgid="3398257437107259682">"через <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Недавние сообщения"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Информация о компании"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> мил."</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> км"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Откроется завтра в <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Откроется сегодня в <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Работает до <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Сегодня не работает с <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Сейчас открыто"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Сейчас закрыто"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Вам знаком номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> – это спам?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблокирован. Вы сообщили о вызове как о спаме."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Вы сообщили, что звонок с номера <xliff:g id="NUMBER">%1$s</xliff:g> – это не спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Нажмите, чтобы добавить в контакты или заблокировать номер как спам."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Это первый вызов с этого номера. Если это был спам, вы можете сообщить об этом и заблокировать этот номер."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Нажмите, чтобы сообщить, что это НЕ СПАМ, или заблокировать номер."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Возможно, этот звонок – спам. Если это не так, нажмите НЕ СПАМ, чтобы сообщить нам об этом."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Блокировать/сообщить"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Добавить контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Заблокировать номер"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Добавить в контакты"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Заблокировать и сообщить о спаме"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Не спам"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ошибка SIM-карты или SIM-карта не установлена"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершить вызов"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-вызов"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Вызов"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Переключение на мобильные данные…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не удалось подключиться к сети Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Переключение на мобильный Интернет…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не удалось переключиться на сеть Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больше не показывать"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-si/strings.xml b/java/com/android/incallui/res/values-si/strings.xml
index 989879a..0e0acd6 100644
--- a/java/com/android/incallui/res/values-si/strings.xml
+++ b/java/com/android/incallui/res/values-si/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"දුරකථනය"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"සම්මන්ත්‍රණ ඇමතුම"</string>
-    <string name="call_lost" msgid="2082971531689406145">"ඇමතුම නැවතුණි"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"පහත නාද යවන්නද?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"නාද යවමින්\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"යවන්න"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ඔව්"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"නැත"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"අක්ෂරය ප්‍රතිස්ථාපනය කරන්නේ"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"සම්මන්ත්‍රණ ඇමතුම <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"හඬ තැපැල් අංකය"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ඩයල් කරමින්"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> වෙතින් මඟ හැරුණු ඇමතුම"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"කරගෙනය යන ඇමතුම"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"කරගෙන යන කාර්යාල ඇමතුම"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"දැනට ක්‍රියාත්මක Wi-Fi ඇමතුම"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"කරගෙන යන Wi-Fi කාර්යාල ඇමතුම"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"කෙරෙමින් පවතින <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"එන <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi ඇමතුම"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi කාර්යාල ඇමතුම"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"රඳවා ගනිමින්"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"එන ඇමතුම"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ඡායාරූපය සමග එන ඇමතුම"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ඇමුණුම් සමග වැදගත් එන ඇමතුම"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"පැමිණෙන කාර්යාල ඇමතුම"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"පැමිණෙන Wi-Fi ඇමතුම"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"පැමිණෙන Wi-Fi කාර්යාල ඇමතුම"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"එන සැකසහිත අයාචිත තැපැල් ඇමතුම"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"පැමිණෙන වීඩියෝ ඉල්ලීම"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"සේවාව නැත"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"තෝරා ඇති ජාලය (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) නොමැත"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"පිළිතුරු දෙන්න"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"විසන්ධි කරන්න"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"වීඩියෝව"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"හඬ"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"පිළිගන්න"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ප්‍රතික්ෂේප කිරීම"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"වෙනත් උපාංගයක සිදු වන ඇමතුම"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"වෙනත් උපාංගයක කෙරෙමින් පවතින වීඩියෝ ඇමතුම"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"ඇමතුම ගන්න"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"වීඩියෝ ඇමතුම ගන්න"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"ඇමතුමක් ගැනීමට, මුලින්ම ගුවන්යානා ආකාරය අක්‍රිය කරන්න."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ජාලය මත ලියාපදිංචි වී නැත."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"සෙලියුලර් ජාලය නොමැත"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"ඇමතුමක් ලබාගැනීමට, වලංගු අංකයක් ලබාගන්න."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"ඇමතුම් ගැනීමට නොහැක."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI අනුපිළිවෙල ආරම්භ කරමින්…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"සේවාව සහාය ලබාදෙන්නේ නැත."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ඇමතුම් මාරු කිරීම කළ නොහැක."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ඇමතුම වෙන් කිරීම කළ නොහැක."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"මාරු කිරීමට නොහැක."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"සාකච්ඡාව කළ නොහැක."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ඇමතුම ප්‍රතික්ෂේප කළ නොහැක."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ඇමතුම(ම්) මුදාහැරීම කළ නොහැක."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"හදිසි ඇමතුම"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"රේඩියෝව ආරම්භ කරමින්…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"සේවා නැත. නැවත උත්සාහ කරන්න…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"ඇමතීමට නොහැකිය. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> මෙය හදිසි ඇමතුම් අංකයක් නොවේ."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"ඇමතිය නොහැක. හදිසි අංකයක් අමතන්න."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ඇමතීමට කිරීමට යතුරු පුවරුව භාවිතා කරන්න"</string>
-    <string name="player_started" msgid="9177182657338033086">"ධාවකය ආරම්භ කරන ලදි"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"ධාවකය නැවතුණි"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"කැමරාව සූදානම් නැහැ"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"කැමරාව සූදානම්"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"නොදන්නා ඇමතුම් සැසි සිදුවීම"</string>
-    <string name="other_settings" msgid="2537377721890761197">"වෙනත් ඇමතුම් සැකසුම්"</string>
     <string name="goPrivate" msgid="5269514638004595378">"පොද්ගලික බවට යන්න"</string>
-    <string name="selectContact" msgid="1703433172800564849">"සම්බන්ධතාවය තෝරාගන්න"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"නාද රිද්ම සහ කම්පනය"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"හදිසි ඇමතුම් අංකය"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> හරහා"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"මෑත පණිවිඩ"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ව්‍යාපාර තොරතුරු"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"සැතපුම් <xliff:g id="DISTANCE">%.1f</xliff:g>ක් ඈතින්"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"කි.මි. <xliff:g id="DISTANCE">%.1f</xliff:g>ක් ඈතින්"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"හෙට <xliff:g id="OPEN_TIME">%s</xliff:g>ට විවෘත කෙරේ"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"අද <xliff:g id="OPEN_TIME">%s</xliff:g>ට විවෘත කෙරේ"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>ට වසයි"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"අද <xliff:g id="CLOSE_TIME">%s</xliff:g>ට වසනු ලැබේ"</string>
-    <string name="open_now" msgid="5897306702060039512">"දැන් විවෘතයි"</string>
-    <string name="closed_now" msgid="3962291301467974921">"දැන් වසා ඇත"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> දන්නවද?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකය අයාචිතද?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර කර ඇමතුම අයාචිත ලෙස ලකුණු කර ඇත."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකයෙන් ඇමතුම අයාචිත නැති ලෙස වාර්තා කරන ලදී."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"සම්බන්ධතාවලට එක් කිරීමට හෝ අයාචිත අංක අවහිර කිරීමට තට්ටු කරන්න."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"මෙම අංකය ඔබට අමතන ලද පළමු අවස්ථාව මෙයයි. මෙම ඇමතුම අයාචිත නම්, ඔබට මෙම අංකය අවහිර කර ඒ පිළිබඳ පැමිණිලි කළ හැකිය."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"එය අයාචිත නැති ලෙස වාර්තා කිරීමට හෝ අවහිර කිරීමට තට්ටු කරන්න."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"අපි මෙය අයාචිත තැපැල් යවන්නකු බවට සැක කළෙමු. මෙම ඇමතුම අයාචිත නොවුනේ නම්, අපේ අත්වැරැද්ද වාර්තා කිරීමට අයාචිත නැති ලෙස තට්ටු කරන්න."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"අවහිර කර වාර්තා කර."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"සම්බන්ධතාවය එක් කරන්න"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"අයාචිත තැපෑලක් නොවේ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"අංකය අවහිර කරන්න"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"සම්බන්ධතාවලට එක් කරන්න"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"අවහිර කර අයාචිත ලෙස වාර්තා කරන්න"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"අයාචිත තැපෑලක් නොවේ"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM නැත හෝ SIM දෝෂයක්"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ඇමතුම අවසන් කරන්න"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"සම්මන්ත්‍රණ ඇමතුම"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"ඇමතුමක"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"සෙලියුලර් දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"වීඩියෝ ඇමතුම සෙලියුලර් ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ජංගම දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"වීඩියෝ ඇමතුම ජංගම ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"නැවත මෙය නොපෙන්වන්න"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sk/strings.xml b/java/com/android/incallui/res/values-sk/strings.xml
index d09ba44..28232ae 100644
--- a/java/com/android/incallui/res/values-sk/strings.xml
+++ b/java/com/android/incallui/res/values-sk/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefón"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferenčný hovor"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Hovor bol prerušený."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Odoslať nasledujúce tóny?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Odosielanie tónov\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Odoslať"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Áno"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nie"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Nahradiť zástupný znak znakom"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferenčný hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Číslo hlasovej schránky"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Vytáča sa"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Zmeškaný hovor od volajúceho <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Prebiehajúci hovor"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Prebiehajúci pracovný hovor"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Odchádzajúci hovor prostredníctvom siete Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Prebiehajúci pracovný hovor cez Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Prebiehajúci <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Prichádzajúci <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"hovor cez Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"pracovný hovor cez Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Podržaný hovor"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Prichádzajúci hovor"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Prichádzajúci hovor s fotkou"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Dôležitý prich. hovor s fotkou, správou a polohou"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Dôležitý prichádzajúci hovor s prílohami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Prichádzajúci pracovný hovor"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Prichádzajúci hovor prostredníctvom siete Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Prichádzajúci pracovný hovor cez Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Prichádzajúci hovor, pri ktorom je podozrenie, že ide o spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Prichádzajúca žiadosť o video"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Žiadny signál"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Vybratá sieť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie je k dispozícii"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Prijať"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Položiť"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Hlas"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prijať"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odmietnuť"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Prebiehajúci hovor v inom zariadení"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Prebiehajúci videohovor v inom zariadení"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Prevziať hovor"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Prevziať videohovor"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Ak chcete telefonovať, vypnite najprv režim v lietadle."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Prihlásenie do siete nebolo úspešné."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilná sieť nie je k dispozícii."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ak chcete volať, zadajte platné číslo"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Hovor nie je možné uskutočniť"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Prebieha spúšťanie sekvencie MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Služba nie je podporovaná"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nedajú sa prepínať hovory"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nedá sa rozdeliť hovor"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nedá sa preniesť"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Nedá sa uskutočniť konferenčný hovor"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nedá sa odmietnuť hovor"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nedajú sa ukončiť hovory"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Tiesňové volanie"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Prebieha zapínanie rádia..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Žiadna služba. Prebieha opätovný pokus…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Hovor sa nedá uskutočniť. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo tiesňového volania."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Hovor nie je možné uskutočniť. Vytočte číslo tiesňového volania."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Číslo vytočíte pomocou klávesnice."</string>
-    <string name="player_started" msgid="9177182657338033086">"Prehrávač bol spustený"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Prehrávač bol zastavený"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nie je pripravená"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera je pripravená"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Neznáma udalosť relácie volania"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ďalšie nastavenia hovorov"</string>
     <string name="goPrivate" msgid="5269514638004595378">"prepnúť na súkromné"</string>
-    <string name="selectContact" msgid="1703433172800564849">"vybrať kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Tón zvonenia a vibrovanie"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Spravovať konferenčný hovor"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Číslo tiesňového volania"</string>
     <string name="child_number" msgid="3398257437107259682">"na čísle <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedávne správy"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informácie o firme"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Vzdialené <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Vzdialené <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Otvára sa zajtra o <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Dnes sa otvára o <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zatvára sa o <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Dnes bolo zatvorené o <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Otvorené"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Zatvorené"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bolo zablokované a hovor bol nahlásený ako spam"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> bol nahlásený, že nie je spam"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Klepnutím pridajte číslo medzi kontakty alebo zablokujte číslo, ktoré je spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Toto bol prvý hovor z tohto čísla. Ak bol tento hovor spam, môžete toto číslo zablokovať a nahlásiť ho."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Klepnutím môžete nahlásiť, že číslo NIE JE SPAM, alebo ho môžete zablokovať."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Mali sme podozrenie, že ide o šíriteľa spamu. Ak hovor nebol spam, klepnite na možnosť NIE JE SPAM a nahláste náš omyl."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokovať a nahlásiť"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Pridať kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Toto nie je spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokovať číslo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Pridať do kontaktov"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokovať a nahlásiť spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Toto nie je spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta chýba alebo nefunguje"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončiť hovor"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenčný hovor"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Prebieha hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Pokračuje sa v hovore pomocou mobilných dát…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nepodarilo sa prepnúť na sieť Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Pokračuje sa v hovore pomocou mobilných dát…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepodarilo sa prepnúť na sieť Wi‑Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Informácie nabudúce nezobrazovať"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sl/strings.xml b/java/com/android/incallui/res/values-sl/strings.xml
index b083e1b..ba98c2d 100644
--- a/java/com/android/incallui/res/values-sl/strings.xml
+++ b/java/com/android/incallui/res/values-sl/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferenčni klic"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Klic je bil prekinjen"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ali želite poslati naslednje tone?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Pošiljanje tonov\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Pošlji"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zamenjaj nadomestni znak z"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferenčni klic <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Številka glasovne pošte"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Klicanje"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Neodgovorjeni klic od: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktivni klic"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktivni delovni klic"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Odhodni klic prek Wi-Fi-ja"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Aktivni delovni klic prek omrežja Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Aktivni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dohodni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"klic prek omrežja Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"delovni klic prek omrežja Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dohodni klic"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dohodni klic s fotografijo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Pomemben klic s fotografijo, sporočilom, lokacijo"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Pomemben dohodni klic s prilogami"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dohodni delovni klic"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dohodni klic prek Wi-Fi-ja"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dohodni delovni klic prek omrežja Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Domnevno neželeni dohodni klic"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dohodna zahteva za video"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ni storitve"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Izbrano omrežje (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ni na voljo"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Prekinite klic"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoklic"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Govor"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Sprejmi"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Zavrni"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Aktivni klic v drugi napravi"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Aktivni videoklic v drugi napravi"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Sprejmi klic"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Sprejmi videoklic"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Če želite poklicati, najprej izklopite način za letalo."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ni registrirano v omrežju."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilno omrežje ni na voljo."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Če želite opraviti klic, vnesite veljavno številko."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Klicanje ni mogoče."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Začetek zaporedja MMI ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Storitev ni podprta."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Preklop med klici ni mogoč."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Ločitev klica ni mogoča."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Prenos ni mogoč."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferenčni klic ni mogoč."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Zavrnitev klica ni mogoča."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Prevzem klicev ni mogoč."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Klic v sili"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Vklop radia …"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ni signala. Vnovičen poskus …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Klicanje ni mogoče. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za klic v sili."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Klicanje ni mogoče. Opravite klic v sili."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Za klicanje uporabite tipkovnico"</string>
-    <string name="player_started" msgid="9177182657338033086">"Predvajanje začeto"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Predvajanje ustavljeno"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Fotoaparat ni pripravljen"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Fotoaparat je pripravljen"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Neznan dogodek seje klica"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Druge nastavitve klicev"</string>
     <string name="goPrivate" msgid="5269514638004595378">"zasebno"</string>
-    <string name="selectContact" msgid="1703433172800564849">"izbira stika"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ton zvonjenja in vibriranje"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konferenčne klice"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Številka za klic v sili"</string>
     <string name="child_number" msgid="3398257437107259682">"prek <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedavna sporočila"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Podatki o podjetju"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi stran"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km stran"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Odpre se jutri ob <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Odpre se danes ob <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zapre se ob <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zaprto danes ob <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Trenutno odprto"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Trenutno zaprto"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznate številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Ali je klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> neželen?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Številka <xliff:g id="NUMBER">%1$s</xliff:g> je blokirana, klic pa je bil prijavljen kot neželen."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> ni več prijavljen kot neželen."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Dotaknite se, da dodate med stike ali blokirate neželeno številko."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Klic s te številke ste prejeli prvič. Če je bil ta klic neželen, lahko blokirate številko in jo prijavite."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Dotaknite se, da klic prijavite kot »NI NEŽELENI KLIC« ali ga blokirate."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Predvidevali smo, da je to neželeni klic. Če klic ni bil neželen, se dotaknite možnosti »NI NEŽELENI KLIC«, da prijavite našo napako."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokiraj in prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj stik"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ni neželena vsebina"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokiraj številko"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodajanje med stike"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokiraj in prijavi neželeni klic"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ni neželeni klic"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ni kartice SIM ali napaka kartice SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Končaj klic"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenčni klic"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poteka klic"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Nadaljevanje klica prek prenosa podatkov v mobilnih omrežjih …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ni bilo mogoče preklopiti v omrežje Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nadaljevanje klica prek prenosa podatkov v mobilnem omrežju …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ni bilo mogoče preklopiti v omrežje Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tega ne kaži več"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sq/strings.xml b/java/com/android/incallui/res/values-sq/strings.xml
index fd19642..425a0dc 100644
--- a/java/com/android/incallui/res/values-sq/strings.xml
+++ b/java/com/android/incallui/res/values-sq/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefoni"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Telefonatë konference"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Telefonata ra"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Dëshiron t\'i dërgosh tonet e mëposhtme?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Po dërgon tone\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Dërgo"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Po"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Jo"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zëvendëso karakterin variabël me"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Telefonatë konference <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Numri i postës zanore"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Po formon numrin"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Telefonatë e humbur nga <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Telefonatë në vazhdim"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Telefonatë pune dalëse"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Telefonatë në vazhdim me Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Telefonatë pune dalëse përmes Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> në vazhdim"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> në ardhje"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Telefonatë me Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Telefonatë pune me Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Në pritje"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Telefonatë hyrëse"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Telefonatë hyrëse me fotografi"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tel. e rëndësishme me foto, mesazh e vendndodhje"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Telefonatë hyrëse e rëndësishme me bashkëngjitje"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Telefonatë pune hyrëse"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Telefonatë hyrëse Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Telefonatë pune hyrëse përmes Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Telefonatë e dyshuar si e padëshiruar"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kërkesë për video hyrëse"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nuk ka shërbim"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Rrjeti i përzgjedhur (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nuk mundësohet"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Përgjigju"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Mbyll"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Zanore"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prano"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuzo"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Telefonatë në vazhdim në një pajisje tjetër"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Telefonatë në vazhdim në një pajisje tjetër"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Prano telefonatën"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Prano telefonatën me video"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Për të kryer telefonatë, së pari çaktivizo modalitetin e aeroplanit."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"I paregjistruar në rrjet."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Rrjeti celular nuk mundësohet."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Për të kryer një telefonatë, fut një numër të vlefshëm."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nuk mund të telefonojë."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Po fillon sekuencën MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Shërbimi nuk mbështetet."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nuk mund të ndryshojë telefonatat."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nuk mund të ndajë telefonatën."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Nuk mund të transferojë."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Nuk mund të kryejë telefonatë konference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nuk mund të refuzojë telefonatën."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nuk mund të lëshojë telefonatën(at)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Telefonata e urgjencës"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Po aktivizon radion…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nuk ka shërbim. Po provon sërish…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nuk mund të telefonohet. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nuk është një numër urgjence."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nuk mund të telefonohet. Formo një numër urgjence."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Përdor tastierën për të formuar numrin"</string>
-    <string name="player_started" msgid="9177182657338033086">"Luajtësi filloi"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Luajtësi ndaloi"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nuk është gati"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera është gati"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Ngjarje e panjohur në sesionin e telefonatës"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Cilësime të tjera të telefonatës"</string>
     <string name="goPrivate" msgid="5269514638004595378">"bëje private"</string>
-    <string name="selectContact" msgid="1703433172800564849">"përzgjidh kontaktin"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Zilja dhe dridhja"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Menaxho telefonatën konferencë"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numri i urgjencës"</string>
     <string name="child_number" msgid="3398257437107259682">"përmes <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mesazhet e fundit"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacioni i biznesit"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> milje larg"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km larg"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Hapet nesër në <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Hapet sot në <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Mbyllet në <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Mbyllur sot në <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Tani është hapur"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Tani është mbyllur"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"E njeh <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"A është <xliff:g id="NUMBER">%1$s</xliff:g> i/e padëshiruar?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> u bllokua dhe telefonata u raportua si e padëshiruar."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Telefonata nga <xliff:g id="NUMBER">%1$s</xliff:g> u raportua si e padëshiruar."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Trokit për ta shtuar te kontaktet ose për të bllokuar numrin e padëshiruar."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Kjo është hera e parë që ky numër ka telefonuar. Nëse telefonata ishte e padëshiruar, mund ta bllokosh këtë numër dhe ta raportosh."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Trokit për ta raportuar si JO E PADËSHIRUAR ose ta bllokosh."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Dyshojmë se është e padëshiruar. Nëse telefonata nuk është e padëshiruar, trokit JO E PADËSHIRUAR për të raportuar gabimin tonë."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blloko dhe raporto"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Shto kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nuk është i padëshiruar"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blloko numrin"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Shto te kontaktet"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blloko dhe raporto si e padëshiruar"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nuk është i padëshiruar"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nuk ka kartë SIM ose ka gabim në kartën SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mbylle telefonatën"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Telefonatë konferencë"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Në telefonatë"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Po vazhdon telefonatën duke përdorur të dhënat celulare…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Nuk mund të kalonte në rrjetin Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Po vazhdon telefonatën duke përdorur të dhënat celulare…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nuk mund të kalonte në rrjetin Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde të të dhënave."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Mos e shfaq më këtë"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sr/strings.xml b/java/com/android/incallui/res/values-sr/strings.xml
index 4fa7a61..8aed8b6 100644
--- a/java/com/android/incallui/res/values-sr/strings.xml
+++ b/java/com/android/incallui/res/values-sr/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конференцијски позив"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Позив је прекинут"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Желите ли да пошаљете следеће тонове?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Тонови слања\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Пошаљи"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Замените џокер знак са"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конференцијски позив <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Број говорне поште"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Позива се"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропуштен позив од: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Актуелни позив"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текући позив за Work"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Текући Wi-Fi позив"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Текући позив за Work преко Wi-Fi-ја"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> је у току"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Долазни <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi позив"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi пословни позив"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"На чекању"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Долазни позив"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Долазни позив са сликом"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важан долазни позив са сликом, поруком и локацијом"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важан долазни позив са прилозима"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Долазни позив за Work"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Долазни Wi-Fi позив"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Долазни позив за Work преко Wi-Fi-ја"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Сумња на непожељан долазни позив"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Захтев за долазни видео позив"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема услуге"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Изабрана мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) није доступна"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Одговори"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Прекини везу"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Гласовни"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Прихвати"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Одбиј"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Позив је у току на другом уређају"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Видео позив је у току на другом уређају"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Преузми позив"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Преузми видео позив"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Да бисте упутили позив, прво искључите режим рада у авиону."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Није регистровано на мрежи."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобилна мрежа није доступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Да бисте упутили позив, унесите важећи број."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Позив није успео."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Покретање MMI секвенце"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услуга није подржана."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Замена позива није успела."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Раздвајање позива није успело."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Пребацивање није успело."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Конференцијски позив није успео."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Одбијање позива није успело."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Успостављање позива није успело."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Хитан позив"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Укључивање радија…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Нема мреже. Поновни покушај…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Позив није успео. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Позив није успео. Позовите број за хитне случајеве."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Користите тастатуру за позивање"</string>
-    <string name="player_started" msgid="9177182657338033086">"Плејер је покренут"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Плејер је заустављен"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера није спремна"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера је спремна"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Непознат догађај сесије позива"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Друга подешавања позива"</string>
     <string name="goPrivate" msgid="5269514638004595378">"иди на приватно"</string>
-    <string name="selectContact" msgid="1703433172800564849">"изаберите контакт"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Мелодија звона и вибрација"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Управљај конференцијским позивом"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Број за хитне случајеве"</string>
     <string name="child_number" msgid="3398257437107259682">"на <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Недавне поруке"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Информације о предузећу"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Удаљеност је <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Удаљеност је <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Отвара се сутра у <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Отвара се данас у <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Затвара се у <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Затворило се данас у <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Тренутно отворено"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Тренутно затворено"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Познат вам је број <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Да ли је <xliff:g id="NUMBER">%1$s</xliff:g> непожељан?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Блокирали сте <xliff:g id="NUMBER">%1$s</xliff:g>, а позив сте пријавили као непожељан."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Пријавили сте да позив са <xliff:g id="NUMBER">%1$s</xliff:g> није непожељан."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Додирните да бисте додали контакте или блокирали непожељан број."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Први пут сте примили позив са овог броја. Ако је непожељан, можете да га блокирате и пријавите."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Додирните да бисте пријавили да позив НИЈЕ НЕПОЖЕЉАН или блокирајте број."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Сумњамо да је овај позив непожељан. Ако није, додирните НИЈЕ НЕПОЖЕЉНО да бисте пријавили грешку."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Блокирај и пријави"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Додај контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Није непожељан"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Блокирај број"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Додај у контакте"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Блокирај и пријави непожељан позив"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Није непожељан"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Нема SIM картице или постоји грешка на њој"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршите позив"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференцијски позив"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"У позиву"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Позив се наставља помоћу мобилних података…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Пребацивање на Wi-Fi мрежу није успело"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Видео позив ће остати на мобилној мрежи. Могу да важе стандардне накнаде за пренос података."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Позив се наставља помоћу мобилних података…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Пребацивање на Wi‑Fi мрежу није успело"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео позив ће остати на мобилној мрежи. Важе стандардне накнаде за пренос података."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не приказуј ово поново"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sv/strings.xml b/java/com/android/incallui/res/values-sv/strings.xml
index 6d58d90..563ab4d 100644
--- a/java/com/android/incallui/res/values-sv/strings.xml
+++ b/java/com/android/incallui/res/values-sv/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferenssamtal"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Samtalet avbröts"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Skicka följande toner?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Skickar signaler\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Skicka"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nej"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Ersätt jokertecknet med"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferenssamtal <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nummer till röstbrevlåda"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Missat samtal från <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtal"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbsamtal"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Pågående Wi-Fi-samtal"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Pågående jobbsamtal via Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Inkommande <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-samtal"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbsamtal"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Parkerat"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkommande samtal"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkommande samtal med foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktigt inkommande samtal med foto, meddelande och plats"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktigt inkommande samtal med bilagor"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkommande jobbsamtal"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkommande Wi-Fi-samtal"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkommande jobbsamtal via Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkommande misstänkt spamsamtal"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkommande begäran om videosamtal"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ingen tjänst"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Det valda nätverket (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) är inte tillgängligt"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Svara"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Lägg på"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Röst"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Godkänn"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Avvisa"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Pågående samtal på en annan enhet"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Pågående videosamtal på en annan enhet"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Svara på samtal"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Svara på videosamtal"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Om du vill ringa ett samtal måste du först inaktivera flygplansläge."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Inte registrerat på nätverk."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Det finns inget mobilnät tillgängligt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ange ett giltigt nummer om du vill ringa ett samtal."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Det gick inte att ringa."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Startar sekvens för MMI-kod…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjänsten stöds inte."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Det gick inte att växla mellan samtal."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Det gick inte att koppla isär samtalen."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Det gick inte att överföra."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Det gick inte att starta en konferens."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Det gick inte att avvisa samtalet."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Det gick inte att släppa samtal."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Nödsamtal"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Sätter på radion…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ingen tjänst. Försök igen …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Det gick inte att ringa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inget nödnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Det gick inte att ringa. Slå ett nödnummer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Använd tangentbordet om du vill ringa"</string>
-    <string name="player_started" msgid="9177182657338033086">"Spelaren har startats"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Spelaren har stoppats"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kameran är inte klar"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kameran är klar"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Okänd händelse vid samtalssession"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Övriga samtalsinställningar"</string>
     <string name="goPrivate" msgid="5269514638004595378">"gör privat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"välj kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringsignal och vibration"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Hantera konferenssamtal"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nödsamtalsnummer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Senaste meddelandena"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Företagsuppgifter"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> miles bort"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km bort"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Öppnar i morgon kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Öppnar i dag kl. <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Stänger kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Stängde i dag kl. <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Öppet"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Stängt"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Känner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Är <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> blockerad och samtalet rapporterat som spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Samtal från <xliff:g id="NUMBER">%1$s</xliff:g> rapporterat som spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tryck för att lägga till kontakter eller blockera spamnummer."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Det här var första gången det här numret ringde dig. Om det var spam går det att blockera numret och rapportera det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tryck för att rapportera som INTE SPAM eller blockera det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Vi misstänkte att det är en spammare. Om det här samtalet inte var spam, tryck på INTE SPAM för att rapportera misstaget."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blockera, rapportera"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Lägg till kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Inte spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blockera nummer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Lägg till i Kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blockera och rapportera spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Inte spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Inget SIM-kort eller SIM-kortsfel"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avsluta samtal"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferenssamtal"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"I samtal"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Samtalet fortsätter med mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Det gick inte att växla till Wi-Fi-nätverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Samtalet fortsätter med mobildata …"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Det gick inte att växla till Wi-Fi-nätverk"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Visa inte detta igen"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sw/strings.xml b/java/com/android/incallui/res/values-sw/strings.xml
index 0bb1b8c..1a06e46 100644
--- a/java/com/android/incallui/res/values-sw/strings.xml
+++ b/java/com/android/incallui/res/values-sw/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Simu"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Simu ya kongamano"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Simu imekatwa"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ungependa kutuma toni zifuatazo? \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Inatuma toni\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Tuma"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ndiyo"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Hapana"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Badilisha kibambo egemezi na"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Simu ya kongamano <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Nambari ya ujumbe wa sauti"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Inapiga"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Simu ambayo hukujibu kutoka <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Simu inayoendelea"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Simu ya kazi inayoendelea"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Simu ya Wi-Fi inayoendelea"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Simu ya Wi-Fi ya kazi inayoendelea"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> inayoendelea"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> inayoingia"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Simu ya Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Simu ya kazi ya Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Inangoja"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Unapigiwa simu"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Simu inayoingia yenye picha"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Simu muhimu yenye picha, ujumbe na mahali"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Simu muhimu inayoingia yenye viambatisho"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Simu ya kazi inayoingia"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Simu ya Wi-Fi inayoingia"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Simu ya Wi-Fi ya kazi inayoingia"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Simu inayoingia inashukiwa kuwa taka"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ombi  linaloingia la video"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Hakuna huduma"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Mtandao uliochaguliwa <xliff:g id="OPERATOR_NAME">%s</xliff:g> haupatikani"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Jibu"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Kata simu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Sauti"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Kubali"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Kataa"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Una Hangout inayoendelea kwenye kifaa kingine"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Una simu ya video inayoendelea kwenye kifaa kingine"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Pokea Simu"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Pokea Simu ya Video"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Kupiga simu, kwanza zima hali ya ndegeni."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Haijasajiliwa kwa mitandao"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mitandao ya simu za mkononi haipatikani"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ili upige simu, weka nambari sahihi."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Haiwezi kupiga simu."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Inaanzisha msururu wa MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Huduma haitumiki."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Haiwezi kubadili simu."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Haiwezi kutenganisha simu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Haiwezi kuhamisha."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Haiwezi kushiriki katika simu ya mkutano."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Haiwezi kukataa simu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Haiwezi kutoa simu."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Simu ya dharura"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Inawasha redio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Hakuna huduma. Inajaribu tena..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Haiwezi kupiga simu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> si nambari ya dharura."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Haiwezi kupiga simu. Piga nambari ya dharura."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Tumia kibodi kubonyeza"</string>
-    <string name="player_started" msgid="9177182657338033086">"Kichezaji Kimeanzishwa"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Kichezaji Kimekomeshwa"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera haiko tayari"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera iko tayari"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Tukio lisilojulikana la kipindi cha simu"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Mipangilio mingine ya simu"</string>
     <string name="goPrivate" msgid="5269514638004595378">"nenda kwa faragha"</string>
-    <string name="selectContact" msgid="1703433172800564849">"chagua anwani"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Mlio wa simu na Mtetemo"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Dhibiti simu ya mkutano"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nambari ya dharura"</string>
     <string name="child_number" msgid="3398257437107259682">"kupitia <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Ujumbe wa hivi majuzi"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Maelezo ya biashara"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Umbali wa maili <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Umbali wa kilomita <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Itafunguliwa kesho saa <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Itafunguliwa leo saa <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Hufungwa saa <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Imefungwa leo saa <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Sasa imefunguliwa"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Sasa imefungwa"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Je, unaitambua <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je, <xliff:g id="NUMBER">%1$s</xliff:g> ni taka?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> imezuiwa na simu kuripotiwa kuwa taka."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Simu kutoka <xliff:g id="NUMBER">%1$s</xliff:g> imeripotiwa kuwa si taka."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Gonga ili uongeze anwani au uzuie nambari taka."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Hii ndiyo mara ya kwanza nambari hii imekupigia. Kama ilikuwa simu taka, unaweza kuzuia nambari hii na uiripoti."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Gonga ili uripoti kuwa SI TAKA, au kuizuia."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Tunashuku kwamba simu hii ni taka. Ikiwa haikuwa simu taka, gonga SI TAKA ili usahihishe tulivyoichukulia."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Zuia na uripoti"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Ongeza anwani"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Siyo barua taka"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Zuia nambari"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Ongeza kwenye anwani"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Zuia na uripoti taka"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Si taka"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Hakuna SIM au kuna hitilafu ya SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kata simu"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Simu ya kongamano"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Mazungumzo ya simu yanaendelea"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Endelea na mazungumzo ya simu ukitumia data ya kifaa cha mkononi…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Imeshindwa kuhamia mtandao wa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Endelea na mazungumzo ya simu ukitumia data ya simu…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Imeshindwa kuhamia mtandao wa Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Usiionyeshe tena"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ta/strings.xml b/java/com/android/incallui/res/values-ta/strings.xml
index bae8d6a..04036ec 100644
--- a/java/com/android/incallui/res/values-ta/strings.xml
+++ b/java/com/android/incallui/res/values-ta/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"மொபைல்"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"குழு அழைப்பு"</string>
-    <string name="call_lost" msgid="2082971531689406145">"அழைப்பு நிறுத்தப்பட்டது"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"பின்வரும் டோன்களை அனுப்பவா?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"டோன்களை அனுப்புகிறது\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"அனுப்பு"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ஆம்"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"இல்லை"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"இதனுடன் சிறப்புக்குறியை மாற்றியமை"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"குழு அழைப்பு <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"குரலஞ்சல் எண்"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"அழைக்கிறது"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> இடமிருந்து தவறிய அழைப்பு"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"செயலில் இருக்கும் அழைப்பு"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"வெளிச்செல்லும் அழைப்பு (பணி)"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"வெளிச்செல்லும் வைஃபை அழைப்பு"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"வெளிச்செல்லும் வைஃபை அழைப்பு (பணி)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"செயலிலுள்ள அழைப்பு: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"உள்வரும் அழைப்பு: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"வைஃபை அழைப்பு"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"வைஃபை அழைப்பு (பணி)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"காத்திருப்பில்"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"உள்வரும் அழைப்பு"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"படத்துடன் உள்வரும் அழைப்பு"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"படம், செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"இணைப்புகளுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"உள்வரும் அழைப்பு (பணி)"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"உள்வரும் வைஃபை அழைப்பு"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"உள்வரும் வைஃபை அழைப்பு (பணி)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"உள்வரும் சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பு"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"உள்வரும் வீடியோ கோரிக்கை"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"சேவை இல்லை"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"தேர்ந்தெடுத்த நெட்வொர்க் (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) கிடைக்கவில்லை"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"பதிலளி"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"துண்டி"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"வீடியோ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"குரல்"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ஏற்கிறேன்"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"நிராகரி"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"மற்றொரு சாதனத்தில் செயலில் இருக்கும் அழைப்பு"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"மற்றொரு சாதனத்தில் செயலில் இருக்கும் வீடியோ அழைப்பு"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"அழைப்பை எடு"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"வீடியோ அழைப்பை எடு"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"அழைப்பதற்கு, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"நெட்வொர்க்கில் பதிவுசெய்யப்படவில்லை."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"செல்லுலார் நெட்வொர்க் கிடைக்கவில்லை."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"அழைக்க, சரியான எண்ணை உள்ளிடவும்."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"அழைக்க முடியாது."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI வரிசையைத் தொடங்குகிறது..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"சேவை ஆதரிக்கப்படவில்லை."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"அழைப்புகளில் மாற முடியாது."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"அழைப்பைப் பிரிக்க முடியாது."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"மாற்ற முடியாது."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"குழு அழைப்பு செய்ய முடியாது."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"அழைப்பை நிராகரிக்க முடியாது."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"அழைப்பை(அழைப்புகளை) விடுவிக்க முடியாது."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"அவசரகால அழைப்பு"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ரேடியோவை இயக்குகிறது…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"சேவை இல்லை. மீண்டும் முயற்சிக்கிறது…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> என்பது அவசர அழைப்பு எண் இல்லை என்பதால் அழைக்க முடியாது."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"அழைக்க முடியாது. அவசர அழைப்பு எண்ணை அழைக்கவும்."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"டயல் செய்வதற்கு விசைப்பலகையைப் பயன்படுத்துக"</string>
-    <string name="player_started" msgid="9177182657338033086">"வீடியோ துவங்கியது"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"வீடியோ நிறுத்தப்பட்டது."</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"கேமரா தயாராக இல்லை"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"கேமரா தயார்"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"தெரியாத அழைப்பு நேர நிகழ்வு"</string>
-    <string name="other_settings" msgid="2537377721890761197">"பிற அழைப்பு அமைப்பு"</string>
     <string name="goPrivate" msgid="5269514638004595378">"தனிப்பட்டதிற்குச் செல்"</string>
-    <string name="selectContact" msgid="1703433172800564849">"தொடர்பைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"ரிங்டோன் &amp; அதிர்வு"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"குழு அழைப்பை நிர்வகி"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"அவசரகால எண்"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> வழியாக"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"சமீபத்திய செய்திகள்"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"வணிகத் தகவல்"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> மைல் தொலைவில்"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> கிமீ தொலைவில்"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"நாளை <xliff:g id="OPEN_TIME">%s</xliff:g> மணிக்குத் திறக்கப்படும்"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"இன்று <xliff:g id="OPEN_TIME">%s</xliff:g> மணிக்குத் திறக்கப்படும்"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> மணிக்கு மூடப்படும்"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"இன்று <xliff:g id="CLOSE_TIME">%s</xliff:g> மணிக்கு மூடப்பட்டது"</string>
-    <string name="open_now" msgid="5897306702060039512">"இப்போது திறக்கப்பட்டுள்ளது"</string>
-    <string name="closed_now" msgid="3962291301467974921">"இப்போது மூடப்பட்டுள்ளது"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> - தெரிந்த எண்ணா?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> - ஸ்பேமா?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> தடுக்கப்பட்டு, அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்பட்டது."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> இன் அழைப்பு ஸ்பேம் இல்லை எனத் தெரிவிக்கப்பட்டது."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"தொடர்புகளில் சேர்க்க அல்லது ஸ்பேம் எண்ணைத் தடுக்க, தட்டவும்."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"இந்த எண்ணிலிருந்து உங்களுக்கு அழைப்பு வந்தது இதுவே முதல் முறை. இந்த அழைப்பு ஸ்பேமாக இருந்தால், எண்ணைத் தடுத்து புகாரளிக்கலாம்."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"\"ஸ்பேம் இல்லை\" எனத் தெரிவிக்க அல்லது தடுக்க, தட்டவும்."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"இது ஸ்பேமாக இருக்கும் என சந்தேகிக்கிறோம். ஸ்பேம் இல்லை எனில், எங்கள் தவறைச் சுட்டிக்காட்ட, \"ஸ்பேம் இல்லை\" என்பதைத் தட்டவும்."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"தடுத்து புகாரளி"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"தொடர்பைச் சேர்"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ஸ்பேமில்லை"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"எண்ணைத் தடு"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"தொடர்புகளில் சேர்"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"தடுத்து, ஸ்பேமெனப் புகாரளி"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ஸ்பேமில்லை"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"சிம் இல்லை அல்லது சிம் பிழை"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"அழைப்பைத் துண்டிக்கும்"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"குழு அழைப்பு"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"அழைப்பில்"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"செல்லுலார் தரவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"செல்லுலார் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"மொபைல் தரவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"இதை மீண்டும் காட்டாதே"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-te/strings.xml b/java/com/android/incallui/res/values-te/strings.xml
index 6b83388..6846227 100644
--- a/java/com/android/incallui/res/values-te/strings.xml
+++ b/java/com/android/incallui/res/values-te/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ఫోన్"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"ఇన్‌కాల్UI"</string>
-    <string name="confCall" msgid="36560628097626181">"కాన్ఫరెన్స్ కాల్"</string>
-    <string name="call_lost" msgid="2082971531689406145">"కాల్ కట్ అయింది"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"క్రింది టోన్‌లు పంపాలా?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"టోన్‌లు పంపుతోంది\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"పంపు"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"అవును"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"కాదు"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"దీనితో వైల్డ్ అక్షరాన్ని భర్తీ చేయండి"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"కాన్ఫరెన్స్ కాల్ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"వాయిస్ మెయిల్ నంబర్"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"డయల్ చేస్తోంది"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> నుండి సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"కాల్ కొనసాగుతోంది"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"కార్యాలయ కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi కార్యాలయ కాల్ కొనసాగుతోంది"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> కొనసాగుతోంది"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ఇన్‌కమింగ్ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi కాల్"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi కార్యాలయ కాల్"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"హోల్డ్‌లో ఉంది"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ఫోటోతో ఇన్‌కమింగ్ కాల్"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ఫోటో, సందేశం, స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"జోడింపులతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"ఇన్‌కమింగ్ కార్యాలయ కాల్"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi కాల్ వస్తోంది"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ఇన్‌కమింగ్ Wi-Fi కార్యాలయ కాల్"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"అనుమానాస్పద స్పామ్ కాల్ వస్తోంది"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"ఇన్‌కమింగ్ వీడియో అభ్యర్థన"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"సేవ లేదు"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"ఎంచుకున్న నెట్‌వర్క్ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) అందుబాటులో లేదు"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"సమాధానం ఇవ్వండి"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"కాల్‌ను ముగించు"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"వీడియో"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"వాయిస్"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ఆమోదిస్తున్నాను"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"తిరస్కరించు"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"మరో పరికరంలో కాల్ జరుగుతోంది"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"మరో పరికరంలో వీడియో కాల్ జరుగుతోంది"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"కాల్‌ను తీయి"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"వీడియో కాల్‌ను తీయి"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"కాల్ చేయడానికి, మొదట ఎయిర్‌ప్లైన్ మోడ్‌ను ఆపివేయండి."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"నెట్‌వర్క్‌లో నమోదు కాలేదు."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"సెల్యులార్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"కాల్ చేయడానికి, చెల్లుబాటు అయ్యే నంబర్‌ను నమోదు చేయండి."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"కాల్ చేయలేరు."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI శ్రేణిని ప్రారంభిస్తోంది…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"సేవకు మద్దతు లేదు."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"కాల్‌లను మార్చలేరు."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"కాల్‌ను వేరు చేయలేరు."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"బదిలీ చేయలేరు."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"సమావేశం కుదరదు."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"కాల్‌ను తిరస్కరించలేరు."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"కాల్(ల)ను విడిచిపెట్టలేరు."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"అత్యవసర కాల్"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"రేడియోను ప్రారంభిస్తోంది…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"సేవ లేదు. మళ్లీ ప్రయత్నిస్తోంది…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"కాల్ చేయలేరు. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> అత్యవసర నంబర్ కాదు."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"కాల్ చేయలేరు. అత్యవసర నంబర్‌ను డయల్ చేయండి."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"డయల్ చేయడానికి కీబోర్డ్‌ను ఉపయోగించండి"</string>
-    <string name="player_started" msgid="9177182657338033086">"ప్లేయర్ ప్రారంభమైంది"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"ప్లేయర్ ఆపివేయబడింది"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"కెమెరా సిద్ధంగా లేదు"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"కెమెరా సిద్ధంగా ఉంది"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"తెలియని కాల్ సెషన్ ఉదంతం"</string>
-    <string name="other_settings" msgid="2537377721890761197">"ఇతర కాల్ సెట్టింగ్‌లు"</string>
     <string name="goPrivate" msgid="5269514638004595378">"ప్రైవేట్‌గా వెళ్లు"</string>
-    <string name="selectContact" msgid="1703433172800564849">"పరిచయాన్ని ఎంచుకోండి"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"రింగ్‌టోన్ &amp; వైబ్రేట్"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"కాన్ఫరెన్స్ కాల్‌ను నిర్వహించు"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"అత్యవసర నంబర్"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ద్వారా"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ఇటీవలి సందేశాలు"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"వ్యాపార సంస్థ సమాచారం"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> మై. దూరంలో ఉంది"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> కి.మీ దూరంలో ఉంది"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"రేపు <xliff:g id="OPEN_TIME">%s</xliff:g>కి తెరవబడుతుంది"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"ఈరోజు <xliff:g id="OPEN_TIME">%s</xliff:g>కి తెరవబడుతుంది"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g>కి మూసివేయబడుతుంది"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ఈరోజు <xliff:g id="CLOSE_TIME">%s</xliff:g>కి మూసివేయబడింది"</string>
-    <string name="open_now" msgid="5897306702060039512">"ఇప్పుడు తెరిచి ఉంది"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ఇప్పుడు మూసివేయబడింది"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> తెలుసా?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> స్పామ్ కాదా?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> బ్లాక్ చేయబడింది మరియు కాల్ స్పామ్ వలె నివేదించబడింది."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> నుండి కాల్ స్పామ్ కాదని నివేదించబడింది."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"స్పామ్ నంబర్‌ను పరిచయాలకు జోడించడానికి లేదా బ్లాక్ చేయడానికి నొక్కండి."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"ఈ నంబర్ నుండి మీకు కాల్ రావడం ఇదే మొదటిసారి. ఈ కాల్ స్పామ్ అయితే, మీరు ఈ నంబర్‌ను బ్లాక్ చేసి, నివేదించవచ్చు."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"స్పామ్ కాదని నివేదించడానికి లేదా దాన్ని బ్లాక్ చేయడానికి నొక్కండి."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"మాకు ఇది స్పామర్ అయ్యి ఉండవచ్చని అనుమానం కలిగింది. ఈ కాల్ స్పామ్ కాకుంటే, మా పొరపాటును నివేదించడానికి స్పామ్ కాదని నొక్కండి."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"బ్లాక్ చేసి, నివేదించు"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"పరిచయాన్ని జోడించు"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"స్పామ్ కాదు"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"నంబర్‌ను బ్లాక్ చేయి"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"పరిచయాలకు జోడించండి"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"బ్లాక్ చేసి, స్పామ్ అని నివేదించు"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"స్పామ్ కాదు"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"సిమ్ లేదు లేదా సిమ్ లోపం"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"కాల్‌ను ముగిస్తుంది"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"కాన్ఫరెన్స్ కాల్"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"కాల్‌లో ఉన్నారు"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"సెల్యులార్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi నెట్‌వర్క్‌కి మార్చలేకపోయింది"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"వీడియో కాల్ సెల్యులార్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"మొబైల్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi నెట్‌వర్క్‌కి మార్చడం సాధ్యపడలేదు"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"వీడియో కాల్ మొబైల్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"దీన్ని మళ్లీ చూపవద్దు"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-th/strings.xml b/java/com/android/incallui/res/values-th/strings.xml
index 11023b9..ea0d327 100644
--- a/java/com/android/incallui/res/values-th/strings.xml
+++ b/java/com/android/incallui/res/values-th/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"โทรศัพท์"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"การประชุมสาย"</string>
-    <string name="call_lost" msgid="2082971531689406145">"สายหลุด"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"ส่งโทนเสียงต่อไปนี้หรือไม่ \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"กำลังส่งโทนเสียง\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"ส่ง"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ใช่"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"ไม่"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"แทนที่อักขระแทนด้วย"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"การประชุมสาย <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"หมายเลขข้อความเสียง"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"กำลังโทรออก"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"สายที่ไม่ได้รับจาก <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"โทรต่อเนื่อง"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"กำลังอยู่ในสายจากที่ทำงาน"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"กำลังโทรผ่าน Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"กำลังอยู่ในสายจากที่ทำงานผ่าน Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"กำลังอยู่ในสายจาก <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"สายเรียกเข้าจาก <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"การโทรผ่าน Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"สายจากที่ทำงานผ่าน Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"สายเรียกเข้า"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"สายเรียกเข้าพร้อมรูปภาพ"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"สายเรียกเข้าที่สำคัญพร้อมไฟล์แนบ"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"มีสายเรียกเข้าจากที่ทำงาน"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"สายโทรเข้าผ่าน Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"มีสายเรียกเข้าจากที่ทำงานผ่าน Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"สายเรียกเข้าที่สงสัยว่าเป็นสแปม"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"คำขอโทรเข้าเป็นวิดีโอ"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"ไม่มีบริการ"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"เครือข่ายที่เลือกไว้ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ไม่พร้อมใช้งาน"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"รับสาย"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"วางสาย"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"วิดีโอ"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"เสียง"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"ยอมรับ"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"ปฏิเสธ"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"กำลังใช้สายบนอุปกรณ์อื่น"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"มีการโทรแฮงเอาท์วิดีโอบนอุปกรณ์อื่น"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"รับสาย"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"รับสายแฮงเอาท์วิดีโอ"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"หากต้องการโทรออก ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"เครือข่ายมือถือใช้งานไม่ได้"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"หากต้องการโทรออก โปรดป้อนหมายเลขที่ถูกต้อง"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"ไม่สามารถโทรได้"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"กำลังเริ่มต้นลำดับ MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ไม่สนับสนุนบริการนี้"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"ไม่สามารถสลับสายได้"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"ไม่สามารถแยกสายได้"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"ไม่สามารถโอนได้"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"ไม่สามารถประชุมได้"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"ไม่สามารถปฏิเสธสายได้"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"ไม่สามารถเริ่มการโทรได้"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"หมายเลขฉุกเฉิน"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"กำลังเปิดวิทยุ…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"ไม่มีบริการ โปรดลองอีกครั้ง…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"โทรออกไม่ได้ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"ไม่สามารถโทรออก โทรหมายเลขฉุกเฉิน"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ใช้แป้นพิมพ์กดหมายเลขโทรศัพท์"</string>
-    <string name="player_started" msgid="9177182657338033086">"โปรแกรมเล่นเริ่มทำงานแล้ว"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"โปรแกรมเล่นหยุดแล้ว"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"กล้องไม่พร้อมทำงาน"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"กล้องพร้อมทำงาน"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"เหตุการณ์เซสชันการโทรที่ไม่รู้จัก"</string>
-    <string name="other_settings" msgid="2537377721890761197">"การตั้งค่าการโทรอื่นๆ"</string>
     <string name="goPrivate" msgid="5269514638004595378">"เข้าสู่โหมดส่วนตัว"</string>
-    <string name="selectContact" msgid="1703433172800564849">"เลือกรายชื่อติดต่อ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"เสียงเรียกเข้าและการสั่น"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"จัดการการประชุมสาย"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"หมายเลขฉุกเฉิน"</string>
     <string name="child_number" msgid="3398257437107259682">"ผ่านหมายเลข <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"ข้อความล่าสุด"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"ข้อมูลธุรกิจ"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"อยู่ห่างออกไป <xliff:g id="DISTANCE">%.1f</xliff:g> ไมล์"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"อยู่ห่างออกไป <xliff:g id="DISTANCE">%.1f</xliff:g> กม."</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"เปิดให้บริการพรุ่งนี้เวลา <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"เปิดให้บริการวันนี้เวลา <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"ปิดให้บริการเวลา <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"ปิดให้บริการแล้ววันนี้เวลา <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"ขณะนี้เปิดทำการ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"ขณะนี้ปิดทำการ"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"รู้จัก <xliff:g id="NUMBER">%1$s</xliff:g> ไหม"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> เป็นสแปมใช่ไหม"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> และรายงานสายนี้ว่าเป็นสแปมแล้ว"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"รายงานสายจาก <xliff:g id="NUMBER">%1$s</xliff:g> ว่าไม่ใช่สแปมแล้ว"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"แตะเพื่อเพิ่มลงในรายชื่อติดต่อหรือบล็อกหมายเลขสแปม"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"หมายเลขนี้โทรหาคุณเป็นครั้งแรก หากเป็นสแปม คุณสามารถบล็อกและรายงานหมายเลขนี้ได้"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"แตะเพื่อรายงานว่าไม่ใช่สแปม หรือบล็อก"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"เราสงสัยว่าสายนี้จะเป็นนักส่งสแปม หากไม่ใช่สแปม โปรดแตะไม่ใช่สแปมเพื่อรายงานข้อผิดพลาดของเรา"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"บล็อกและรายงาน"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"เพิ่มรายชื่อติดต่อ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"ไม่ใช่จดหมายขยะ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"บล็อกหมายเลข"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"เพิ่มในรายชื่อติดต่อ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"บล็อกและรายงานสแปม"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"ไม่ใช่สแปม"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"วางสาย"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"การประชุมสาย"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"อยู่ในสาย"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"กำลังทำการโทรต่อโดยใช้ข้อมูลเครือข่ายมือถือ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"แฮงเอาท์วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"โทรต่อโดยใช้อินเทอร์เน็ตมือถือ..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"แฮงเอาท์วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"อย่าแสดงสิ่งนี้อีก"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tl/strings.xml b/java/com/android/incallui/res/values-tl/strings.xml
index 00a4623..a11a4cb 100644
--- a/java/com/android/incallui/res/values-tl/strings.xml
+++ b/java/com/android/incallui/res/values-tl/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telepono"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Conference na tawag"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Na-drop ang tawag"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ipadala ang mga sumusunod na tone?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Nagpapadala ng mga tono\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Ipadala"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Oo"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Hindi"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Palitan ang wild character ng"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conference na tawag <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Numero ng voicemail"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Dina-dial"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Hindi nasagot ang tawag mula kay <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Kasalukuyang tawag"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Kasalukuyang tawag sa trabaho"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Isinasagawang tawag sa Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Kasalukuyang tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Kasalukuyang <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Papasok na <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Pagtawag gamit ang Wi‑Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Pagtawag sa trabaho gamit ang Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Papasok na tawag"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Papasok na tawag na may larawan"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mahalagang papasok na tawag na may larawan, mensahe, at lokasyon"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mahalagang papasok na tawag na may mga attachment"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Papasok na tawag sa trabaho"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Papasok na tawag sa Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Papasok na tawag sa trabaho sa pamamagitan ng Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Papasok na pinaghihinalaang spam na tawag"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Papasok na kahilingan ng video"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Walang serbisyo"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Hindi available ang mga piniling network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Sagutin"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Ibaba"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Boses"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Tanggapin"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Tanggihan"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Kasalukuyang tawag sa isa pang device"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"May kasalukuyang isinasagawang video call sa isa pang device"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Sagutin ang Tawag"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Sagutin ang Video Call"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Upang tumawag, paki-off ang Airplane mode."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Hindi nakarehistro sa network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Hindi available ang cellular network"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Upang tumawag, maglagay ng wastong numero."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Hindi makatawag."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Sinisimulan ang pagkakasunud-sunod ng MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Hindi sinusuportahan ang serbisyo."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Hindi mailipat ang mga tawag."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Hindi mapaghiwalay ang tawag"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Hindi mailipat."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Hindi makapag-conference."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Hindi matanggihan ang tawag."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Hindi mailabas ang (mga) tawag."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Emergency na tawag"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ino-on ang radyo…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Walang serbisyo. Sinusubukang muli…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Hindi makatawag. Ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ay hindi isang pang-emergency na numero."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Hindi makatawag. Mag-dial ng emergency na numero."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Gamitin ang keyboard upang mag-dial"</string>
-    <string name="player_started" msgid="9177182657338033086">"Nagsimula na ang Player"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Huminto ang Player"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Hindi pa handa ang camera"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Handa na ang camera"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Hindi alam na kaganapan ng session ng tawag"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Iba pang mga setting ng tawag"</string>
     <string name="goPrivate" msgid="5269514638004595378">"maging pribado"</string>
-    <string name="selectContact" msgid="1703433172800564849">"pumili ng contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Ringtone at Pag-vibrate"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Pamahalaan ang conference call"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Pang-emergency na numero"</string>
     <string name="child_number" msgid="3398257437107259682">"sa pamamagitan ng <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Mga kamakailang mensahe"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Impormasyon ng negosyo"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> (na) milya ang layo"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> (na) kilometro ang layo"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Magbubukas bukas nang <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Magbubukas ngayon nang <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Magsasara nang <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Sarado ngayon nang <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Bukas ngayon"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Sarado ngayon"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Kilala mo ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Spam ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Na-block ang <xliff:g id="NUMBER">%1$s</xliff:g> at inulat ang tawag bilang spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Inulat ang tawag mula sa <xliff:g id="NUMBER">%1$s</xliff:g> bilang hindi spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"I-tap upang idagdag sa mga contact o i-block ang spam na numero."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Ito ang unang beses na tumawag sa iyo ang numerong ito. Kung spam ang tawag na ito, maaari mong i-block ang numerong ito at iulat ito."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"I-tap upang iulat na HINDI SPAM, o i-block ito."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Pinaghihinalaan namin ito bilang isang spammer. Kung hindi spam ang tawag na ito, i-tap ang HINDI SPAM upang iulat ang aming pagkakamali."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"I-block at iulat"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Magdagdag ng contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Hindi spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"I-block ang numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Idagdag sa mga contact"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"I-block at iulat ang spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Hindi spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Walang SIM, o error sa SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tapusin ang tawag"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Nasa tawag"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Ipinagpapatuloy ang tawag gamit ang cellular data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Hindi makalipat sa Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Mananatili sa cellular network ang video call. Maaaring may mga babayaran sa data."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Ipinagpapatuloy ang tawag gamit ang mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Hindi makalipat sa Wi-Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Mananatili sa mobile network ang video call. Maaaring may mga babayaran sa data."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Huwag itong ipakitang muli"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tr/strings.xml b/java/com/android/incallui/res/values-tr/strings.xml
index 9820a69..ed46b03 100644
--- a/java/com/android/incallui/res/values-tr/strings.xml
+++ b/java/com/android/incallui/res/values-tr/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferans görüşmesi"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Çağrı kesildi"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Şu zil sesleri gönderilsin mi?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Sayı tonları gönderiliyor\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Gönder"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Evet"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Hayır"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Joker karakteri şununla değiştir:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferans görüşmesi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Sesli mesaj numarası"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Numara çevriliyor"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Cevapsız çağrı: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Devam eden çağrılar"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Süren iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Giden kablosuz çağrı"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Süren kablosuz iş çağrısı"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Devam eden <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gelen <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Kablosuz çağrı"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"İşle ilgili kablosuz çağrı"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Gelen çağrı"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Fotoğraf eklenmiş gelen çağrı"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fotoğraf, mesaj ve konum eklenmiş önemli çağrı"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ek iliştirilmiş önemli gelen çağrı"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gelen iş çağrısı"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Gelen kablosuz çağrı"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Gelen kablosuz iş çağrısı"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Spam olabilecek gelen arama"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gelen video isteği"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Hizmet yok"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Seçili ağ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) kullanılamıyor"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Yanıtla"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Kapat"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Ses"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Kabul et"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Reddet"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Başka bir cihazda devam eden çağrı"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Başka bir cihazda devam eden video görüşmesi var"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Çağrıyı Al"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video Görüşmesini Al"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Bir çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ağda kayıtlı değil."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Hücresel ağ kullanılamıyor."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Telefon etmek için geçerli bir numara girin."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Arama yapılamıyor."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI dizisi başlatılıyor..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servis desteklenmiyor."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Çağrı geçişi yapılamıyor."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Çağrı ayrılamıyor."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Aktarılamıyor."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferans yapılamıyor."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Çağrı reddedilemiyor."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Çağrılar bırakılamıyor."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Acil durum çağrısı"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Radyo açılıyor..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Servis yok. Tekrar deneniyor…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Çağrı yapılamıyor. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Aranamıyor. Bir acil durum numarasını arayın."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Çevirmek için klavyeyi kullan"</string>
-    <string name="player_started" msgid="9177182657338033086">"Oynatıcı Başlatıldı"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Oynatıcı Durduruldu"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera hazır değil"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera hazır"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Bilinmeyen çağrı oturumu etkinliği"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Diğer çağrı ayarları"</string>
     <string name="goPrivate" msgid="5269514638004595378">"özele git"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kişi seçin"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Zil Sesi ve Titreşim"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferans çağrısını yönet"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Acil durum numarası"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ile"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Son iletiler"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"İş bilgileri"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzakta"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzakta"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Yarın açılış saati: <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Bugün açılış saati: <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Kapanış saati: <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Bugün kapanış saati: <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Şu an açık"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Şu an kapalı"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> tanıdık bir numara mı?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> spam amaçlı bir numara mı?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> engellendi ve çağrı spam olarak bildirildi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefondan gelen çağrının spam olmadığı bildirildi."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Kişilere eklemek veya spam numarasını engellemek için dokunun."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Bu numaradan ilk kez arandınız. Bu çağrı spam amaçlı olarak yapıldıysa numarayı engelleyip bildirebilirsiniz."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"SPAM DEĞİL bildirimi göndermek için dokunun veya numarayı engelleyin."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Bu numaranın spam amaçlı olduğundan şüphelendik. Çağrı spam amaçlı değilse, SPAM DEĞİL\'e dokunarak kararımızın hatalı olduğunu bildirin."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Engelle ve bildir"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Kişi ekle"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Spam değil"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Numarayı engelle"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Kişilere ekle"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Engelle ve spam bildir"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Spam değil"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM kart yok veya SIM hatası"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Çağrı sonlandırılır"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferans çağrısı"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Konferans çağrısında"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Görüşmeye hücresel veri kullanılarak devam ediliyor…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kablosuz ağa geçilemedi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video görüşmesi hücresel ağda devam edecek. Standart veri ücretleri alınabilir."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Görüşmeye mobil veri kullanılarak devam ediliyor…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kablosuz ağa geçilemedi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Görüntülü görüşme mobil ağda devam edecek. Standart veri ücretleri alınabilir."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bir daha gösterme"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uk/strings.xml b/java/com/android/incallui/res/values-uk/strings.xml
index b3b297d..2bc07ee 100644
--- a/java/com/android/incallui/res/values-uk/strings.xml
+++ b/java/com/android/incallui/res/values-uk/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Конференц-виклик"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Виклик перервано"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Надісл. наступні сигнали?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Надсилання сигналів\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Надіслати"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Так"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ні"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Замінити довільний символ на"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Конференц-виклик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Номер голосової пошти"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Набір номера"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Пропущений виклик: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Поточний виклик"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Поточний дзвінок на робочий телефон"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Активний дзвінок через Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Поточний дзвінок на робочий телефон через Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Поточний <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Вхідний <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"дзвінок через Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"робочий дзвінок через Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Очікує"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Вхідний виклик"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Вхідний дзвінок із фото"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важливий дзвінок із фото, повідомленням і адресою"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важливий вхідний дзвінок із вкладеними файлами"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Вхідний дзвінок на робочий телефон"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Вхідний дзвінок через Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Вхідний дзвінок на робочий телефон через Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Цей дзвінок може бути спамом"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запит на вхідний відеодзвінок"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Нема служби"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Вибрана мережа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Відповісти"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Завершити виклик"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Відео"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Голосовий дзвінок"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Приймаю"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Відхилити"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Поточний виклик на іншому пристрої"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Поточний відеодзвінок на іншому пристрої"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Прийняти дзвінок"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Прийняти відеодзвінок"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Щоб установ. з\'єднання, споч. вимк. режим польоту."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Не зареєстровано в мережі."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Мобільна мережа недоступна."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Щоб зателефонувати, введіть дійсний номер."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Неможливо зателефонувати."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Запуск ряду MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Служба не підтримується."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Неможливо переключитися між викликами."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Неможливо розділити виклик."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Неможливо перенести."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Неможливо здійснити конференц-виклик."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Неможливо відхилити виклик."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Неможливо телефонувати."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Аварійний виклик"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Увімкнення радіо…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Зв’язку немає. Повторна спроба…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Не вдається зателефонувати. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не є екстреним номером."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Неможливо зателефонувати. Наберіть екстрений номер."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Викор. клав. для набору"</string>
-    <string name="player_started" msgid="9177182657338033086">"Програвач запущено"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Програвач зупинено"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Камера неготова"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Камера готова"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Невідомий сеанс дзвінка"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Інші налаштування виклику"</string>
     <string name="goPrivate" msgid="5269514638004595378">"конфіденц."</string>
-    <string name="selectContact" msgid="1703433172800564849">"вибрати контакт"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Сигнал дзвінка та вібрація"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Керувати конференц-зв’язком"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Екстрений номер"</string>
     <string name="child_number" msgid="3398257437107259682">"на номер <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Останні повідомлення"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Інформація про компанію"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"За <xliff:g id="DISTANCE">%.1f</xliff:g> мил."</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"За <xliff:g id="DISTANCE">%.1f</xliff:g> км"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g>–<xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Відчиняється завтра о <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Відчиняється сьогодні о <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Зачиняється о <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Зачинено сьогодні о <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Відчинено"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Зачинено"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Знаєте цей номер: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> спам?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблоковано, а виклик із нього позначено як спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> позначено як не спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Торкніться, щоб додати до контактів або заблокувати номер як спам."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"З цього номера вам телефонують уперше. Якщо це був спам, заблокуйте номер і поскаржтеся."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Торкніться, щоб позначити як НЕ СПАМ або заблокувати."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Ми вважаємо, що вам телефонував спамер. Якщо це не так, виберіть \"НЕ СПАМ\", щоб повідомити нам про це."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Блокувати й поскарж."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Додати контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Заблокувати номер"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Додати до контактів"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Блокувати й позначити як спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Не спам"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Помилка SIM-карти або SIM-карта відсутня"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершити виклик"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Конференц-зв’язок"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Триває виклик"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Продовження виклику через мобільний трафік…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Не вдалося перейти в мережу Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Відеодзвінок продовжиться в мобільній мережі. Діють стандартні тарифи."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Продовження виклику з використанням мобільного Інтернету…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не вдалося перейти на мережу Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відеодзвінок продовжиться з використанням мобільного Інтернету. Діють стандартні тарифи."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Більше не показувати це"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ur/strings.xml b/java/com/android/incallui/res/values-ur/strings.xml
index e3326a2..fa1151e 100644
--- a/java/com/android/incallui/res/values-ur/strings.xml
+++ b/java/com/android/incallui/res/values-ur/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"فون"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"کانفرنس کال"</string>
-    <string name="call_lost" msgid="2082971531689406145">"کال چھوڑ دی گئی"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"درج ذیل ٹونز بھیجیں؟\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"ٹونز بھیج رہا ہے\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"بھیجیں"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"ہاں"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"نہیں"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"وائلڈ حرف کو اس کے ساتھ بدلیں"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"کانفرنس کال <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"صوتی میل نمبر"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"ڈائل ہو رہا ہے"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> کی جانب سے چھوٹی ہوئی کال"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"جاری کال"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"کام سے متعلق جاری کال"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"‏Wi-Fi کال جاری ہے"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"‏کام سے متعلق جاری Wi-Fi کال"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"جاری <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"آنے والی <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏Wi-Fi کال"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏کام سے متعلق Wi-Fi کال"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"ہولڈ پر"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"آنے والی کال"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تصویر کے ساتھ آنے والی کال"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تصویر، پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"منسلکات کے ساتھ آنے والی اہم کال"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"کام سے متعلق آنے والی کال"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"‏Wi-Fi کال آ رہی ہے"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"‏کام سے متعلق آنے والی Wi-Fi کال"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"آنے والی مشتبہ سپام کال"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"اِن کمنگ ویڈیو درخواست"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"کوئی سروس نہیں ہے"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"منتخب کردہ نیٹ ورک (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) دستیاب نہیں ہے"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"جواب دیں"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"کال منقطع کریں"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"ویڈیو"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"آواز"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"قبول کریں"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"مسترد کریں"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"ایک اور آلے پر جاری کال"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"ایک اور آلے پر جاری ویڈیو کال"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"کال لیں"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"ویڈیو کال لیں"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"کال کرنے کیلئے، پہلے ہوائی جہاز طرز کو آف کریں۔"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"نیٹ ورک پر رجسٹرڈ نہیں ہے۔"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"سیلولر نیٹ ورک دستیاب نہیں ہے۔"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"کال کرنے کیلئے، ایک درست نمبر درج کریں۔"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"کال نہیں کر سکتے۔"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"‏MMI ترتیب شروع ہو رہی ہے…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"سروس تعاون یافتہ نہیں ہے۔"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"کالز سوئچ نہیں کر سکتے۔"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"کال کو الگ نہیں کر سکتے۔"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"منتقل نہیں کر سکتے۔"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"کانفرنس نہیں کر سکتے۔"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"کال مسترد نہیں کی جا سکتی۔"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"کال(ز) ریلیز نہیں کر سکتے۔"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"ہنگامی کال"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"ریڈیو آن کر رہا ہے…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"کوئی سروس نہیں ہے۔ دوبارہ کوشش کی جا رہی ہے…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"کال نہیں کی جا سکتی۔ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ایک ہنگامی نمبر نہیں ہے۔"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"کال نہیں کی جا سکتی۔ ایک ہنگامی نمبر ڈائل کریں۔"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"ڈائل کرنے کیلئے کی بورڈ استعمال کریں"</string>
-    <string name="player_started" msgid="9177182657338033086">"پلیئر شروع ہوگیا"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"پلیئر بند ہوگیا"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"کیمرہ تیار نہیں ہے"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"کیمرہ تیار ہے"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"نامعلوم کال سیشن ایونٹ"</string>
-    <string name="other_settings" msgid="2537377721890761197">"دیگر کال کی ترتیبات"</string>
     <string name="goPrivate" msgid="5269514638004595378">"نجی ہوجائیں"</string>
-    <string name="selectContact" msgid="1703433172800564849">"رابطہ منتخب کریں"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"رنگ ٹون اور وائبریٹ"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"کانفرنس کال کا نظم کریں"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ہنگامی نمبر"</string>
     <string name="child_number" msgid="3398257437107259682">"بذریعہ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"حالیہ پیغامات"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"کاروباری معلومات"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> میل دور"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> کلومیٹر دور"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>، <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>، <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"کل <xliff:g id="OPEN_TIME">%s</xliff:g> بجے کھلے گا"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"آج <xliff:g id="OPEN_TIME">%s</xliff:g> بجے کھلے گا"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> بجے بند ہوگا"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"آج <xliff:g id="CLOSE_TIME">%s</xliff:g> بجے بند ہوا"</string>
-    <string name="open_now" msgid="5897306702060039512">"ابھی کھلا ہے"</string>
-    <string name="closed_now" msgid="3962291301467974921">"اب بند ہے"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> سے واقف ہیں؟"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"کیا <xliff:g id="NUMBER">%1$s</xliff:g> سپام ہے؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود ہو گیا اور کال کی بطور سپام اطلاع ہو گئی۔"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> سے کال کی اطلاع \'سپام نہیں\' کے بطور ہو گئی۔"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"رابطوں میں شامل کرنے یا سپام نمبر کو مسدود کرنے کیلئے تھپتھپائیں۔"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"آپ کو اس نمبر سے پہلی بار کال آئی ہے۔ اگر یہ کال سپام تھی تو آپ اس نمبر کو مسدود کر سکتے ہیں اور اس کی اطلاع دے سکتے ہیں۔"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"\'سپام نہیں\' کے بطور اطلاع دینے کیلئے تھپتھپائیں یا اسے مسدود کریں۔"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"ہمیں اس پر سپامر ہونے کا شک تھا۔ اگر یہ کال سپام نہیں تھی تو ہماری غلطی کی اطلاع دینے کیلئے \'سپام نہیں\' تھپتھپائیں۔"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"مسدود کریں اور اطلاع دیں"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"رابطہ شامل کریں"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"اسپام نہیں ہے"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"نمبر مسدود کریں"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"رابطوں میں شامل کریں"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"مسدود کریں اور اطلاع دیں"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"سپام نہیں ہے"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"‏SIM نہیں ہے یا SIM میں خرابی ہے"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"کال ختم کریں"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"کانفرنس کال"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"کال میں"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"سیلولر ڈیٹا استعمال کرکے کال جاری ہے"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"ویڈیو کال سیلولر نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"موبائل ڈیٹا استعمال کرکے کال جاری ہے"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ویڈیو کال موبائل نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"اسے دوبارہ مت دکھائیں"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index 3828501..893e931 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -18,25 +18,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferensiya qo‘ng‘irog‘i"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Chaqiruv uzilib qoldi"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Tovushlar jo‘natilmoqda\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Yuborish"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ha"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Yo‘q"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Belgilarni quyidagilar bilan almashtiring:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferensiya qo‘ng‘irog‘i <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Ovozli pochta raqami"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Raqam terilmoqda"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> chaqiruvi javobsiz qoldi"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy qo‘ng‘iroq"</string>
+    <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy chaqiruv"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiquvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiquvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Joriy <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Kiruvchi <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi qo‘ng‘iroq"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi qo‘ng‘iroq (ish)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Xabarga ega kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Joylashuv axborotiga ega kiruvchi chaqiruv"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Biriktirmalarga ega muhim kiruvchi chaqiruv"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Kiruvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Kiruvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Shubhali kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Kiruvchi chaqiruv: shubhali spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kiruvchi video so\'rovi"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Xizmat mavjud emas"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Javob"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Suhbatni tugatish"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Ovoz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Roziman"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rad etish"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Boshqa qurilmada hozir qo‘ng‘iroq amalga oshirilmoqda."</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Boshqa qurilmada hozir video qo‘ng‘iroq amalga oshirilmoqda."</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Qo‘ng‘iroqni qabul qilish"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video qo‘ng‘iroq. qabul qilish"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Qo‘ng‘iroq qilish uchun, avval \"Parvoz rejimi\" o‘chirilishi kerak."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobil tarmoq mavjud emas."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI tartibi ishga tushmoqda..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Xizmat qo‘llab-quvvatlanmaydi."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"O‘tkazib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferens-aloqa o‘rnatib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Qo‘ng‘iroqni rad qilib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Qo‘ng‘iroq(lar)ni chiqarib bo‘lmadi."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Favqulodda qo‘ng‘iroq"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Radio yoqilmoqda…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Aloqa yo‘q. Qayta urinilmoqda…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Qo‘ng‘iroq qilib bo‘lmadi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> favqulodda raqam emas."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Qo‘ng‘iroq qilib bo‘lmadi. Favqulodda raqamga tering."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Terish uchun tugmatagdan foydalaning"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pleyer ishga tushirildi"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pleyer to‘xtatildi"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera tayyor emas"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera tayyor"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Noma’lum qo‘ng‘iroq sessiyasi hodisasi"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Boshqa qo‘ng‘iroq sozlamalari"</string>
     <string name="goPrivate" msgid="5269514638004595378">"alohidaga o‘tish"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kontaktni tanlash"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Rington va tebranish"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferens-aloqani sozlash"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Favqulodda qo‘ng‘iroq raqamlari"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> orqali"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"So‘nggi xabarlar"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Korporativ ma’lumotlar"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzoqda"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzoqda"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ertaga <xliff:g id="OPEN_TIME">%s</xliff:g> da ochiladi"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Bugun <xliff:g id="OPEN_TIME">%s</xliff:g> da ochiladi"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da yopiladi"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Bugun <xliff:g id="CLOSE_TIME">%s</xliff:g> da yopiladi"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ochiq"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Yopiq"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> sizga tanish raqammi?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> shubhali raqammi?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklandi va shubhali deb belgilandi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan qo‘ng‘iroq spam emas deb belgilandi."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Kontaktlarga qo‘shish yoki shubhali raqam deb bloklash uchun bosing."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Bu raqamdan sizga birinchi marta qo‘ng‘iroq qilindi. Agar bu spam-qo‘ng‘iroq bo‘lsa, uni spam deb belgilang va raqamni bloklang."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"SPAM EMAS deb belgilash yoki raqamni bloklash uchun bosing."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Bu spam-qo‘ng‘iroqqa o‘xshayapti. Agar u spam bo‘lmasa, bu haqda bizga xabar berish uchun SPAM EMAS deb belgilang."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloklash/xabar ber."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Kontakt saqlash"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Spam emas"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Raqamni bloklash"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Kontaktlarga saqlash"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloklash va spam haqida xabar berish"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Spam emas"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta yo‘q yoki SIM kartada xato"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qo‘ng‘iroqni tugatish"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferens-aloqa"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Qo‘ng‘iroq davom etmoqda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Qo‘ng‘iroq mobil internet orqali davom ettirilmoqda…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video qo‘ng‘iroq uyali tarmoqda davom etilaveradi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Qo‘ng‘iroq mobil internetga o‘tkazilmoqda…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video qo‘ng‘iroq mobil internet orqali davom ettiriladi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bu xabar boshqa ko‘rsatilmasin"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-vi/strings.xml b/java/com/android/incallui/res/values-vi/strings.xml
index b466b02..cd29b1e 100644
--- a/java/com/android/incallui/res/values-vi/strings.xml
+++ b/java/com/android/incallui/res/values-vi/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Điện thoại"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Cuộc gọi hội nghị"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Cuộc gọi bị gián đoạn"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Gửi các âm sau?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Đang gửi âm\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Gửi"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Có"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Không"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Thay thế ký tự tự do bằng"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Cuộc gọi hội nghị <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Số thư thoại"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Đang gọi"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Cuộc gọi nhỡ từ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Cuộc gọi đang thực hiện"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Cuộc gọi đang diễn ra về công việc"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Cuộc gọi đang diễn ra qua Wi-Fi"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Cuộc gọi đang diễn ra qua Wi-Fi về công việc"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Cuộc gọi đang diễn ra qua <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Cuộc gọi đến qua <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Cuộc gọi qua Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Cuộc gọi về công việc qua Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Cuộc gọi đến"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Cuộc gọi đến có ảnh"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Cuộc gọi đến quan trọng có ảnh, tin nhắn và vị trí"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Cuộc gọi đến quan trọng có tệp đính kèm"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Cuộc gọi đến về công việc"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Cuộc gọi đến qua Wi-Fi"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Cuộc gọi đến qua Wi-Fi về công việc"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Cuộc gọi spam đến bị nghi ngờ"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Yêu cầu video đến"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Không có dịch vụ nào"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Mạng được chọn (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) không khả dụng"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Trả lời"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Kết thúc"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Thoại"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Chấp nhận"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Từ chối"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Cuộc gọi đang diễn ra trên một thiết bị khác"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Cuộc gọi điện video đang diễn ra trên một thiết bị khác"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Nhận cuộc gọi"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Nhận cuộc gọi điện video"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Để thực hiện cuộc gọi, trước tiên, hãy tắt chế độ trên Máy bay."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Chưa được đăng ký trên mạng."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Không có mạng di động."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Để thực hiện cuộc gọi, hãy nhập một số hợp lệ."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Không thực hiện được cuộc gọi."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Khởi động chuỗi MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Dịch vụ không được hỗ trợ."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Không chuyển đổi được cuộc gọi."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Không tách được cuộc gọi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Không chuyển được cuộc gọi."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Không thực hiện được cuộc gọi hội nghị."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Không từ chối được cuộc gọi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Không thực hiện được cuộc gọi."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Cuộc gọi khẩn cấp"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Đang bật radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Không có dịch vụ nào. Đang thử lại…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Không thực hiện được cuộc gọi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> không phải là số khẩn cấp."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Không thực hiện được cuộc gọi. Hãy quay số khẩn cấp."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Sử dụng bàn phím để quay số"</string>
-    <string name="player_started" msgid="9177182657338033086">"Đã khởi động trình phát"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Đã dừng trình phát"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Máy ảnh chưa sẵn sàng"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Máy ảnh đã sẵn sàng"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Sự kiện phiên cuộc gọi không xác định"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Cài đặt cuộc gọi khác"</string>
     <string name="goPrivate" msgid="5269514638004595378">"chuyển thành riêng tư"</string>
-    <string name="selectContact" msgid="1703433172800564849">"chọn địa chỉ liên hệ"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Nhạc chuông và rung"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Quản lý cuộc gọi nhiều bên"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Số khẩn cấp"</string>
     <string name="child_number" msgid="3398257437107259682">"qua <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Tin nhắn gần đây"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Thông tin doanh nghiệp"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Cách <xliff:g id="DISTANCE">%.1f</xliff:g> dặm"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Cách <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Mở cửa lúc <xliff:g id="OPEN_TIME">%s</xliff:g> ngày mai"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Mở cửa lúc <xliff:g id="OPEN_TIME">%s</xliff:g> hôm nay"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Đóng cửa lúc <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Đã đóng cửa lúc <xliff:g id="CLOSE_TIME">%s</xliff:g> hôm nay"</string>
-    <string name="open_now" msgid="5897306702060039512">"Mở ngay bây giờ"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Hiện đã đóng cửa"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Bạn có biết <xliff:g id="NUMBER">%1$s</xliff:g> không?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> có phải là spam không?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> bị chặn và cuộc gọi đã bị báo cáo là spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Cuộc gọi từ <xliff:g id="NUMBER">%1$s</xliff:g> được báo cáo là không phải spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Nhấn để thêm vào danh bạ hoặc chặn số spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Đây là lần đầu tiên số này gọi cho bạn. Nếu cuộc gọi này là spam, bạn có thể chặn và báo cáo số này."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Nhấn để báo cáo là KHÔNG PHẢI SPAM hoặc chặn."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Chúng tôi nghi ngờ rằng đây là người gửi spam. Nếu cuộc gọi này không phải là spam, hãy nhấn KHÔNG PHẢI SPAM để báo cáo sự nhầm lẫn của chúng tôi."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Chặn và báo cáo"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Thêm liên hệ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Không phải là spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Chặn số"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Thêm vào danh bạ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Chặn và báo cáo spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Không phải là spam"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Không có SIM hoặc lỗi SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kết thúc cuộc gọi"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Cuộc gọi nhiều bên"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Đang trong cuộc gọi"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Không thể chuyển sang mạng Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Cuộc gọi điện video sẽ duy trì trên mạng di động. Có thể áp dụng phí dữ liệu chuẩn."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Không thể chuyển sang mạng Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Cuộc gọi điện video sẽ tiếp tục trên mạng di động. Bạn có thể phải trả phí dữ liệu chuẩn."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Không hiển thị lại"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rCN/strings.xml b/java/com/android/incallui/res/values-zh-rCN/strings.xml
index e26ab0c..0fa9719 100644
--- a/java/com/android/incallui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rCN/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"电话"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"电话会议"</string>
-    <string name="call_lost" msgid="2082971531689406145">"通话中断"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"发送以下音频？\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"正在发送双音频\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"发送"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"将通配符替换为"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"电话会议<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"语音信箱号码"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"正在拨号"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"来自<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>的未接电话"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"当前通话"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"工作通话进行中"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"正在进行 WLAN 通话"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"WLAN 工作通话进行中"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"正在通话 - <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"正在接听来电 - <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WLAN 通话"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"WLAN 工作通话"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保持"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"来电"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含照片的来电"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含照片、讯息和位置信息的重要来电"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要来电"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作来电"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"WLAN 来电"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"WLAN 工作来电"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"有疑似骚扰来电"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到视频通话邀请"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"无服务"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"所选网络（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）不可用"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"接听"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"挂断"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"视频"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"语音"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"拒绝"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"其他设备上有正在进行的通话"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"其他设备上有正在进行的视频通话"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"接通通话"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"接通视频通话"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"要进行呼叫，请先关闭飞行模式。"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"尚未注册网络。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"无法连接到移动网络。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"要拨打电话，请输入有效的电话号码。"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"无法拨打该电话。"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"正在启动 MMI 序列..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"服务不受支持。"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"无法切换通话。"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"无法单独通话。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"无法转移呼叫。"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"无法进行电话会议。"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"无法拒接来电。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"无法挂断电话。"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"紧急呼救"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"正在打开天线..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"无服务，正在重试…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"无法拨打该电话。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码。"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"无法拨打该电话。请拨打紧急呼救电话。"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"使用键盘拨号"</string>
-    <string name="player_started" msgid="9177182657338033086">"播放器已启动"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"播放器已停止"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"相机尚未准备就绪"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"相机已准确就绪"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"未知通话事件"</string>
-    <string name="other_settings" msgid="2537377721890761197">"其他通话设置"</string>
     <string name="goPrivate" msgid="5269514638004595378">"私聊"</string>
-    <string name="selectContact" msgid="1703433172800564849">"选择联系人"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"铃声和振动"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"管理电话会议"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"紧急电话号码"</string>
     <string name="child_number" msgid="3398257437107259682">"通过 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"最近的信息"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"商家信息"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里远"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里远"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="LOCALITY">%2$s</xliff:g><xliff:g id="STREET_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>，<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"将于明天<xliff:g id="OPEN_TIME">%s</xliff:g>开始营业"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"将于今天<xliff:g id="OPEN_TIME">%s</xliff:g>开始营业"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"将于<xliff:g id="CLOSE_TIME">%s</xliff:g>结束营业"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"已于今天<xliff:g id="CLOSE_TIME">%s</xliff:g>结束营业"</string>
-    <string name="open_now" msgid="5897306702060039512">"营业中"</string>
-    <string name="closed_now" msgid="3962291301467974921">"现已打烊"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> 是陌生号码吗？"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> 是骚扰电话号码吗？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"已屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g>，并将来电举报为骚扰电话。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"已取消将 <xliff:g id="NUMBER">%1$s</xliff:g> 的来电举报为骚扰电话。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"点按即可添加到通讯录或屏蔽骚扰电话号码。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"这是此号码的第一次来电。如果是骚扰电话，您可以屏蔽此号码并举报。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"点按即可列为“非骚扰电话号码”，或将其屏蔽。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"我们怀疑这是骚扰电话号码。如果不是，请点按“非骚扰电话号码”，向我们报告错误。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"屏蔽并举报"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"添加联系人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"非骚扰电话号码"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"屏蔽号码"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"添加到通讯录"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"屏蔽并举报骚扰电话号码"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"不是骚扰电话"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"无SIM卡或SIM卡出错"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"结束通话"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"电话会议"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通话"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"正在使用移动数据网络继续通话…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"无法切换到 WLAN 网络"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"正在使用移动数据继续通话…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"无法切换到 WLAN 网络"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不再显示"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/res/values-zh-rHK/strings.xml
index 5eb8892..6b9972d 100644
--- a/java/com/android/incallui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rHK/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"視訊會議"</string>
-    <string name="call_lost" msgid="2082971531689406145">"已中斷通話"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"傳送下列鈴聲？ \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"正在傳送訊號音\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"傳送"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"將萬用字元改成"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"電話會議 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"留言信箱號碼"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"正在撥號"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"正在進行工作通話"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"正在進行 Wi-Fi 通話"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"正在進行 Wi-Fi 工作通話"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"正在進行 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"有其他人打來的 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 工作通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留通話"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"附有相片的來電"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"附有相片、訊息和位置的重要來電"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"附有附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作來電"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 來電"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi 工作來電"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"疑似收到垃圾來電"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視像要求"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"沒有服務"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"您所選取的網絡 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"接聽"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"掛斷"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"影片"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"語音"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"拒絕"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"其他裝置上有正在進行的通話"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"其他裝置上有正在進行的視像通話"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"接受通話"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"接受視像通話"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"請先關閉飛行模式後再撥打電話。"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"未在網絡上完成註冊。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"無法連線至流動網絡。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"要撥打電話，請輸入有效的號碼。"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"無法通話。"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"開始 MMI 序列..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"不支援的服務。"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"無法切換通話。"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"無法分開通話。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"無法轉移。"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"無法進行會議。"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"無法拒絕來電。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"無法釋放通話。"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"緊急電話"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"正在開啟無線電..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"沒有服務。請再試一次…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼。"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"無法通話。撥打緊急號碼。"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"使用鍵盤撥號"</string>
-    <string name="player_started" msgid="9177182657338033086">"開始播放"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"停止播放"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"相機未準備好"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"已可使用相機"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"未知的視像通訊"</string>
-    <string name="other_settings" msgid="2537377721890761197">"其他通話設定"</string>
     <string name="goPrivate" msgid="5269514638004595378">"私人通話"</string>
-    <string name="selectContact" msgid="1703433172800564849">"選取聯絡人"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"鈴聲和震動"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急電話號碼"</string>
     <string name="child_number" msgid="3398257437107259682">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"最新訊息"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"公司資料"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里外"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里外"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g> (<xliff:g id="LATER_TIME">%2$s</xliff:g>)"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"將於明天<xliff:g id="OPEN_TIME">%s</xliff:g> 開放"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"將於今天<xliff:g id="OPEN_TIME">%s</xliff:g> 開放"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"將於<xliff:g id="CLOSE_TIME">%s</xliff:g> 關門"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"已於今天<xliff:g id="CLOSE_TIME">%s</xliff:g> 關門"</string>
-    <string name="open_now" msgid="5897306702060039512">"營業中"</string>
-    <string name="closed_now" msgid="3962291301467974921">"休息"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> 是已知號碼？"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> 是垃圾號碼？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 封鎖並舉報為垃圾號碼。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> 的來電已舉報為非垃圾來電。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"輕按以新增至通訊錄，或封鎖垃圾號碼。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"這是此號碼的第一次來電，如果是垃圾來電，您可以封鎖並舉報此號碼。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"輕按以舉報為非垃圾來電，或加以封鎖。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"我們懷疑此為垃圾來電。如果不是，請輕按 [非垃圾來電] 舉報我們的錯誤。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"封鎖並舉報"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"新增聯絡人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"非垃圾來電"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"封鎖號碼"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"新增至通訊錄"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"封鎖並舉報垃圾來電"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"非垃圾來電"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"沒有 SIM 卡，或是 SIM 卡錯誤"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"會議通話"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通話"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"使用流動數據繼續通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"無法切換為 Wi-Fi 網絡"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用流動數據繼續通話…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換為 Wi-Fi 網絡"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示此訊息"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rTW/strings.xml b/java/com/android/incallui/res/values-zh-rTW/strings.xml
index 9f02866..440db9d 100644
--- a/java/com/android/incallui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rTW/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"多方通話"</string>
-    <string name="call_lost" msgid="2082971531689406145">"通話已中斷"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"傳送此鈴聲？\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"正在傳送信號音\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"傳送"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"將萬用字元改成"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"多方通話<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"語音信箱號碼"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"撥號中"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"進行中的公司通話"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"撥出的 Wi-Fi 電話"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"進行中的公司通話 (透過 Wi-Fi)"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"透過「<xliff:g id="BRAND_NAME">%1$s</xliff:g>」進行的通話"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"透過「<xliff:g id="BRAND_NAME">%1$s</xliff:g>」接聽的來電"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi 公司通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"通話保留"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含相片的來電"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含相片、訊息和位置資訊的重要來電"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"公司來電"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"撥入的 Wi-Fi 電話"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"公司來電 (透過 Wi-Fi)"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"可疑的騷擾/廣告來電"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視訊要求"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"沒有服務"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"您所選取的網路 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"接聽"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"掛斷"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"視訊"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"語音"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"拒絕"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"其他裝置上有進行中的通話"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"其他裝置上有進行中的視訊通話"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"接聽通話"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"接聽視訊通話"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"撥號前，請先關閉飛航模式。"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"尚未註冊網路。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"無法連線到行動網路。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"如要撥打電話，請輸入有效的號碼。"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"無法通話。"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"開始 MMI 序列…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"不支援的服務。"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"無法切換通話。"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"無法分割通話。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"無法轉接。"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"無法進行電話會議。"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"無法拒接來電。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"無法掛斷電話。"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"緊急電話"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"開啟無線通訊中…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"找不到服務訊號，正在重試…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼。"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"無法通話。只能撥打緊急號碼。"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"使用鍵盤撥號"</string>
-    <string name="player_started" msgid="9177182657338033086">"已啟動播放器"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"已停止播放器"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"相機尚未就緒"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"相機準備就緒"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"不明的通話工作階段事件"</string>
-    <string name="other_settings" msgid="2537377721890761197">"其他通話設定"</string>
     <string name="goPrivate" msgid="5269514638004595378">"私人通話"</string>
-    <string name="selectContact" msgid="1703433172800564849">"選取聯絡人"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"鈴聲與震動"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"管理電話會議"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急電話號碼"</string>
     <string name="child_number" msgid="3398257437107259682">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"最近的訊息"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"商家資訊"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里遠"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里遠"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>，<xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>，<xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"將於明日<xliff:g id="OPEN_TIME">%s</xliff:g>開始營業"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"將於本日<xliff:g id="OPEN_TIME">%s</xliff:g>開始營業"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"將於<xliff:g id="CLOSE_TIME">%s</xliff:g>結束營業"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"已於本日<xliff:g id="CLOSE_TIME">%s</xliff:g>結束營業"</string>
-    <string name="open_now" msgid="5897306702060039512">"營業中"</string>
-    <string name="closed_now" msgid="3962291301467974921">"今日已結束營業"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"您知道 <xliff:g id="NUMBER">%1$s</xliff:g> 這組號碼嗎？"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> 是騷擾/廣告電話嗎？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 並將本次來電回報為騷擾/廣告電話。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 的來電回報為非騷擾/廣告電話。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"輕觸即可加到通訊錄或封鎖騷擾/廣告電話號碼。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"這組號碼首次致電給您。如果本次來電為騷擾/廣告電話，您可以封鎖並檢舉這組號碼。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"輕觸即可回報為「非騷擾/廣告電話」或封鎖這組號碼。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"我們懷疑這通來電是騷擾/廣告電話。如果我們的判斷有誤，請輕觸 [非騷擾/廣告電話] 來回報錯誤。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"封鎖並回報"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"新增聯絡人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"非垃圾來電"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"封鎖號碼"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"新增為聯絡人"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"封鎖並回報為騷擾/廣告電話"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"非騷擾/廣告電話"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"沒有 SIM 卡或 SIM 卡發生錯誤"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"電話會議"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"使用行動數據繼續進行通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"無法切換至 Wi-Fi 網路"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用行動網路繼續進行通話…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換至 Wi-Fi 網路"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示這項說明"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zu/strings.xml b/java/com/android/incallui/res/values-zu/strings.xml
index db415cc..5366192 100644
--- a/java/com/android/incallui/res/values-zu/strings.xml
+++ b/java/com/android/incallui/res/values-zu/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Ifoni"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUl"</string>
-    <string name="confCall" msgid="36560628097626181">"Ikholi yengqungquthela"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Ikholi ivaliwe"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Thumela amathoni alandelayo?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Ithumela Amathoni \n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Thumela"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Yebo"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Cha"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Miselela uhlamvu lwasendle nge"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Ikholi yengqungquthela <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Inombolo yevoyisimeyili"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Iyadayela"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Uphuthelwe ikholi kusukela ku-<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Ikholi eqhubekayo"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ikholi yomsebenzi eqhubekayo"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ikholi ye-Wi-Fi eqhubekayo"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ikholi yomsebenzi eqhubekayo ye-Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"I-<xliff:g id="BRAND_NAME">%1$s</xliff:g> eqhubekayo"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"I-<xliff:g id="BRAND_NAME">%1$s</xliff:g> engenayo"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Ikholi ye-Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Ikholi yomsebenzi ye-Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Ibambile"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Ikholi engenayo"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ikholi engenayo enesithombe"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ikholi engenayo ebalulekile enesithombe, umlayezo nendawo"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ikholi engenayo ebalulekile enokunamathiselwe kwi-imeyili"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ikholi engenayo yomsebenzi"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Ikholi ye-Wi-Fi engenayo"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Ikholi engenayo yomsebenzi ye-Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ikholi engenayo osolisayo kagaxekile"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Isicelo sevidiyo engenayo"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Ayikho isevisi"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Inethiwekhi ekhethiwe <xliff:g id="OPERATOR_NAME">%s</xliff:g> ayitholakali"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Phendula"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Vala ikholi"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Ividiyo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Izwi"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Yamukela"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Yenqaba"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Ikholi eqhubekayo kwenye idivayisi"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Ikholi yevidiyo eqhubekayo kwenye idivayisi"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Thatha ikholi"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Thatha ikholi yevidiyo"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Ukwenza ikholi, vala kuqala imodi Yendiza."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ayibhalisiwe kwinethiwekhi."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Inethiwekhi yeselula ayitholakali."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Ukuze wenze ikholi, faka inombolo evumelekile."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Ayikwazi ukushaya."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Iqalisa ukulandelana kwe-MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Isevisi ayisekelwe."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Ayikwazi ukushintsha amakholi."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Ayikwazi ukuhlukanisa ikholi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Ayikwazi ukudlulisela."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Ayikwazi ukwenza inkomfa."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Ayikwazi ukunqabela ikholi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Ayikwazi ukukhipha amakholi."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Ikholi ephuthumayo"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Ivula umsakazo..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Ayikho isevisi. Iyazama futhi…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Ayikwazi ukushaya. U-<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo yesimo esiphuthumayo."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Ayikwazi ukushaya. Shayela inombolo yesimo esiphuthumayo."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Sebenzisa ikhibhodi ukudayela"</string>
-    <string name="player_started" msgid="9177182657338033086">"Umdlali uqalile"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Umdlali umisiwe"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Ikhamela ayilungile"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Ikhamela ilungile"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Umcimbi wesikhathi sekholi ongaziwa"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ezinye izilungiselelo zekholi"</string>
     <string name="goPrivate" msgid="5269514638004595378">"yenza kube imfihlo"</string>
-    <string name="selectContact" msgid="1703433172800564849">"khetha othintana naye"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Iringithoni yokukhala nokudlidliza"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Phatha ucingo lwengqungquthela"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Inombolo yesimo esiphuthumayo"</string>
     <string name="child_number" msgid="3398257437107259682">"nge-<xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Imilayezo yakamuva"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Ulwazi lwebhizinisi"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mi kude"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km kude"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> - <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Kuvulwa kusasa ngo-<xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Kuvulwa namuhla ngo-<xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Kuvalwa ngo-<xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Kuvalwe namuhla ngo-<xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Kuvuliwe manje"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Kuvaliwe manje"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Uyayazi i-<xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Ingabe i-<xliff:g id="NUMBER">%1$s</xliff:g> ugaxekile?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> ivinjelwe futhi ikholi ibikwe njengogaxekile."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Ikholi esuka ku-<xliff:g id="NUMBER">%1$s</xliff:g> ibikwe njengokungeyena ugaxekile."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Thepha ukwengeza koxhumana nabo noma ukuvimbela inombolo engugaxekile."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Okokuqala le nombolo ikushayela. Uma le kholi kade ingugaxekile, ungakwazi ukuvimbela le nombolo futhi uyibike."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Thepha ukubika NJENGOKUNGEYENA UGAXEKILE, noma ukuyivimbela."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sisola ukuthi lokhu ugaxekile. Uma le kholi kade ingeyena ugaxekile, thepha okuthi AKUYENA UGAXEKILE ukuze ubike iphutha lethu."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Vimba futhi ubike"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Engeza othintana naye"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Akusiko okugaxekile"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Vimba inombolo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Engeza koxhumana nabo"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Vimba futhi ubike ugaxekile"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Akuyena ugaxekile"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Ayikho i-SIM, noma iphutha le-SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qeda ikholi"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Ikholi yengqungquthela"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Isecingweni"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Iqhuba ikholi isebenzisa idatha yeselula…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Ikholi yevidiyo izohlala kunethiwekhi yeselula. Izindleko zedatha ejwayelekile zingasebenza."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Iqhubekisa ikholi isebenzisa idatha yeselula…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Ikholi yevidiyo izohlala ikunethiwekhi yeselula. Amashaji edatha avamile angasebenza."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ungabonisi lokhu futhi"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values/animation_constants.xml b/java/com/android/incallui/res/values/animation_constants.xml
deleted file mode 100644
index ac50db2..0000000
--- a/java/com/android/incallui/res/values/animation_constants.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<resources>
-  <integer name="reveal_animation_duration">333</integer>
-</resources>
diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml
index 0c73cdb..4bded78 100644
--- a/java/com/android/incallui/res/values/colors.xml
+++ b/java/com/android/incallui/res/values/colors.xml
@@ -16,27 +16,16 @@
   -->
 
 <resources>
-
-  <color name="incall_action_bar_background_color">@color/dialer_theme_color</color>
-  <color name="incall_action_bar_text_color">#ffffff</color>
-
-  <!-- Put on top of each photo, implying 80% darker than usual. -->
-  <color name="on_hold_dim_effect">#cc000000</color>
-
   <color name="conference_call_manager_caller_name_text_color">#4d4d4d</color>
   <color name="conference_call_manager_icon_color">#999999</color>
   <!-- Used with some smaller texts in manage conference screen. -->
   <color name="conference_call_manager_secondary_text_color">#999999</color>
 
   <color name="incall_dialpad_background">#ffffff</color>
-  <color name="incall_dialpad_background_pressed">#ccaaaaaa</color>
-  <color name="incall_window_scrim">#b2000000</color>
 
   <!-- Background color for status bar. For portrait this will be ignored. -->
   <color name="statusbar_background_color">@color/dialer_theme_color</color>
 
-  <color name="translucent_shadow">#33999999</color>
-
   <!-- 20% opacity, theme color. -->
   <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
 
@@ -69,15 +58,6 @@
     <item>#841F10</item>
   </array>
 
-  <!-- Background color for spam. This color must match one of background_colors above. -->
-  <color name="incall_call_spam_background_color">@color/blocked_contact_background</color>
-
-  <!-- Ripple color used over light backgrounds. -->
-  <color name="ripple_light">#40000000</color>
-
-  <!-- Background color for large notification icon in after call from unknown numbers -->
-  <color name="unknown_number_color">#F4B400</color>
-
   <color name="incall_background_gradient_top">#E91141BB</color>
   <color name="incall_background_gradient_middle">#E91141BB</color>
   <color name="incall_background_gradient_bottom">#CC229FEB</color>
diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml
index 18816f6..9310281 100644
--- a/java/com/android/incallui/res/values/dimens.xml
+++ b/java/com/android/incallui/res/values/dimens.xml
@@ -16,20 +16,6 @@
   -->
 
 <resources>
-  <dimen name="incall_action_bar_elevation">3dp</dimen>
-
-  <!-- Margin between the bottom of the "call card" photo
-       and the top of the in-call button cluster. -->
-  <dimen name="in_call_touch_ui_upper_margin">2dp</dimen>
-
-  <!-- Padding at the top and bottom edges of the "provider information" -->
-  <dimen name="provider_info_top_bottom_padding">8dp</dimen>
-
-  <!-- Right padding for name and number fields in the call banner.
-       This padding is used to ensure that ultra-long names or
-       numbers won't overlap the elapsed time indication. -->
-  <dimen name="call_banner_name_number_right_padding">50sp</dimen>
-
   <!-- The InCallUI dialpad will sometimes want digits sizes that are different
        from dialer. Note, these are the default sizes for small devices. Larger
        screen sizes apply the values in values-sw360dp/dimens.xml. -->
@@ -38,26 +24,16 @@
   <dimen name="incall_dialpad_zero_key_number_margin_bottom">0dp</dimen>
   <dimen name="incall_dialpad_digits_adjustable_text_size">20sp</dimen>
   <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen>
-  <dimen name="incall_dialpad_key_numbers_size">36sp</dimen>
-
-  <!-- Dimensions for OTA Call Card -->
-  <dimen name="otaactivate_layout_marginTop">10dp</dimen>
-  <dimen name="otalistenprogress_layout_marginTop">5dp</dimen>
-  <dimen name="otasuccessfail_layout_marginTop">10dp</dimen>
+  <dimen name="incall_dialpad_key_numbers_size">36dp</dimen>
 
   <!-- Dimension used to possibly down-scale high-res photo into what is suitable
        for notification's large icon. -->
   <dimen name="notification_icon_size">64dp</dimen>
 
-  <!-- Height of translucent shadow effect -->
-  <dimen name="translucent_shadow_height">2dp</dimen>
-
-  <!-- The smaller dimension of the video preview.  When in portrait orientation this is the
-       width of the preview.  When in landscape, this is the height. -->
-  <dimen name="video_preview_small_dimension">90dp</dimen>
-
   <dimen name="conference_call_manager_button_dimension">48dp</dimen>
 
+  <dimen name="return_to_call_initial_offset_y">120dp</dimen>
+
   <!-- Whether or not the landscape mode layout is currently being used -->
   <bool name="is_layout_landscape">false</bool>
 
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index aede428..177f386 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -15,20 +15,12 @@
   ~ limitations under the License
   -->
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- Official label of the phone app, as seen in "Manage Applications"
        and other settings UIs. -->
   <string name="phoneAppLabel" product="default">Phone</string>
 
-  <!-- Official label for the in-call UI. DO NOT TRANSLATE. -->
-  <string name="inCallLabel" translate="false">InCallUI</string>
-
-  <!-- In-call screen: status label for a conference call -->
-  <string name="confCall">Conference call</string>
-  <!-- In-call screen: call lost dialog text -->
-  <string name="call_lost">Call dropped</string>
-
   <!-- MMI dialog strings -->
   <!-- Dialog label when an MMI code starts running -->
 
@@ -37,51 +29,34 @@
        the "wait" character in a phone number to be dialed; this dialog asks the
        user if it's OK to send the numbers following the "wait". -->
   <string name="wait_prompt_str">Send the following tones?\n</string>
-  <!-- In-call screen: body text of the dialog that appears when we encounter
-       the "PAUSE" character in a phone number to be dialed; this dialog gives
-       informative message to the user to show the sending numbers following the "Pause". -->
-  <string name="pause_prompt_str">Sending tones\n</string>
-  <!-- In-call screen: button label on the "wait" prompt dialog -->
-  <string name="send_button">Send</string>
   <!-- In-call screen: button label on the "wait" prompt dialog in CDMA Mode-->
   <string name="pause_prompt_yes">Yes</string>
   <!-- In-call screen: button label on the "wait" prompt dialog in CDMA Mode-->
   <string name="pause_prompt_no">No</string>
-  <!-- In-call screen: on the "wild" character dialog, this is the label
-       for a text widget that lets the user enter the digits that should
-       replace the "wild" character. -->
-  <string name="wild_prompt_str">Replace wild character with</string>
-
-  <!-- In-call screen: status label for a conference call -->
-  <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
-
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_phoneNumber_text" translatable="false">(650) 555-1234</string>
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_infoText_text" translatable="false">Incoming phone number</string>
-  <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-  <string name="fake_phone_activity_placeCall_text" translatable="false">Fake Incoming Call</string>
-
-  <!-- Call settings screen, Set voicemail dialog title -->
-  <string name="voicemail_settings_number_label">Voicemail number</string>
 
   <!-- Notification strings -->
   <!-- The "label" of the in-call Notification for a dialing call, used
        as the format string for a Chronometer widget. [CHAR LIMIT=60] -->
   <string name="notification_dialing">Dialing</string>
-  <!-- Missed call notification message used for a single missed call, including
-       the caller-id info from the missed call -->
-  <string name="notification_missedCallTicker">Missed call from <xliff:g id="missed_call_from">%s</xliff:g></string>
   <!-- The "label" of the in-call Notification for an ongoing call. [CHAR LIMIT=60] -->
   <string name="notification_ongoing_call">Ongoing call</string>
   <!-- The "label" of the in-call Notification for an ongoing work call. [CHAR LIMIT=60] -->
   <string name="notification_ongoing_work_call">Ongoing work call</string>
-  <!-- The "label" of the in-call Notification for an ongoing call, which is being made over
-       Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_call_wifi">Ongoing Wi-Fi call</string>
-  <!-- The "label" of the in-call Notification for an ongoing work call, which is being made
-       over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_ongoing_work_call_wifi">Ongoing Wi-Fi work call</string>
+
+  <!-- Template for the label on the in-call Notification for an ongoing call, which is being made
+      over Wi-Fi. The format argument is @string/notification_call_wifi_brand [CHAR LIMIT=20]-->
+  <string name="notification_ongoing_call_wifi_template">Ongoing <xliff:g id="brand_name">%1$s</xliff:g></string>
+
+  <!-- Template for the label of the in-call Notification for an incoming call, which is being made
+      over Wi-Fi. The format argument is @string/notification_call_wifi_brand [CHAR LIMIT=20] -->
+  <string name="notification_incoming_call_wifi_template">Incoming <xliff:g id="brand_name">%1$s</xliff:g></string>
+
+  <!-- "Brand name" for WiFi calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40]-->
+  <string name="notification_call_wifi_brand">Wi\u2011Fi call</string>
+
+  <!-- "Brand name" for WiFi work calls. Will be overridden for specific mcc-mnc combinations [CHAR LIMIT=40] -->
+  <string name="notification_call_wifi_work_brand">Wi\u2011Fi work call</string>
+
   <!-- The "label" of the in-call Notification for a call that's on hold -->
   <string name="notification_on_hold">On hold</string>
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
@@ -124,21 +99,10 @@
 
   <!-- The "label" of the in-call Notification for an incoming ringing call. [CHAR LIMIT=60] -->
   <string name="notification_incoming_work_call">Incoming work call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_call_wifi">Incoming Wi-Fi call</string>
-  <!-- The "label" of the in-call Notification for an incoming ringing work call,
-       which is being made over Wi-Fi. [CHAR LIMIT=60] -->
-  <string name="notification_incoming_work_call_wifi">Incoming Wi-Fi work call</string>
   <!-- The "label" of the in-call Notification for an incoming ringing spam call. -->
   <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
   <!-- The "label" of the in-call Notification for upgrading an existing call to a video call. -->
   <string name="notification_requesting_video_call">Incoming video request</string>
-  <!-- Label for the "No service" notification item, when expanded. -->
-  <string name="notification_network_selection_title">No service</string>
-  <!-- Label for the expanded "No service" notification item, including the
-       operator name set by user -->
-  <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string>
   <!-- Label for the "Answer call" action. This is the displayed label for the action that answers
        an incoming call. [CHAR LIMIT=12] -->
   <string name="notification_action_answer">Answer</string>
@@ -150,9 +114,6 @@
   <!-- Label for "Video Call" notification action. This is a displayed on the notification for an
        incoming video call, and answers the call as a video call. [CHAR LIMIT=12] -->
   <string name="notification_action_answer_video">Video</string>
-  <!-- Label for "Voice" notification action. This is a displayed on the notification for an
-       incoming video call, and answers the call as an audio call. [CHAR LIMIT=12] -->
-  <string name="notification_action_answer_voice">Voice</string>
   <!-- Label for "Accept" notification action. This is somewhat generic, and may refer to
        scenarios such as accepting an incoming call or accepting a video call request.
        [CHAR LIMIT=12] -->
@@ -184,62 +145,9 @@
        video call to the current device.
        [CHAR LIMIT=30] -->
   <string name="notification_take_video_call">Take Video Call</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_power_off">To place a call, first turn off Airplane mode.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog.
-       This string is currently unused (see comments in InCallActivity.java.) -->
-  <string name="incall_error_emergency_only">Not registered on network.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_out_of_service">Cellular network not available.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_no_phone_number_supplied">To place a call, enter a valid number.</string>
-  <!-- In-call screen: call failure message displayed in an error dialog -->
-  <string name="incall_error_call_failed">Can\'t call.</string>
-  <!-- In-call screen: status message displayed in a dialog when starting an MMI -->
-  <string name="incall_status_dialed_mmi">Starting MMI sequence\u2026</string>
+
   <!-- In-call screen: message displayed in an error dialog -->
   <string name="incall_error_supp_service_unknown">Service not supported.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_switch">Can\'t switch calls.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_separate">Can\'t separate call.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_transfer">Can\'t transfer.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_conference">Can\'t conference.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_reject">Can\'t reject call.</string>
-  <!-- In-call screen: message displayed in an error dialog -->
-  <string name="incall_error_supp_service_hangup">Can\'t release call(s).</string>
-
-  <!-- Dialog title for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_title">Emergency call</string>
-  <!-- Status message for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_message">Turning on radio\u2026</string>
-  <!-- Status message for the "radio enable" UI for emergency calls -->
-  <string name="emergency_enable_radio_dialog_retry">No service. Trying again\u2026</string>
-
-  <!-- Dialer text on Emergency Dialer -->
-  <!-- Emergency dialer: message displayed in an error dialog -->
-  <string name="dial_emergency_error">Can\'t call. <xliff:g id="non_emergency_number">%s</xliff:g> is not an emergency number.</string>
-  <!-- Emergency dialer: message displayed in an error dialog -->
-  <string name="dial_emergency_empty_error">Can\'t call. Dial an emergency number.</string>
-
-  <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
-       to dial using the physical keyboard -->
-  <string name="dialerKeyboardHintText">Use keyboard to dial</string>
-
-  <!-- Message indicating that Video Started flowing for IMS-VT calls -->
-  <string name="player_started">Player Started</string>
-  <!-- Message indicating that Video Stopped flowing for IMS-VT calls -->
-  <string name="player_stopped">Player Stopped</string>
-  <!-- Message indicating that camera failure has occurred for the selected camera and
-       as result camera is not ready -->
-  <string name="camera_not_ready">Camera not ready</string>
-  <!-- Message indicating that camera is ready/available -->
-  <string name="camera_ready">Camera ready</string>
-  <!-- Message indicating unknown call session event -->
-  <string name="unknown_call_session_event">"Unkown call session event"</string>
 
   <!-- For incoming calls, this is a string we can get from a CDMA network instead of
        the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
@@ -248,21 +156,11 @@
     <item>ABSENTNUMBER</item>
   </string-array>
 
-  <!-- Title displayed above settings coming after voicemail in the call features screen -->
-  <string name="other_settings">Other call settings</string>
-
   <!-- Use this to describe the separate conference call button; currently for screen readers through accessibility. -->
   <string name="goPrivate">go private</string>
-  <!--  Use this to describe the select contact button in EditPhoneNumberPreference; currently for screen readers through accessibility. -->
-  <string name="selectContact">select contact</string>
-
-  <!-- Title for the category "ringtone", which is shown above ringtone and vibration
-       related settings.
-       [CHAR LIMIT=30] -->
-  <string name="preference_category_ringtone">Ringtone &amp; Vibrate</string>
 
   <!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
-  <string name="manageConferenceLabel">Manage conference call</string>
+  <string name="manageConferenceLabel" tools:ignore="UnusedResources">Manage conference call</string>
 
   <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">Emergency number</string>
@@ -271,72 +169,8 @@
       phone number associated with their device. [CHAR LIMIT=16] -->
   <string name="child_number">via <xliff:g example="650-555-1212" id="child_number">%s</xliff:g></string>
 
-  <!-- Title for the call context with a person-type contact. [CHAR LIMIT=40] -->
-  <string name="person_contact_context_title">Recent messages</string>
-
-  <!-- Title for the call context with a business-type contact. [CHAR LIMIT=40] -->
-  <string name="business_contact_context_title">Business info</string>
-
   <!-- Distance strings for business caller ID context. -->
 
-  <!-- Used to inform the user how far away a location is in miles. [CHAR LIMIT=NONE] -->
-  <string name="distance_imperial_away"><xliff:g id="distance">%.1f</xliff:g> mi away</string>
-  <!-- Used to inform the user how far away a location is in kilometers. [CHAR LIMIT=NONE] -->
-  <string name="distance_metric_away"><xliff:g id="distance">%.1f</xliff:g> km away</string>
-  <!-- A shortened way to display a business address. Formatted [street address], [city/locality]. -->
-  <string name="display_address"><xliff:g id="street_address">%1$s</xliff:g>, <xliff:g id="locality">%2$s</xliff:g></string>
-  <!-- Used to indicate hours of operation for a location as a time span. e.g. "11 am - 9 pm" [CHAR LIMIT=NONE] -->
-  <string name="open_time_span"><xliff:g id="open_time">%1$s</xliff:g> - <xliff:g id="close_time">%2$s</xliff:g></string>
-  <!-- Used to indicate a series of opening hours for a location.
-       This first argument may be one or more time spans. e.g. "11 am - 9 pm, 9 pm - 11 pm"
-       The second argument is an additional time span. e.g. "11 pm - 1 am"
-       The string is used to build a list of opening hours.
-       [CHAR LIMIT=NONE] -->
-  <string name="opening_hours"><xliff:g id="earlier_times">%1$s</xliff:g>, <xliff:g id="later_time">%2$s</xliff:g></string>
-  <!-- Used to express when a location will open the next day. [CHAR LIMIT=NONE] -->
-  <string name="opens_tomorrow_at">Opens tomorrow at <xliff:g id="open_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location will be open today. [CHAR LIMIT=NONE] -->
-  <string name="opens_today_at">Opens today at <xliff:g id="open_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location will close today. [CHAR LIMIT=NONE] -->
-  <string name="closes_today_at">Closes at <xliff:g id="close_time">%s</xliff:g></string>
-  <!-- Used to express the next time at which a location closed today if it is already closed. [CHAR LIMIT=NONE] -->
-  <string name="closed_today_at">Closed today at <xliff:g id="close_time">%s</xliff:g></string>
-  <!-- Displayed when a place is open. -->
-  <string name="open_now">Open now</string>
-  <!-- Displayed when a place is closed. -->
-  <string name="closed_now">Closed now</string>
-
-  <!-- Title for the notification to the user after a call from an unknown number ends. [CHAR LIMIT=100] -->
-  <string name="non_spam_notification_title">Know <xliff:g id="number">%1$s</xliff:g>?</string>
-  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_title">Is <xliff:g id="number">%1$s</xliff:g> spam?</string>
-  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
-  <string name="spam_notification_block_report_toast_text"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as spam.</string>
-  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
-  <string name="spam_notification_not_spam_toast_text">Call from <xliff:g id="number">%1$s</xliff:g> reported as not spam.</string>
-  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
-  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
-  <string name="spam_notification_non_spam_call_expanded_text">This is the first time this number called you. If this call was spam, you can block this number and report it.</string>
-  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
-  <string name="spam_notification_spam_call_collapsed_text">Tap to report as NOT SPAM, or block it.</string>
-  <!-- Text displayed in the expanded notification to the user after a spam call ends. [CHAR LIMIT=NONE] -->
-  <string name="spam_notification_spam_call_expanded_text">We suspected this to be a spammer. If this call wasn\'t spam, tap "NOT SPAM" to report our mistake.</string>
-  <!-- Text for the reporting spam action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_report_spam_action_text">Block &amp; report</string>
-  <!-- Text for the adding to contacts action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_add_contact_action_text">Add contact</string>
-  <!-- Text for the reporting as not spam action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_not_spam_action_text">Not spam</string>
-  <!-- Text for the blocking spam action in the after call prompt. [CHAR LIMIT=20] -->
-  <string name="spam_notification_block_spam_action_text">Block number</string>
-  <!-- Text for the adding to contacts action in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
-  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
-  <!-- Text for the marking a call as not spam in the after call dialog. [CHAR LIMIT=40] -->
-  <string name="spam_notification_dialog_was_not_spam_action_text">Not spam</string>
-
   <string name="callFailed_simError">No SIM or SIM error</string>
 
   <string name="conference_caller_disconnect_content_description">End call</string>
@@ -349,11 +183,11 @@
   <string name="generic_conference_call_name">In call</string>
 
   <!-- Displayed when handover from WiFi to Lte occurs during a video call -->
-  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using cellular data…</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using mobile data\u2026</string>
 
   <!-- Displayed when WiFi handover from LTE fails during a video call. -->
-  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi-Fi network</string>
-  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on cellular network. Standard
+  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi\u2011Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on the mobile network. Standard
     data charges may apply.
   </string>
   <string name="video_call_lte_to_wifi_failed_do_not_show">Do not show this again</string>
diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml
index 68a38f0..5f1aefd 100644
--- a/java/com/android/incallui/res/values/styles.xml
+++ b/java/com/android/incallui/res/values/styles.xml
@@ -16,8 +16,6 @@
   -->
 
 <resources>
-  <drawable name="grayBg">#FF333333</drawable>
-
   <!-- Theme for the InCallActivity activity. Should have a transparent background for the
        circular reveal animation for a new outgoing call to work correctly. We don't just use
        Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
@@ -78,4 +76,13 @@
     <item name="android:colorAccent">@color/dialer_theme_color</item>
   </style>
 
+  <style name="Theme.Incall.DialogHolder" parent="Theme.AppCompat.Translucent">
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowActivityTransitions">false</item>
+
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+  </style>
+
 </resources>
diff --git a/java/com/android/incallui/sessiondata/MultimediaFragment.java b/java/com/android/incallui/sessiondata/MultimediaFragment.java
index 85a60b6..3e6cdbb 100644
--- a/java/com/android/incallui/sessiondata/MultimediaFragment.java
+++ b/java/com/android/incallui/sessiondata/MultimediaFragment.java
@@ -107,6 +107,7 @@
   public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
     if (isSpam) {
+      LogUtil.i("MultimediaFragment.onCreateView", "show spam layout");
       return layoutInflater.inflate(R.layout.fragment_spam, viewGroup, false);
     }
 
@@ -116,23 +117,30 @@
     if (hasMap && MapsComponent.get(getContext()).getMaps().isAvailable()) {
       if (hasImage) {
         if (hasSubject) {
+          LogUtil.i("MultimediaFragment.onCreateView", "show text, image, location layout");
           return layoutInflater.inflate(
               R.layout.fragment_composer_text_image_frag, viewGroup, false);
         } else {
+          LogUtil.i("MultimediaFragment.onCreateView", "show image, location layout");
           return layoutInflater.inflate(R.layout.fragment_composer_image_frag, viewGroup, false);
         }
       } else if (hasSubject) {
+        LogUtil.i("MultimediaFragment.onCreateView", "show text, location layout");
         return layoutInflater.inflate(R.layout.fragment_composer_text_frag, viewGroup, false);
       } else {
+        LogUtil.i("MultimediaFragment.onCreateView", "show location layout");
         return layoutInflater.inflate(R.layout.fragment_composer_frag, viewGroup, false);
       }
     } else if (hasImage) {
       if (hasSubject) {
+        LogUtil.i("MultimediaFragment.onCreateView", "show text, image layout");
         return layoutInflater.inflate(R.layout.fragment_composer_text_image, viewGroup, false);
       } else {
+        LogUtil.i("MultimediaFragment.onCreateView", "show image layout");
         return layoutInflater.inflate(R.layout.fragment_composer_image, viewGroup, false);
       }
     } else {
+      LogUtil.i("MultimediaFragment.onCreateView", "show text layout");
       return layoutInflater.inflate(R.layout.fragment_composer_text, viewGroup, false);
     }
   }
@@ -155,11 +163,11 @@
       ((TextView) view.findViewById(R.id.spam_text)).setText(R.string.spam_message_text);
     }
 
-    TextView messageText = (TextView) view.findViewById(R.id.answer_message_text);
+    TextView messageText = view.findViewById(R.id.answer_message_text);
     if (messageText != null) {
       messageText.setText(getSubject());
     }
-    ImageView mainImage = (ImageView) view.findViewById(R.id.answer_message_image);
+    ImageView mainImage = view.findViewById(R.id.answer_message_image);
     if (mainImage != null) {
       Glide.with(this)
           .load(getImageUri())
@@ -185,6 +193,7 @@
                     Target<Drawable> target,
                     DataSource dataSource,
                     boolean isFirstResource) {
+                  LogUtil.enterBlock("MultimediaFragment.onResourceReady");
                   view.findViewById(R.id.loading_spinner).setVisibility(View.GONE);
                   return false;
                 }
@@ -192,7 +201,7 @@
           .into(mainImage);
       mainImage.setClipToOutline(true);
     }
-    FrameLayout fragmentHolder = (FrameLayout) view.findViewById(R.id.answer_message_frag);
+    FrameLayout fragmentHolder = view.findViewById(R.id.answer_message_frag);
     if (fragmentHolder != null) {
       fragmentHolder.setClipToOutline(true);
       Fragment mapFragment =
@@ -202,7 +211,7 @@
           .replace(R.id.answer_message_frag, mapFragment)
           .commitNow();
     }
-    avatarImageView = ((ImageView) view.findViewById(R.id.answer_message_avatar));
+    avatarImageView = view.findViewById(R.id.answer_message_avatar);
     if (avatarImageView != null) {
       avatarImageView.setVisibility(showAvatar ? View.VISIBLE : View.GONE);
     }
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
index ed29e78..3b3327d 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
@@ -24,8 +24,8 @@
 
   <ImageView
       android:id="@id/answer_message_image"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
       android:layout_marginTop="@dimen/answer_message_contents_margin_top"
       android:layout_marginBottom="4dp"
       android:layout_centerInParent="true"
@@ -34,7 +34,7 @@
       android:background="@drawable/answer_data_background"
       android:elevation="@dimen/answer_data_elevation"
       android:adjustViewBounds="true"
-      android:scaleType="fitCenter"/>
+      android:scaleType="centerCrop"/>
 
   <ProgressBar
       android:layout_width="wrap_content"
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
index d2147ea..b93db63 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
@@ -16,29 +16,34 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
     android:paddingStart="@dimen/answer_message_margin_start_end"
     android:paddingEnd="@dimen/answer_message_margin_start_end">
 
-  <TextView
+  <android.support.v7.widget.AppCompatTextView
       android:id="@id/answer_message_text"
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/answer_message_contents_margin_top"
       android:layout_marginBottom="4dp"
       android:layout_centerHorizontal="true"
       android:layout_alignTop="@+id/answer_message_avatar"
-      android:paddingTop="44dp"
-      android:paddingBottom="44dp"
-      android:paddingStart="18dp"
-      android:paddingEnd="18dp"
-      android:background="@drawable/answer_text_only_background"
       android:elevation="@dimen/answer_data_elevation"
-      android:gravity="center_horizontal"
+      android:gravity="center"
+      android:paddingTop="22dp"
+      android:paddingBottom="22dp"
+      android:paddingStart="32dp"
+      android:paddingEnd="32dp"
+      android:minHeight="108dp"
+      android:lineSpacingMultiplier="1.2"
       android:textColor="@color/background_dialer_white"
-      android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+      android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"
+      android:background="@drawable/answer_text_only_background"
+      app:autoSizeTextType="uniform"
+      app:autoSizeMaxTextSize="44sp"/>
 
   <ImageView
       android:id="@id/answer_message_avatar"
diff --git a/java/com/android/incallui/spam/AndroidManifest.xml b/java/com/android/incallui/spam/AndroidManifest.xml
new file mode 100644
index 0000000..46319a6
--- /dev/null
+++ b/java/com/android/incallui/spam/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.incallui.autoresizetext">
+
+  <application>
+    <!--
+       Comments for attributes in SpamNotificationActivity:
+       taskAffinity=""             -> Open the dialog without opening the dialer app behind it
+       noHistory="true"            -> Navigating away finishes activity
+       excludeFromRecents="true"   -> Don't show in "recent apps" screen
+       -->
+    <activity
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:name=".SpamNotificationActivity"
+        android:noHistory="true"
+        android:taskAffinity=""
+        android:theme="@style/AfterCallNotificationTheme">
+    </activity>
+
+    <service
+        android:exported="false"
+        android:name=".SpamNotificationService"/>
+
+  </application>
+</manifest>
diff --git a/java/com/android/incallui/spam/NumberInCallHistoryTask.java b/java/com/android/incallui/spam/NumberInCallHistoryTask.java
deleted file mode 100644
index 886933f..0000000
--- a/java/com/android/incallui/spam/NumberInCallHistoryTask.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2016 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.incallui.spam;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.os.AsyncTask;
-import android.os.Build.VERSION_CODES;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.support.annotation.NonNull;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
-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;
-import com.android.incallui.call.DialerCall.CallHistoryStatus;
-import java.util.Objects;
-
-/** Checks if the number is in the call history. */
-@TargetApi(VERSION_CODES.M)
-public class NumberInCallHistoryTask extends AsyncTask<Void, Void, Integer> {
-
-  public static final String TASK_ID = "number_in_call_history_status";
-
-  private final Context context;
-  private final Listener listener;
-  private final String number;
-  private final String countryIso;
-
-  public NumberInCallHistoryTask(
-      @NonNull Context context, @NonNull Listener listener, String number, String countryIso) {
-    this.context = Objects.requireNonNull(context);
-    this.listener = Objects.requireNonNull(listener);
-    this.number = number;
-    this.countryIso = countryIso;
-  }
-
-  public void submitTask() {
-    if (!PermissionsUtil.hasPhonePermissions(context)) {
-      return;
-    }
-    AsyncTaskExecutor asyncTaskExecutor = AsyncTaskExecutors.createThreadPoolExecutor();
-    asyncTaskExecutor.submit(TASK_ID, this);
-  }
-
-  @Override
-  @CallHistoryStatus
-  public Integer doInBackground(Void... params) {
-    String numberToQuery = number;
-    String fieldToQuery = Calls.NUMBER;
-    String normalizedNumber = PhoneNumberUtils.formatNumberToE164(number, countryIso);
-
-    // If we can normalize the number successfully, look in "normalized_number"
-    // field instead. Otherwise, look for number in "number" field.
-    if (!TextUtils.isEmpty(normalizedNumber)) {
-      numberToQuery = normalizedNumber;
-      fieldToQuery = Calls.CACHED_NORMALIZED_NUMBER;
-    }
-    try (Cursor cursor =
-        context
-            .getContentResolver()
-            .query(
-                TelecomUtil.getCallLogUri(context),
-                new String[] {CallLog.Calls._ID},
-                fieldToQuery + " = ?",
-                new String[] {numberToQuery},
-                null)) {
-      return cursor != null && cursor.getCount() > 0
-          ? DialerCall.CALL_HISTORY_STATUS_PRESENT
-          : DialerCall.CALL_HISTORY_STATUS_NOT_PRESENT;
-    } catch (SQLiteException e) {
-      LogUtil.e("NumberInCallHistoryTask.doInBackground", "query call log error", e);
-      return DialerCall.CALL_HISTORY_STATUS_UNKNOWN;
-    }
-  }
-
-  @Override
-  public void onPostExecute(@CallHistoryStatus Integer callHistoryStatus) {
-    listener.onComplete(callHistoryStatus);
-  }
-
-  /** Callback for the async task. */
-  public interface Listener {
-
-    void onComplete(@CallHistoryStatus int callHistoryStatus);
-  }
-}
diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java
index 547337e..6b2bdce 100644
--- a/java/com/android/incallui/spam/SpamCallListListener.java
+++ b/java/com/android/incallui/spam/SpamCallListListener.java
@@ -16,29 +16,40 @@
 
 package com.android.incallui.spam;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.Notification.Builder;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
 import android.graphics.drawable.Icon;
+import android.os.Build.VERSION_CODES;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.os.BuildCompat;
 import android.telecom.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blocking.FilteredNumbersUtil;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorFactory;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.spam.Spam;
-import com.android.incallui.R;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.CallHistoryStatus;
@@ -49,24 +60,79 @@
  * etc).
  */
 public class SpamCallListListener implements CallList.Listener {
+  /** Common ID for all spam notifications. */
+  static final int NOTIFICATION_ID = 1;
+  /** Prefix used to generate a unique tag for each spam notification. */
+  static final String NOTIFICATION_TAG_PREFIX = "SpamCall_";
+  /**
+   * Key used to associate all spam notifications into a single group. Note, unlike other group
+   * notifications in Dialer, spam notifications don't have a top level group summary notification.
+   * The group is still useful for things like rate limiting on a per group basis.
+   */
+  private static final String GROUP_KEY = "SpamCallGroup";
 
-  static final int NOTIFICATION_ID = R.id.notification_spam_call;
-  private static final String TAG = "SpamCallListListener";
   private final Context context;
   private final Random random;
+  private final DialerExecutorFactory dialerExecutorFactory;
 
-  public SpamCallListListener(Context context) {
-    this.context = context;
-    this.random = new Random();
+  public SpamCallListListener(Context context, @NonNull DialerExecutorFactory factory) {
+    this(context, new Random(), factory);
   }
 
-  public SpamCallListListener(Context context, Random rand) {
+  public SpamCallListListener(
+      Context context, Random rand, @NonNull DialerExecutorFactory factory) {
     this.context = context;
     this.random = rand;
+    this.dialerExecutorFactory = Assert.isNotNull(factory);
   }
 
-  private static String pii(String pii) {
-    return com.android.incallui.Log.pii(pii);
+  /** Checks if the number is in the call history. */
+  @TargetApi(VERSION_CODES.M)
+  private static final class NumberInCallHistoryWorker implements Worker<Void, Integer> {
+
+    private final Context appContext;
+    private final String number;
+    private final String countryIso;
+
+    public NumberInCallHistoryWorker(
+        @NonNull Context appContext, String number, String countryIso) {
+      this.appContext = Assert.isNotNull(appContext);
+      this.number = number;
+      this.countryIso = countryIso;
+    }
+
+    @Override
+    @NonNull
+    @CallHistoryStatus
+    public Integer doInBackground(@Nullable Void input) throws Throwable {
+      String numberToQuery = number;
+      String fieldToQuery = Calls.NUMBER;
+      String normalizedNumber = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+
+      // If we can normalize the number successfully, look in "normalized_number"
+      // field instead. Otherwise, look for number in "number" field.
+      if (!TextUtils.isEmpty(normalizedNumber)) {
+        numberToQuery = normalizedNumber;
+        fieldToQuery = Calls.CACHED_NORMALIZED_NUMBER;
+      }
+
+      try (Cursor cursor =
+          appContext
+              .getContentResolver()
+              .query(
+                  TelecomUtil.getCallLogUri(appContext),
+                  new String[] {CallLog.Calls._ID},
+                  fieldToQuery + " = ?",
+                  new String[] {numberToQuery},
+                  null)) {
+        return cursor != null && cursor.getCount() > 0
+            ? DialerCall.CALL_HISTORY_STATUS_PRESENT
+            : DialerCall.CALL_HISTORY_STATUS_NOT_PRESENT;
+      } catch (SQLiteException e) {
+        LogUtil.e("NumberInCallHistoryWorker.doInBackground", "query call log error", e);
+        return DialerCall.CALL_HISTORY_STATUS_UNKNOWN;
+      }
+    }
   }
 
   @Override
@@ -75,15 +141,21 @@
     if (TextUtils.isEmpty(number)) {
       return;
     }
-    NumberInCallHistoryTask.Listener listener =
-        new NumberInCallHistoryTask.Listener() {
-          @Override
-          public void onComplete(@CallHistoryStatus int callHistoryStatus) {
-            call.setCallHistoryStatus(callHistoryStatus);
-          }
-        };
-    new NumberInCallHistoryTask(context, listener, number, GeoUtil.getCurrentCountryIso(context))
-        .submitTask();
+
+    if (!PermissionsUtil.hasCallLogReadPermissions(context)) {
+      LogUtil.i(
+          "SpamCallListListener.onIncomingCall",
+          "call log permission missing, not checking if number is in call history");
+      return;
+    }
+
+    NumberInCallHistoryWorker historyTask =
+        new NumberInCallHistoryWorker(context, number, GeoUtil.getCurrentCountryIso(context));
+    dialerExecutorFactory
+        .createNonUiTaskBuilder(historyTask)
+        .onSuccess((result) -> call.setCallHistoryStatus(result))
+        .build()
+        .executeParallel(null);
   }
 
   @Override
@@ -127,7 +199,6 @@
     if (call.isSpam()) {
       maybeShowSpamCallNotification(call);
     } else {
-      LogUtil.d(TAG, "Showing not spam notification for number=" + pii(call.getNumber()));
       maybeShowNonSpamCallNotification(call);
     }
   }
@@ -161,7 +232,7 @@
     if (callHistoryStatus == DialerCall.CALL_HISTORY_STATUS_PRESENT) {
       return false;
     } else if (callHistoryStatus == DialerCall.CALL_HISTORY_STATUS_UNKNOWN) {
-      LogUtil.i(TAG, "DialerCall history status is unknown, returning false");
+      LogUtil.i("SpamCallListListener.shouldShowAfterCallNotification", "history status unknown");
       return false;
     }
 
@@ -171,7 +242,7 @@
       return false;
     }
 
-    LogUtil.i(TAG, "shouldShowAfterCallNotification, returning true");
+    LogUtil.i("SpamCallListListener.shouldShowAfterCallNotification", "returning true");
     return true;
   }
 
@@ -179,15 +250,18 @@
    * Creates a notification builder with properties common among the two after call notifications.
    */
   private Notification.Builder createAfterCallNotificationBuilder(DialerCall call) {
-    Builder builder =
+    Notification.Builder builder =
         new Builder(context)
             .setContentIntent(
                 createActivityPendingIntent(call, SpamNotificationActivity.ACTION_SHOW_DIALOG))
             .setCategory(Notification.CATEGORY_STATUS)
             .setPriority(Notification.PRIORITY_DEFAULT)
             .setColor(context.getColor(R.color.dialer_theme_color))
-            .setSmallIcon(R.drawable.ic_call_end_white_24dp);
-    NotificationChannelManager.applyChannel(builder, context, Channel.DEFAULT, null);
+            .setSmallIcon(R.drawable.quantum_ic_call_end_vd_theme_24)
+            .setGroup(GROUP_KEY);
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.DEFAULT);
+    }
     return builder;
   }
 
@@ -201,7 +275,6 @@
   private void showNonSpamCallNotification(DialerCall call) {
     Notification.Builder notificationBuilder =
         createAfterCallNotificationBuilder(call)
-            .setLargeIcon(Icon.createWithResource(context, R.drawable.unknown_notification_icon))
             .setContentText(
                 context.getString(R.string.spam_notification_non_spam_call_collapsed_text))
             .setStyle(
@@ -211,7 +284,7 @@
             // Add contact
             .addAction(
                 new Notification.Action.Builder(
-                        R.drawable.ic_person_add_grey600_24dp,
+                        R.drawable.quantum_ic_person_add_vd_theme_24,
                         context.getString(R.string.spam_notification_add_contact_action_text),
                         createActivityPendingIntent(
                             call, SpamNotificationActivity.ACTION_ADD_TO_CONTACTS))
@@ -219,14 +292,14 @@
             // Block/report spam
             .addAction(
                 new Notification.Action.Builder(
-                        R.drawable.ic_block_grey600_24dp,
+                        R.drawable.quantum_ic_block_vd_theme_24,
                         context.getString(R.string.spam_notification_report_spam_action_text),
                         createBlockReportSpamPendingIntent(call))
                     .build())
             .setContentTitle(
                 context.getString(R.string.non_spam_notification_title, getDisplayNumber(call)));
-    ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
-        .notify(call.getNumber(), NOTIFICATION_ID, notificationBuilder.build());
+    DialerNotificationManager.notify(
+        context, getNotificationTagForCall(call), NOTIFICATION_ID, notificationBuilder.build());
   }
 
   private boolean shouldThrottleSpamNotification() {
@@ -234,21 +307,20 @@
     int thresholdForShowing = Spam.get(context).percentOfSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, not showing - percentOfSpamNotificationsToShow is 0");
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "not showing - percentOfSpamNotificationsToShow is 0");
       return true;
     } else if (randomNumber < thresholdForShowing) {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, showing " + randomNumber + " < " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "showing " + randomNumber + " < " + thresholdForShowing);
       return false;
     } else {
       LogUtil.d(
-          TAG,
-          "shouldThrottleSpamNotification, not showing "
-              + randomNumber
-              + " >= "
-              + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleSpamNotification",
+          "not showing %d >= %d",
+          randomNumber,
+          thresholdForShowing);
       return true;
     }
   }
@@ -257,15 +329,23 @@
     int randomNumber = random.nextInt(100);
     int thresholdForShowing = Spam.get(context).percentOfNonSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
-      LogUtil.d(TAG, "Not showing non spam notification: percentOfNonSpamNotificationsToShow is 0");
+      LogUtil.d(
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "not showing non spam notification: percentOfNonSpamNotificationsToShow is 0");
       return true;
     } else if (randomNumber < thresholdForShowing) {
       LogUtil.d(
-          TAG, "Showing non spam notification: " + randomNumber + " < " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "showing non spam notification: %d < %d",
+          randomNumber,
+          thresholdForShowing);
       return false;
     } else {
       LogUtil.d(
-          TAG, "Not showing non spam notification:" + randomNumber + " >= " + thresholdForShowing);
+          "SpamCallListListener.shouldThrottleNonSpamNotification",
+          "not showing non spam notification: %d >= %d",
+          randomNumber,
+          thresholdForShowing);
       return true;
     }
   }
@@ -316,21 +396,21 @@
             // Not spam
             .addAction(
                 new Notification.Action.Builder(
-                        R.drawable.ic_close_grey600_24dp,
+                        R.drawable.quantum_ic_close_vd_theme_24,
                         context.getString(R.string.spam_notification_not_spam_action_text),
                         createNotSpamPendingIntent(call))
                     .build())
             // Block/report spam
             .addAction(
                 new Notification.Action.Builder(
-                        R.drawable.ic_block_grey600_24dp,
+                        R.drawable.quantum_ic_block_vd_theme_24,
                         context.getString(R.string.spam_notification_block_spam_action_text),
                         createBlockReportSpamPendingIntent(call))
                     .build())
             .setContentTitle(
                 context.getString(R.string.spam_notification_title, getDisplayNumber(call)));
-    ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
-        .notify(call.getNumber(), NOTIFICATION_ID, notificationBuilder.build());
+    DialerNotificationManager.notify(
+        context, getNotificationTagForCall(call), NOTIFICATION_ID, notificationBuilder.build());
   }
 
   /**
@@ -358,7 +438,8 @@
   /** Creates a pending intent for {@link SpamNotificationService}. */
   private PendingIntent createServicePendingIntent(DialerCall call, String action) {
     Intent intent =
-        SpamNotificationService.createServiceIntent(context, call, action, NOTIFICATION_ID);
+        SpamNotificationService.createServiceIntent(
+            context, call, action, getNotificationTagForCall(call), NOTIFICATION_ID);
     return PendingIntent.getService(
         context, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
   }
@@ -366,8 +447,13 @@
   /** Creates a pending intent for {@link SpamNotificationActivity}. */
   private PendingIntent createActivityPendingIntent(DialerCall call, String action) {
     Intent intent =
-        SpamNotificationActivity.createActivityIntent(context, call, action, NOTIFICATION_ID);
+        SpamNotificationActivity.createActivityIntent(
+            context, call, action, getNotificationTagForCall(call), NOTIFICATION_ID);
     return PendingIntent.getActivity(
         context, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
   }
+
+  static String getNotificationTagForCall(@NonNull DialerCall call) {
+    return NOTIFICATION_TAG_PREFIX + call.getNumber();
+  }
 }
diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java
index ece0e49..86988ad 100644
--- a/java/com/android/incallui/spam/SpamNotificationActivity.java
+++ b/java/com/android/incallui/spam/SpamNotificationActivity.java
@@ -18,7 +18,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -38,8 +37,8 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.spam.Spam;
-import com.android.incallui.R;
 import com.android.incallui.call.DialerCall;
 
 /** Creates the after call notification dialogs. */
@@ -57,6 +56,7 @@
       "com.android.incallui.spam.ACTION_MARK_NUMBER_AS_NOT_SPAM";
 
   private static final String TAG = "SpamNotifications";
+  private static final String EXTRA_NOTIFICATION_TAG = "notification_tag";
   private static final String EXTRA_NOTIFICATION_ID = "notification_id";
   private static final String EXTRA_CALL_INFO = "call_info";
 
@@ -82,12 +82,13 @@
    * @return Intent intent that starts this activity.
    */
   public static Intent createActivityIntent(
-      Context context, DialerCall call, String action, int notificationId) {
+      Context context, DialerCall call, String action, String notificationTag, int notificationId) {
     Intent intent = new Intent(context, SpamNotificationActivity.class);
     intent.setAction(action);
     // This ensures only one activity of this kind exists at a time.
     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    intent.putExtra(EXTRA_NOTIFICATION_TAG, notificationTag);
     intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
     intent.putExtra(EXTRA_CALL_INFO, newCallInfoBundle(call));
     return intent;
@@ -294,10 +295,9 @@
 
   /** Cancels the notification associated with the number. */
   private void cancelNotification() {
+    String notificationTag = getIntent().getStringExtra(EXTRA_NOTIFICATION_TAG);
     int notificationId = getIntent().getIntExtra(EXTRA_NOTIFICATION_ID, 1);
-    String number = getCallInfo().getString(CALL_INFO_KEY_PHONE_NUMBER);
-    ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE))
-        .cancel(number, notificationId);
+    DialerNotificationManager.cancel(this, notificationTag, notificationId);
   }
 
   private String getCountryIso() {
@@ -373,7 +373,7 @@
           .setTitle(getString(R.string.spam_notification_title, getFormattedNumber(number)))
           .setMessage(getString(R.string.spam_notification_spam_call_expanded_text))
           .setNeutralButton(
-              getString(R.string.notification_action_dismiss),
+              getString(R.string.spam_notification_action_dismiss),
               new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -459,7 +459,7 @@
           .setCancelable(false)
           .setMessage(getString(R.string.spam_notification_non_spam_call_expanded_text))
           .setNeutralButton(
-              getString(R.string.notification_action_dismiss),
+              getString(R.string.spam_notification_action_dismiss),
               new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
diff --git a/java/com/android/incallui/spam/SpamNotificationService.java b/java/com/android/incallui/spam/SpamNotificationService.java
index 7888fc8..91377db 100644
--- a/java/com/android/incallui/spam/SpamNotificationService.java
+++ b/java/com/android/incallui/spam/SpamNotificationService.java
@@ -16,7 +16,6 @@
 
 package com.android.incallui.spam;
 
-import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -30,6 +29,7 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.spam.Spam;
 import com.android.incallui.call.DialerCall;
 
@@ -47,19 +47,22 @@
   private static final String EXTRA_PHONE_NUMBER = "service_phone_number";
   private static final String EXTRA_CALL_ID = "service_call_id";
   private static final String EXTRA_CALL_START_TIME_MILLIS = "service_call_start_time_millis";
+  private static final String EXTRA_NOTIFICATION_TAG = "service_notification_tag";
   private static final String EXTRA_NOTIFICATION_ID = "service_notification_id";
   private static final String EXTRA_CONTACT_LOOKUP_RESULT_TYPE =
       "service_contact_lookup_result_type";
   /** Creates an intent to start this service. */
   public static Intent createServiceIntent(
-      Context context, DialerCall call, String action, int notificationId) {
+      Context context, DialerCall call, String action, String notificationTag, int notificationId) {
     Intent intent = new Intent(context, SpamNotificationService.class);
     intent.setAction(action);
     intent.putExtra(EXTRA_PHONE_NUMBER, call.getNumber());
     intent.putExtra(EXTRA_CALL_ID, call.getUniqueCallId());
     intent.putExtra(EXTRA_CALL_START_TIME_MILLIS, call.getTimeAddedMs());
+    intent.putExtra(EXTRA_NOTIFICATION_TAG, notificationTag);
     intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
-    intent.putExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult);
+    intent.putExtra(
+        EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult.getNumber());
     return intent;
   }
 
@@ -80,13 +83,13 @@
       return START_NOT_STICKY;
     }
     String number = intent.getStringExtra(EXTRA_PHONE_NUMBER);
+    String notificationTag = intent.getStringExtra(EXTRA_NOTIFICATION_TAG);
     int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, 1);
     String countryIso = GeoUtil.getCurrentCountryIso(this);
     ContactLookupResult.Type contactLookupResultType =
         ContactLookupResult.Type.forNumber(intent.getIntExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, 0));
 
-    ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE))
-        .cancel(number, notificationId);
+    DialerNotificationManager.cancel(this, notificationTag, notificationId);
 
     switch (intent.getAction()) {
       case SpamNotificationActivity.ACTION_MARK_NUMBER_AS_SPAM:
diff --git a/java/com/android/incallui/spam/res/drawable/spam_notification_icon.xml b/java/com/android/incallui/spam/res/drawable/spam_notification_icon.xml
new file mode 100644
index 0000000..a414428
--- /dev/null
+++ b/java/com/android/incallui/spam/res/drawable/spam_notification_icon.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/incall_call_spam_background_color"/>
+      <size
+        android:height="@android:dimen/notification_large_icon_height"
+        android:width="@android:dimen/notification_large_icon_width"/>
+    </shape>
+  </item>
+
+  <item
+    android:drawable="@drawable/quantum_ic_report_white_36"
+    android:gravity="center"/>
+
+</layer-list>
diff --git a/java/com/android/incallui/spam/res/values-af/strings.xml b/java/com/android/incallui/spam/res/values-af/strings.xml
new file mode 100644
index 0000000..7b82888
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-af/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ken jy <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> strooipos?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeer en oproep is as strooipos aangegee."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Oproep vanaf <xliff:g id="NUMBER">%1$s</xliff:g> is as nie strooipos nie aangegee."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tik om by kontakte te voeg of strooiposnommer te blokkeer."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dit is die eerste keer wat hierdie nommer jou bel. As hierdie oproep strooipos was, kan jy hierdie nommer blokkeer en dit aangee."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tik om as NIE STROOIPOS NIE aan te gee, of dit te blokkeer."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Ons vermoed dit was \'n strooiposser. As hierdie oproep nie strooipos was nie, tik NIE STROOIPOS NIE om ons fout aan te gee."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkeer en gee aan"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Voeg kontak by"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nie strooipos nie"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkeer nommer"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Voeg by kontakte"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkeer en gee strooipos aan"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nie strooipos nie"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Wys af"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-am/strings.xml b/java/com/android/incallui/spam/res/values-am/strings.xml
new file mode 100644
index 0000000..7ebefac
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-am/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>ን ያውቁታል?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> አይፈለጌ ነው?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ታግደዋል ጥሪውም እንደ አይፈለጌ መልዕክት ሪፖርት ተደርጓል።"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ከ<xliff:g id="NUMBER">%1$s</xliff:g> የመጣው ጥሪ አይፈለጌ እንዳልሆነ ሪፖርት ተደርጓል።"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"እውቂያዎችን ለማከል ወይም አይፈለጌ ቁጥር ለማገድ መታ ያድርጉ።"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ይህ ቁጥር ሲደውልልዎ ይህ የመጀመሪያ ጊዜ ነው። ይህ ጥሪ አይፈለጌ ነበር፣ ይህን ቁጥር ማገድ እና ሪፖርት ማድረግ ይችላሉ።"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"አይፈለጌ እንዳልሆነ ሪፖርት ለማድረግ ወይም ለማገድ መታ ያድርጉ።"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ይህ አይፈለጌ ለቃቂ እንደሆነ ጠርጥረናል። ይህ ጥሪ አይፈለጌ ያልነበረ ከሆነ፣ «አይፈለጌ አይደለም» ላይ መታ ያድርጉ እና ስህተታችንን ይንገሩን።"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"አግድ እና ሪፖርት አድርግ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"እውቂያ ያክሉ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"አይፈለጌ መልዕክት አይደለም"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ቁጥርን አግድ"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ወደ እውቂያዎች ያክሉ"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"አግድ እና አይፈለጌ ሪፖርት አድርግ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"አይፈለጌ መልዕክት አይደለም"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"አትቀበል"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ar/strings.xml b/java/com/android/incallui/spam/res/values-ar/strings.xml
new file mode 100644
index 0000000..0813392
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ar/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"هل تعرف <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"هل <xliff:g id="NUMBER">%1$s</xliff:g> غير مرغوب فيه؟"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g> والإبلاغ عن المكالمة باعتبرها غير مرغوب فيها."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"تم الإبلاغ عن أن مكالمة <xliff:g id="NUMBER">%1$s</xliff:g> ليست من النوع غير المرغوب فيه."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"انقر للإضافة إلى جهات الاتصال أو لحظر الرقم غير المرغوب فيه."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"هذه هي المرة الأولى التي تتلقى فيها اتصالاً من هذا الرقم. إذا كانت هذه المكالمة غير مرغوب فيها، يمكنك حظر هذا الرقم والإبلاغ عنه."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"انقر للإبلاغ عن المكالمة باعتبارها غير مرغوب فيها أو حظرها."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"لدينا شك في أن هذا المتصل من النوع غير المرغوب فيه. إذا لم تكن هذه المكالمة من النوع غير المرغوب فيه، اضغط \"ليس رقمًا غير مرغوب فيه \" للإبلاغ عن خطأنا."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"حظر وإبلاغ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"إضافة جهة اتصال"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ليست محادثة غير مرغوب فيها."</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"حظر الرقم"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"إضافة إلى جهات الاتصال"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"حظر الرقم والإبلاغ عنه كرقم غير مرغوب فيه"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ليست محادثة غير مرغوب فيها."</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"رفض"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-az/strings.xml b/java/com/android/incallui/spam/res/values-az/strings.xml
new file mode 100644
index 0000000..27ad7c5
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-az/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsini tanıyırsınız?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> spamdır?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blok edilib və zəng spam olaraq bildirilib."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsindən gələn zəng spam olaraq bildirilib."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klikləyərək kontaktlara əlavə edin və ya spam nömrə kimi blok edin."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"İlk dəfədir ki, bu nömrədən Sizə zəng gəlir. Bu zəng spamdırsa, nömrəni blok edə və ya şikayət edə bilərsiniz."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"SPAM DEYİL seçiminə klikləyin və ya blok edin."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bunun spam olduğundan şübhələnirik. Bu zəng spam deyilsə, yanıldığımızı bildirmək üçün SPAM DEYİL seçiminə klikləyin."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blok/şikayət edin"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontakt əlavə edin"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam deyil"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nömrəni blok edin"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kontaktlara əlavə edin"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blok edin və ya spamı bildirin"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam deyil"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"İmtina edin"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..f73adb5
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznat vam je broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Da li je <xliff:g id="NUMBER">%1$s</xliff:g> nepoželjan?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Blokirali ste <xliff:g id="NUMBER">%1$s</xliff:g>, a poziv ste prijavili kao nepoželjan."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Prijavili ste da poziv sa <xliff:g id="NUMBER">%1$s</xliff:g> nije nepoželjan."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite da biste dodali kontakte ili blokirali nepoželjan broj."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Prvi put ste primili poziv sa ovog broja. Ako je nepoželjan, možete da ga blokirate i prijavite."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite da biste prijavili da poziv NIJE NEPOŽELJAN ili blokirajte broj."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da je ovaj poziv nepoželjan. Ako nije, dodirnite NIJE NEPOŽELJAN da biste prijavili grešku."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj i prijavi"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije nepoželjan"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj i prijavi nepoželjan poziv"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije nepoželjan"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-be/strings.xml b/java/com/android/incallui/spam/res/values-be/strings.xml
new file mode 100644
index 0000000..dc60639
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-be/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Вы ведаеце нумар <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> спамерскі?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> заблакіраваны, а выклік быў заяўлены як спамерскі."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Выклік з нумара <xliff:g id="NUMBER">%1$s</xliff:g> заяўлены як няспамерскі."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Дакраніцеся, каб дадаць да кантактаў ці заблакіраваць спамерскі нумар."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"З гэтага нумара вас выклікалі ўпершыню. Калі гэта быў спамерскі выклік, вы можаце заблакіраваць гэты нумар і паведаміць аб гэтым."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Дакраніцеся, каб заявіць гэты нумар як НЯСПАМЕРСКІ, або заблакіраваць яго."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Мы падазраём, што гэта быў спамер. Калі гэты выклік быў няспамерскім, дакраніцеся да кнопкі \"НЕ СПАМ\", каб паведаміць аб нашай памылцы."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Заблак. і паведаміць"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Дадаць кантакт"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблакіраваць нумар"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Дадаць у кантакты"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Заблакіраваць і паведаміць пра спам"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Адхіліць"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-bg/strings.xml b/java/com/android/incallui/spam/res/values-bg/strings.xml
new file mode 100644
index 0000000..b9f7dfd
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-bg/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> известен ли ви е?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам ли е?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Блокирахте <xliff:g id="NUMBER">%1$s</xliff:g> и за обаждането бе подаден сигнал, че е спам."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"За обаждането от <xliff:g id="NUMBER">%1$s</xliff:g> бе подаден сигнал, че не е спам."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Докоснете, за да добавите към контактите или да блокирате номера със спам."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"За първи път ви се обаждат от този номер. Ако обаждането е било спам, можете да блокирате номера и да подадете сигнал за него."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Докоснете за подаване на сигнал „НЕ Е СПАМ“ или за блокиране."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Предполагахме, че това е разпространител на спам. Ако обаждането не е било спам, докоснете „НЕ Е СПАМ“, за да сигнализирате за грешката ни."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокиране и сигнал"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Добавяне на контакт"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не е спам"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокиране на номера"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Добавяне към контактите"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокиране и подаване на сигнал за спам"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не е спам"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Отхвърляне"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-bn/strings.xml b/java/com/android/incallui/spam/res/values-bn/strings.xml
new file mode 100644
index 0000000..2fdd3e0
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-bn/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি জানেন?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি কি স্প্যাম?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটিকে ব্লক করা হয়েছে এবং কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বর থেকে আসা কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"পরিচিতিগুলিতে যোগ করার জন্য ট্যাপ করুন অথবা স্প্যাম নম্বর ব্লক করুন।"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"এই প্রথমবার এই নম্বর থেকে আপনাকে কল করা হয়েছে। যদি এই কলটি স্প্যাম হয় তাহলে এই নম্বরটিকে ব্লক করে এটির বিষয়ে রিপোর্ট করুন।"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"স্প্যাম নয় হিসাবে রিপোর্ট করতে ট্যাপ করুন অথবা এটিকে ব্লক করুন।"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"এটি কোনও স্প্যামার হতে পারে বলে আমাদের মনে হয়েছে। যদি এটি স্প্যাম না হয় তাহলে আমাদের ভুল হয়েছে জানাতে \'স্প্যাম নয়\' এ ট্যাপ করুন।"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ব্লক করে রিপোর্ট করুন"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"পরিচিতি যোগ করুন"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"স্প্যাম নয়"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"নম্বর ব্লক করুন"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"পরিচিতিগুলিতে যোগ করুন"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ব্লক করে স্প্যাম হিসেবে রিপোর্ট করুন"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"স্প্যাম নয়"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"প্রত্যাখ্যান করুন"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-bs/strings.xml b/java/com/android/incallui/spam/res/values-bs/strings.xml
new file mode 100644
index 0000000..65a5fef
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-bs/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznajete <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni poziv?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran i poziv je prijavljen kao neželjen."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> je prijavljen kao neželjen."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite da biste dodali u kontakte ili blokirani neželjeni broj."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ovo je prvi poziv koji ste primili s ovog broja. Ako je poziv neželjen, možete blokirati ovaj broj i prijaviti ga."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJEN ili ga blokirajte."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da se radi o neželjenom pozivu. Ako nije neželjeni poziv, dodirnite NIJE NEŽELJEN da biste prijavili našu grešku."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj i prijavi"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije neželjeno"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj i prijavi neželjeni poziv"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije neželjeno"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ca/strings.xml b/java/com/android/incallui/spam/res/values-ca/strings.xml
new file mode 100644
index 0000000..bc3b5eb
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ca/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Saps de qui és el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"El <xliff:g id="NUMBER">%1$s</xliff:g> és un número brossa?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"El <xliff:g id="NUMBER">%1$s</xliff:g> s\'ha bloquejat i la trucada s\'ha marcat com a brossa."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"S\'ha indicat que la trucada del <xliff:g id="NUMBER">%1$s</xliff:g> no és brossa."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca per afegir el número als contactes o bé per marcar-lo com a brossa i bloquejar-lo."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"És la primera vegada que aquest número t\'ha trucat. Si era una trucada brossa, pots bloquejar-lo i informar-ne."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca per indicar que NO ÉS BROSSA o per bloquejar-lo."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Segons les nostres sospites, l\'autor de la trucada és un generador de contingut brossa. Si ens equivoquem, toca NO ÉS BROSSA per informar-nos-en."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloqueja i marca"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Afegeix als contactes"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No és brossa"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloqueja el número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Afegeix als contactes"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloqueja i marca com a brossa"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No és brossa"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rebutja"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-cs/strings.xml b/java/com/android/incallui/spam/res/values-cs/strings.xml
new file mode 100644
index 0000000..82c7dbf
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-cs/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Znáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bylo zablokováno a hovor byl nahlášen jako spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Bylo nahlášeno, že hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> nebyl spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klepnutím číslo přidáte do kontaktů nebo zablokujete jako spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Toto číslo vám volalo poprvé. Pokud se jednalo o spam, můžete číslo zablokovat a nahlásit."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Klepnutím nahlásíte, že toto číslo NENÍ SPAM, nebo ho zablokujete."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Máme podezření, že tento hovor byl spam. Pokud se nejednalo o spam, klepněte na NEŠLO O SPAM a nahlaste nám tak omyl."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokovat a nahlásit"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Přidat kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nešlo o spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zablokovat číslo"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Přidat do kontaktů"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zablokovat a nahlásit spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nešlo o spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odmítnout"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-da/strings.xml b/java/com/android/incallui/spam/res/values-da/strings.xml
new file mode 100644
index 0000000..b4ae0e5
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-da/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kender du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Er <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blev blokeret, og opkaldet blev rapporteret som spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Opkaldet fra <xliff:g id="NUMBER">%1$s</xliff:g> blev ikke rapporteret som spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tryk for at føje til kontaktpersoner eller for at blokere spamnummeret."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er første gang, at dette nummer har ringet til dig. Hvis det var et spamopkald, kan du blokere nummeret og rapportere det."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tryk for at rapportere nummeret som IKKE SPAM, eller bloker det."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi har mistanke om, at dette er en spammer. Hvis opkaldet ikke er spam, skal du trykke på IKKE SPAM for at rapportere vores mistanke."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloker og rapportér"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tilføj kontaktperson"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloker nummer"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Føj til kontaktpersoner"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloker og rapportér spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Afvis"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-de/strings.xml b/java/com/android/incallui/spam/res/values-de/strings.xml
new file mode 100644
index 0000000..35bbf63
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-de/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kennst du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Ist <xliff:g id="NUMBER">%1$s</xliff:g> Spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> wurde blockiert und der Anruf wurde als Spam gemeldet."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anruf von <xliff:g id="NUMBER">%1$s</xliff:g> wurde als kein Spam gemeldet."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tippen, um die Nummer deinen Kontakten hinzuzufügen oder sie als Spam zu blockieren."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Du wurdest das erste Mal von dieser Nummer angerufen. Wenn dieser Anruf Spam war, kannst du die Nummer blockieren und melden."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tippen, um die Nummer als KEIN SPAM zu melden oder sie zu blockieren."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Dies ist vermutlich Spam. Wenn der Anruf kein Spam war, tippe auf KEIN SPAM, um den Fehler zu melden."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blockieren und melden"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontakt hinzufügen"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Kein Spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nummer blockieren"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Zu Kontakten hinzufügen"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blockieren und als Spam melden"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Kein Spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Ablehnen"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-el/strings.xml b/java/com/android/incallui/spam/res/values-el/strings.xml
new file mode 100644
index 0000000..cd0b9d0
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-el/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Γνωρίζετε τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Είναι ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> ανεπιθύμητος;"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε και η κλήση αναφέρθηκε ως ανεπιθύμητη."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Η κλήση από τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g> αναφέρθηκε ως μη ανεπιθύμητη."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Πατήστε για προσθήκη στις επαφές ή αποκλεισμό αριθμού ως ανεπιθύμητο."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Αυτή είναι η πρώτη φορά που σας καλεί αυτός ο αριθμός. Αν η κλήση αυτή ήταν ανεπιθύμητη, μπορείτε να αποκλείσετε αυτόν τον αριθμό και να τον αναφέρετε."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Πατήστε για αναφορά ως ΜΗ ΑΝΕΠΙΘΥΜΗΤΗΣ ή για αποκλεισμό της."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Υποψιαστήκαμε ότι πρόκειται για ανεπιθύμητο καλούντα. Εάν η κλήση δεν ήταν ανεπιθύμητη, πατήστε ΜΗ ΑΝΕΠΙΘΥΜΗΤΗ για να αναφέρετε το λάθος μας."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Αποκλεισμός και αναφορά"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Προσθήκη επαφής"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Μη ανεπιθύμητη"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Αποκλεισμός αριθμού"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Προσθήκη στις επαφές"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Αποκλεισμός και αναφορά ως ανεπιθύμητης"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Μη ανεπιθύμητη"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Απόρριψη"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rAU/strings.xml b/java/com/android/incallui/spam/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..925176b
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-en-rAU/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rGB/strings.xml b/java/com/android/incallui/spam/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..925176b
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-en-rGB/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rIN/strings.xml b/java/com/android/incallui/spam/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..925176b
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-en-rIN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-es-rUS/strings.xml b/java/com/android/incallui/spam/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..a794ab3
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-es-rUS/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"¿Sabes quién es <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"¿<xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado. La llamada se marcó como spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Se indicó que la llamada de <xliff:g id="NUMBER">%1$s</xliff:g> no es spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Presiona para agregar a los contactos o para bloquear el número marcado como spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta es la primera vez que este número te llama. Si la llamada fue spam, puedes bloquear este número y denunciarlo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Presiona para informar que NO ES SPAM o para bloquearlo."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospechamos que era spam. Si la llamada no fue spam, presiona NO ES SPAM para informarnos de nuestro error."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear y denunciar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Agregar contacto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No es spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Agregar a contactos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear y marcar como spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No es spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rechazar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-es/strings.xml b/java/com/android/incallui/spam/res/values-es/strings.xml
new file mode 100644
index 0000000..f35d018
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-es/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"¿Conoces el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"¿El número <xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Se ha bloqueado el número <xliff:g id="NUMBER">%1$s</xliff:g> y se ha marcado la llamada como Spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Se ha marcado la llamada del <xliff:g id="NUMBER">%1$s</xliff:g> como No es spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca el número para añadirlo a los contactos o bloquearlo como spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Es la primera vez que recibes una llamada de este número. Si se trata de spam, puedes bloquear el número y denunciarlo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca el número para marcarlo como NO ES SPAM o bloquearlo."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospechamos que es un spammer. Si la llamada no es spam, toca NO ES SPAM para informarnos de nuestro error."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear y denunciar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Añadir contacto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No es spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Añadir a contactos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear y marcar como spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No es spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rechazar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-et/strings.xml b/java/com/android/incallui/spam/res/values-et/strings.xml
new file mode 100644
index 0000000..6a41e9a
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-et/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kas teate numbrit <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Kas number <xliff:g id="NUMBER">%1$s</xliff:g> saadab rämpsposti?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Number <xliff:g id="NUMBER">%1$s</xliff:g> blokeeriti ja kõne liigitati rämpspostiks."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Kõnet numbrilt <xliff:g id="NUMBER">%1$s</xliff:g> ei liigitatud rämpspostiks."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Puudutage kontaktide lisamiseks või rämpsposti saatva numbri blokeerimiseks."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Teile helistati sellelt numbrilt esimest korda. Kui see kõne oli rämpspost, blokeerige see number ja teavitage meid sellest."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Puudutage, kui see POLE RÄMPSPOST, või blokeerige see."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kahtlustame, et see on rämpsposti saatja. Kui see kõne polnud rämpspost, puudutage valikut POLE RÄMPSPOST, et meid veast teavitada."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokeeri ja teavita"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lisa kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Pole rämpspost"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokeeri number"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lisa kontaktidesse"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokeeri ja teavita rämpspostist"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Pole rämpspost"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Keeldu"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-eu/strings.xml b/java/com/android/incallui/spam/res/values-eu/strings.xml
new file mode 100644
index 0000000..562b61a
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-eu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ezagutzen duzu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Spama da <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Blokeatu da <xliff:g id="NUMBER">%1$s</xliff:g>, eta spama dela salatu da."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Ez-spam gisa markatu da <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Sakatu kontaktuetan gehitzeko edo blokeatu spam-zenbakia."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Zenbaki honek deitu dizun lehenengo aldia izan da. Spama bada, blokeatu eta salatu egin dezakezu."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Sakatu EZ DA SPAMA gisa markatzeko, edo blokea ezazu."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Spam-igorle baten deia izan dela susmatu dugu. Dei hau ez bada spama izan, sakatu EZ DA SPAMA gure akatsaren berri emateko."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokeatu eta salatu"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Gehitu kontaktua"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ez da spama"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokeatu zenbakia"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Gehitu kontaktuetan"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokeatu eta salatu spama dela"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ez da spama"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Baztertu"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-fa/strings.xml b/java/com/android/incallui/spam/res/values-fa/strings.xml
new file mode 100644
index 0000000..7c63c30
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-fa/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> را می‌شناسید؟"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> هرزنامه است؟"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شد و تماس به‌عنوان هرزنامه گزارش شد."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"تماس از <xliff:g id="NUMBER">%1$s</xliff:g> به‌عنوان غیرهرزنامه گزارش شد."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"برای افزودن مخاطبین یا مسدود کردن شماره هرزنامه، ضربه بزنید."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"اولین بار است که این شماره با شما تماس گرفته است. اگر این تماس هرزنامه است می‌توانید شماره را مسدود کنید و آن را گزارش کنید."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"برای گزارش به‌عنوان «غیرهرزنامه» ضربه بزنید یا آن را مسدود کنید."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"مشکوک هستیم که هرزنامه باشد. اگر این تماس هرزنامه نیست، روی «غیرهرزنامه» ضربه بزنید تا اشتباه ما را گزارش کنید."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"مسدود کردن و گزارش کردن"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"افزودن مخاطب"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"هرزنامه نیست"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"مسدود کردن شماره"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"افزودن به مخاطبین"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"مسدود کردن و گزارش هرزنامه"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"هرزنامه نیست"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"رد کردن"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-fi/strings.xml b/java/com/android/incallui/spam/res/values-fi/strings.xml
new file mode 100644
index 0000000..7054ee2
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-fi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> sinulle tuttu?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> häirikkönumero?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> estettiin ja puhelu ilmoitettiin häirikköpuheluksi."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Numerosta <xliff:g id="NUMBER">%1$s</xliff:g> saapunut puhelu ei ole häirikköpuhelu."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Lisää yhteystietoihin tai estä häirikkönumero napauttamalla."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Tästä numerosta soitettiin sinulle ensimmäisen kerran. Jos kyseessä oli häirikköpuhelu, voit estää numeron ja ilmoittaa siitä."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Valitse tilaksi Ei HÄIRIKKÖSOITTAJA tai estä numero napauttamalla."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kyseessä saattoi olla häirikkösoittaja. Jos näin ei ole, napauta EI HÄIRIKKÖSOITTAJA ja ilmoita meille virheestä."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Estä ja ilmoita"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lisää yhteystieto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ei häirikkösoittaja"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Estä numero"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lisää yhteystietoihin"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Estä ja ilmoita häirikkösoittajaksi"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ei ole häirikkösoittaja"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Hylkää"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml b/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..ae79f31
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Connaissez-vous le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> est-il un pourriel?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué, et l\'appel a été signalé comme pourriel."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été signalé comme n\'étant pas un pourriel."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Touchez pour ajouter aux contacts, ou bloquez le numéro source de pourriel."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"C\'est la première fois que ce numéro vous appelle. Si cet appel était un pourriel, vous pouvez le signaler et bloquer le numéro."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Touchez pour signaler que l\'appel N\'EST PAS UN POURRIEL, ou bloquez le numéro."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Cet appel nous semblait suspect. Le cas échéant, touchez N\'EST PAS UN POURRIEL pour signaler notre erreur."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquer et signaler"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ajouter le contact"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"N\'est pas un pourriel"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquer le numéro"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ajouter aux contacts"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquer le numéro et signaler le pourriel"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"N\'est pas un pourriel"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuser"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-fr/strings.xml b/java/com/android/incallui/spam/res/values-fr/strings.xml
new file mode 100644
index 0000000..8594f91
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-fr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Vous connaissez le propriétaire du <xliff:g id="NUMBER">%1$s</xliff:g> ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont-ils indésirables ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué et l\'appel a été signalé comme indésirable."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont signalés comme fiables."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Appuyez pour ajouter le numéro à vos contacts ou le bloquer s\'il s\'agit d\'un numéro indésirable."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"C\'est la première fois que vous recevez un appel de ce numéro. S\'il s\'agit d\'un appel indésirable, vous pouvez bloquer le numéro et signaler ce dernier."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Appuyez pour signaler ce numéro comme FIABLE ou pour le bloquer."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Selon nos informations, il pouvait s\'agir d\'un spammeur. Si l\'appel n\'était pas indésirable, appuyez sur FIABLE pour signaler notre erreur."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquer et signaler"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ajouter"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Fiable"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquer le numéro"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ajouter aux contacts"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquer et signaler comme indésirable"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Fiable"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuser"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-gl/strings.xml b/java/com/android/incallui/spam/res/values-gl/strings.xml
new file mode 100644
index 0000000..dfe31a7
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-gl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Coñeces o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"É spam o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Bloqueouse o <xliff:g id="NUMBER">%1$s</xliff:g> e informouse de que a chamada era spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Informouse de que a chamada do <xliff:g id="NUMBER">%1$s</xliff:g> non era spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca para engadir o número a contactos ou bloquéao se é spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"É a primeira vez que te chama este número. Se a chamada era spam, podes bloquear o número e marcalo como inadecuado."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca para informar de que NON É SPAM ou bloquéao."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospeitamos que se trata dun xerador de spam. Se esta chamada non era spam, toca NON É SPAM para informar do noso erro."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e informar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Engadir contacto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Non é spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Engadir a contactos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e informar de spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Non é spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rexeitar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-gu/strings.xml b/java/com/android/incallui/spam/res/values-gu/strings.xml
new file mode 100644
index 0000000..7e06837
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-gu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ને જાણો છો?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"શું <xliff:g id="NUMBER">%1$s</xliff:g> સ્પામ છે?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અવરોધિત કર્યો અને કૉલની સ્પામ તરીકે જાણ કરવામાં આવી."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ના કૉલની સ્પામ નથી તરીકે જાણ કરવામાં આવી."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"સંપર્કોમાં ઉમેરવા માટે ટૅપ કરો અથવા સ્પામ નંબરને અવરોધિત કરો."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"આ નંબરથી તમને પહેલી વાર કૉલ કરવામાં આવ્યો છે. જો આ કૉલ સ્પામ હોય, તો તમે આ નંબરને અવરોધિત કરી અને તેની જાણ કરી શકો છો."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"સ્પામ નથી તરીકે જાણ કરવા માટે ટૅપ કરો અથવા તેને અવરોધિત કરો."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"અમને આ સ્પામર હોવાની શંકા છે. જો આ કૉલ સ્પામ ન હોય, તો અમારી ભૂલની જાણ કરવા માટે સ્પામ નથી ટૅપ કરો."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"અવરોધિત અને જાણ કરો"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"સંપર્ક ઉમેરો"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"સ્પામ નથી"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"નંબર અવરોધિત કરો"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"સંપર્કોમાં ઉમેરો"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"અવરોધિત કરો અને સ્પામ તરીકે જાણ કરો"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"સ્પામ નથી"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"નકારો"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-hi/strings.xml b/java/com/android/incallui/spam/res/values-hi/strings.xml
new file mode 100644
index 0000000..4f030b1
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-hi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"क्या आप <xliff:g id="NUMBER">%1$s</xliff:g> से परिचित हैं?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"क्या <xliff:g id="NUMBER">%1$s</xliff:g> स्पैम है?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ब्लॉक कर दिया गया और कॉल को स्पैम के रूप में रिपोर्ट किया गया."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> से आए कॉल की स्पैम के रूप में रिपोर्ट नहीं की गई."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"संपर्कों में जोड़ने के लिए टैप करें या स्पैम नंबर ब्लॉक करें."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"इस नंबर से आपको पहली बार कॉल किया गया है. अगर यह कॉल स्पैम था, तो आप इस नंबर को ब्लॉक कर सकते हैं और उसकी रिपोर्ट कर सकते हैं."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्पैम नहीं के रूप में रिपोर्ट करने के लिए टैप करें या उसे ब्लॉक करें."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हमें इसके स्पैमर होने का शक था. अगर यह कॉल स्पैम नहीं था, तो हमारी गलती की रिपोर्ट करने के लिए स्पैम नहीं टैप करें."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ब्लॉक व रिपोर्ट करें"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"संपर्क जोड़ें"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्पैम नहीं"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नंबर ब्लॉक करें"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"संपर्क में जोड़ें"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"स्पैम को ब्लॉक करके उसकी रिपोर्ट करें"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्पैम नहीं"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"मना करें"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-hr/strings.xml b/java/com/android/incallui/spam/res/values-hr/strings.xml
new file mode 100644
index 0000000..278e786
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-hr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznajete li broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni broj?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> blokiran je, a poziv je prijavljen kao neželjeni."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> prijavljen je kao željeni."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite za dodavanje kontakata ili blokiranje neželjenih brojeva."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Prvi put ste primili poziv s tog broja. Ako je poziv bio neželjen, broj možete blokirati i prijaviti ga."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJENI ili ga blokirajte."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da je ovo neželjeni poziv. Ako ovaj poziv nije neželjeni, dodirnite NIJE NEŽELJENI da biste prijavili našu pogrešku."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiranje i prijava"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije neželjena pošta"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiranje i prijava neželjenog poziva"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije neželjena pošta"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-hu/strings.xml b/java/com/android/incallui/spam/res/values-hu/strings.xml
new file mode 100644
index 0000000..4a1490a
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-hu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ismeri a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Spam ez a szám: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Letiltotta a(z) <xliff:g id="NUMBER">%1$s</xliff:g> számot, és bejelentette a hívást spamként."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A(z) <xliff:g id="NUMBER">%1$s</xliff:g> számról érkező hívást bejelentette nem spamként."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Koppintson a névjegyekhez való hozzáadáshoz vagy a spamszám letiltásához."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ez az első alkalom, hogy erről a számról hívása érkezett. Ha a hívás spam, letilthatja és bejelentheti a számot."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Koppintson a nem spamként való bejelentéshez vagy a letiltáshoz."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Azt gyanítottuk, hogy ez egy spamszám. Ha a hívás nem spam volt, koppintson a NEM SPAM elemre a hiba bejelentéséhez."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Tiltás és bejelentés"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Névjegy hozzáadása"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nem spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Szám tiltása"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Hozzáadás a névjegyekhez"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Letiltás és spam bejelentése"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nem spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Elutasítás"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-hy/strings.xml b/java/com/android/incallui/spam/res/values-hy/strings.xml
new file mode 100644
index 0000000..4851021
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-hy/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը ծանո՞թ է"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը լցո՞ն է"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> համարն արգելափակվեց, և զանգը նշվեց որպես լցոն:"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից ստացված զանգը նշվեց որպես ոչ լցոն:"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Հպեք՝ կոնտակտներում ավելացնելու համար, կամ արգելափակեք լցոնային համարը:"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Այս համարից առաջին անգամ եք զանգ ստանում: Եթե այս զանգը լցոն էր, դուք կարող եք արգելափակել այս համարը և նշել այն որպես լցոն:"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ համարը որպես ոչ լցոն նշելու համար, կամ արգելափակեք այն:"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Կասկածներ կան, որ այս զանգը լցոնողից էր: Եթե այն լցոն չէր, ապա հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ սխալմունքի մասին մեզ հայտնելու համար:"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Արգելափակել և նշել լցոն"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ավելացնել կոնտակտ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Լցոն չէ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Արգելափակել համարը"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ավելացնել կոնտակտներում"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Արգելափակել և նշել որպես լցոն"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Լցոն չէ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Մերժել"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-in/strings.xml b/java/com/android/incallui/spam/res/values-in/strings.xml
new file mode 100644
index 0000000..a6d4876
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-in/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Tahu nomor <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Apakah nomor <xliff:g id="NUMBER">%1$s</xliff:g> termasuk spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> diblokir dan panggilan dilaporkan sebagai spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Panggilan dari <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap untuk menambahkan ke kontak atau memblokir nomor spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Nomor ini baru pertama kali menghubungi Anda. Jika panggilan termasuk spam, Anda dapat memblokir nomor ini dan melaporkannya."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap untuk melaporkan sebagai BUKAN SPAM, atau blokir."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kami menduga nomor ini berasal dari pelaku spam. Jika panggilan ini bukan spam, tap BUKAN SPAM untuk melaporkan kesalahan kami."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokir &amp; laporkan"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tambahkan kontak"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Bukan spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokir nomor"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Tambahkan ke kontak"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokir &amp; laporkan sebagai spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Bukan spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tolak"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-is/strings.xml b/java/com/android/incallui/spam/res/values-is/strings.xml
new file mode 100644
index 0000000..9fd1428
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-is/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Þekkirðu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Er <xliff:g id="NUMBER">%1$s</xliff:g> ruslnúmer?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> var sett á bannlista og símtalið tilkynnt."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Símtal frá <xliff:g id="NUMBER">%1$s</xliff:g> var ekki tilkynnt."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Ýttu til að bæta í tengiliði eða setja á bannlista."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Þetta er í fyrsta sinn sem hringt er í þig úr þessu númeri. Ef þetta símtal var úr ruslnúmeri geturðu sett það á bannlista og tilkynnt það."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Ýttu til að tilkynna sem EKKI RUSLNÚMER eða settu það á bannlista."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Okkur grunaði að þetta símtal væri úr ruslnúmeri. Ef það var ekki raunin skaltu ýta á EKKI RUSLNÚMER til að tilkynna okkur um þessi mistök."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Banna og tilkynna"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Bæta tengilið við"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ekki ruslnúmer"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Setja númer á bannlista"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Bæta við tengiliði"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Banna og tilkynna sem ruslnúmer"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ekki ruslnúmer"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Hafna"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-it/strings.xml b/java/com/android/incallui/spam/res/values-it/strings.xml
new file mode 100644
index 0000000..1d480c3
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-it/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Conosci <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> è spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> è stato bloccato e la chiamata è stata segnalata come spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"La chiamata da <xliff:g id="NUMBER">%1$s</xliff:g> è stata segnalata come non spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tocca per aggiungere ai contatti o per bloccare il numero come spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"È la prima volta che vieni chiamato da questo numero. Se la chiamata era spam, puoi bloccare il numero e segnalarlo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tocca per segnalare il numero come NON SPAM o per bloccarlo."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Avevamo il sospetto che si trattasse di uno spammer. Se la chiamata non era spam, tocca NON SPAM per segnalare l\'errore."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blocca e segnala"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Aggiungi contatto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Non spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blocca numero"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Aggiungi a contatti"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blocca e segnala spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Non spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rifiuta"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-iw/strings.xml b/java/com/android/incallui/spam/res/values-iw/strings.xml
new file mode 100644
index 0000000..4835114
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-iw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"האם <xliff:g id="NUMBER">%1$s</xliff:g> מוכר לך?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"האם <xliff:g id="NUMBER">%1$s</xliff:g> הוא ספאם?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> נחסם והשיחה דווחה כספאם."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"השיחה מ-<xliff:g id="NUMBER">%1$s</xliff:g> דווחה שהיא אינה ספאם."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ניתן להקיש כדי להוסיף את המספר לאנשי הקשר או לחסום אותו כספאם."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"זוהי הפעם הראשונה שמתקשרים אליך מהמספר הזה. אם השיחה הזו הייתה ספאם, באפשרותך לחסום את המספר הזה ולדווח עליו."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ניתן להקיש כדי לדווח שזהו לא ספאם או כדי לחסום את המספר."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"חשדנו שהשיחה הזו היא ספאם. אם היא לא ספאם, ניתן להקיש על \'לא ספאם\' כדי לדווח על הטעות שלנו."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"חסימה ודיווח"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"הוספת איש קשר"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"לא ספאם"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"חסימת המספר"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"הוספה לאנשי הקשר"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"חסימה ודיווח כספאם"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"לא ספאם"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"דחייה"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ja/strings.xml b/java/com/android/incallui/spam/res/values-ja/strings.xml
new file mode 100644
index 0000000..96555cb
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ja/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"発信者（<xliff:g id="NUMBER">%1$s</xliff:g>）をご存知ですか？"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"「<xliff:g id="NUMBER">%1$s</xliff:g>」は迷惑電話ですか？"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"「<xliff:g id="NUMBER">%1$s</xliff:g>」をブロックして、迷惑電話として報告しました。"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"「<xliff:g id="NUMBER">%1$s</xliff:g>」からの通話は迷惑電話ではないと報告しました。"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"タップして連絡先に追加するか、迷惑電話としてこの番号をブロックできます。"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"この番号からの通話を着信したのはこれが初めてです。迷惑電話だった場合は、この番号をブロックして報告してください。"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"タップして「迷惑電話ではない」と報告するか、この番号をブロックできます。"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"この通話は迷惑電話として検知されました。迷惑電話ではなかった場合は、[迷惑電話ではない] をタップして、誤検知であることを報告してください。"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ブロックして報告"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"連絡先に追加"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"迷惑電話ではない"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"番号をブロック"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"連絡先に追加"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ブロックして迷惑電話として報告"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"迷惑電話ではない"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒否"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ka/strings.xml b/java/com/android/incallui/spam/res/values-ka/strings.xml
new file mode 100644
index 0000000..39de5f6
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ka/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ნაცნობია?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> სპამია?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> დაიბლოკა და ზარი სპამად მოინიშნა."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>-დან ზარზე გაიგზავნა სპამის გაუქმების შეტყობინება."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"შეეხეთ კონტაქტებში დასამატებლად ან სპამის ნომრის დასაბლოკად."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ამ ნომრიდან პირველად დაგირეკეს. თუ ეს ზარი სპამი იყო, შეგიძლიათ დაბლოკოთ ეს ნომერი და შეგვატყობინოთ."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"შეეხეთ, რათა გვაცნობოთ, რომ „სპამი არ არის“, ან დაბლოკოთ."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ვვარაუდობთ, რომ ეს სპამია. თუ ეს ზარი სპამი არ არის, შეეხეთ „სპამი არ არის“, რათა შეგვატყობინოთ ჩვენი შეცდომის შესახებ."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"დაბლოკვა და შეტყობ."</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"კონტაქტის დამატება"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"არ არის სპამი"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ნომრის დაბლოკვა"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"კონტაქტებში დამატება"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"დაბლოკვა და სპამის შესახებ შეტყობინება"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"არ არის სპამი"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"უარყოფა"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-kk/strings.xml b/java/com/android/incallui/spam/res/values-kk/strings.xml
new file mode 100644
index 0000000..981ab0a
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-kk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> таныс па?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам ба?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеліп, \"спам\" деп белгіленді."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> қоңырауы \"спам емес\" деп белгіленді."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Контактілерге қосу немесе спам нөмірді бөгеу үшін түртіңіз."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Бұл нөмір сізге алғаш рет қоңырау шалып тұр. Егер қоңырау спам болса, нөмірді бөгеп, \"спам\" деп белгілеуге болады."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\"СПАМ ЕМЕС \"деп белгілеу үшін түртіңіз немесе бөгеңіз."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бұл қоңырау спам сияқты. Спам болмаса, \"СПАМ ЕМЕС\" деп белгілеп, қателікті түзетіңіз."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Бөгеу және хабарлау"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Контакт қосу"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам емес"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Нөмірді бөгеу"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Контактілерге қосу"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Бөгеу және спам туралы хабарлау"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам емес"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Қабылдамау"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-km/strings.xml b/java/com/android/incallui/spam/res/values-km/strings.xml
new file mode 100644
index 0000000..baf9ffc
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-km/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"ស្គាល់ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"តើ <xliff:g id="NUMBER">%1$s</xliff:g> ជា​ការហៅ​​ឥត​បាន​ការមែនទេ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"បាន​បិទ <xliff:g id="NUMBER">%1$s</xliff:g> និង​បាន​រាយការណ៍​ការ​ហៅ​ថា​ជា​​ការហៅ​ឥត​បានការ។"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ការ​ហៅ​ពី <xliff:g id="NUMBER">%1$s</xliff:g> ត្រូវបាន​រាយការណ៍​ថា​ មិន​មែន​ជា​ការហៅ​​ឥត​បានការ។"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ចុច ​ដើម្បី​បញ្ចូល​​ទំនាក់ទំនង ឬ​​បិទលេខ​ដែល​​ឥត​បាន​​ការ។"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"នេះ​គឺ​ជា​លើក​ដំបូង​ហើយ​ដែល​លេខ​នេះ​បាន​ហៅ​មក​អ្នក។ បើ​ការ​ហៅ​នេះ​ជា​ការហៅ​​ឥត​បានការ អ្នក​អាច​ទប់ស្កាត់​លេខ​​នេះ និង​រាយការណ៍​បញ្ហា​នេះ។"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ចុច ដើម្បី​រាយការណ៍​​ថា មិន​មែន​ជា​ការហៅ​ឥត​បានការ ឬ​ទប់ស្កាត់​វា។"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"យើង​សង្ស័យ​​ថា​វា​​ជា​​ការហៅ​ឥត​បាន​ការ។ បើ​ការ​ហៅ​នេះ​មិន​មែន​ជា​ការហៅ​ឥត​បានការទេ សូម​ចុច​មិន​មែន​ជាការហៅ​​ឥត​បានការ ​ដើម្បី​រាយការណ៍​​បញ្ហា​របស់​យើង។"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ទប់ស្កាត់និងរាយការណ៍"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"បញ្ចូល​​ទំនាក់ទំនង"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"មិនមែន​ជា​ការហៅ​​ឥតបានការ​ទេ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"បិទលេខ"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"បញ្ចូល​ទៅ​ក្នុង​ទំនាក់ទំនង"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ទប់ស្កាត់ និងរាយការណ៍​ការហៅ​ឥត​បានការ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"មិនមែន​ជា​ការហៅ​​ឥតបានការ​ទេ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"បដិសេធ"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-kn/strings.xml b/java/com/android/incallui/spam/res/values-kn/strings.xml
new file mode 100644
index 0000000..b7d9d32
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-kn/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ತಿಳಿದಿದೆಯೇ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> ಸ್ಪ್ಯಾಮ್ ಆಗಿದೆಯೇ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಮತ್ತು ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿಂದ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿಮಾಡಲಾಗಿದೆ."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಲು ಅಥವಾ ಸ್ಪ್ಯಾಮ್ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ಇದೇ ಮೊದಲ ಬಾರಿಗೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ನಿಮಗೆ ಕರೆ ಮಾಡಲಾಗಿದೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಎನಿಸಿದರೆ, ನೀವು ಈ ಕರೆಯನ್ನು ನಿರ್ಬಂಧಿಸಬಹುದು ಮತ್ತು ವರದಿ ಮಾಡಿ."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಇದನ್ನು ನಿರ್ಬಂಧಿಸಿ."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ನಾವು ಈ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮರ್‌ ಎಂದು ಶಂಕಿಸಿದ್ದೇವೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ಭಾವಿಸಿದರೆ, ನಮ್ಮ ತಪ್ಪಾದ ವರದಿಗೆ NOT SPAM ಎಂದು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ವರದಿ ಮಾಡಿ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ವರದಿ ಮಾಡಿ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ನಿರಾಕರಿಸಿ"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ko/strings.xml b/java/com/android/incallui/spam/res/values-ko/strings.xml
new file mode 100644
index 0000000..db6c6d1
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ko/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>번은 알고 있는 전화번호인가요?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g>번이 스팸인가요?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단하고 스팸으로 신고했습니다."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 걸려온 전화는 스팸이 아닌 것으로 신고했습니다."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"탭하여 연락처에 추가하거나 스팸 전화번호를 차단합니다."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"이 번호에서 처음으로 걸려온 전화입니다. 이 전화가 스팸이라면 이 전화번호를 차단하고 신고할 수 있습니다."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"탭하여 스팸이 아닌 것으로 신고하거나 차단합니다."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"스팸 발송자로 의심됩니다. 이 전화가 스팸이 아니었다면 \'스팸 아님\'을 탭하여 실수였음을 신고합니다."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"차단 및 신고"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"연락처 추가"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"스팸 아님"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"번호 차단"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"연락처에 추가"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"스팸 차단 및 신고"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"스팸 아님"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"거부"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ky/strings.xml b/java/com/android/incallui/spam/res/values-ky/strings.xml
new file mode 100644
index 0000000..1460e0b
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ky/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> билесизби?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спамбы?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлдү жана бул чалуу спам деп кабарланды."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> номеринен келген чалуу спам эмес деп кабарланды."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Номерди байланыштарга кошуу үчүн таптап коюңуз же спам деп бөгөттөңүз"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Бул номер сизге биринчи жолу чалып жатат. Ал спам болсо, номерди бөгөттөп, ал жөнүндө кабарлап койсоңуз болот."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"СПАМ ЭМЕС деп кабарлоо үчүн таптап коюңуз же аны бөгөттөңүз."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бул спам окшойт. Эгер спам эмес десеңиз, СПАМ ЭМЕС дегенди басып, бизге кабарлап коюңуз."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Бөгөттөө жана кабарлоо"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Байланыш кошуу"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам эмес"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Номерди бөгөттөө"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Байланыштарга кошуу"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Бөгөттөө жана спам тууралуу кабарлоо"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам эмес"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Баш тартуу"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-lo/strings.xml b/java/com/android/incallui/spam/res/values-lo/strings.xml
new file mode 100644
index 0000000..34b2c21
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-lo/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"ຮູ້ຈັກ <xliff:g id="NUMBER">%1$s</xliff:g> ບໍ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> ແມ່ນສະແປມບໍ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"ບລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ແລະ ລາຍງານການໂທວ່າເປັນສະແປມແລ້ວ."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ໝາຍການໂທຈາກ <xliff:g id="NUMBER">%1$s</xliff:g> ວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ແຕະເພື່ອເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່ ຫຼື ບລັອກເບີໂທສະແປມ."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ນີ້ເປັນເທື່ອທຳອິດທີ່ເບີນີ້ໂທຫາທ່ານ. ຫາກນີ້ເປັນການໂທສະແປມ, ທ່ານສາມາດບລັອກເບີນີ້ ແລະ ລາຍງານມັນໄດ້."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ແຕະເພື່ອລາຍງານວ່າບໍ່ແມ່ນສະແປມ ຫຼື ບລັອກມັນ."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ພວກເຮົາສົງໄສວ່ານີ້ເປັນສະແປມ. ຫາກມັນບໍ່ແມ່ນສະແປມ, ໃຫ້ແຕະໃສ່ ບໍ່ແມ່ນສະແປມ ເພື່ອລາຍງານຄວາມຜິດພາດຂອງພວກເຮົາ."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ບລັອກ ແລະ ລາຍງານ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ເພີ່ມລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ບໍ່ແມ່ນສະແປມ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ບລັອກເບີໂທ"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ເພີ່ມໃສ່ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ບລັອກ ແລະ ລາຍງານສະແປມ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ບໍ່ແມ່ນສະແປມ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ປະຕິເສດ"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-lt/strings.xml b/java/com/android/incallui/spam/res/values-lt/strings.xml
new file mode 100644
index 0000000..317e930
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-lt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Pažįstate numerį <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Ar numeris <xliff:g id="NUMBER">%1$s</xliff:g> yra šlamšto siuntėjas?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numeris <xliff:g id="NUMBER">%1$s</xliff:g> užblokuotas ir apie skambutį buvo pranešta kaip apie šlamštą."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Apie skambutį iš numerio <xliff:g id="NUMBER">%1$s</xliff:g> buvo pranešta kaip ne apie šlamštą."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Palieskite, kad pridėtumėte prie kontaktų arba blokuotumėte numerį kaip šlamšto siuntėją."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Tai pirmas kartas, kai jums buvo skambinama iš šio numerio. Jei šis skambutis buvo šlamštas, galite užblokuoti šį numerį ir apie jį pranešti."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Palieskite, kad praneštumėte kaip apie NE ŠLAMŠTĄ arba užblokuotumėte."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Įtarėme, kad tai yra šlamšto siuntėjas. Jei šis skambutis nebuvo šlamštas, palieskite NE ŠLAMŠTAS, kad praneštumėte apie mūsų klaidą."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokuoti ir pranešti"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pridėti kontaktą"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ne šlamštas"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokuoti numerį"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pridėti prie kontaktų"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokuoti ir pranešti apie šlamštą"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ne šlamštas"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Atmesti"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-lv/strings.xml b/java/com/android/incallui/spam/res/values-lv/strings.xml
new file mode 100644
index 0000000..92b0a71
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-lv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Vai saglabāt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Vai numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir nevēlams?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir bloķēts, un zvans tika atzīmēts kā nevēlams."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Zvans no numura <xliff:g id="NUMBER">%1$s</xliff:g> netika atzīmēts kā nevēlams."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Pieskarieties, lai numuru pievienotu kontaktpersonām vai bloķētu nevēlamu numuru."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Šis jums ir pirmais zvans no šī numura. Ja šis zvans bija nevēlams, varat bloķēt šo numuru un ziņot par to."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Pieskarieties, lai atzīmētu, ka tas NAV NEVĒLAMS NUMURS, vai lai bloķētu numuru."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Šķiet, ka šis bija nevēlams zvanītājs. Ja šis zvans nebija nevēlams, pieskarieties vienumam “NAV NEVĒLAMS NUMURS”, lai ziņotu mums par kļūdu."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloķēt un ziņot"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pievienot kontaktp."</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nav nevēlams numurs"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloķēt numuru"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pievienot kontaktpersonām"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloķēt numuru un ziņot par to"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nav nevēlams zvans"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Noraidīt"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-mk/strings.xml b/java/com/android/incallui/spam/res/values-mk/strings.xml
new file mode 100644
index 0000000..590b589
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-mk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Го знаете <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Дали <xliff:g id="NUMBER">%1$s</xliff:g> е спам?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> е блокиран и повикот е пријавен како спам."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Повикот од <xliff:g id="NUMBER">%1$s</xliff:g> е пријавен дека не е спам."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Допрете за додавање контакти или блокирање спам број."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"За првпат добивте повик од бројов. Ако повикот е спам, бројот може да го блокирате и да го пријавите."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Допрете за да пријавите дека НЕ Е СПАМ или за да го блокирате."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Се сомневавме дека повиков е спам. Ако не е, допрете НЕ Е СПАМ за да ја пријавите нашата грешка."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокирај и пријави"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додај контакт"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не е спам"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокирај го бројот"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додај во контакти"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокирај и пријави спам"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не е спам"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Одбиј"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ml/strings.xml b/java/com/android/incallui/spam/res/values-ml/strings.xml
new file mode 100644
index 0000000..31b11ad
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ml/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> അറിയാമോ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> സ്‌പാം ആണോ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്‌ത്, കോൾ സ്‌പാം ആയി റിപ്പോർട്ടുചെയ്‌തു."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> എന്ന നമ്പറിൽ നിന്നുള്ള കോളിനെ സ്‌പാം അല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കാനോ സ്‌പാം നമ്പർ ബ്ലോക്കുചെയ്യാനോ ടാപ്പുചെയ്യുക."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ഈ നമ്പറിൽ നിന്ന് ആദ്യമായാണ് നിങ്ങൾക്ക് കോൾ വരുന്നത്. ഈ കോൾ സ്‌പാം ആയിരുന്നെങ്കിൽ, ഈ നമ്പർ ബ്ലോക്കുചെയ്‌ത് റിപ്പോർട്ടുചെയ്യാനാകും."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"സ്‌പാം അല്ല എന്ന് റിപ്പോർട്ടുചെയ്യാൻ ടാപ്പുചെയ്യുക, അല്ലെങ്കിൽ അത് ബ്ലോക്കുചെയ്യുക."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ഇത് ഒരു സ്‌പാമർ ആണെന്ന് ഞങ്ങൾക്ക് സംശയമുണ്ടായിരുന്നു. ഈ കോൾ ഒരു സ്‌പാം ആയിരുന്നില്ലെങ്കിൽ, ഞങ്ങളുടെ തെറ്റ് റിപ്പോർട്ടുചെയ്യാൻ സ്‌പാം അല്ല എന്നതിൽ ടാപ്പുചെയ്യുക."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ബ്ലോക്കുചെയ്‌ത്, റിപ്പോർട്ടുചെയ്യുക"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"സ്പാം അല്ല"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"കോൺടാക്‌റ്റുകളിൽ ചേർക്കുക"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ബ്ലോക്കുചെയ്‌ത്, സ്‌പാമെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"സ്പാം അല്ല"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"നിരസിക്കുക"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-mn/strings.xml b/java/com/android/incallui/spam/res/values-mn/strings.xml
new file mode 100644
index 0000000..93510ab
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-mn/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>-г мэдэх үү?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам уу?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g>-г хориглож, дуудлагыг спам гэж мэдээлсэн."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>-с ирсэн дуудлагыг спам гэж мэдээлсэн."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Харилцагчдад нэмэх буюу спам дугаарыг хориглох бол товшино уу."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Энэ дугаараас танд анх удаа дуудлага ирсэн. Хэрэв энэ дуудлага спам бол та энэ дугаарыг хориглож, спамаар мэдээлэх боломжтой."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"СПАМ БИШ гэж мэдээлэх буюу хориглох бол товшино уу."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бид энийг спам гэж сэжиглэж байна. Хэрэв спам байгаагүй бол СПАМ БИШ гэснийг товшиж бидний алдааг мэдээлнэ үү."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Хориглож, мэдээлэх"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Харилцагч нэмэх"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам биш"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Дугаар хориглох"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Харилцагчдад нэмэх"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Хориглож, спам гэж мэдээлэх"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам биш"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Татгалзах"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-mr/strings.xml b/java/com/android/incallui/spam/res/values-mr/strings.xml
new file mode 100644
index 0000000..8df30c0
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-mr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> माहीत आहे का?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> स्पॅम आहे का?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ब्लॉक केला आणि कॉल स्पॅम असल्याचे कळवले."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> वरील कॉल स्पॅम नसल्याचे कळवले."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"संपर्कांमध्ये जोडण्यासाठी किंवा स्पॅम नंबर ब्लॉक करण्यासाठी टॅप करा."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"तुम्हाला पहिल्यांदाच या नंबरवरून कॉल आला होता. हा कॉल स्पॅम असल्यास, तुम्ही हा नंबर ब्लॉक करू शकता आणि आणि तसे कळवू शकता."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्पॅम नसल्याचे कळवण्यासाठी किंवा तो ब्लॉक करण्यासाठी टॅप करा."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हा स्पॅमर असल्याचा आम्हाला संशय होता. हा कॉल स्पॅम नसल्यास, आम्ही चुकले असल्याचे कळवण्यासाठी स्पॅम नाही वर टॅप करा."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ब्लॉक करा आणि अहवाल द्या"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"संपर्क जोडा"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्पॅम नाही"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नंबर ब्लॉक करा"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"संपर्कांमध्ये जोडा"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ब्लॉक करा आणि स्पॅमचा असल्याचे कळवा"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्पॅम नाही"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"नकार द्या"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ms/strings.xml b/java/com/android/incallui/spam/res/values-ms/strings.xml
new file mode 100644
index 0000000..c42002a
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ms/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Anda mengenali <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Adakah <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> disekat dan panggilan telah dilaporkan sebagai spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Panggilan daripada <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Ketik untuk menambahkan nombor pada kenalan atau sekat nombor spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ini merupakan kali pertama nombor ini memanggil anda. Jika panggilan ini spam, anda boleh menyekat nombor ini dan melaporkannya."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Ketik untuk melaporkan sebagai BUKAN SPAM atau sekat nombor."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kami mengesyaki panggilan ini adalah spam. Jika panggilan ini bukan spam, ketik BUKAN SPAM untuk melaporkan kesilapan kami."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Sekat &amp; lapor"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tambah kenalan"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Bukan spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Sekat nombor"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Tambahkan pada kenalan"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Sekat &amp; laporkan spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Bukan spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tolak"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-my/strings.xml b/java/com/android/incallui/spam/res/values-my/strings.xml
new file mode 100644
index 0000000..b79abd6
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-my/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို သိပါသလား။"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> က စပမ်းလား။"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ပိတ်ဆို့လိုက်ပြီး ခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပြီးပါပြီ။"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ထံမှ ခေါ်ဆိုမှုကို စပမ်းမဟုတ်ကြောင်း သတင်းပို့ပြီးပါပြီ။"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"အဆက်အသွယ်များသို့ ထည့်ရန် (သို့) စပမ်းနံပါတ်ကို ပိတ်ဆို့ရန် နှိပ်ပါ"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ဤနံပါတ်သည် သင့်ထံသို့ ပထမဆုံးခေါ်ဖူးခြင်းဖြစ်သည်။ ဤခေါ်ဆိုမှုသည် စပမ်းဖြစ်ပါက ဤနံပါတ်ကို ပိတ်ဆို့၍ သတင်းပို့နိုင်ပါသည်။"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"စပမ်းမဟုတ်ကြောင်း သတင်းပို့ရန် နှိပ်ပါ (သို့) ၎င်းကို ပိတ်ဆို့ပါ။"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ဤသည်ကို စပမ်မာဟု ကျွန်ုပ်တို့ သံသယရှိပါသည်။ ဤခေါ်ဆိုမှုသည် စပမ်းမဟုတ်ပါက ကျွန်ုပ်တို့၏မှားယွင်းမှုကို သတင်းပို့ရန် \"စပမ်းမဟုတ်ပါ\" ကို နှိပ်ပါ။"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"အဆက်အသွယ်ထည့်ရန်"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"စပမ်း မဟုတ်ပါ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"နံပါတ်ကို ပိတ်ဆို့ရန်"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"အဆက်အသွယ်များထဲသို့ ထည့်ရန်"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"စပမ်းကို ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"စပမ်း မဟုတ်ပါ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ငြင်းပယ်ရန်"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-nb/strings.xml b/java/com/android/incallui/spam/res/values-nb/strings.xml
new file mode 100644
index 0000000..b8d6a84
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-nb/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkér og rapportér"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Legg til kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke useriøs"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkér nummeret"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Legg til i kontakter"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkér og rapportér som useriøst"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke useriøs"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avslå"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ne/strings.xml b/java/com/android/incallui/spam/res/values-ne/strings.xml
new file mode 100644
index 0000000..24b9574
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ne/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> लाई चिन्नुहुन्छ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> स्प्याम हो?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> माथि रोक लगाइयो र कललाई स्प्याम भनी रिपोर्ट गरियो।"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> बाट आएको कललाई स्प्याम होइन भनी रिपोर्ट गरियो।"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"सम्पर्कहरूमा थप्न वा स्प्याम नम्बरमाथि रोक लगाउन ट्याप गर्नुहोस्।"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"यस नम्बरबाट तपाईंलाई कल आएको यो पहिलोपटक हो। यो कल स्प्याम हो भने तपाईं यो नम्बरमाथि रोक लगाउन र यसबारे रिपोर्ट गर्न सक्नुहुन्छ।"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्प्याम होइन भनी रिपोर्ट गर्न वा यसमाथि रोक लगाउन ट्याप गर्नुहोस्।"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हामीलाई यो कल गर्ने व्यक्ति एक स्प्यामर हो भन्ने आशङ्का लाग्यो। यो कल स्प्याम थिएन भने हाम्रो गल्तीको रिपोर्ट गर्न स्प्याम होइनमा ट्याप गर्नुहोस्।"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"रोक लगाउनुहोस्‌ र रिपोर्ट गर्नुहोस्‌"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"सम्पर्क थप्नुहोस्"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्प्याम होइन"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नम्बरमाथि रोक लगाउनुहोस्"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"सम्पर्कहरूमा थप्नुहोस्‌"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"रोक लगाउनुहोस्‌ र स्प्याम भनी रिपोर्ट गर्नुहोस्‌"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्प्याम होइन"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"अस्वीकार गर्नुहोस्"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-nl/strings.xml b/java/com/android/incallui/spam/res/values-nl/strings.xml
new file mode 100644
index 0000000..4b1f842
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-nl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ken je <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeerd en de oproep wordt gemeld als spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"De oproep van <xliff:g id="NUMBER">%1$s</xliff:g> wordt niet gemeld als spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tik om contacten toe te voegen of om dit spamnummer te blokkeren."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dit is de eerste keer dat je bent gebeld door dit nummer. Als deze oproep spam is, kun je dit nummer blokkeren en melden."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tik om te melden als GEEN SPAM of om te blokkeren."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We hebben dit nummer aangemerkt als spam. Als deze oproep geen spam was, tik je op GEEN SPAM om onze fout te melden."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkeren en melden"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Contact toevoegen"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Geen spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nummer blokkeren"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Toevoegen aan contacten"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkeren en spam melden"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Geen spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Weigeren"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-no/strings.xml b/java/com/android/incallui/spam/res/values-no/strings.xml
new file mode 100644
index 0000000..b8d6a84
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-no/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkér og rapportér"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Legg til kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke useriøs"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkér nummeret"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Legg til i kontakter"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkér og rapportér som useriøst"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke useriøs"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avslå"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-pa/strings.xml b/java/com/android/incallui/spam/res/values-pa/strings.xml
new file mode 100644
index 0000000..b375d86
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-pa/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਜਾਣਦੇ ਹੋ?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਸਪੈਮ ਹੈ?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਅਤੇ ਕਾਲ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ਤੋਂ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਸਪੈਮ ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ਇਸ ਨੰਬਰ ਤੋਂ ਤੁਹਾਨੂੰ ਪਹਿਲੀ ਵਾਰ ਤੁਹਾਨੂੰ ਕਾਲ ਆਈ ਹੈ, ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਸੀ, ਤਾਂ ਤੁਸੀਂ ਇਹ ਨੰਬਰ ਬਲੌਕ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰਨ ਲਈ, ਜਾਂ ਇਸ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ਸਾਨੂੰ ਇਹ ਕਾਲ ਸਪੈਮਰ ਲੱਗ ਰਹੀ ਸੀ। ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਸੀ, ਤਾਂ ਸਾਡੀ ਗਲਤੀ ਦੀ ਰਿਪੋਰਟ ਕਰਨ ਲਈ ਸਪੈਮ ਨਹੀਂ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ਬਲੌਕ ਕਰੋ ਅਤੇ ਰਿਪੋਰਟ ਕਰੋ"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ਸਪੈਮ ਨਹੀਂ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ਨੰਬਰ ਬਲੌਕ ਕਰੋ"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ਸਪੈਮ ਨੂੰ ਬਲੌਕ ਕਰੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ਸਪੈਮ ਨਹੀਂ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-pl/strings.xml b/java/com/android/incallui/spam/res/values-pl/strings.xml
new file mode 100644
index 0000000..72d4ed0
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-pl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Znasz numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Czy połączenie z numeru <xliff:g id="NUMBER">%1$s</xliff:g> to spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> został zablokowany, a połączenie zgłoszone jako spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Połączenie z numeru <xliff:g id="NUMBER">%1$s</xliff:g> zostało zgłoszone jako niebędące spamem."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Kliknij, aby dodać do kontaktów lub zablokować jako spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"To pierwsze połączenie z tego numeru. Jeśli to spam, możesz zablokować ten numer i zgłosić go."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Kliknij, aby zgłosić to połączenie jako NIEBĘDĄCE SPAMEM lub zablokować je."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Podejrzewamy, że to spam. Jeśli to połączenie nie było spamem, kliknij TO NIE SPAM, aby zgłosić naszą pomyłkę."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Zablokuj i zgłoś"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"To nie spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zablokuj numer"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj do kontaktów"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zablokuj i zgłoś spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"To nie spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odrzuć"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml b/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..1b119d8
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para informar que NÃO É SPAM ou bloquear."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contato"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contatos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml b/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..e7d9153
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Conhece <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é considerado spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado e a chamada foi denunciada como spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada de <xliff:g id="NUMBER">%1$s</xliff:g> não é considerada spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contactos ou bloquear um número considerado spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"É a primeira vez que este número lhe liga. Se esta chamada foi considerada spam, pode bloquear o número e denunciá-lo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para denunciar como NÃO É SPAM ou para bloquear."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um spammer. Se esta chamada não foi considerada spam, toque em NÃO É SPAM para denunciar o nosso erro."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contacto"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contactos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar como spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-pt/strings.xml b/java/com/android/incallui/spam/res/values-pt/strings.xml
new file mode 100644
index 0000000..1b119d8
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-pt/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para informar que NÃO É SPAM ou bloquear."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contato"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contatos"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ro/strings.xml b/java/com/android/incallui/spam/res/values-ro/strings.xml
new file mode 100644
index 0000000..fa1a0d1
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ro/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Cunoașteți numărul <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Este numărul <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> a fost blocat și apelul a fost raportat ca spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Apelul primit de la <xliff:g id="NUMBER">%1$s</xliff:g> a fost raportat ca nefiind spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Atingeți pentru a adăuga numărul în agendă sau pentru a-l raporta ca spam și a-l bloca."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Aceasta este prima dată când ați primit apel de la acest număr. Dacă apelul a fost spam, puteți să blocați numărul și să îl raportați."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Atingeți pentru a raporta ca NU ESTE SPAM sau blocați-l."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Am suspectat acest număr ca fiind autor de spam. Dacă apelul nu a fost spam, atingeți NU ESTE SPAM pentru a raporta greșeala noastră."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blocați și raportați"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adăugați o persoană"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nu este spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blocați numărul"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adăugați în agendă"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blocați și raportați spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nu este spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuzați"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ru/strings.xml b/java/com/android/incallui/spam/res/values-ru/strings.xml
new file mode 100644
index 0000000..beeaf6d
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ru/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Вы знаете, кому принадлежит номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> использовался для распространения спама?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблокирован. Вы сообщили, что вызов использовался для распространения спама."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Вы сообщили, что вызов с номера <xliff:g id="NUMBER">%1$s</xliff:g> не использовался для распространения спама"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Нажмите, чтобы добавить номер в контакты или заблокировать его за распространение спама."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Это был первый вызов с указанного номера. Если он использовался для распространения спама, вы можете сообщить об этом и заблокировать этот номер."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Нажмите, чтобы сообщить, что это был НЕ СПАМ, или заблокируйте номер."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Мы подозреваем, что этот вызов использовался для распространения спама. Если это не так, нажмите НЕ СПАМ, чтобы сообщить нам об ошибке."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокировать/сообщить"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Добавить в контакты"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблокировать номер"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Добавить в контакты"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Заблокировать и сообщить о спаме"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Отклонить"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-si/strings.xml b/java/com/android/incallui/spam/res/values-si/strings.xml
new file mode 100644
index 0000000..df7eb3c
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-si/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> දන්නවද?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකය අයාචිතද?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර කර ඇමතුම අයාචිත ලෙස ලකුණු කර ඇත."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකයෙන් ඇමතුම අයාචිත නැති ලෙස වාර්තා කරන ලදී."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"සම්බන්ධතාවලට එක් කිරීමට හෝ අයාචිත අංක අවහිර කිරීමට තට්ටු කරන්න."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"මෙම අංකය ඔබට අමතන ලද පළමු අවස්ථාව මෙයයි. මෙම ඇමතුම අයාචිත නම්, ඔබට මෙම අංකය අවහිර කර ඒ පිළිබඳ පැමිණිලි කළ හැකිය."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"එය අයාචිත නැති ලෙස වාර්තා කිරීමට හෝ අවහිර කිරීමට තට්ටු කරන්න."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"අපි මෙය අයාචිත තැපැල් යවන්නකු බවට සැක කළෙමු. මෙම ඇමතුම අයාචිත නොවුනේ නම්, අපේ අත්වැරැද්ද වාර්තා කිරීමට අයාචිත නැති ලෙස තට්ටු කරන්න."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"අවහිර කර වාර්තා කර."</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"සම්බන්ධතාව එක් කරන්න"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"අයාචිත තැපෑලක් නොවේ"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"අංකය අවහිර කරන්න"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"සම්බන්ධතාවලට එක් කරන්න"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"අයාචිත තැපැල් අවහිර කර වාර්තා කරන්න"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"අයාචිත තැපෑලක් නොවේ"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ප්‍රතික්ෂේප කරන්න"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sk/strings.xml b/java/com/android/incallui/spam/res/values-sk/strings.xml
new file mode 100644
index 0000000..7334171
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bolo zablokované a hovor bol nahlásený ako spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> bol nahlásený, že nie je spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klepnutím pridáte číslo medzi kontakty alebo zablokujte ako spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Toto bol prvý hovor z tohto čísla. Ak bol tento hovor spam, môžete toto číslo zablokovať a nahlásiť ho."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Klepnutím môžete nahlásiť, že číslo NIE JE SPAM, alebo ho môžete zablokovať."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Mali sme podozrenie, že ide o šíriteľa spamu. Ak hovor nebol spam, klepnite na možnosť NIE JE SPAM a nahláste náš omyl."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokovať a nahlásiť"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pridať kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nie je spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokovať číslo"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pridať medzi kontakty"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokovať a nahlásiť spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nie je spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odmietnuť"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sl/strings.xml b/java/com/android/incallui/spam/res/values-sl/strings.xml
new file mode 100644
index 0000000..a37ab4c
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznate številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Ali je klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> neželen?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Številka <xliff:g id="NUMBER">%1$s</xliff:g> je blokirana, klic pa je bil prijavljen kot neželen."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> ni več prijavljen kot neželen."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dotaknite se, da dodate med stike ali blokirate neželeno številko."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Klic s te številke ste prejeli prvič. Če je bil ta klic neželen, lahko blokirate številko in jo prijavite."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dotaknite se, da klic prijavite kot »NI NEŽELENI KLIC« ali ga blokirate."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Predvidevali smo, da je to neželeni klic. Če klic ni bil neželen, se dotaknite možnosti »NI NEŽELENI KLIC«, da prijavite našo napako."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj in prijavi"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj stik"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ni neželeni klic"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj številko"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj med stike"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj in prijavi neželeni klic"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ni neželeni klic"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Zavrni"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sq/strings.xml b/java/com/android/incallui/spam/res/values-sq/strings.xml
new file mode 100644
index 0000000..ace4be4
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sq/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"E njeh <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"A është <xliff:g id="NUMBER">%1$s</xliff:g> i padëshiruar?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> u bllokua dhe telefonata u raportua si e padëshiruar."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Telefonata nga <xliff:g id="NUMBER">%1$s</xliff:g> u raportua si e padëshiruar."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trokit për ta shtuar te kontaktet ose për të bllokuar numrin e padëshiruar."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Kjo është hera e parë që ky numër ka telefonuar. Nëse telefonata ishte e padëshiruar, mund ta bllokosh këtë numër dhe ta raportosh."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trokit për ta raportuar si JO E PADËSHIRUAR ose ta bllokosh."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Dyshojmë se është e padëshiruar. Nëse telefonata nuk është e padëshiruar, trokit JO E PADËSHIRUAR për të raportuar gabimin tonë."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blloko dhe raporto"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Shto një kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nuk është postë e bezdisshme"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blloko numrin"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Shto te kontaktet"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blloko dhe raporto si e padëshiruar"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nuk është postë e bezdisshme"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuzo"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sr/strings.xml b/java/com/android/incallui/spam/res/values-sr/strings.xml
new file mode 100644
index 0000000..bd81b3c
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Познат вам је број <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Да ли је <xliff:g id="NUMBER">%1$s</xliff:g> непожељан?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Блокирали сте <xliff:g id="NUMBER">%1$s</xliff:g>, а позив сте пријавили као непожељан."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Пријавили сте да позив са <xliff:g id="NUMBER">%1$s</xliff:g> није непожељан."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Додирните да бисте додали контакте или блокирали непожељан број."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Први пут сте примили позив са овог броја. Ако је непожељан, можете да га блокирате и пријавите."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Додирните да бисте пријавили да позив НИЈЕ НЕПОЖЕЉАН или блокирајте број."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Сумњамо да је овај позив непожељан. Ако није, додирните НИЈЕ НЕПОЖЕЉАН да бисте пријавили грешку."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокирај и пријави"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додај контакт"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Није непожељан"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокирај број"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додај у контакте"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокирај и пријави непожељан позив"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Није непожељан"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Одбиј"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sv/strings.xml b/java/com/android/incallui/spam/res/values-sv/strings.xml
new file mode 100644
index 0000000..6a06a46
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sv/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Känner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Är <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blockerat och samtalet rapporterat som spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Samtal från <xliff:g id="NUMBER">%1$s</xliff:g> rapporterat som spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tryck för att lägga till kontakter eller blockera spamnummer."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Det här var första gången det här numret ringde dig. Om det var spam går det att blockera numret och rapportera det."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tryck för att rapportera som INTE SPAM eller blockera det."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi misstänkte att det är en spammare. Om det här samtalet inte var spam, tryck på INTE SPAM för att rapportera misstaget."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blockera, rapportera"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lägg till kontakt"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Inte spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blockera nummer"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lägg till i Kontakter"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blockera och rapportera spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Inte spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avvisa"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-sw/strings.xml b/java/com/android/incallui/spam/res/values-sw/strings.xml
new file mode 100644
index 0000000..bc2fdc5
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-sw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Je, unaitambua <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Je, <xliff:g id="NUMBER">%1$s</xliff:g> ni taka?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> imezuiwa na simu ikaripotiwa kuwa taka."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Simu kutoka <xliff:g id="NUMBER">%1$s</xliff:g> imeripotiwa kuwa si taka."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Gonga ili uongeze kwenye anwani au uzuie nambari taka."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Hii ndiyo mara ya kwanza nambari hii imekupigia. Ikiwa ilikuwa simu taka, unaweza kuzuia nambari hii na uiripoti."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Gonga ili uripoti kuwa SI TAKA, au kuizuia."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Tunashuku kwamba simu hii ni taka. Ikiwa haikuwa simu taka, gonga SI TAKA ili usahihishe tulivyoichukulia."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Zuia na uripoti"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ongeza anwani"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Si taka"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zuia nambari"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ongeza kwenye anwani"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zuia na uripoti taka"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Si taka"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Kataa"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ta/strings.xml b/java/com/android/incallui/spam/res/values-ta/strings.xml
new file mode 100644
index 0000000..2438aa7
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ta/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> - தெரிந்த எண்ணா?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> - ஸ்பேமா?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> தடுக்கப்பட்டு, அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்பட்டது."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> இன் அழைப்பு ஸ்பேம் இல்லை எனத் தெரிவிக்கப்பட்டது."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"தொடர்புகளில் சேர்க்க அல்லது ஸ்பேம் எண்ணைத் தடுக்க, தட்டவும்."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"இந்த எண்ணிலிருந்து உங்களுக்கு அழைப்பு வந்தது இதுவே முதல் முறை. இந்த அழைப்பு ஸ்பேமாக இருந்தால், எண்ணைத் தடுத்துப் புகாரளிக்கலாம்."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\"ஸ்பேம் இல்லை\" எனத் தெரிவிக்க அல்லது தடுக்க, தட்டவும்."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"இது ஸ்பேமாக இருக்கும் எனச் சந்தேகிக்கிறோம். ஸ்பேம் இல்லை எனில், எங்கள் தவறைச் சுட்டிக்காட்ட, \"ஸ்பேம் இல்லை\" என்பதைத் தட்டவும்."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"தடுத்துப் புகாரளி"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"தொடர்பைச் சேர்"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ஸ்பேமில்லை"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"எண்ணைத் தடு"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"தொடர்புகளில் சேர்"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"தடுத்து, ஸ்பேமெனப் புகாரளி"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ஸ்பேமில்லை"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"நிராகரி"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-te/strings.xml b/java/com/android/incallui/spam/res/values-te/strings.xml
new file mode 100644
index 0000000..2d5e3aa
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-te/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> తెలుసా?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> స్పామ్ కాదా?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> బ్లాక్ చేయబడింది మరియు కాల్ స్పామ్ అని నివేదించబడింది."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> నుండి కాల్ స్పామ్ కాదని నివేదించబడింది."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"స్పామ్ నంబర్‌ను పరిచయాలకు జోడించడానికి లేదా బ్లాక్ చేయడానికి నొక్కండి."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ఈ నంబర్ నుండి మీకు కాల్ రావడం ఇదే మొదటిసారి. ఈ కాల్ స్పామ్ అయితే, మీరు ఈ నంబర్‌ను బ్లాక్ చేసి, నివేదించవచ్చు."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"స్పామ్ కాదని నివేదించడానికి లేదా దాన్ని బ్లాక్ చేయడానికి నొక్కండి."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"మాకు ఇది స్పామర్ అయ్యి ఉండవచ్చని అనుమానం కలిగింది. ఈ కాల్ స్పామ్ కాకుంటే, మా పొరపాటును నివేదించడానికి స్పామ్ కాదుని నొక్కండి."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"బ్లాక్ చేసి, నివేదించండి"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"పరిచయాన్ని జోడించండి"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"స్పామ్ కాదు"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"నంబర్‌ను బ్లాక్ చేయండి"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"పరిచయాలకు జోడించండి"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"బ్లాక్ చేసి, స్పామ్ అని నివేదించండి"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"స్పామ్ కాదు"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"తిరస్కరించండి"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-th/strings.xml b/java/com/android/incallui/spam/res/values-th/strings.xml
new file mode 100644
index 0000000..51e8b47
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-th/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"รู้จัก <xliff:g id="NUMBER">%1$s</xliff:g> ไหม"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> เป็นสแปมใช่ไหม"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> และรายงานสายนี้ว่าเป็นสแปมแล้ว"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"รายงานสายจาก <xliff:g id="NUMBER">%1$s</xliff:g> ว่าไม่ใช่สแปมแล้ว"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"แตะเพื่อเพิ่มลงในรายชื่อติดต่อหรือบล็อกหมายเลขสแปม"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"หมายเลขนี้โทรหาคุณเป็นครั้งแรก หากเป็นสแปม คุณสามารถบล็อกและรายงานหมายเลขนี้ได้"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"แตะเพื่อรายงานว่าไม่ใช่สแปม หรือบล็อก"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"เราสงสัยว่าสายนี้จะเป็นนักส่งสแปม หากไม่ใช่สแปม โปรดแตะไม่ใช่สแปมเพื่อรายงานข้อผิดพลาดของเรา"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"บล็อกและรายงาน"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"เพิ่มผู้ติดต่อ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ไม่ใช่สแปม"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"บล็อกหมายเลข"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"เพิ่มในรายชื่อติดต่อ"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"บล็อกและรายงานสแปม"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ไม่ใช่สแปม"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ปฏิเสธ"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-tl/strings.xml b/java/com/android/incallui/spam/res/values-tl/strings.xml
new file mode 100644
index 0000000..0dac485
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-tl/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kilala mo ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Spam ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Na-block ang <xliff:g id="NUMBER">%1$s</xliff:g> at inulat ang tawag bilang spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Inulat ang tawag mula sa <xliff:g id="NUMBER">%1$s</xliff:g> bilang hindi spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"I-tap upang idagdag sa mga contact o i-block ang spam na numero."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ito ang unang beses na tumawag sa iyo ang numerong ito. Kung spam ang tawag na ito, maaari mong i-block ang numerong ito at iulat ito."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"I-tap upang iulat na HINDI SPAM, o i-block ito."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Pinaghihinalaan namin ito bilang isang spammer. Kung hindi spam ang tawag na ito, i-tap ang HINDI SPAM upang iulat ang aming pagkakamali."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"I-block at iulat"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Magdagdag ng contact"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Hindi spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"I-block ang numero"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Idagdag sa mga contact"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"I-block at iulat ang spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Hindi spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tanggihan"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-tr/strings.xml b/java/com/android/incallui/spam/res/values-tr/strings.xml
new file mode 100644
index 0000000..80937ce
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-tr/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> tanıdık bir numara mı?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> spam amaçlı bir numara mı?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> engellendi ve çağrı spam olarak bildirildi."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefondan gelen çağrının spam olmadığı bildirildi."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Kişilere eklemek veya spam numarasını engellemek için dokunun."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Bu numaradan ilk kez arandınız. Bu çağrı spam amaçlı olarak yapıldıysa numarayı engelleyip bildirebilirsiniz."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"SPAM DEĞİL bildirimi göndermek için dokunun veya numarayı engelleyin."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bu numaranın spam amaçlı olduğundan şüphelendik. Çağrı spam amaçlı değilse SPAM DEĞİL\'e dokunarak kararımızın hatalı olduğunu bildirin."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Engelle ve bildir"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kişi olarak ekle"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam değil"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Numarayı engelle"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kişilere ekle"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Engelle ve spam olarak bildir"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam değil"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Reddet"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-uk/strings.xml b/java/com/android/incallui/spam/res/values-uk/strings.xml
new file mode 100644
index 0000000..42580b5
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-uk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Знаєте номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> спам?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблоковано, а виклик із нього позначено як спам."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> позначено як не спам."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Торкніться, щоб додати до контактів або заблокувати номер як спам."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"З цього номера вам телефонують уперше. Якщо це спам, заблокуйте номер і поскаржтеся."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Торкніться, щоб позначити як НЕ СПАМ або заблокувати."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Ми вважаємо, що вам телефонував спамер. Якщо це не так, виберіть \"НЕ СПАМ\", щоб повідомити нам про це."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокувати й поскарж."</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додати контакт"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблокувати номер"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додати в контакти"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокувати й позначити як спам"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Відхилити"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-ur/strings.xml b/java/com/android/incallui/spam/res/values-ur/strings.xml
new file mode 100644
index 0000000..5783803
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-ur/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> سے واقف ہیں؟"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"کیا <xliff:g id="NUMBER">%1$s</xliff:g> اسپام ہے؟"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود ہو گیا اور کال کی بطور اسپام اطلاع ہو گئی۔"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> سے کال کی اطلاع \'اسپام نہیں\' کے بطور ہو گئی۔"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"رابطوں میں شامل کرنے یا اسپام نمبر کو مسدود کرنے کیلئے تھپتھپائیں۔"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"آپ کو اس نمبر سے پہلی بار کال آئی ہے۔ اگر یہ کال اسپام تھی، تو آپ اس نمبر کو مسدود کر سکتے ہیں اور اس کی اطلاع دے سکتے ہیں۔"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\'اسپام نہیں\' کے بطور اطلاع دینے کیلئے تھپتھپائیں یا اسے مسدود کریں۔"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ہمیں اس پر اسپامر ہونے کا شک تھا۔ اگر یہ کال اسپام نہیں تھی تو ہماری غلطی کی اطلاع دینے کیلئے \'اسپام نہیں\' پر تھپتھپائیں۔"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"مسدود کریں اور اطلاع دیں"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"رابطہ شامل کریں"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"اسپام نہیں ہے"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"نمبر مسدود کریں"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"رابطوں میں شامل کریں"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"مسدود کریں اور اسپام کی اطلاع دیں"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"اسپام نہیں ہے"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"مسترد کریں"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-uz/strings.xml b/java/com/android/incallui/spam/res/values-uz/strings.xml
new file mode 100644
index 0000000..833cb8f
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-uz/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> sizga tanish raqammi?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan keluvchi qo‘ng‘iroqlar spammi?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklandi va undan keluvchi qo‘ng‘iroqlar spam deb belgilandi."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan keluvchi qo‘ng‘iroqlar spam emas deb belgilandi."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Raqamni kontaktlarga qo‘shish yoki uni spam tarqatuvchi deb bloklash uchun bosing."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Bu raqamdan sizga birinchi marta qo‘ng‘iroq qilindi. Agar u spam bo‘lsa, uni spam deb belgilang va raqamni bloklang."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Qo‘ng‘iroqni SPAM EMAS deb belgilash yoki raqamni bloklash uchun bosing."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bu raqamdan spam qo‘ng‘iroq qilinganga o‘xshaydi. Agar u spam bo‘lmasa, bu haqda bizga xabar berish uchun uni SPAM EMAS deb belgilang."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloklash/xabar ber."</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontaktl-ga qo‘shish"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam emas"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Raqamni bloklash"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kontaktlarga qo‘shish"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloklash va spam haqida xabar berish"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam emas"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rad etish"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-vi/strings.xml b/java/com/android/incallui/spam/res/values-vi/strings.xml
new file mode 100644
index 0000000..1806cf0
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-vi/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Bạn có biết <xliff:g id="NUMBER">%1$s</xliff:g> không?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> có phải là spam không?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> bị chặn và cuộc gọi đã bị báo cáo là spam."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Cuộc gọi từ <xliff:g id="NUMBER">%1$s</xliff:g> được báo cáo là không phải spam."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Nhấn để thêm vào danh bạ hoặc chặn số spam."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Đây là lần đầu tiên số này gọi cho bạn. Nếu cuộc gọi này là spam, bạn có thể chặn và báo cáo số này."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Nhấn để báo cáo là KHÔNG PHẢI SPAM hoặc chặn."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Chúng tôi nghi ngờ rằng đây là người gửi spam. Nếu cuộc gọi này không phải là spam, hãy nhấn vào KHÔNG PHẢI SPAM để báo cáo sự nhầm lẫn của chúng tôi."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Chặn và báo cáo"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Thêm liên hệ"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Không phải là spam"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Chặn số"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Thêm vào danh bạ"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Chặn và báo cáo spam"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Không phải là spam"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Từ chối"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml b/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..26a65b1
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是陌生号码吗？"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是骚扰电话号码吗？"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g>，并将来电举报为骚扰电话。"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"已取消将 <xliff:g id="NUMBER">%1$s</xliff:g> 的来电举报为骚扰电话。"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"点按即可添加到通讯录或屏蔽骚扰电话号码。"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"这是此号码的第一次来电。如果是骚扰电话，您可以屏蔽此号码并举报。"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"点按即可列为“非骚扰电话号码”，或将其屏蔽。"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我们怀疑这是骚扰电话号码。如果不是，请点按“非骚扰电话号码”，向我们报告错误。"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"屏蔽并举报"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"添加联系人"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非骚扰电话号码"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"屏蔽号码"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"添加到通讯录"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"屏蔽并举报骚扰电话号码"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非骚扰电话号码"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒接"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml b/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..ceaaa65
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是已知號碼？"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是垃圾號碼？"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 封鎖並舉報為垃圾號碼。"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> 的來電已舉報為非垃圾來電。"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"輕按以新增至通訊錄，或封鎖垃圾號碼。"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"這是此號碼的第一次來電，如果是垃圾來電，您可以封鎖並舉報此號碼。"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"輕按以舉報為非垃圾來電，或加以封鎖。"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我們懷疑此為垃圾來電。如果不是，請輕按 [非垃圾來電] 舉報我們的錯誤。"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"封鎖並舉報"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"新增聯絡人"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非垃圾來電"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"封鎖號碼"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"加入通訊錄"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"封鎖並舉報垃圾來電"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非垃圾來電"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒絕"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml b/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..70cb15d
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是你熟悉的電話號碼嗎？"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是騷擾/廣告電話嗎？"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 並將本次來電回報為騷擾/廣告電話。"</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 的來電回報為非騷擾/廣告電話。"</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"輕觸這裡即可加到通訊錄或封鎖騷擾/廣告電話號碼。"</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"這組號碼是首次致電給你。如果本次來電為騷擾/廣告電話，你可以封鎖並檢舉這組號碼。"</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"輕觸這裡即可回報為「非騷擾/廣告電話」或封鎖這組號碼。"</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我們懷疑這通來電是騷擾/廣告電話。如果我們的判斷有誤，請輕觸 [非騷擾/廣告電話] 來回報錯誤。"</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"封鎖並回報"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"新增聯絡人"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非騷擾/廣告電話"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"封鎖號碼"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"新增為聯絡人"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"封鎖並回報為騷擾/廣告電話"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非騷擾/廣告電話"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒接"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values-zu/strings.xml b/java/com/android/incallui/spam/res/values-zu/strings.xml
new file mode 100644
index 0000000..90887f2
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values-zu/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="non_spam_notification_title" msgid="2599384745904934400">"Uyayazi i-<xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
+    <string name="spam_notification_title" msgid="609838099069629476">"Ingabe i-<xliff:g id="NUMBER">%1$s</xliff:g> ugaxekile?"</string>
+    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ivinjelwe futhi ikholi ibikwe njengogaxekile."</string>
+    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Ikholi esuka ku-<xliff:g id="NUMBER">%1$s</xliff:g> ibikwe njengokungeyena ugaxekile."</string>
+    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Thepha ukwengeza koxhumana nabo noma ukuvimbela inombolo engugaxekile."</string>
+    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Okokuqala le nombolo ikushayela. Uma le kholi kade ingugaxekile, ungakwazi ukuvimbela le nombolo futhi uyibike."</string>
+    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Thepha ukubika NJENGOKUNGEYENA UGAXEKILE, noma ukuyivimbela."</string>
+    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sisola ukuthi lokhu ugaxekile. Uma le kholi kade ingeyena ugaxekile, thepha okuthi AKUYENA UGAXEKILE ukuze ubike iphutha lethu."</string>
+    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Vimba futhi ubike"</string>
+    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Engeza oxhumana naye"</string>
+    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Akusiko okugaxekile"</string>
+    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Vimba inombolo"</string>
+    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Engeza koxhumana nabo"</string>
+    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Vimba futhi ubike ugaxekile"</string>
+    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Akusiko okugaxekile"</string>
+    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Yenqaba"</string>
+</resources>
diff --git a/java/com/android/incallui/spam/res/values/strings.xml b/java/com/android/incallui/spam/res/values/strings.xml
new file mode 100644
index 0000000..02e7225
--- /dev/null
+++ b/java/com/android/incallui/spam/res/values/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- Title for the notification to the user after a call from an unknown number ends. [CHAR LIMIT=100] -->
+  <string name="non_spam_notification_title">Know <xliff:g id="number">%1$s</xliff:g>?</string>
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string name="spam_notification_title">Is <xliff:g id="number">%1$s</xliff:g> spam?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string name="spam_notification_block_report_toast_text"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as spam.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string name="spam_notification_not_spam_toast_text">Call from <xliff:g id="number">%1$s</xliff:g> reported as not spam.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string name="spam_notification_non_spam_call_expanded_text">This is the first time this number called you. If this call was spam, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string name="spam_notification_spam_call_collapsed_text">Tap to report as NOT SPAM, or block it.</string>
+  <!-- Text displayed in the expanded notification to the user after a spam call ends. [CHAR LIMIT=NONE] -->
+  <string name="spam_notification_spam_call_expanded_text">We suspected this to be a spammer. If this call wasn\'t spam, tap "NOT SPAM" to report our mistake.</string>
+  <!-- Text for the reporting spam action in the after call prompt. [CHAR LIMIT=20] -->
+  <string name="spam_notification_report_spam_action_text">Block &amp; report</string>
+  <!-- Text for the adding to contacts action in the after call prompt. [CHAR LIMIT=20] -->
+  <string name="spam_notification_add_contact_action_text">Add contact</string>
+  <!-- Text for the reporting as not spam action in the after call prompt. [CHAR LIMIT=20] -->
+  <string name="spam_notification_not_spam_action_text">Not spam</string>
+  <!-- Text for the blocking spam action in the after call prompt. [CHAR LIMIT=20] -->
+  <string name="spam_notification_block_spam_action_text">Block number</string>
+  <!-- Text for the adding to contacts action in the after call dialog. [CHAR LIMIT=40] -->
+  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
+  <!-- Text for the marking a call as not spam in the after call dialog. [CHAR LIMIT=40] -->
+  <string name="spam_notification_dialog_was_not_spam_action_text">Not spam</string>
+
+  <!-- Label for "Dismiss" notification action. [CHAR LIMIT=12] -->
+  <string name="spam_notification_action_dismiss">Decline</string>
+
+</resources>
diff --git a/java/com/android/incallui/speakerbuttonlogic/AndroidManifest.xml b/java/com/android/incallui/speakerbuttonlogic/AndroidManifest.xml
new file mode 100644
index 0000000..9557d03
--- /dev/null
+++ b/java/com/android/incallui/speakerbuttonlogic/AndroidManifest.xml
@@ -0,0 +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.incallui.speakerbuttonlogic">
+</manifest>
diff --git a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java
new file mode 100644
index 0000000..5ab821b
--- /dev/null
+++ b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java
@@ -0,0 +1,91 @@
+/*
+ * 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.incallui.speakerbuttonlogic;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IntDef;
+import android.support.annotation.StringRes;
+import android.telecom.CallAudioState;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Info about how a "Speaker" button should be displayed */
+public class SpeakerButtonInfo {
+
+  // Testing note: most of this is exercised in ReturnToCallTest.java
+
+  /** Preferred size for icons */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({IconSize.SIZE_24_DP, IconSize.SIZE_36_DP})
+  public @interface IconSize {
+    int SIZE_24_DP = 1;
+    int SIZE_36_DP = 2;
+  }
+
+  @DrawableRes public final int icon;
+  @StringRes public final int contentDescription;
+  @StringRes public final int label;
+  public final boolean checkable;
+  public final boolean isChecked;
+
+  public SpeakerButtonInfo(CallAudioState audioState, @IconSize int iconSize) {
+    if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
+        == CallAudioState.ROUTE_BLUETOOTH) {
+      checkable = false;
+      isChecked = false;
+      label = R.string.incall_label_audio;
+
+      if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH)
+          == CallAudioState.ROUTE_BLUETOOTH) {
+        icon =
+            iconSize == IconSize.SIZE_36_DP
+                ? R.drawable.quantum_ic_bluetooth_audio_white_36
+                : R.drawable.quantum_ic_bluetooth_audio_white_24;
+        contentDescription = R.string.incall_content_description_bluetooth;
+      } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER)
+          == CallAudioState.ROUTE_SPEAKER) {
+        icon =
+            iconSize == IconSize.SIZE_36_DP
+                ? R.drawable.quantum_ic_volume_up_white_36
+                : R.drawable.quantum_ic_volume_up_white_24;
+        contentDescription = R.string.incall_content_description_speaker;
+      } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET)
+          == CallAudioState.ROUTE_WIRED_HEADSET) {
+        icon =
+            iconSize == IconSize.SIZE_36_DP
+                ? R.drawable.quantum_ic_headset_white_36
+                : R.drawable.quantum_ic_headset_white_24;
+        contentDescription = R.string.incall_content_description_headset;
+      } else {
+        icon =
+            iconSize == IconSize.SIZE_36_DP
+                ? R.drawable.quantum_ic_phone_in_talk_white_36
+                : R.drawable.quantum_ic_phone_in_talk_white_24;
+        contentDescription = R.string.incall_content_description_earpiece;
+      }
+    } else {
+      checkable = true;
+      isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER;
+      label = R.string.incall_label_speaker;
+      icon =
+          iconSize == IconSize.SIZE_36_DP
+              ? R.drawable.quantum_ic_volume_up_white_36
+              : R.drawable.quantum_ic_volume_up_white_24;
+      contentDescription = R.string.incall_content_description_speaker;
+    }
+  }
+}
diff --git a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java b/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
deleted file mode 100644
index 9e5ab3c..0000000
--- a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2016 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.incallui.video.impl;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import com.android.dialer.common.FragmentUtils;
-
-/** Dialog fragment to ask for camera permission from user. */
-public class CameraPermissionDialogFragment extends DialogFragment {
-
-  static CameraPermissionDialogFragment newInstance() {
-    CameraPermissionDialogFragment fragment = new CameraPermissionDialogFragment();
-    return fragment;
-  }
-
-  @NonNull
-  @Override
-  public Dialog onCreateDialog(Bundle bundle) {
-    return new AlertDialog.Builder(getContext())
-        .setTitle(R.string.camera_permission_dialog_title)
-        .setMessage(R.string.camera_permission_dialog_message)
-        .setPositiveButton(
-            R.string.camera_permission_dialog_positive_button,
-            new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-                CameraPermissionDialogCallback fragment =
-                    FragmentUtils.getParentUnsafe(
-                        CameraPermissionDialogFragment.this, CameraPermissionDialogCallback.class);
-                fragment.onCameraPermissionGranted();
-              }
-            })
-        .setNegativeButton(
-            R.string.camera_permission_dialog_negative_button,
-            new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-              }
-            })
-        .create();
-  }
-
-  /** Callback for being granted camera permission. */
-  public interface CameraPermissionDialogCallback {
-    void onCameraPermissionGranted();
-  }
-}
diff --git a/java/com/android/incallui/video/impl/SpeakerButtonController.java b/java/com/android/incallui/video/impl/SpeakerButtonController.java
index e12032a..d98545f 100644
--- a/java/com/android/incallui/video/impl/SpeakerButtonController.java
+++ b/java/com/android/incallui/video/impl/SpeakerButtonController.java
@@ -88,7 +88,7 @@
         icon = R.drawable.quantum_ic_headset_white_36;
         contentDescriptionResId = R.string.incall_content_description_headset;
       } else {
-        icon = R.drawable.ic_phone_audio_white_36dp;
+        icon = R.drawable.quantum_ic_phone_in_talk_white_36;
         contentDescriptionResId = R.string.incall_content_description_earpiece;
       }
     } else {
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
index b7a960e..95bdd6b 100644
--- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
@@ -50,6 +50,7 @@
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
 import com.android.incallui.contactgrid.ContactGridManager;
@@ -65,7 +66,6 @@
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
-import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -85,15 +85,12 @@
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener,
-        CameraPermissionDialogCallback {
+        OnSystemUiVisibilityChangeListener {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
 
   private static final int CAMERA_PERMISSION_REQUEST_CODE = 1;
-  private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG =
-      "CameraPermissionDialogFragment";
   private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L;
   private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L;
 
@@ -131,7 +128,7 @@
       new Runnable() {
         @Override
         public void run() {
-          if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) {
+          if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) {
             LogUtil.i(
                 "SurfaceViewVideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
             checkCameraPermission();
@@ -495,7 +492,7 @@
   }
 
   private View[] getAllPreviewRelatedViews() {
-    return new View[] {previewRoot};
+    return new View[] {previewRoot, mutePreviewOverlay};
   }
 
   private int getOffsetTop(View view) {
@@ -612,7 +609,7 @@
   @Override
   public void onCheckedChanged(CheckableImageButton button, boolean isChecked) {
     if (button == cameraOffButton) {
-      if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+      if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
         LogUtil.i("SurfaceViewVideoCallFragment.onCheckedChanged", "show camera permission dialog");
         checkCameraPermission();
       } else {
@@ -644,12 +641,6 @@
     updateVideoOffViews();
   }
 
-  /**
-   * This method scales the video feed inside the texture view, it doesn't change the texture view's
-   * size. In the old UI we would change the view size to match the aspect ratio of the video. In
-   * the new UI the view is always square (with the circular clip) so we have to do additional work
-   * to make sure the non-square video doesn't look squished.
-   */
   @Override
   public void onLocalVideoDimensionsChanged() {
     LogUtil.i("SurfaceViewVideoCallFragment.onLocalVideoDimensionsChanged", null);
@@ -834,6 +825,9 @@
   }
 
   @Override
+  public void onAudioRouteSelectorDismiss() {}
+
+  @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("SurfaceViewVideoCallFragment.setPrimary", primaryInfo.toString());
     contactGridManager.setPrimary(primaryInfo);
@@ -1051,24 +1045,19 @@
     }
   }
 
-  @Override
-  public void onCameraPermissionGranted() {
-    videoCallScreenDelegate.onCameraPermissionGranted();
-  }
-
   private void checkCameraPermission() {
     // Checks if user has consent of camera permission and the permission is granted.
     // If camera permission is revoked, shows system permission dialog.
     // If camera permission is granted but user doesn't have consent of camera permission
     // (which means it's first time making video call), shows custom dialog instead. This
     // will only be shown to user once.
-    if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+    if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
       videoCallScreenDelegate.onCameraPermissionDialogShown();
       if (!VideoUtils.hasCameraPermission(getContext())) {
         requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE);
       } else {
-        CameraPermissionDialogFragment.newInstance()
-            .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG);
+        PermissionsUtil.showCameraPermissionToast(getContext());
+        videoCallScreenDelegate.onCameraPermissionGranted();
       }
     }
   }
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 8e2f5ae..b0beb77 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -44,11 +44,11 @@
 import android.view.TextureView;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnLayoutChangeListener;
 import android.view.View.OnSystemUiVisibilityChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewOutlineProvider;
-import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;
@@ -60,6 +60,7 @@
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
+import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
 import com.android.incallui.contactgrid.ContactGridManager;
@@ -75,7 +76,6 @@
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
-import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -93,21 +93,18 @@
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener,
-        CameraPermissionDialogCallback {
+        OnSystemUiVisibilityChangeListener {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
 
-  private static final float BLUR_PREVIEW_RADIUS = 16.0f;
-  private static final float BLUR_PREVIEW_SCALE_FACTOR = 1.0f;
+  @VisibleForTesting static final float BLUR_PREVIEW_RADIUS = 16.0f;
+  @VisibleForTesting static final float BLUR_PREVIEW_SCALE_FACTOR = 1.0f;
   private static final float BLUR_REMOTE_RADIUS = 25.0f;
   private static final float BLUR_REMOTE_SCALE_FACTOR = 0.25f;
   private static final float ASPECT_RATIO_MATCH_THRESHOLD = 0.2f;
 
   private static final int CAMERA_PERMISSION_REQUEST_CODE = 1;
-  private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG =
-      "CameraPermissionDialogFragment";
   private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L;
   private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L;
 
@@ -121,6 +118,7 @@
           outline.setOval(x - radius, y - radius, x + radius, y + radius);
         }
       };
+
   private InCallScreenDelegate inCallScreenDelegate;
   private VideoCallScreenDelegate videoCallScreenDelegate;
   private InCallButtonUiDelegate inCallButtonUiDelegate;
@@ -156,7 +154,7 @@
       new Runnable() {
         @Override
         public void run() {
-          if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) {
+          if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) {
             LogUtil.i("VideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
             checkCameraPermission();
           }
@@ -252,25 +250,43 @@
     greenScreenBackgroundView = view.findViewById(R.id.videocall_green_screen_background);
     fullscreenBackgroundView = view.findViewById(R.id.videocall_fullscreen_background);
 
-    // We need the texture view size to be able to scale the remote video. At this point the view
-    // layout won't be complete so add a layout listener.
-    ViewTreeObserver observer = remoteTextureView.getViewTreeObserver();
-    observer.addOnGlobalLayoutListener(
-        new ViewTreeObserver.OnGlobalLayoutListener() {
+    remoteTextureView.addOnLayoutChangeListener(
+        new OnLayoutChangeListener() {
           @Override
-          public void onGlobalLayout() {
-            LogUtil.i("VideoCallFragment.onGlobalLayout", null);
+          public void onLayoutChange(
+              View v,
+              int left,
+              int top,
+              int right,
+              int bottom,
+              int oldLeft,
+              int oldTop,
+              int oldRight,
+              int oldBottom) {
+            LogUtil.i("VideoCallFragment.onLayoutChange", "remoteTextureView layout changed");
             updateRemoteVideoScaling();
-            updatePreviewVideoScaling();
-            updateVideoOffViews();
-            // Remove the listener so we don't continually re-layout.
-            ViewTreeObserver observer = remoteTextureView.getViewTreeObserver();
-            if (observer.isAlive()) {
-              observer.removeOnGlobalLayoutListener(this);
-            }
+            updateRemoteOffView();
           }
         });
 
+    previewTextureView.addOnLayoutChangeListener(
+        new OnLayoutChangeListener() {
+          @Override
+          public void onLayoutChange(
+              View v,
+              int left,
+              int top,
+              int right,
+              int bottom,
+              int oldLeft,
+              int oldTop,
+              int oldRight,
+              int oldBottom) {
+            LogUtil.i("VideoCallFragment.onLayoutChange", "previewTextureView layout changed");
+            updatePreviewVideoScaling();
+            updatePreviewOffView();
+          }
+        });
     return view;
   }
 
@@ -453,7 +469,7 @@
     View view = getView();
     if (view != null) {
       // Code is more expressive with all flags present, even though some may be combined
-      //noinspection PointlessBitwiseExpression
+      // noinspection PointlessBitwiseExpression
       view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
   }
@@ -633,7 +649,7 @@
   @Override
   public void onCheckedChanged(CheckableImageButton button, boolean isChecked) {
     if (button == cameraOffButton) {
-      if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+      if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
         LogUtil.i("VideoCallFragment.onCheckedChanged", "show camera permission dialog");
         checkCameraPermission();
       } else {
@@ -654,23 +670,21 @@
         "showPreview: %b, shouldShowRemote: %b",
         shouldShowPreview,
         shouldShowRemote);
-    this.shouldShowPreview = shouldShowPreview;
-    this.shouldShowRemote = shouldShowRemote;
-    this.isRemotelyHeld = isRemotelyHeld;
 
     videoCallScreenDelegate.getLocalVideoSurfaceTexture().attachToTextureView(previewTextureView);
     videoCallScreenDelegate.getRemoteVideoSurfaceTexture().attachToTextureView(remoteTextureView);
 
-    updateVideoOffViews();
-    updateRemoteVideoScaling();
+    this.isRemotelyHeld = isRemotelyHeld;
+    if (this.shouldShowRemote != shouldShowRemote) {
+      this.shouldShowRemote = shouldShowRemote;
+      updateRemoteOffView();
+    }
+    if (this.shouldShowPreview != shouldShowPreview) {
+      this.shouldShowPreview = shouldShowPreview;
+      updatePreviewOffView();
+    }
   }
 
-  /**
-   * This method scales the video feed inside the texture view, it doesn't change the texture view's
-   * size. In the old UI we would change the view size to match the aspect ratio of the video. In
-   * the new UI the view is always square (with the circular clip) so we have to do additional work
-   * to make sure the non-square video doesn't look squished.
-   */
   @Override
   public void onLocalVideoDimensionsChanged() {
     LogUtil.i("VideoCallFragment.onLocalVideoDimensionsChanged", null);
@@ -732,7 +746,6 @@
     } else {
       exitFullscreenMode();
     }
-    updateVideoOffViews();
 
     OnHoldFragment onHoldFragment =
         ((OnHoldFragment)
@@ -853,6 +866,9 @@
   }
 
   @Override
+  public void onAudioRouteSelectorDismiss() {}
+
+  @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("VideoCallFragment.setPrimary", primaryInfo.toString());
     contactGridManager.setPrimary(primaryInfo);
@@ -1016,7 +1032,6 @@
     params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
     previewTextureView.setLayoutParams(params);
     previewTextureView.setOutlineProvider(null);
-    updatePreviewVideoScaling();
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(true);
     updateMutePreviewOverlayVisibility();
@@ -1045,7 +1060,6 @@
     params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
     previewTextureView.setLayoutParams(params);
     previewTextureView.setOutlineProvider(circleOutlineProvider);
-    updatePreviewVideoScaling();
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(false);
     updateMutePreviewOverlayVisibility();
@@ -1055,7 +1069,9 @@
     previewOffBlurredImageView.setClipToOutline(true);
   }
 
-  private void updateVideoOffViews() {
+  private void updatePreviewOffView() {
+    LogUtil.enterBlock("VideoCallFragment.updatePreviewOffView");
+
     // Always hide the preview off and remote off views in green screen mode.
     boolean previewEnabled = isInGreenScreenMode || shouldShowPreview;
     previewOffOverlay.setVisibility(previewEnabled ? View.GONE : View.VISIBLE);
@@ -1065,7 +1081,10 @@
         shouldShowPreview,
         BLUR_PREVIEW_RADIUS,
         BLUR_PREVIEW_SCALE_FACTOR);
+  }
 
+  private void updateRemoteOffView() {
+    LogUtil.enterBlock("VideoCallFragment.updateRemoteOffView");
     boolean remoteEnabled = isInGreenScreenMode || shouldShowRemote;
     boolean isResumed = remoteEnabled && !isRemotelyHeld;
     if (isResumed) {
@@ -1092,7 +1111,6 @@
           isRemotelyHeld ? R.string.videocall_remotely_held : R.string.videocall_remote_video_off);
       remoteVideoOff.setVisibility(View.VISIBLE);
     }
-    LogUtil.i("VideoCallFragment.updateVideoOffViews", "calling updateBlurredImageView");
     updateBlurredImageView(
         remoteTextureView,
         remoteOffBlurredImageView,
@@ -1101,52 +1119,60 @@
         BLUR_REMOTE_SCALE_FACTOR);
   }
 
-  private void updateBlurredImageView(
+  @VisibleForTesting
+  void updateBlurredImageView(
       TextureView textureView,
       ImageView blurredImageView,
       boolean isVideoEnabled,
       float blurRadius,
       float scaleFactor) {
-    boolean didBlur = false;
-    long startTimeMillis = SystemClock.elapsedRealtime();
-    if (!isVideoEnabled) {
-      int width = Math.round(textureView.getWidth() * scaleFactor);
-      int height = Math.round(textureView.getHeight() * scaleFactor);
-      // This call takes less than 10 milliseconds.
-      Bitmap bitmap = textureView.getBitmap(width, height);
-      if (bitmap != null) {
-        // TODO: When the view is first displayed after a rotation the bitmap is empty
-        // and thus this blur has no effect.
-        // This call can take 100 milliseconds.
-        blur(getContext(), bitmap, blurRadius);
+    Context context = getContext();
 
-        // TODO: Figure out why only have to apply the transform in landscape mode
-        if (width > height) {
-          bitmap =
-              Bitmap.createBitmap(
-                  bitmap,
-                  0,
-                  0,
-                  bitmap.getWidth(),
-                  bitmap.getHeight(),
-                  textureView.getTransform(null),
-                  true);
-        }
-
-        blurredImageView.setImageBitmap(bitmap);
-        blurredImageView.setVisibility(View.VISIBLE);
-        didBlur = true;
-      }
-    }
-    if (!didBlur) {
+    if (isVideoEnabled || context == null) {
       blurredImageView.setImageBitmap(null);
       blurredImageView.setVisibility(View.GONE);
+      return;
     }
 
+    long startTimeMillis = SystemClock.elapsedRealtime();
+    int width = Math.round(textureView.getWidth() * scaleFactor);
+    int height = Math.round(textureView.getHeight() * scaleFactor);
+
+    LogUtil.i("VideoCallFragment.updateBlurredImageView", "width: %d, height: %d", width, height);
+
+    // This call takes less than 10 milliseconds.
+    Bitmap bitmap = textureView.getBitmap(width, height);
+
+    if (bitmap == null) {
+      blurredImageView.setImageBitmap(null);
+      blurredImageView.setVisibility(View.GONE);
+      return;
+    }
+
+    // TODO(mdooley): When the view is first displayed after a rotation the bitmap is empty
+    // and thus this blur has no effect.
+    // This call can take 100 milliseconds.
+    blur(getContext(), bitmap, blurRadius);
+
+    // TODO(mdooley): Figure out why only have to apply the transform in landscape mode
+    if (width > height) {
+      bitmap =
+          Bitmap.createBitmap(
+              bitmap,
+              0,
+              0,
+              bitmap.getWidth(),
+              bitmap.getHeight(),
+              textureView.getTransform(null),
+              true);
+    }
+
+    blurredImageView.setImageBitmap(bitmap);
+    blurredImageView.setVisibility(View.VISIBLE);
+
     LogUtil.i(
         "VideoCallFragment.updateBlurredImageView",
-        "didBlur: %b, took %d millis",
-        didBlur,
+        "took %d millis",
         (SystemClock.elapsedRealtime() - startTimeMillis));
   }
 
@@ -1228,26 +1254,21 @@
     videoCallScreenDelegate.onSystemUiVisibilityChange(navBarVisible);
   }
 
-  @Override
-  public void onCameraPermissionGranted() {
-    videoCallScreenDelegate.onCameraPermissionGranted();
-  }
-
   private void checkCameraPermission() {
     // Checks if user has consent of camera permission and the permission is granted.
     // If camera permission is revoked, shows system permission dialog.
     // If camera permission is granted but user doesn't have consent of camera permission
     // (which means it's first time making video call), shows custom dialog instead. This
     // will only be shown to user once.
-    if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+    if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
       videoCallScreenDelegate.onCameraPermissionDialogShown();
       if (!VideoUtils.hasCameraPermission(getContext())) {
         requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE);
       } else {
-        CameraPermissionDialogFragment.newInstance()
-            .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG);
+        PermissionsUtil.showCameraPermissionToast(getContext());
+        videoCallScreenDelegate.onCameraPermissionGranted();
       }
     }
   }
 }
-//LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java)
+// LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java)
diff --git a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index 2deaadd..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png
deleted file mode 100644
index 95d6824..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index c752813..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png
deleted file mode 100644
index 1ff3e7c..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index 4d5e033..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png
deleted file mode 100644
index e5c3fc4..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index a0be8d1..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png
deleted file mode 100644
index 9961858..0000000
--- a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
index c672466..1a2bc24 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -32,7 +32,7 @@
     android:id="@+id/videocall_remote_video_off"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
+    android:layout_centerInParent="true"
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
@@ -71,20 +71,23 @@
       android:visibility="gone"
       android:importantForAccessibility="no"
       tools:visibility="visible"/>
-
-    <ImageView
-      android:id="@+id/videocall_video_preview_mute_overlay"
-      android:layout_width="32dp"
-      android:layout_height="32dp"
-      android:layout_gravity="center"
-      android:background="@drawable/videocall_background_circle_white"
-      android:contentDescription="@string/incall_content_description_muted"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_mic_off_black_24"
-      android:visibility="gone"
-      tools:visibility="visible"/>
   </FrameLayout>
 
+  <ImageView
+    android:id="@+id/videocall_video_preview_mute_overlay"
+    android:layout_width="32dp"
+    android:layout_height="32dp"
+    android:layout_alignBottom="@id/videocall_preview_root"
+    android:layout_alignEnd="@id/videocall_preview_root"
+    android:layout_marginBottom="-8dp"
+    android:layout_marginEnd="-8dp"
+    android:background="@drawable/videocall_background_circle_white"
+    android:contentDescription="@string/incall_content_description_muted"
+    android:scaleType="center"
+    android:src="@drawable/quantum_ic_mic_off_black_24"
+    android:visibility="gone"
+    tools:visibility="visible"/>
+
   <View
     android:id="@+id/videocall_green_screen_background"
     android:layout_width="match_parent"
@@ -102,4 +105,4 @@
     android:layout_height="wrap_content"
     android:layout_gravity="top"/>
 
-</FrameLayout>
+</RelativeLayout>
diff --git a/java/com/android/incallui/video/impl/res/values-af/strings.xml b/java/com/android/incallui/video/impl/res/values-af/strings.xml
index 91e650a..92a48da 100644
--- a/java/com/android/incallui/video/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-af/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Hulle video is af"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hulle video is aan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Oproep gehou"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Oproep is hervat"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Laat video toe?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Die Foon-program wil jou kamera vir video-oproepe gebruik."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Laat toe"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Weier"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-am/strings.xml b/java/com/android/incallui/video/impl/res/values-am/strings.xml
index 307cae4..e8d6602 100644
--- a/java/com/android/incallui/video/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-am/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ቪዲዮዋቸው ጠፍቷል"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"የእነሱ ቪዲዮ በርቷል"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ጥሪ በይቆይ ላይ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ጥሪ ከቆመበት ቀጥሏል"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ቪድዮ ይፈቀድ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"የስልክ መተግበሪያው ለቪድዮ ጥሪዎች ካሜራዎን መጠቀም ይፈልጋል።"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ፍቀድ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ከልክል"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ar/strings.xml b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
index 8b5893e..571ed99 100644
--- a/java/com/android/incallui/video/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"الفيديو الخاص بهم قيد إيقاف التشغيل"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"الفيديو قيد التشغيل"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"المكالمة معلقة"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تم استئناف المكالمة"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"السماح بالفيديو؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"يريد تطبيق الهاتف استخدام الكاميرا لإجراء مكالمات الفيديو."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"سماح"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"رفض"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-az/strings.xml b/java/com/android/incallui/video/impl/res/values-az/strings.xml
index 5fca42d..f47ff9f 100644
--- a/java/com/android/incallui/video/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-az/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoları deaktivdir"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Bu video aktivdir"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zəng gözləmədədir"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zəng davam edir"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Videoya icazə verilsin?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon tətbiqi video zənglər üçün kameranızı istifadə etmək istəyir."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"İcazə verin"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rədd edin"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
index 5381ecc..aa0635d 100644
--- a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je isključen"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera ove osobe je uključena"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv je na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Želite da dozvolite video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi da koristi vašu kameru za video pozive."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dozvoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-be/strings.xml b/java/com/android/incallui/video/impl/res/values-be/strings.xml
index 4af9ce7..b804835 100644
--- a/java/com/android/incallui/video/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-be/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відэа гэтага чалавека адключана"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відэа гэтага чалавека ўключана"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Выклік на ўтрыманні"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Выклік адноўлены"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Дазволіць відэа?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Праграма Тэлефон хоча карыстацца вашай камерай для відэавыклікаў."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дазволіць"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Адмовіць"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bg/strings.xml b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
index 6ae1b53..1459f95 100644
--- a/java/com/android/incallui/video/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото отсреща е изкл."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видеото на другия участник е включено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Задържано обаждане"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Възобновено обажд."</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Да се разреши ли видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Приложението Телефон иска да използва камерата ви за видеообаждания."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Разрешаване"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Отказване"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bn/strings.xml b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
index 511989c..0c3c645 100644
--- a/java/com/android/incallui/video/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"তাদের ভিডিও বন্ধ রয়েছে"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"তাদের ভিডিও চালু রয়েছে"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"কলটি হোল্ডে রয়েছে"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"কল পুনরায় শুরু করা হয়েছে"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ভিডিওর মঞ্জুরি দেবেন?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ফোন অ্যাপটি ভিডিও কলগুলির জন্য আপনার ক্যামেরা ব্যবহার করতে চায়৷"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"অনুমতি দিন"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"আস্বীকার করুন"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bs/strings.xml b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
index b27137f..47d1d02 100644
--- a/java/com/android/incallui/video/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Kamera je isključena"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera je uključena"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Dozvoliti pristup kameri?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija za telefon želi koristiti kameru za videopozive?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dozvoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ca/strings.xml b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
index 9db64e0..9745bcb 100644
--- a/java/com/android/incallui/video/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Tenen vídeo desactivat"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Té el vídeo activat"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Trucada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Trucada represa"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vols permetre el vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'aplicació Telèfon vol fer servir la càmera per a les videotrucades."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permet"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denega"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-cs/strings.xml b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
index 07b5e01..d8258e5 100644
--- a/java/com/android/incallui/video/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video tohoto uživatele je vypnuto"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohoto uživatele je zapnuto"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Podržený hovor"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor byl obnoven"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Povolit video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikace Telefon chcete při videohovorech používat vaši kameru."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Povolit"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Zakázat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-da/strings.xml b/java/com/android/incallui/video/impl/res/values-da/strings.xml
index 35a7f16..a52a2bc 100644
--- a/java/com/android/incallui/video/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-da/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vedkommendes video er slået fra"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Vedkommendes video er slået til"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkeret opkald"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Opkaldet er genoptaget"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vil du tillade videoen?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Appen Fotos vil gerne bruge dit kamera til videoopkald."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillad"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Afvis"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-de/strings.xml b/java/com/android/incallui/video/impl/res/values-de/strings.xml
index e6ae11e..fcc8fb9 100644
--- a/java/com/android/incallui/video/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-de/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video deaktiviert"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video ist aktiviert"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Anruf wird gehalten."</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Anruf fortgesetzt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Video zulassen?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Die App \"Telefon\" möchte die Kamera für Videoanrufe verwenden."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Zulassen"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ablehnen"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-el/strings.xml b/java/com/android/incallui/video/impl/res/values-el/strings.xml
index 3546481..eb4c671 100644
--- a/java/com/android/incallui/video/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-el/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Το βίντεό τους απεν."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Το βίντεό τους είναι ενεργοποιημένο"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Κλήση σε αναμονή"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Συνέχιση κλήσης"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Να επιτραπεί η χρήση βίντεο;"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Η εφαρμογή Τηλέφωνο θέλει να χρησιμοποιήσει την κάμερά σας για βιντεοκλήσεις."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Να επιτραπεί"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Να μην επιτραπεί"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
index 9fee9f8..1677600 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
index 9fee9f8..1677600 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
index 9fee9f8..1677600 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
index 7175c50..46765ac 100644
--- a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"El video está activado."</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"¿Deseas habilitar el video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"La app de teléfono quiere usar la cámara para las videollamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es/strings.xml b/java/com/android/incallui/video/impl/res/values-es/strings.xml
index c28ecf5..035bc3c 100644
--- a/java/com/android/incallui/video/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Su vídeo está activado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"¿Quieres permitir el vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"La aplicación Teléfono quiere usar la cámara para realizar videollamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-et/strings.xml b/java/com/android/incallui/video/impl/res/values-et/strings.xml
index db5e9f1..d685d0b 100644
--- a/java/com/android/incallui/video/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-et/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Nende video on välj."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Nende video on eetris"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Kõne on ootel"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Kõne jätkub"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kas lubada video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Rakendus Telefon soovib videokõnede jaoks teie kaamerat kasutada."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Luba"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Keela"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-eu/strings.xml b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
index 21f36b1..daa30e0 100644
--- a/java/com/android/incallui/video/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Bideoa desaktibatuta"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Aktibatuta du bideoa"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zain dago deia"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Deiari berrekin zaio"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kamera atzitzeko baimena eman?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Bideo-deiak egiteko, kamera atzitzeko baimena behar du Telefonoa aplikazioak."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Baimendu"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ukatu"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fa/strings.xml b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
index eb264b0..4c4c186 100644
--- a/java/com/android/incallui/video/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ویدیوی طرف مقابل غیرفعال است"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ویدیوی طرف مقابل فعال است"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"تماس درحال انتظار"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تماس ازسرگرفته‌شده"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ویدیو مجاز است؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"برنامه تلفن می‌خواهد برای تماس‌های ویدیویی از دوربینتان استفاده کند."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"مجاز است"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"رد کردن"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fi/strings.xml b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
index ff1427f..eae4b43 100644
--- a/java/com/android/incallui/video/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ei videota"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hänen videonsa on päällä"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Puhelu pidossa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Puhelua jatkettiin"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Sallitaanko video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Puhelin-sovellus haluaa käyttää kameraa videopuheluiden soittamista varten."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Salli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Estä"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
index 548af9f..e59d14b 100644
--- a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Sa vidéo est activée"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Appel repris"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Autoriser la vidéo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'application Téléphone veut utiliser votre caméra pour les appels vidéo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Autoriser"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuser"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr/strings.xml b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
index f49b86f..5ef4543 100644
--- a/java/com/android/incallui/video/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Leur vidéo est lancée"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Reprise de l\'appel"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Autoriser la vidéo ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'application Téléphone requiert l\'utilisation de la caméra de votre appareil pour les appels vidéo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Autoriser"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuser"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gl/strings.xml b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
index 61a91e9..263ee3b 100644
--- a/java/com/android/incallui/video/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O seu vídeo está activado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Retomouse a chamada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Queres permitir o vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A aplicación Teléfono quere utilizar a túa cámara para as videochamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gu/strings.xml b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
index 68ad388..8164e6e 100644
--- a/java/com/android/incallui/video/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"તેમનો વિડિઓ બંધ છે"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"તેમની વિડિઓ ચાલુ છે"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"કૉલ હોલ્ડ પર છે"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"કૉલ ફરી શરૂ કર્યો"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"વિડિઓની મંજૂરી આપીએ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ફોન ઍપ્લિકેશન વિડિઓ કૉલ્સ માટે તમારા કૅમેરાનો ઉપયોગ કરવા માંગે છે."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"મંજૂરી આપો"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"નકારો"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
index a53fb64..e9e7f9e 100644
--- a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
@@ -19,5 +19,5 @@
   <dimen name="videocall_button_size">72dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
-  <dimen name="videocall_preview_long">104dp</dimen>
+  <dimen name="videocall_preview_long">116dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hi/strings.xml b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
index e3ff5d8..bce1eb6 100644
--- a/java/com/android/incallui/video/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनका वीडियो बंद है"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनका वीडियो चालू है"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्ड पर है"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल फिर से शुरू किया गया"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"क्या वीडियो की अनुमति देना चाहते हैं?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"फ़ोन ऐप्लिकेशन, वीडियो कॉल के लिए आपके कैमरे का उपयोग करना चाहता है."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमति दें"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"अस्वीकार करें"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hr/strings.xml b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
index 9acb9e3..9acadbb 100644
--- a/java/com/android/incallui/video/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videokamera je isk."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videopoziv je uključen"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Dopustiti pristup kameri?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi koristiti vašu kameru za videopozive."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Omogući"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hu/strings.xml b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
index 9b34cad..0042d83 100644
--- a/java/com/android/incallui/video/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"A videokép leállt"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"A videokép be van kapcsolva"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Várakoztatás"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hívás folytatva"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Engedélyezi a videoképet?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A Telefon alkalmazás videohíváshoz szeretné használni a kamerát."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Engedélyezés"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Elutasítás"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hy/strings.xml b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
index ee94cd5..fb06169 100644
--- a/java/com/android/incallui/video/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Իր խցիկն անջատած է"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Զրուցակցի խցիկը միացած է"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Զանգը սպասման մեջ է"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Զանգը վերսկսվեց"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Թույլատրե՞լ տեսագրում:"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Տեսազանգերի համար «Հեռախոս» հավելվածը պետք է օգտագործի ձեր տեսախցիկը:"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Թույլ տալ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Մերժել"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-in/strings.xml b/java/com/android/incallui/video/impl/res/values-in/strings.xml
index 025ba88..6abb2a7 100644
--- a/java/com/android/incallui/video/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-in/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mereka nonaktif"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka aktif"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditahan"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Panggilan dilanjutkan"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Izinkan video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikasi Telepon ingin menggunakan kamera untuk video call."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Izinkan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tolak"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-is/strings.xml b/java/com/android/incallui/video/impl/res/values-is/strings.xml
index fce879b..e1834dd 100644
--- a/java/com/android/incallui/video/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-is/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Slökkt er á mynd"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kveikt er á myndskeiði viðkomandi"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Símtal í bið"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Símtal heldur áfram"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Viltu leyfa myndupptöku?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Símaforritið vill nota myndavélina í myndsímtöl."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Leyfa"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Hafna"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-it/strings.xml b/java/com/android/incallui/video/impl/res/values-it/strings.xml
index ea9746c..fd7549d 100644
--- a/java/com/android/incallui/video/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-it/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Il suo video non è attivo"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Il loro video è attivo"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chiamata in attesa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chiamata ripristinata"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Consentire l\'uso del video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'app Telefono desidera utilizzare la fotocamera per le videochiamate."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Consenti"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rifiuta"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-iw/strings.xml b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
index 4f38da3..c93dbb8 100644
--- a/java/com/android/incallui/video/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"הווידאו של הצד השני מושבת"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"הווידאו של הצד השני מופעל"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"השיחה הועברה להמתנה"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"השיחה חודשה"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"האם לאפשר גישה לווידאו?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"אפליקציית הטלפון רוצה להשתמש במצלמה שלך לשיחות וידאו."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"אפשר"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"דחה"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ja/strings.xml b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
index 1c916ef..8a5d99a 100644
--- a/java/com/android/incallui/video/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"相手のビデオ: OFF"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"相手のビデオ: ON"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話が再開されました"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ビデオを許可しますか？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ビデオハングアウトを利用するには、電話アプリにカメラへのアクセスを許可する必要があります。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"許可"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒否"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ka/strings.xml b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
index 7533b72..6340c5f 100644
--- a/java/com/android/incallui/video/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"მათი ვიდ. გამორთულია"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"მისი ვიდეო ჩართულია"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ზარი მოცდის რეჟიმშია"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ზარი განახლდა"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"გსურთ ვიდეოს დაშვება?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ტელეფონის აპს სურს თქვენი კამერის გამოყენება ვიდეოზარებისთვის."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"დაშვება"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"უარყოფა"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kk/strings.xml b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
index 56077d8..9f7626b 100644
--- a/java/com/android/incallui/video/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Олардың бейнесі өшірулі"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Олардың бейне құралы қосулы"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Қоңырау күту күйінде"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Қоңырауды жалғастырды"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Бейнеге рұқсат беру қажет пе?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Телефон қолданбасы камераңызды бейне қоңыраулар үшін пайдаланғысы келеді."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Рұқсат беру"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Рұқсат бермеу"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-km/strings.xml b/java/com/android/incallui/video/impl/res/values-km/strings.xml
index cd4d55a..8d5cac4 100644
--- a/java/com/android/incallui/video/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-km/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បិទ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បើក"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ការ​ហៅ​កំពុង​រង់ចាំ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"បាន​បន្ត​ការ​ហៅ​ទូរសព្ទ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"អនុញ្ញាត​វីដេអូ​ដែរ​ឬ​ទេ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"កម្មវិធី​ទូរសព្ទ​ចង់​ប្រើប្រាស់​កាមេរ៉ា​របស់​អ្នក​ដើម្បី​ហៅ​ជា​វីដេអូ។"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"អនុញ្ញាត"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"បដិសេធ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kn/strings.xml b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
index 0f84a0b..09ff808 100644
--- a/java/com/android/incallui/video/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ಅವರ ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ಅವರ ವಿಡಿಯೋ ಆನ್ ಆಗಿದೆ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ಕರೆ ಹೋಲ್ಡ್‌ ಮಾಡಿದೆ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ಕರೆಯನ್ನು ಪುನರಾರಂಭಿಸಲಾಗಿದೆ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ವೀಡಿಯೊವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ವೀಡಿಯೊ ಕರೆಗಳಿಗೆ ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ಅನುಮತಿಸಿ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ನಿರಾಕರಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ko/strings.xml b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
index ed25858..6feb991 100644
--- a/java/com/android/incallui/video/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"상대방 동영상 꺼짐"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"동영상이 켜져 있음"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"통화 대기 중"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"통화 재개됨"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"동영상을 허용하시겠습니까?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"전화 앱에서 화상 통화를 위해 카메라를 사용하고자 합니다."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"허용"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"거부"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ky/strings.xml b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
index ac002dd..c61db4a 100644
--- a/java/com/android/incallui/video/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камерасы өчүк"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Алардын видеосу күйгүзүлгөн"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Чалуу күтүүгө коюлду."</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Чалуу улантылды"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Видеого уруксат берилсинби?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Телефон колдонмосуна видео режиминде чалуу үчүн камераңыз керек."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Уруксат берүү"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Жок"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-land/dimens.xml b/java/com/android/incallui/video/impl/res/values-land/dimens.xml
index 6485735..d0a5e40 100644
--- a/java/com/android/incallui/video/impl/res/values-land/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-land/dimens.xml
@@ -15,5 +15,5 @@
   ~ limitations under the License
   -->
 <resources>
-  <dimen name="videocall_preview_long">92dp</dimen>
+  <dimen name="videocall_preview_long">96dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-land/styles.xml b/java/com/android/incallui/video/impl/res/values-land/styles.xml
index a809708..f60dbd1 100644
--- a/java/com/android/incallui/video/impl/res/values-land/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values-land/styles.xml
@@ -16,7 +16,8 @@
   -->
 <resources>
   <style name="VideoPreviewHolder">
-    <item name="android:layout_gravity">bottom|end</item>
+    <item name="android:layout_alignParentBottom">true</item>
+    <item name="android:layout_alignParentEnd">true</item>
     <item name="android:layout_width">@dimen/videocall_preview_long</item>
     <item name="android:layout_height">@dimen/videocall_preview_height</item>
     <item name="android:layout_marginBottom">@dimen/videocall_preview_margin_bottom</item>
diff --git a/java/com/android/incallui/video/impl/res/values-lo/strings.xml b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
index f8481eb..11505dd 100644
--- a/java/com/android/incallui/video/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ວິດີໂອຂອງເຂົາເຈົ້າປິດຢູ່"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ເຂົາເຈົ້າເປີດວິດີໂອຢູ່"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ພັກສາຍຢູ່"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ສືບຕໍ່ສາຍແລ້ວ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ອະນຸຍາດວິດີໂອບໍ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ແອັບໂທລະສັບຢາກໃຊ້ກ້ອງຂອງທ່ານເພື່ອໂທແບບວິດີໂອ."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ອະນຸຍາດ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ປະຕິເສດ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lt/strings.xml b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
index 2890ad3..4ef10a4 100644
--- a/java/com/android/incallui/video/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vaizdo kamera išjungta"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Jų vaizdo įrašas rodomas"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Skambutis sulaikytas"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Skambutis tęsiamas"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Leisti vaizdą?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefono programa nori naudoti kamerą, kad būtų galima atlikti vaizdo skambučius."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Leisti"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Atmesti"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lv/strings.xml b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
index 75e81f1..220a30c 100644
--- a/java/com/android/incallui/video/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video ir izslēgts"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Dalībnieku video ir ieslēgts"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zvans aizturēts"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zvans ir atsākts"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vai atļaut video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Lietotnē Tālrunis tiek mēģināts izmantot jūsu kameru videozvaniem."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Atļaut"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Aizliegt"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mk/strings.xml b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
index 90528bc..8a764a2 100644
--- a/java/com/android/incallui/video/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото е исклучено"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Нивното видео е вклучено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Повик на чекање"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Повикот продолжи"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Да се дозволи видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Апликацијата Телефон сака да ја користи вашата камера за видеоповици."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Овозможи"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Одбиј"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ml/strings.xml b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
index 1958fa4..a20a4ca 100644
--- a/java/com/android/incallui/video/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"അവരുടെ വീഡിയോ ഓഫാണ്"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"അവരുടെ വീഡിയോ ഓണാണ്"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"കോൾ ഹോൾഡിലാണ്"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"കോൾ വീണ്ടും ആരംഭിച്ചു"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"വീഡിയോ അനുവദിക്കണോ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"വീഡിയോ കോളുകൾക്ക് നിങ്ങളുടെ ക്യാമറ ഉപയോഗിക്കാൻ ഫോൺ ആപ്പ് താൽപ്പര്യപ്പെടുന്നു."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"അനുവദിക്കുക"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"നിരസിക്കുക"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mn/strings.xml b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
index 8e2186a..5e2c354 100644
--- a/java/com/android/incallui/video/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Тэдний видео идэвхгүй байна"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Тэдний видео идэвхтэй байна"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Дуудлага хүлээлгэсэн"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дуудлагыг үргэлжлүүлсэн"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Видеог зөвшөөрөх үү?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Утас апп видео дуудлага хийхэд таны камерыг ашиглахыг хүсэж байна."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Зөвшөөрөх"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Татгалзах"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mr/strings.xml b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
index 2119cdc..c8ea9bc 100644
--- a/java/com/android/incallui/video/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"त्यांचा व्हिडिओ बंद केला आहे"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"त्यांचा व्हिडिओ चालू आहे"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्डवर आहे"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल पुनः सुरु झाला"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"व्हिडिओला अनुमती द्यायची?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"व्हिडिओ कॉलसाठी फोन अॅप आपला कॅमेरा वापरू इच्छितो."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमती द्या"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"नकार द्या"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ms/strings.xml b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
index fe2e563..f886625 100644
--- a/java/com/android/incallui/video/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mrk dimatikan"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka dihidupkan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditunda"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Pgln disambung smla"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Benarkan video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Apl Telefon mahu menggunakan kamera anda untuk panggilan video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Benarkan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tolak"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-my/strings.xml b/java/com/android/incallui/video/impl/res/values-my/strings.xml
index 10788df..93749a3 100644
--- a/java/com/android/incallui/video/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-my/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"သူတို့ဗီဒီယို ပိတ်ထားသည်"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"၎င်းတို့၏ဗီဒီယိုကို ဖွင့်ထားပါသည်"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ခေါ်ဆိုမှု ခဏရပ်ထားသည်"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ခေါ်ဆိုမှုပြန်စသည်"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ဗီဒီယို ခွင့်ပြုမလား။"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ဗီဒီယိုခေါ်ဆိုမှုများအတွက် သင့်ကင်မရာကို Phone အက်ပ်က အသုံးပြုလိုပါသည်။"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ခွင့်ပြုရန်"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ငြင်းပယ်ရန်"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nb/strings.xml b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
index 249065b..8b44300 100644
--- a/java/com/android/incallui/video/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillat video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon-appen ønsker å bruke kameraet ditt til videosamtaler."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillat"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ikke tillat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ne/strings.xml b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
index e2850ae..66d236d 100644
--- a/java/com/android/incallui/video/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनीहरूको भिडियो बन्द छ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनीहरूको भिडियो सक्रिय छ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कल होल्डमा छ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कल पुन: सुचारु गरियो"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"भिडियो खिच्ने अनुमति दिने हो?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"फोन अनुप्रयोगले भिडियो कलका लागि तपाईंको क्यामेरा प्रयोग गर्न चाहन्छ।"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमति दिनुहोस्"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"अस्वीकार गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nl/strings.xml b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
index b797b13..b83a72b 100644
--- a/java/com/android/incallui/video/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video staat uit"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Zijn video is aan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Gesprek in de wacht"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Gesprek hervat"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Video toestaan?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"De app Telefoon wil je camera gebruiken voor videogesprekken."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Toestaan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Weigeren"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-no/strings.xml b/java/com/android/incallui/video/impl/res/values-no/strings.xml
index 249065b..8b44300 100644
--- a/java/com/android/incallui/video/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-no/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillat video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon-appen ønsker å bruke kameraet ditt til videosamtaler."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillat"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ikke tillat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pa/strings.xml b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
index 6bded1d..e23efe1 100644
--- a/java/com/android/incallui/video/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਬੰਦ ਹੈ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਚਾਲੂ ਹੈ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕੀਤੀ ਗਈ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ਕੀ ਵੀਡੀਓ ਦੀ ਇਜਾਜ਼ਤ ਦੇਣੀ ਹੈ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ਫ਼ੋਨ ਐਪ ਵੀਡੀਓ ਕਾਲਾਂ ਲਈ ਤੁਹਾਡੇ ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pl/strings.xml b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
index 355ad6f..c84ea69 100644
--- a/java/com/android/incallui/video/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Wideo tej osoby wył."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Obraz wideo tej osoby jest włączony"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Rozmowa wstrzymana"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Połączenie wznowione"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Pozwolić na tryb wideo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacja Telefon chce używać kamery do rozmów wideo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Zezwól"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odmów"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
index 1171ac0..f5c8cea 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Permitir que o app Telefone use sua câmera para fazer videochamadas?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Negar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
index 8480031..1c5fc57 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desativado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo está ligado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A aplicação Telefone pretende utilizar a sua câmara para videochamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Recusar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt/strings.xml b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
index 1171ac0..f5c8cea 100644
--- a/java/com/android/incallui/video/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Permitir que o app Telefone use sua câmera para fazer videochamadas?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Negar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ro/strings.xml b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
index eaae475..6cd5193 100644
--- a/java/com/android/incallui/video/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Imagine dezactivată"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Imaginea sa video este activată."</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Apel în așteptare"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"S-a reluat apelul."</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permiteți transmisia video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplicația Telefon vrea să utilizeze camera foto pentru apeluri video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permiteți"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuzați"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ru/strings.xml b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
index 8b29882..3e62d0e 100644
--- a/java/com/android/incallui/video/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камера собеседника выключена"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видео собеседника включено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Вызов на удержании"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Вызов возобновлен"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Включить видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Для видеовстреч приложению \"Телефон\" необходим доступ к камере."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Разрешить"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Запретить"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-si/strings.xml b/java/com/android/incallui/video/impl/res/values-si/strings.xml
index e9869fe..52e5573 100644
--- a/java/com/android/incallui/video/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-si/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"වීඩියෝ අක්‍රිය කර ඇ."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ඔවුන්ගේ වීඩියෝව ක්‍රියාත්මකයි"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ඇමතුම රඳවාගෙන ඇත"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ඇමතුම නැවත ආරම්භ විය"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"වීඩියෝවට ඉඩ දෙන්නද?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"දුරකථන යෙදුමට වීඩියෝ ඇමතුම් සඳහා ඔබේ කැමරාව භාවිත කිරීමට අවශ්‍යයි."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ඉඩ දෙන්න"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ප්‍රතික්ෂේප කරන්න"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sk/strings.xml b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
index a2438ac..c9920b3 100644
--- a/java/com/android/incallui/video/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Má vypnuté video"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohto používateľa je zapnuté"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Hovor je podržaný"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor bol obnovený"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Povoliť video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikácia Telefón chce pri videohovoroch používať vašu kameru."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Povoliť"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odmietnuť"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sl/strings.xml b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
index 42d4b0c..8c6baed 100644
--- a/java/com/android/incallui/video/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je izklopljen"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video te osebe je vklopljen"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Klic je zadržan"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Klic se nadaljuje"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Želite omogočiti video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi za videoklice uporabiti vaš fotoaparat."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dovoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Zavrni"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sq/strings.xml b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
index 5956333..77a7648 100644
--- a/java/com/android/incallui/video/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video e tyre joaktive"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videoja e tyre është aktive"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Telefonatë në pritje"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Telefonata vazhdoi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Të lejohet video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacioni \"Telefoni\" dëshiron të përdorë aparatin tënd për telefonata me video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Lejo"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuzo"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sr/strings.xml b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
index 8a2ef6a..ce7070d 100644
--- a/java/com/android/incallui/video/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видео је искључен"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Камера ове особе је укључена"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Позив је на чекању"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Позив је настављен"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Желите да дозволите видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Апликација Телефон жели да користи вашу камеру за видео позиве."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дозволи"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Одбиј"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sv/strings.xml b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
index cbedf9b..29221de 100644
--- a/java/com/android/incallui/video/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Deras video avstängd"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Andra partens video är på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkerat samtal"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtal återupptaget"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillåt video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Appen Telefon vill använda kameran till videosamtal."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillåt"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Avvisa"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sw/strings.xml b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
index fae85d2..74475b3 100644
--- a/java/com/android/incallui/video/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Amezima video"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video take imewashwa"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Simu imesitishwa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Simu sasa inaendelea"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Je, unataka kuruhusu video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Programu ya Simu inataka kutumia kamera yako kwa ajili ya Hangout za Video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Ruhusu"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Kataa"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ta/strings.xml b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
index 07172ec..baaced6 100644
--- a/java/com/android/incallui/video/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"பிறரின் வீடியோ ஆஃப்"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"அவரின் வீடியோ இயக்கப்பட்டுள்ளது"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"அழைப்பு ஹோல்டில்"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"மீண்டும் தொடங்கப்பட்டது"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"வீடியோவை அனுமதிக்கவா?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"வீடியோ அழைப்புகளுக்கு உங்கள் கேமராவைப் பயன்படுத்த, மொபைல் பயன்பாடு அனுமதி கோருகிறது."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"அனுமதி"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"நிராகரி"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-te/strings.xml b/java/com/android/incallui/video/impl/res/values-te/strings.xml
index 80fd1f6..8724be4 100644
--- a/java/com/android/incallui/video/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-te/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"వారి వీడియో ఆఫ్‌లో ఉంది"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"వారి వీడియో ఆన్‌లో ఉంది"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"కాల్ హోల్డ్‌లో ఉంది"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"కాల్ పునఃప్రారంభించబడింది"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"వీడియోను అనుమతించాలా?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ఫోన్ అనువర్తనం వీడియో కాల్‌ల కోసం మీ కెమెరాను ఉపయోగించాలనుకుంటోంది."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"అనుమతించు"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"తిరస్కరించు"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-th/strings.xml b/java/com/android/incallui/video/impl/res/values-th/strings.xml
index fe58dda..f3a2cb5 100644
--- a/java/com/android/incallui/video/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-th/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"วิดีโอปิดอยู่"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"วิดีโอของผู้ใช้เปิดอยู่"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"มีการพักสาย"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"โทรต่อ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"อนุญาตให้ใช้วิดีโอไหม"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"แอปโทรศัพท์ต้องการใช้กล้องเพื่อโทรแบบวิดีโอ"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"อนุญาต"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ปฏิเสธ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tl/strings.xml b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
index 6fcc6d5..ca91097 100644
--- a/java/com/android/incallui/video/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Off ang video nila"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Naka-on ang video nila"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Naka-hold ang tawag"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Itinuloy ang tawag"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Payagan ang video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Gustong gamitin ng app na Telepono ang iyong camera para sa mga video call."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Payagan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tanggihan"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tr/strings.xml b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
index 291f977..1cd4a67 100644
--- a/java/com/android/incallui/video/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videosu kapalı"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video açık"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Çağrı beklemede"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Çağrı sürdürüldü"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Videoya izin verilsin mi?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon uygulaması, görüntülü görüşmeler için kameranızı kullanmak istiyor."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"İzin ver"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Reddet"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uk/strings.xml b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
index d9a4748..c450c62 100644
--- a/java/com/android/incallui/video/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відео абон. вимкнено"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відео співрозмовника ввімкнено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Виклик утримується"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дзвінок відновлено"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Увімкнути відео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Додаток Телефон запитує дозволу використовувати камеру для відеодзвінків."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дозволити"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Відмовити"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ur/strings.xml b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
index 3df2621..798681d 100644
--- a/java/com/android/incallui/video/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ان کی ویڈیو آف ہے"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ان کی ویڈیو آن ہے"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"کال ہولڈ پر ہے"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"کال دوبارہ شروع ہو گئی"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ویڈیو کی اجازت دیں؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"فون ایپ ویڈیو کالز کیلئے آپ کا کیمرا استعمال کرنا چاہتی ہے۔"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"اجازت دیں"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"مسترد کریں"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uz/strings.xml b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
index c3d302b..cf92b1e 100644
--- a/java/com/android/incallui/video/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Suhbatdosh video kamerasi o‘chiq"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Suhbatdosh kamerasi yoniq"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Kutish holatida"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Qo‘ng‘iroq tiklandi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kamera yoqilsinmi?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon ilovasi video qo‘ng‘iroqlar uchun kamerangizdan foydalanishga ruxsat so‘ramoqda."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Ruxsat berish"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rad etish"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-vi/strings.xml b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
index 5b78ebe..442ec7e 100644
--- a/java/com/android/incallui/video/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video của họ đã tắt"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video của họ đang bật"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Cuộc gọi đang chờ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Đã tiếp tục cuộc gọi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Cho phép video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Ứng dụng Điện thoại muốn sử dụng máy ảnh của bạn cho cuộc gọi điện video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Cho phép"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Từ chối"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
index a53fb64..e9e7f9e 100644
--- a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
@@ -19,5 +19,5 @@
   <dimen name="videocall_button_size">72dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
-  <dimen name="videocall_preview_long">104dp</dimen>
+  <dimen name="videocall_preview_long">116dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
index f88561e..6c0d350 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"对方的视频画面已关闭"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"对方已开启视频功能"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"保持的通话"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通话已恢复"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"允许使用摄像头？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"“电话”应用需要使用摄像头进行视频通话。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允许"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒绝"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
index 5590c8c..2ac6a47 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"他們已關閉視像功能"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"另一方已開啟視像功能"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話目前保留"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話繼續"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"允許視像？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"手機應用程式希望使用您的相機進行視像通話。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允許"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒絕"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
index 0e4e21f..115822a 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"對方的視訊畫面已關閉"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"對方已開啟視訊畫面"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"已恢復通話"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"要允許應用程式存取攝影機嗎？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"「電話」應用程式要求存取你的攝影機，以便進行視訊通話。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允許"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒絕"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zu/strings.xml b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
index 414ddf1..0752e52 100644
--- a/java/com/android/incallui/video/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ 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
+   -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ividiyo yabo ivaliwe"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Ividiyo yabo ivuliwe"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Ikholi imisiwe"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Ikholi iqaliswe kabusha"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vumela ividiyo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Uhlelo lokusebenza lwefoni lifuna ukusebenzisela ikhamera yakho amakholi evidiyo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Vumela"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Nqaba"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/dimens.xml b/java/com/android/incallui/video/impl/res/values/dimens.xml
index aa08c9d..606b158 100644
--- a/java/com/android/incallui/video/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values/dimens.xml
@@ -17,7 +17,7 @@
 <resources>
   <dimen name="videocall_preview_width">72dp</dimen>
   <dimen name="videocall_preview_height">72dp</dimen>
-  <dimen name="videocall_preview_long">84dp</dimen>
+  <dimen name="videocall_preview_long">96dp</dimen>
   <dimen name="videocall_preview_margin_bottom">24dp</dimen>
   <dimen name="videocall_preview_margin_start">24dp</dimen>
   <dimen name="videocall_preview_margin_end">24dp</dimen>
diff --git a/java/com/android/incallui/video/impl/res/values/strings.xml b/java/com/android/incallui/video/impl/res/values/strings.xml
index 2b72b80..58ea8bd 100644
--- a/java/com/android/incallui/video/impl/res/values/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
 <resources>
 
   <!-- Text indicates the video from remote party is off. [CHAR LIMIT=40] -->
@@ -13,16 +29,4 @@
   <!-- Text indicates the call is resumed from held by remote party. [CHAR LIMIT=20] -->
   <string name="videocall_remotely_resumed">Call resumed</string>
 
-  <!-- Title of dialog to ask user for camera permission. [CHAR LIMIT=30] -->
-  <string name="camera_permission_dialog_title">Allow video?</string>
-
-  <!-- Message of dialog to ask user for camera permission. [CHAR LIMIT=100] -->
-  <string name="camera_permission_dialog_message">The Phone app wants to use your camera for video calls.</string>
-
-  <!-- Text of button to be confirmed for camera permission by user. [CHAR LIMIT=20] -->
-  <string name="camera_permission_dialog_positive_button">Allow</string>
-
-  <!-- Text of button to be declined for camera permission by user. [CHAR LIMIT=20] -->
-  <string name="camera_permission_dialog_negative_button">Deny</string>
-
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/styles.xml b/java/com/android/incallui/video/impl/res/values/styles.xml
index f73075f..010aca2 100644
--- a/java/com/android/incallui/video/impl/res/values/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values/styles.xml
@@ -23,7 +23,8 @@
     <item name="android:stateListAnimator">@animator/disabled_alpha</item>
   </style>
   <style name="VideoPreviewHolder">
-    <item name="android:layout_gravity">bottom|start</item>
+    <item name="android:layout_alignParentBottom">true</item>
+    <item name="android:layout_alignParentStart">true</item>
     <item name="android:layout_width">@dimen/videocall_preview_width</item>
     <item name="android:layout_height">@dimen/videocall_preview_long</item>
     <item name="android:layout_marginBottom">@dimen/videocall_preview_margin_bottom</item>
diff --git a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
index e7e69df..55ea23f 100644
--- a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
+++ b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
@@ -37,7 +37,7 @@
 
   void onCameraPermissionGranted();
 
-  boolean shouldShowCameraPermissionDialog();
+  boolean shouldShowCameraPermissionToast();
 
   void onCameraPermissionDialogShown();
 
diff --git a/java/com/android/incallui/videosurface/bindings/VideoSurfaceBindings.java b/java/com/android/incallui/videosurface/bindings/VideoSurfaceBindings.java
index 96fccb4..1cb26bd 100644
--- a/java/com/android/incallui/videosurface/bindings/VideoSurfaceBindings.java
+++ b/java/com/android/incallui/videosurface/bindings/VideoSurfaceBindings.java
@@ -24,12 +24,12 @@
 /** Bindings for video surface module. */
 public class VideoSurfaceBindings {
 
-  public static VideoSurfaceTexture createLocalVideoSurfaceTexture() {
-    return new VideoSurfaceTextureImpl(VideoSurfaceTexture.SURFACE_TYPE_LOCAL);
+  public static VideoSurfaceTexture createLocalVideoSurfaceTexture(boolean isPixel2017) {
+    return new VideoSurfaceTextureImpl(isPixel2017, VideoSurfaceTexture.SURFACE_TYPE_LOCAL);
   }
 
-  public static VideoSurfaceTexture createRemoteVideoSurfaceTexture() {
-    return new VideoSurfaceTextureImpl(VideoSurfaceTexture.SURFACE_TYPE_REMOTE);
+  public static VideoSurfaceTexture createRemoteVideoSurfaceTexture(boolean isPixel2017) {
+    return new VideoSurfaceTextureImpl(isPixel2017, VideoSurfaceTexture.SURFACE_TYPE_REMOTE);
   }
 
   public static void scaleVideoAndFillView(
diff --git a/java/com/android/incallui/videosurface/impl/VideoSurfaceTextureImpl.java b/java/com/android/incallui/videosurface/impl/VideoSurfaceTextureImpl.java
index 8cac402..6ce564a 100644
--- a/java/com/android/incallui/videosurface/impl/VideoSurfaceTextureImpl.java
+++ b/java/com/android/incallui/videosurface/impl/VideoSurfaceTextureImpl.java
@@ -18,6 +18,8 @@
 
 import android.graphics.Point;
 import android.graphics.SurfaceTexture;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
@@ -33,6 +35,8 @@
  */
 public class VideoSurfaceTextureImpl implements VideoSurfaceTexture {
   @SurfaceType private final int surfaceType;
+  private final boolean isPixel2017;
+
   private VideoSurfaceDelegate delegate;
   private TextureView textureView;
   private Surface savedSurface;
@@ -41,7 +45,8 @@
   private Point sourceVideoDimensions;
   private boolean isDoneWithSurface;
 
-  public VideoSurfaceTextureImpl(@SurfaceType int surfaceType) {
+  public VideoSurfaceTextureImpl(boolean isPixel2017, @SurfaceType int surfaceType) {
+    this.isPixel2017 = isPixel2017;
     this.surfaceType = surfaceType;
   }
 
@@ -68,6 +73,13 @@
         "surfaceDimensions: " + surfaceDimensions + " " + toString());
     this.surfaceDimensions = surfaceDimensions;
     if (surfaceDimensions != null && savedSurfaceTexture != null) {
+      // Only do this on O (not at least O) because we expect this issue to be fixed in OMR1
+      if (VERSION.SDK_INT == VERSION_CODES.O && isPixel2017) {
+        LogUtil.i(
+            "VideoSurfaceTextureImpl.setSurfaceDimensions",
+            "skip setting default buffer size on Pixel 2017 ODR");
+        return;
+      }
       savedSurfaceTexture.setDefaultBufferSize(surfaceDimensions.x, surfaceDimensions.y);
     }
   }
diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java
index 7da74c0..79a8c60 100644
--- a/java/com/android/incallui/videotech/VideoTech.java
+++ b/java/com/android/incallui/videotech/VideoTech.java
@@ -17,6 +17,8 @@
 package com.android.incallui.videotech;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
+import com.android.dialer.logging.DialerImpression;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
 import com.android.incallui.videotech.utils.SessionModificationState;
@@ -41,6 +43,8 @@
 
   void onCallStateChanged(Context context, int newState);
 
+  void onRemovedFromCallList();
+
   @SessionModificationState
   int getSessionModificationState();
 
@@ -62,10 +66,16 @@
 
   void unpause();
 
-  void setCamera(String cameraId);
+  void setCamera(@Nullable String cameraId);
 
   void setDeviceOrientation(int rotation);
 
+  /**
+   * Called on {@code VideoTechManager.savedTech} when it's first selected and it will always be
+   * used.
+   */
+  void becomePrimary();
+
   /** Listener for video call events. */
   interface VideoTechListener {
 
@@ -80,5 +90,7 @@
     void onVideoUpgradeRequestReceived();
 
     void onUpgradedToVideo(boolean switchToSpeaker);
+
+    void onImpressionLoggingNeeded(DialerImpression.Type impressionType);
   }
 }
diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
index d0a111d..34dd1bf 100644
--- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
+++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
@@ -17,6 +17,7 @@
 package com.android.incallui.videotech.empty;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -56,6 +57,9 @@
   public void onCallStateChanged(Context context, int newState) {}
 
   @Override
+  public void onRemovedFromCallList() {}
+
+  @Override
   public int getSessionModificationState() {
     return SessionModificationState.NO_REQUEST;
   }
@@ -90,8 +94,11 @@
   public void unpause() {}
 
   @Override
-  public void setCamera(String cameraId) {}
+  public void setCamera(@Nullable String cameraId) {}
 
   @Override
   public void setDeviceOrientation(int rotation) {}
+
+  @Override
+  public void becomePrimary() {}
 }
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java
index 17c2e65..b839293 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java
@@ -161,6 +161,13 @@
     }
   }
 
+  // In the vendor code rx_pause and rx_resume get triggered when the video player starts or stops
+  // playing the incoming video stream.  For the case where you're resuming a held call, its
+  // definitely a good signal to use to know that the video is resuming (though the video state
+  // should change to indicate its not paused in this case as well).  However, keep in mind you'll
+  // get these signals as well on carriers that don't support the video pause signalling (like TMO)
+  // so you want to ensure you don't send sessionModifyRequests with pause/resume based on these
+  // signals. Also, its technically possible to have a pause/resume if the video signal degrades.
   @Override
   public void onCallSessionEvent(int event) {
     switch (event) {
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index 01e4bb8..fec05dc 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.telecom.Call;
 import android.telecom.Call.Details;
 import android.telecom.VideoProfile;
@@ -25,6 +26,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.LoggingBindings;
+import com.android.dialer.util.CallUtil;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
 import com.android.incallui.videotech.VideoTech;
@@ -40,6 +42,13 @@
       SessionModificationState.NO_REQUEST;
   private int previousVideoState = VideoProfile.STATE_AUDIO_ONLY;
   private boolean paused = false;
+  private String savedCameraId;
+
+  // Hold onto a flag of whether or not stopTransmission was called but resumeTransmission has not
+  // been. This is needed because there is time between calling stopTransmission and
+  // call.getDetails().getVideoState() reflecting the change. During that time, pause() and
+  // unpause() will send the incorrect VideoProfile.
+  private boolean transmissionStopped = false;
 
   public ImsVideoTech(LoggingBindings logger, VideoTechListener listener, Call call) {
     this.logger = logger;
@@ -53,12 +62,31 @@
       return false;
     }
 
-    boolean hasCapabilities =
-        call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX)
-            && call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX);
+    if (call.getVideoCall() == null) {
+      return false;
+    }
 
-    return call.getVideoCall() != null
-        && (hasCapabilities || VideoProfile.isVideo(call.getDetails().getVideoState()));
+    // We are already in an IMS video call
+    if (VideoProfile.isVideo(call.getDetails().getVideoState())) {
+      return true;
+    }
+
+    // The user has disabled IMS video calling in system settings
+    if (!CallUtil.isVideoEnabled(context)) {
+      return false;
+    }
+
+    // The current call doesn't support transmitting video
+    if (!call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {
+      return false;
+    }
+
+    // The current call remote device doesn't support receiving video
+    if (!call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {
+      return false;
+    }
+
+    return true;
   }
 
   @Override
@@ -120,6 +148,9 @@
   }
 
   @Override
+  public void onRemovedFromCallList() {}
+
+  @Override
   public int getSessionModificationState() {
     return sessionModificationState;
   }
@@ -183,7 +214,7 @@
   public void stopTransmission() {
     LogUtil.enterBlock("ImsVideoTech.stopTransmission");
 
-    setCamera(null);
+    transmissionStopped = true;
 
     int unpausedVideoState = getUnpausedVideoState(call.getDetails().getVideoState());
     call.getVideoCall()
@@ -195,6 +226,8 @@
   public void resumeTransmission() {
     LogUtil.enterBlock("ImsVideoTech.resumeTransmission");
 
+    transmissionStopped = false;
+
     int unpausedVideoState = getUnpausedVideoState(call.getDetails().getVideoState());
     call.getVideoCall()
         .sendSessionModifyRequest(
@@ -204,38 +237,75 @@
 
   @Override
   public void pause() {
-    if (canPause() && !paused) {
+    if (call.getState() != Call.STATE_ACTIVE) {
+      LogUtil.i("ImsVideoTech.pause", "not pausing because call is not active");
+      return;
+    }
+
+    if (!isTransmittingOrReceiving()) {
+      LogUtil.i("ImsVideoTech.pause", "not pausing because this is not a video call");
+      return;
+    }
+
+    if (paused) {
+      LogUtil.i("ImsVideoTech.pause", "already paused");
+      return;
+    }
+
+    paused = true;
+
+    if (canPause()) {
       LogUtil.i("ImsVideoTech.pause", "sending pause request");
-      paused = true;
       int pausedVideoState = call.getDetails().getVideoState() | VideoProfile.STATE_PAUSED;
+      if (transmissionStopped && VideoProfile.isTransmissionEnabled(pausedVideoState)) {
+        LogUtil.i("ImsVideoTech.pause", "overriding TX to false due to user request");
+        pausedVideoState &= ~VideoProfile.STATE_TX_ENABLED;
+      }
       call.getVideoCall().sendSessionModifyRequest(new VideoProfile(pausedVideoState));
     } else {
-      LogUtil.i(
-          "ImsVideoTech.pause",
-          "not sending request: canPause: %b, paused: %b",
-          canPause(),
-          paused);
+      // This video call does not support pause so we fall back to disabling the camera
+      LogUtil.i("ImsVideoTech.pause", "disabling camera");
+      call.getVideoCall().setCamera(null);
     }
   }
 
   @Override
   public void unpause() {
-    if (canPause() && paused) {
+    if (call.getState() != Call.STATE_ACTIVE) {
+      LogUtil.i("ImsVideoTech.unpause", "not unpausing because call is not active");
+      return;
+    }
+
+    if (!isTransmittingOrReceiving()) {
+      LogUtil.i("ImsVideoTech.unpause", "not unpausing because this is not a video call");
+      return;
+    }
+
+    if (!paused) {
+      LogUtil.i("ImsVideoTech.unpause", "already unpaused");
+      return;
+    }
+
+    paused = false;
+
+    if (canPause()) {
       LogUtil.i("ImsVideoTech.unpause", "sending unpause request");
-      paused = false;
       int unpausedVideoState = getUnpausedVideoState(call.getDetails().getVideoState());
+      if (transmissionStopped && VideoProfile.isTransmissionEnabled(unpausedVideoState)) {
+        LogUtil.i("ImsVideoTech.unpause", "overriding TX to false due to user request");
+        unpausedVideoState &= ~VideoProfile.STATE_TX_ENABLED;
+      }
       call.getVideoCall().sendSessionModifyRequest(new VideoProfile(unpausedVideoState));
     } else {
-      LogUtil.i(
-          "ImsVideoTech.unpause",
-          "not sending request: canPause: %b, paused: %b",
-          canPause(),
-          paused);
+      // This video call does not support pause so we fall back to re-enabling the camera
+      LogUtil.i("ImsVideoTech.pause", "re-enabling camera");
+      setCamera(savedCameraId);
     }
   }
 
   @Override
-  public void setCamera(String cameraId) {
+  public void setCamera(@Nullable String cameraId) {
+    savedCameraId = cameraId;
     call.getVideoCall().setCamera(cameraId);
     call.getVideoCall().requestCameraCapabilities();
   }
@@ -245,10 +315,14 @@
     call.getVideoCall().setDeviceOrientation(rotation);
   }
 
+  @Override
+  public void becomePrimary() {
+    listener.onImpressionLoggingNeeded(
+        DialerImpression.Type.UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN_FOR_IMS);
+  }
+
   private boolean canPause() {
-    return call.getDetails().can(Details.CAPABILITY_CAN_PAUSE_VIDEO)
-        && call.getState() == Call.STATE_ACTIVE
-        && isTransmitting();
+    return call.getDetails().can(Details.CAPABILITY_CAN_PAUSE_VIDEO);
   }
 
   static int getUnpausedVideoState(int videoState) {
diff --git a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
index e49d0b8..4882ba8 100644
--- a/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
+++ b/java/com/android/incallui/videotech/lightbringer/LightbringerTech.java
@@ -17,11 +17,17 @@
 package com.android.incallui.videotech.lightbringer;
 
 import android.content.Context;
+import android.os.Build;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.telecom.Call;
+import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.lightbringer.Lightbringer;
 import com.android.dialer.lightbringer.LightbringerListener;
+import com.android.dialer.logging.DialerImpression;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
 import com.android.incallui.videotech.VideoTech;
@@ -30,15 +36,18 @@
 public class LightbringerTech implements VideoTech, LightbringerListener {
   private final Lightbringer lightbringer;
   private final VideoTechListener listener;
+  private final Call call;
   private final String callingNumber;
   private int callState = Call.STATE_NEW;
 
   public LightbringerTech(
       @NonNull Lightbringer lightbringer,
       @NonNull VideoTechListener listener,
+      @NonNull Call call,
       @NonNull String callingNumber) {
     this.lightbringer = Assert.isNotNull(lightbringer);
     this.listener = Assert.isNotNull(listener);
+    this.call = Assert.isNotNull(call);
     this.callingNumber = Assert.isNotNull(callingNumber);
 
     lightbringer.registerListener(this);
@@ -46,7 +55,33 @@
 
   @Override
   public boolean isAvailable(Context context) {
-    return callState == Call.STATE_ACTIVE && lightbringer.isReachable(context, callingNumber);
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      LogUtil.v("LightbringerTech.isAvailable", "upgrade unavailable, only supported on O+");
+      return false;
+    }
+
+    if (!ConfigProviderBindings.get(context)
+        .getBoolean("enable_lightbringer_video_upgrade", true)) {
+      LogUtil.v("LightbringerTech.isAvailable", "upgrade disabled by flag");
+      return false;
+    }
+
+    if (callState != Call.STATE_ACTIVE) {
+      LogUtil.v("LightbringerTech.isAvailable", "upgrade unavailable, call must be active");
+      return false;
+    }
+
+    if (!TelecomManagerCompat.supportsHandover()) {
+      LogUtil.v("LightbringerTech.isAvailable", "upgrade unavailable, telephony support missing");
+      return false;
+    }
+
+    if (!lightbringer.supportsUpgrade(context, callingNumber)) {
+      LogUtil.v("LightbringerTech.isAvailable", "upgrade unavailable, number does not support it");
+      return false;
+    }
+
+    return true;
   }
 
   @Override
@@ -80,13 +115,19 @@
   }
 
   @Override
+  public void onRemovedFromCallList() {
+    lightbringer.unregisterListener(this);
+  }
+
+  @Override
   public int getSessionModificationState() {
     return SessionModificationState.NO_REQUEST;
   }
 
   @Override
   public void upgradeToVideo() {
-    // TODO: upgrade to a video call
+    listener.onImpressionLoggingNeeded(DialerImpression.Type.LIGHTBRINGER_UPGRADE_REQUESTED);
+    lightbringer.requestUpgrade(call);
   }
 
   @Override
@@ -120,18 +161,20 @@
   }
 
   @Override
-  public void pause() {
+  public void pause() {}
+
+  @Override
+  public void unpause() {}
+
+  @Override
+  public void setCamera(@Nullable String cameraId) {
     throw Assert.createUnsupportedOperationFailException();
   }
 
   @Override
-  public void unpause() {
-    throw Assert.createUnsupportedOperationFailException();
-  }
-
-  @Override
-  public void setCamera(String cameraId) {
-    throw Assert.createUnsupportedOperationFailException();
+  public void becomePrimary() {
+    listener.onImpressionLoggingNeeded(
+        DialerImpression.Type.UPGRADE_TO_VIDEO_CALL_BUTTON_SHOWN_FOR_LIGHTBRINGER);
   }
 
   @Override
diff --git a/java/com/android/incallui/videotech/utils/VideoUtils.java b/java/com/android/incallui/videotech/utils/VideoUtils.java
index 5276540..9dfc687 100644
--- a/java/com/android/incallui/videotech/utils/VideoUtils.java
+++ b/java/com/android/incallui/videotech/utils/VideoUtils.java
@@ -20,12 +20,10 @@
 import android.content.pm.PackageManager;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
-import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.PermissionsUtil;
 
 public class VideoUtils {
 
-  private static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user";
-
   public static boolean hasSentVideoUpgradeRequest(@SessionModificationState int state) {
     return state == SessionModificationState.WAITING_FOR_UPGRADE_TO_VIDEO_RESPONSE
         || state == SessionModificationState.UPGRADE_TO_VIDEO_REQUEST_FAILED
@@ -37,24 +35,12 @@
     return state == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
   }
 
-  public static boolean hasCameraPermissionAndAllowedByUser(@NonNull Context context) {
-    return isCameraAllowedByUser(context) && hasCameraPermission(context);
+  public static boolean hasCameraPermissionAndShownPrivacyToast(@NonNull Context context) {
+    return PermissionsUtil.hasCameraPrivacyToastShown(context) && hasCameraPermission(context);
   }
 
   public static boolean hasCameraPermission(@NonNull Context context) {
     return ContextCompat.checkSelfPermission(context, android.Manifest.permission.CAMERA)
         == PackageManager.PERMISSION_GRANTED;
   }
-
-  public static boolean isCameraAllowedByUser(@NonNull Context context) {
-    return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
-        .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false);
-  }
-
-  public static void setCameraAllowedByUser(@NonNull Context context) {
-    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
-        .edit()
-        .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true)
-        .apply();
-  }
 }
diff --git a/java/com/android/incallui/wifi/AndroidManifest.xml b/java/com/android/incallui/wifi/AndroidManifest.xml
deleted file mode 100644
index 843f8f3..0000000
--- a/java/com/android/incallui/wifi/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest
-  package="com.android.incallui.wifi">
-</manifest>
diff --git a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java b/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java
deleted file mode 100644
index 85603bf..0000000
--- a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.incallui.wifi;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.telecom.DisconnectCause;
-import android.util.Pair;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-
-/** Prompts the user to enable Wi-Fi calling. */
-public class EnableWifiCallingPrompt {
-  // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect
-  // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might
-  // consider using a more explicit way to signal this.
-  private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";
-  private static final String ACTION_WIFI_CALLING_SETTINGS =
-      "android.settings.WIFI_CALLING_SETTINGS";
-  private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings";
-
-  public static boolean shouldShowPrompt(@NonNull DisconnectCause cause) {
-    Assert.isNotNull(cause);
-    if (cause.getReason() != null && cause.getReason().startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) {
-      LogUtil.i(
-          "EnableWifiCallingPrompt.shouldShowPrompt",
-          "showing prompt for disconnect cause: %s",
-          cause);
-      return true;
-    }
-    return false;
-  }
-
-  @NonNull
-  public static Pair<Dialog, CharSequence> createDialog(
-      final @NonNull Context context, @NonNull DisconnectCause cause) {
-    Assert.isNotNull(context);
-    Assert.isNotNull(cause);
-    CharSequence message = cause.getDescription();
-    Dialog dialog =
-        new AlertDialog.Builder(context)
-            .setMessage(message)
-            .setPositiveButton(
-                R.string.incall_enable_wifi_calling_button,
-                new OnClickListener() {
-                  @Override
-                  public void onClick(DialogInterface dialog, int which) {
-                    openWifiCallingSettings(context);
-                  }
-                })
-            .setNegativeButton(android.R.string.cancel, null)
-            .create();
-    return new Pair<Dialog, CharSequence>(dialog, message);
-  }
-
-  private static void openWifiCallingSettings(@NonNull Context context) {
-    LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings");
-    context.startActivity(
-        new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE));
-  }
-
-  private EnableWifiCallingPrompt() {}
-}
diff --git a/java/com/android/incallui/wifi/res/values-af/strings.xml b/java/com/android/incallui/wifi/res/values-af/strings.xml
deleted file mode 100644
index d9df5c6..0000000
--- a/java/com/android/incallui/wifi/res/values-af/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktiveer"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-am/strings.xml b/java/com/android/incallui/wifi/res/values-am/strings.xml
deleted file mode 100644
index 1aa5673..0000000
--- a/java/com/android/incallui/wifi/res/values-am/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"አንቃ"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ar/strings.xml b/java/com/android/incallui/wifi/res/values-ar/strings.xml
deleted file mode 100644
index 972cd37..0000000
--- a/java/com/android/incallui/wifi/res/values-ar/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"تمكين"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-az/strings.xml b/java/com/android/incallui/wifi/res/values-az/strings.xml
deleted file mode 100644
index 46bbda1..0000000
--- a/java/com/android/incallui/wifi/res/values-az/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktiv edin"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 51a57e4..0000000
--- a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Omogući"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-be/strings.xml b/java/com/android/incallui/wifi/res/values-be/strings.xml
deleted file mode 100644
index a8277a1..0000000
--- a/java/com/android/incallui/wifi/res/values-be/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Уключыць"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-bg/strings.xml b/java/com/android/incallui/wifi/res/values-bg/strings.xml
deleted file mode 100644
index ff5b94d..0000000
--- a/java/com/android/incallui/wifi/res/values-bg/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Активиране"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-bn/strings.xml b/java/com/android/incallui/wifi/res/values-bn/strings.xml
deleted file mode 100644
index 94e84c3..0000000
--- a/java/com/android/incallui/wifi/res/values-bn/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"সক্ষম করুন"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-bs/strings.xml b/java/com/android/incallui/wifi/res/values-bs/strings.xml
deleted file mode 100644
index 51a57e4..0000000
--- a/java/com/android/incallui/wifi/res/values-bs/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Omogući"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ca/strings.xml b/java/com/android/incallui/wifi/res/values-ca/strings.xml
deleted file mode 100644
index 8af77c9..0000000
--- a/java/com/android/incallui/wifi/res/values-ca/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Activa"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-cs/strings.xml b/java/com/android/incallui/wifi/res/values-cs/strings.xml
deleted file mode 100644
index b057d1c..0000000
--- a/java/com/android/incallui/wifi/res/values-cs/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Zapnout"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-da/strings.xml b/java/com/android/incallui/wifi/res/values-da/strings.xml
deleted file mode 100644
index 81f837f..0000000
--- a/java/com/android/incallui/wifi/res/values-da/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktivér"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-de/strings.xml b/java/com/android/incallui/wifi/res/values-de/strings.xml
deleted file mode 100644
index d6dda7e..0000000
--- a/java/com/android/incallui/wifi/res/values-de/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktivieren"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-el/strings.xml b/java/com/android/incallui/wifi/res/values-el/strings.xml
deleted file mode 100644
index c181743..0000000
--- a/java/com/android/incallui/wifi/res/values-el/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Ενεργοποίηση"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml b/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml
deleted file mode 100644
index 6877c49..0000000
--- a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Enable"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml b/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml
deleted file mode 100644
index 6877c49..0000000
--- a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Enable"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml b/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml
deleted file mode 100644
index 6877c49..0000000
--- a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Enable"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml b/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml
deleted file mode 100644
index f460251..0000000
--- a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Habilitar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-es/strings.xml b/java/com/android/incallui/wifi/res/values-es/strings.xml
deleted file mode 100644
index f460251..0000000
--- a/java/com/android/incallui/wifi/res/values-es/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Habilitar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-et/strings.xml b/java/com/android/incallui/wifi/res/values-et/strings.xml
deleted file mode 100644
index ae447bd..0000000
--- a/java/com/android/incallui/wifi/res/values-et/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Luba"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-eu/strings.xml b/java/com/android/incallui/wifi/res/values-eu/strings.xml
deleted file mode 100644
index 557bdfb..0000000
--- a/java/com/android/incallui/wifi/res/values-eu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Gaitu"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-fa/strings.xml b/java/com/android/incallui/wifi/res/values-fa/strings.xml
deleted file mode 100644
index a1bf8da..0000000
--- a/java/com/android/incallui/wifi/res/values-fa/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"فعال کردن"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-fi/strings.xml b/java/com/android/incallui/wifi/res/values-fi/strings.xml
deleted file mode 100644
index 06aac1d..0000000
--- a/java/com/android/incallui/wifi/res/values-fi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Ota käyttöön"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml b/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml
deleted file mode 100644
index ff7bc8b..0000000
--- a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Activer"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-fr/strings.xml b/java/com/android/incallui/wifi/res/values-fr/strings.xml
deleted file mode 100644
index ff7bc8b..0000000
--- a/java/com/android/incallui/wifi/res/values-fr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Activer"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-gl/strings.xml b/java/com/android/incallui/wifi/res/values-gl/strings.xml
deleted file mode 100644
index eb6e939..0000000
--- a/java/com/android/incallui/wifi/res/values-gl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Activar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-gu/strings.xml b/java/com/android/incallui/wifi/res/values-gu/strings.xml
deleted file mode 100644
index 39b9849..0000000
--- a/java/com/android/incallui/wifi/res/values-gu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"સક્ષમ કરો"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-hi/strings.xml b/java/com/android/incallui/wifi/res/values-hi/strings.xml
deleted file mode 100644
index f6c6b78..0000000
--- a/java/com/android/incallui/wifi/res/values-hi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"सक्षम करें"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-hr/strings.xml b/java/com/android/incallui/wifi/res/values-hr/strings.xml
deleted file mode 100644
index 51a57e4..0000000
--- a/java/com/android/incallui/wifi/res/values-hr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Omogući"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-hu/strings.xml b/java/com/android/incallui/wifi/res/values-hu/strings.xml
deleted file mode 100644
index c1daa24..0000000
--- a/java/com/android/incallui/wifi/res/values-hu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Engedélyezés"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-hy/strings.xml b/java/com/android/incallui/wifi/res/values-hy/strings.xml
deleted file mode 100644
index e9390bd..0000000
--- a/java/com/android/incallui/wifi/res/values-hy/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Միացնել"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-in/strings.xml b/java/com/android/incallui/wifi/res/values-in/strings.xml
deleted file mode 100644
index c6ed43c..0000000
--- a/java/com/android/incallui/wifi/res/values-in/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktifkan"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-is/strings.xml b/java/com/android/incallui/wifi/res/values-is/strings.xml
deleted file mode 100644
index 03316aa..0000000
--- a/java/com/android/incallui/wifi/res/values-is/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Kveikja"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-it/strings.xml b/java/com/android/incallui/wifi/res/values-it/strings.xml
deleted file mode 100644
index d53ccdc..0000000
--- a/java/com/android/incallui/wifi/res/values-it/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Abilita"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-iw/strings.xml b/java/com/android/incallui/wifi/res/values-iw/strings.xml
deleted file mode 100644
index c624f64..0000000
--- a/java/com/android/incallui/wifi/res/values-iw/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"הפעל"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ja/strings.xml b/java/com/android/incallui/wifi/res/values-ja/strings.xml
deleted file mode 100644
index e918153..0000000
--- a/java/com/android/incallui/wifi/res/values-ja/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"有効にする"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ka/strings.xml b/java/com/android/incallui/wifi/res/values-ka/strings.xml
deleted file mode 100644
index bd778d5..0000000
--- a/java/com/android/incallui/wifi/res/values-ka/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ჩართვა"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-kk/strings.xml b/java/com/android/incallui/wifi/res/values-kk/strings.xml
deleted file mode 100644
index c0c62a4..0000000
--- a/java/com/android/incallui/wifi/res/values-kk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Қосу"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-km/strings.xml b/java/com/android/incallui/wifi/res/values-km/strings.xml
deleted file mode 100644
index 73f194f..0000000
--- a/java/com/android/incallui/wifi/res/values-km/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"បើក"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-kn/strings.xml b/java/com/android/incallui/wifi/res/values-kn/strings.xml
deleted file mode 100644
index 2f776cf..0000000
--- a/java/com/android/incallui/wifi/res/values-kn/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ko/strings.xml b/java/com/android/incallui/wifi/res/values-ko/strings.xml
deleted file mode 100644
index 354efe6..0000000
--- a/java/com/android/incallui/wifi/res/values-ko/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"사용"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ky/strings.xml b/java/com/android/incallui/wifi/res/values-ky/strings.xml
deleted file mode 100644
index 6cf39db..0000000
--- a/java/com/android/incallui/wifi/res/values-ky/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Иштетүү"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-lo/strings.xml b/java/com/android/incallui/wifi/res/values-lo/strings.xml
deleted file mode 100644
index a34d48e..0000000
--- a/java/com/android/incallui/wifi/res/values-lo/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ເປິດນຳໃຊ້"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-lt/strings.xml b/java/com/android/incallui/wifi/res/values-lt/strings.xml
deleted file mode 100644
index b473b2d..0000000
--- a/java/com/android/incallui/wifi/res/values-lt/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Įgalinti"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-lv/strings.xml b/java/com/android/incallui/wifi/res/values-lv/strings.xml
deleted file mode 100644
index 6704846..0000000
--- a/java/com/android/incallui/wifi/res/values-lv/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Iespējot"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-mk/strings.xml b/java/com/android/incallui/wifi/res/values-mk/strings.xml
deleted file mode 100644
index 30e6e84..0000000
--- a/java/com/android/incallui/wifi/res/values-mk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Овозможи"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ml/strings.xml b/java/com/android/incallui/wifi/res/values-ml/strings.xml
deleted file mode 100644
index d20daa1..0000000
--- a/java/com/android/incallui/wifi/res/values-ml/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-mn/strings.xml b/java/com/android/incallui/wifi/res/values-mn/strings.xml
deleted file mode 100644
index a0b6bb4..0000000
--- a/java/com/android/incallui/wifi/res/values-mn/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Идэвхжүүлэх"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-mr/strings.xml b/java/com/android/incallui/wifi/res/values-mr/strings.xml
deleted file mode 100644
index e45dda1..0000000
--- a/java/com/android/incallui/wifi/res/values-mr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"सक्षम करा"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ms/strings.xml b/java/com/android/incallui/wifi/res/values-ms/strings.xml
deleted file mode 100644
index d87f96c..0000000
--- a/java/com/android/incallui/wifi/res/values-ms/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Dayakan"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-my/strings.xml b/java/com/android/incallui/wifi/res/values-my/strings.xml
deleted file mode 100644
index 93fba1c..0000000
--- a/java/com/android/incallui/wifi/res/values-my/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ဖွင့်ရန်"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-nb/strings.xml b/java/com/android/incallui/wifi/res/values-nb/strings.xml
deleted file mode 100644
index 0afafec..0000000
--- a/java/com/android/incallui/wifi/res/values-nb/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Slå på"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ne/strings.xml b/java/com/android/incallui/wifi/res/values-ne/strings.xml
deleted file mode 100644
index 0f15de7..0000000
--- a/java/com/android/incallui/wifi/res/values-ne/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"सक्षम पार्नुहोस्"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-nl/strings.xml b/java/com/android/incallui/wifi/res/values-nl/strings.xml
deleted file mode 100644
index 4fed4b3..0000000
--- a/java/com/android/incallui/wifi/res/values-nl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Inschakelen"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-no/strings.xml b/java/com/android/incallui/wifi/res/values-no/strings.xml
deleted file mode 100644
index 0afafec..0000000
--- a/java/com/android/incallui/wifi/res/values-no/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Slå på"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-pa/strings.xml b/java/com/android/incallui/wifi/res/values-pa/strings.xml
deleted file mode 100644
index 3397491..0000000
--- a/java/com/android/incallui/wifi/res/values-pa/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ਯੋਗ ਬਣਾਓ"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-pl/strings.xml b/java/com/android/incallui/wifi/res/values-pl/strings.xml
deleted file mode 100644
index 43ff017..0000000
--- a/java/com/android/incallui/wifi/res/values-pl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Włącz"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 4f1a423..0000000
--- a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Ativar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 4f1a423..0000000
--- a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Ativar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-pt/strings.xml b/java/com/android/incallui/wifi/res/values-pt/strings.xml
deleted file mode 100644
index 4f1a423..0000000
--- a/java/com/android/incallui/wifi/res/values-pt/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Ativar"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ro/strings.xml b/java/com/android/incallui/wifi/res/values-ro/strings.xml
deleted file mode 100644
index af90045..0000000
--- a/java/com/android/incallui/wifi/res/values-ro/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Activați"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ru/strings.xml b/java/com/android/incallui/wifi/res/values-ru/strings.xml
deleted file mode 100644
index 00ae00e..0000000
--- a/java/com/android/incallui/wifi/res/values-ru/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Включить"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-si/strings.xml b/java/com/android/incallui/wifi/res/values-si/strings.xml
deleted file mode 100644
index a19c389..0000000
--- a/java/com/android/incallui/wifi/res/values-si/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"සබල කරන්න"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sk/strings.xml b/java/com/android/incallui/wifi/res/values-sk/strings.xml
deleted file mode 100644
index 252f6e5..0000000
--- a/java/com/android/incallui/wifi/res/values-sk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Povoliť"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sl/strings.xml b/java/com/android/incallui/wifi/res/values-sl/strings.xml
deleted file mode 100644
index f1efb71..0000000
--- a/java/com/android/incallui/wifi/res/values-sl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Omogoči"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sq/strings.xml b/java/com/android/incallui/wifi/res/values-sq/strings.xml
deleted file mode 100644
index c69185d..0000000
--- a/java/com/android/incallui/wifi/res/values-sq/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktivizo"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sr/strings.xml b/java/com/android/incallui/wifi/res/values-sr/strings.xml
deleted file mode 100644
index 8bd22f6..0000000
--- a/java/com/android/incallui/wifi/res/values-sr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Омогући"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sv/strings.xml b/java/com/android/incallui/wifi/res/values-sv/strings.xml
deleted file mode 100644
index d0dbc40..0000000
--- a/java/com/android/incallui/wifi/res/values-sv/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Aktivera"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-sw/strings.xml b/java/com/android/incallui/wifi/res/values-sw/strings.xml
deleted file mode 100644
index f0cb245..0000000
--- a/java/com/android/incallui/wifi/res/values-sw/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Washa"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ta/strings.xml b/java/com/android/incallui/wifi/res/values-ta/strings.xml
deleted file mode 100644
index 38628af..0000000
--- a/java/com/android/incallui/wifi/res/values-ta/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"இயக்கு"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-te/strings.xml b/java/com/android/incallui/wifi/res/values-te/strings.xml
deleted file mode 100644
index 40fd08f..0000000
--- a/java/com/android/incallui/wifi/res/values-te/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"ప్రారంభించు"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-th/strings.xml b/java/com/android/incallui/wifi/res/values-th/strings.xml
deleted file mode 100644
index f201a20..0000000
--- a/java/com/android/incallui/wifi/res/values-th/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"เปิดใช้"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-tl/strings.xml b/java/com/android/incallui/wifi/res/values-tl/strings.xml
deleted file mode 100644
index b182eec..0000000
--- a/java/com/android/incallui/wifi/res/values-tl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"I-enable"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-tr/strings.xml b/java/com/android/incallui/wifi/res/values-tr/strings.xml
deleted file mode 100644
index 65e70e2..0000000
--- a/java/com/android/incallui/wifi/res/values-tr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Etkinleştir"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-uk/strings.xml b/java/com/android/incallui/wifi/res/values-uk/strings.xml
deleted file mode 100644
index db64076..0000000
--- a/java/com/android/incallui/wifi/res/values-uk/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Увімкнути"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-ur/strings.xml b/java/com/android/incallui/wifi/res/values-ur/strings.xml
deleted file mode 100644
index a788280..0000000
--- a/java/com/android/incallui/wifi/res/values-ur/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"فعال کریں"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-uz/strings.xml b/java/com/android/incallui/wifi/res/values-uz/strings.xml
deleted file mode 100644
index dd5c475..0000000
--- a/java/com/android/incallui/wifi/res/values-uz/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Yoqish"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-vi/strings.xml b/java/com/android/incallui/wifi/res/values-vi/strings.xml
deleted file mode 100644
index 003d5ad..0000000
--- a/java/com/android/incallui/wifi/res/values-vi/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Bật"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml
deleted file mode 100644
index a198042..0000000
--- a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"启用"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml
deleted file mode 100644
index b7cf926..0000000
--- a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"啟用"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml
deleted file mode 100644
index b7cf926..0000000
--- a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"啟用"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values-zu/strings.xml b/java/com/android/incallui/wifi/res/values-zu/strings.xml
deleted file mode 100644
index 6c516e7..0000000
--- a/java/com/android/incallui/wifi/res/values-zu/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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">
-    <string name="incall_enable_wifi_calling_button" msgid="2741166159276797490">"Vumela"</string>
-</resources>
diff --git a/java/com/android/incallui/wifi/res/values/strings.xml b/java/com/android/incallui/wifi/res/values/strings.xml
deleted file mode 100644
index 1b52b9f..0000000
--- a/java/com/android/incallui/wifi/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-  <!-- Button to enable Wi-Fi calling. This is displayed in a dialog after a phone call disconnects
-      because there is no cellular service.
-      [CHAR LIMIT=20] -->
-  <string name="incall_enable_wifi_calling_button">Enable</string>
-
-</resources>
diff --git a/java/com/android/voicemail/AndroidManifest.xml b/java/com/android/voicemail/AndroidManifest.xml
new file mode 100644
index 0000000..817cf1b
--- /dev/null
+++ b/java/com/android/voicemail/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<!--
+  ~ 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 xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.android.voicemail">
+
+  <uses-sdk
+    android:minSdkVersion="23"
+    android:targetSdkVersion="26"/>
+
+  <!-- Applications using this module should merge these permissions using android_manifest_merge -->
+
+  <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
+  <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+  <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.SEND_SMS"/>
+  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+  <application>
+    <receiver
+        android:name=".VoicemailSecretCodeReceiver"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.provider.Telephony.SECRET_CODE" />
+        <data android:scheme="android_secret_code" />
+      </intent-filter>
+    </receiver>
+
+    <receiver android:name="com.android.voicemail.VoicemailPowerCycleReceiver"
+        android:exported="false">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.intent.action.ACTION_SHUTDOWN" />
+      </intent-filter>
+    </receiver>
+  </application>
+</manifest>
diff --git a/java/com/android/voicemail/VoicemailClient.java b/java/com/android/voicemail/VoicemailClient.java
index 97b824b..d52a67a 100644
--- a/java/com/android/voicemail/VoicemailClient.java
+++ b/java/com/android/voicemail/VoicemailClient.java
@@ -18,7 +18,10 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.PersistableBundle;
 import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
@@ -52,6 +55,18 @@
       "com.android.voicemail.VoicemailClient.ACTION_SHOW_LEGACY_VOICEMAIL";
 
   /**
+   * Boolean extra send with {@link #ACTION_SHOW_LEGACY_VOICEMAIL}, indicating that the notification
+   * is sent by legacy mode and should not be suppressed even when VVM is activated
+   */
+  String EXTRA_IS_LEGACY_MODE = "is_legacy_mode";
+
+  /**
+   * Secret code to launch the voicemail config activity intended for OEMs and Carriers. {@code
+   * *#*#VVMCONFIG#*#*}
+   */
+  String VOICEMAIL_SECRET_CODE = "886266344";
+
+  /**
    * Whether the visual voicemail service is enabled for the {@code phoneAccountHandle}. "Enable"
    * means the user "wants" to have this service on, and does not mean the service is actually
    * functional(For example, the service is blocked on the carrier side. The service will be
@@ -122,4 +137,23 @@
    * provisioning. Being "activated" means all setup are completed, and VVM is expected to work.
    */
   boolean isActivated(Context context, PhoneAccountHandle phoneAccountHandle);
+
+  /**
+   * Called when {@link #VOICEMAIL_SECRET_CODE} is dialed. {@code context} will be a broadcast
+   * receiver context.
+   */
+  @MainThread
+  void showConfigUi(@NonNull Context context);
+
+  @NonNull
+  PersistableBundle getConfig(
+      @NonNull Context context, @Nullable PhoneAccountHandle phoneAccountHandle);
+
+  @MainThread
+  void onBoot(@NonNull Context context);
+
+  @MainThread
+  void onShutdown(@NonNull Context context);
+
+  void onTosAccepted(Context context);
 }
diff --git a/java/com/android/voicemail/VoicemailPowerCycleReceiver.java b/java/com/android/voicemail/VoicemailPowerCycleReceiver.java
new file mode 100644
index 0000000..e9362b4
--- /dev/null
+++ b/java/com/android/voicemail/VoicemailPowerCycleReceiver.java
@@ -0,0 +1,38 @@
+/*
+ * 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.voicemail;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import com.android.dialer.common.Assert;
+
+/** Receives {@link Intent#ACTION_BOOT_COMPLETED} and {@link Intent#ACTION_SHUTDOWN} */
+public class VoicemailPowerCycleReceiver extends BroadcastReceiver {
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
+    if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+      voicemailClient.onBoot(context);
+    } else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) {
+      voicemailClient.onShutdown(context);
+    } else {
+      throw Assert.createAssertionFailException("unexpected action: " + intent.getAction());
+    }
+  }
+}
diff --git a/java/com/android/voicemail/VoicemailSecretCodeReceiver.java b/java/com/android/voicemail/VoicemailSecretCodeReceiver.java
new file mode 100644
index 0000000..6d14241
--- /dev/null
+++ b/java/com/android/voicemail/VoicemailSecretCodeReceiver.java
@@ -0,0 +1,36 @@
+/*
+ * 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.voicemail;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import com.android.dialer.common.LogUtil;
+
+/** Receives android.provider.Telephony.SECRET_CODE */
+public class VoicemailSecretCodeReceiver extends BroadcastReceiver {
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    String host = intent.getData().getHost();
+    if (!VoicemailClient.VOICEMAIL_SECRET_CODE.equals(host)) {
+      return;
+    }
+    LogUtil.i("VoicemailSecretCodeReceiver.onReceive", "secret code received");
+    VoicemailComponent.get(context).getVoicemailClient().showConfigUi(context);
+  }
+}
diff --git a/java/com/android/voicemail/impl/ActivationTask.java b/java/com/android/voicemail/impl/ActivationTask.java
index 6e27b50..320ea2a 100644
--- a/java/com/android/voicemail/impl/ActivationTask.java
+++ b/java/com/android/voicemail/impl/ActivationTask.java
@@ -36,7 +36,6 @@
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
 import com.android.voicemail.impl.sms.StatusMessage;
 import com.android.voicemail.impl.sms.StatusSmsFetcher;
-import com.android.voicemail.impl.sync.OmtpVvmSyncService;
 import com.android.voicemail.impl.sync.SyncTask;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 import com.android.voicemail.impl.utils.LoggerUtils;
@@ -258,7 +257,7 @@
         VoicemailStatus.edit(context, phoneAccountHandle),
         OmtpEvents.CONFIG_REQUEST_STATUS_SUCCESS);
     clearLegacyVoicemailNotification(context, phoneAccountHandle);
-    SyncTask.start(context, phoneAccountHandle, OmtpVvmSyncService.SYNC_FULL_SYNC);
+    SyncTask.start(context, phoneAccountHandle);
   }
 
   /** Sends a broadcast to the dialer UI to clear legacy voicemail notifications if any. */
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index 95e6e82..4cad224 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -15,15 +15,10 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.voicemailomtp">
+  package="com.android.voicemail.impl">
 
   <application
-    android:allowBackup="false"
-    android:supportsRtl="true"
-    android:usesCleartextTraffic="true"
-    android:defaultToDeviceProtectedStorage="true"
-    android:directBootAware="true">
-
+    android:supportsRtl="true">
     <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
       be handling the settings. Has no effect before OC where dialer cannot provide voicemail
       settings-->
@@ -97,6 +92,16 @@
         android:exported="false"/>
 
     <service
+        android:name="com.android.voicemail.impl.transcribe.TranscriptionService"
+        android:permission="android.permission.BIND_JOB_SERVICE"
+        android:exported="false"/>
+
+    <service
+        android:name="com.android.voicemail.impl.transcribe.TranscriptionBackfillService"
+        android:permission="android.permission.BIND_JOB_SERVICE"
+        android:exported="false"/>
+
+    <service
         android:name="com.android.voicemail.impl.OmtpService"
         android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
         android:exported="true"
@@ -112,10 +117,10 @@
       android:windowSoftInputMode="stateVisible|adjustResize">
     </activity>
 
-    <receiver android:name="com.android.voicemail.impl.VoicemailBootReceiver"
-      android:exported="false">
+    <receiver android:name="com.android.voicemail.impl.PackageReplacedReceiver"
+        android:exported="false">
       <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
       </intent-filter>
     </receiver>
 
diff --git a/java/com/android/voicemail/impl/DeviceProvisionedJobService.java b/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
index a0b999d..20993d0 100644
--- a/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
+++ b/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
@@ -29,6 +29,7 @@
 import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.constants.ScheduledJobIds;
 
@@ -39,29 +40,25 @@
 @TargetApi(VERSION_CODES.O)
 public class DeviceProvisionedJobService extends JobService {
 
-  private static final String EXTRA_PHONE_ACCOUNT_HANDLE = "EXTRA_PHONE_ACCOUNT_HANDLE";
+  @VisibleForTesting static final String EXTRA_PHONE_ACCOUNT_HANDLE = "EXTRA_PHONE_ACCOUNT_HANDLE";
 
   /** Queue the phone account to be reactivated after the setup wizard has completed. */
   public static void activateAfterProvisioned(
       Context context, PhoneAccountHandle phoneAccountHandle) {
-    JobInfo jobInfo =
-        new JobInfo.Builder(
-                ScheduledJobIds.VVM_DEVICE_PROVISIONED_JOB,
-                new ComponentName(context, DeviceProvisionedJobService.class))
-            .addTriggerContentUri(
-                new TriggerContentUri(Global.getUriFor(Global.DEVICE_PROVISIONED), 0))
-            // VVM activation must be run as soon as possible to avoid voicemail loss
-            .setTriggerContentMaxDelay(0)
-            .build();
-
     Intent intent = new Intent();
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
-    context.getSystemService(JobScheduler.class).enqueue(jobInfo, new JobWorkItem(intent));
+    context
+        .getSystemService(JobScheduler.class)
+        .enqueue(createJobInfo(context), new JobWorkItem(intent));
   }
 
   @Override
   public boolean onStartJob(JobParameters params) {
-    Assert.isTrue(isDeviceProvisioned());
+    if (!isDeviceProvisioned()) {
+      VvmLog.i("DeviceProvisionedJobService.onStartJob", "device not provisioned, rescheduling");
+      getSystemService(JobScheduler.class).schedule(createJobInfo(this));
+      return false; // job not running in background
+    }
     VvmLog.i("DeviceProvisionedJobService.onStartJob", "device provisioned");
     for (JobWorkItem item = params.dequeueWork(); item != null; item = params.dequeueWork()) {
       PhoneAccountHandle phoneAccountHandle =
@@ -82,4 +79,14 @@
   private boolean isDeviceProvisioned() {
     return Settings.Global.getInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) == 1;
   }
+
+  private static JobInfo createJobInfo(Context context) {
+    return new JobInfo.Builder(
+            ScheduledJobIds.VVM_DEVICE_PROVISIONED_JOB,
+            new ComponentName(context, DeviceProvisionedJobService.class))
+        .addTriggerContentUri(new TriggerContentUri(Global.getUriFor(Global.DEVICE_PROVISIONED), 0))
+        // VVM activation must be run as soon as possible to avoid voicemail loss
+        .setTriggerContentMaxDelay(0)
+        .build();
+  }
 }
diff --git a/java/com/android/voicemail/impl/OmtpConstants.java b/java/com/android/voicemail/impl/OmtpConstants.java
index 599d0d5..97da2a8 100644
--- a/java/com/android/voicemail/impl/OmtpConstants.java
+++ b/java/com/android/voicemail/impl/OmtpConstants.java
@@ -234,6 +234,39 @@
   public static final int CHANGE_PIN_INVALID_CHARACTER = 5;
   public static final int CHANGE_PIN_SYSTEM_ERROR = 6;
 
-  /** Indicates the client is Google visual voicemail version 1.0. */
-  public static final String CLIENT_TYPE_GOOGLE_10 = "google.vvm.10";
+  public static String getClientType() {
+    String manufacturer =
+        truncate(
+            android.os.Build.MANUFACTURER
+                .replace('=', '_')
+                .replace(';', '_')
+                .replace('.', '_')
+                .replace(' ', '_'),
+            12);
+
+    String version =
+        truncate(
+            android.os.Build.VERSION
+                .RELEASE
+                .replace('=', '_')
+                .replace(';', '_')
+                .replace('.', '_')
+                .replace(' ', '_'),
+            8);
+
+    String model =
+        truncate(
+            android.os.Build.MODEL
+                .replace('=', '_')
+                .replace(';', '_')
+                .replace('.', '_')
+                .replace(' ', '_'),
+            28 - manufacturer.length() - version.length());
+
+    return String.format("%s.%s.%s", manufacturer, model, version);
+  }
+
+  private static final String truncate(String string, int length) {
+    return string.substring(0, Math.min(length, string.length()));
+  }
 }
diff --git a/java/com/android/voicemail/impl/OmtpReceiver.java b/java/com/android/voicemail/impl/OmtpReceiver.java
deleted file mode 100644
index 9baf954..0000000
--- a/java/com/android/voicemail/impl/OmtpReceiver.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.voicemail.impl;
-
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build.VERSION_CODES;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.VisualVoicemailSms;
-import com.android.dialer.common.Assert;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.voicemail.VoicemailComponent;
-import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
-import com.android.voicemail.impl.sync.VvmAccountManager;
-
-/** Listens to com.android.phone.vvm.ACTION_TEMP_VISUAL_VOICEMAIL_SERVICE_EVENT */
-@TargetApi(VERSION_CODES.O)
-public class OmtpReceiver extends BroadcastReceiver {
-
-  private static final String TAG = "VvmOmtpReceiver";
-
-  public static final String ACTION_SMS_RECEIVED = "com.android.vociemailomtp.sms.sms_received";
-
-  public static final String EXTRA_VOICEMAIL_SMS = "extra_voicemail_sms";
-
-  private static final String EXTRA_WHAT = "what";
-
-  private static final int MSG_ON_CELL_SERVICE_CONNECTED = 1;
-
-  private static final int MSG_ON_SMS_RECEIVED = 2;
-
-  private static final int MSG_ON_SIM_REMOVED = 3;
-
-  private static final int MSG_TASK_STOPPED = 5;
-
-  private static final String DATA_PHONE_ACCOUNT_HANDLE = "data_phone_account_handle";
-
-  private static final String DATA_SMS = "data_sms";
-
-  @Override
-  public void onReceive(Context context, Intent intent) {
-    // ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT is not a protected broadcast pre-O.
-    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
-      VvmLog.e(TAG, "ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT received when module is disabled");
-      return;
-    }
-
-    int what = intent.getIntExtra(EXTRA_WHAT, -1);
-    PhoneAccountHandle phoneAccountHandle = intent.getParcelableExtra(DATA_PHONE_ACCOUNT_HANDLE);
-    OmtpVvmCarrierConfigHelper config = new OmtpVvmCarrierConfigHelper(context, phoneAccountHandle);
-    if (!config.isValid()) {
-      VvmLog.i(TAG, "VVM not supported on " + phoneAccountHandle);
-      return;
-    }
-    if (!VisualVoicemailSettingsUtil.isEnabled(context, phoneAccountHandle)
-        && !config.isLegacyModeEnabled()) {
-      VvmLog.i(TAG, "VVM is disabled");
-      return;
-    }
-    switch (what) {
-      case MSG_ON_CELL_SERVICE_CONNECTED:
-        VvmLog.i(TAG, "onCellServiceConnected");
-        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-        ActivationTask.start(context, phoneAccountHandle, null);
-        break;
-      case MSG_ON_SMS_RECEIVED:
-        VvmLog.i(TAG, "onSmsReceived");
-        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-        VisualVoicemailSms sms = intent.getParcelableExtra(DATA_SMS);
-        Intent receivedIntent = new Intent(ACTION_SMS_RECEIVED);
-        receivedIntent.setPackage(context.getPackageName());
-        receivedIntent.putExtra(EXTRA_VOICEMAIL_SMS, sms);
-        context.sendBroadcast(receivedIntent);
-        break;
-      case MSG_ON_SIM_REMOVED:
-        VvmLog.i(TAG, "onSimRemoved");
-        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-        VvmAccountManager.removeAccount(context, phoneAccountHandle);
-        break;
-      case MSG_TASK_STOPPED:
-        VvmLog.i(TAG, "onStopped");
-        Logger.get(context).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
-        break;
-      default:
-        throw Assert.createIllegalStateFailException("unexpected what: " + what);
-    }
-  }
-}
diff --git a/java/com/android/voicemail/impl/OmtpService.java b/java/com/android/voicemail/impl/OmtpService.java
index b82cc5f..4db1aeb 100644
--- a/java/com/android/voicemail/impl/OmtpService.java
+++ b/java/com/android/voicemail/impl/OmtpService.java
@@ -17,9 +17,13 @@
 package com.android.voicemail.impl;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build.VERSION_CODES;
 import android.os.UserManager;
+import android.preference.PreferenceManager;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.VisualVoicemailService;
 import android.telephony.VisualVoicemailSms;
@@ -40,6 +44,8 @@
 
   public static final String EXTRA_VOICEMAIL_SMS = "extra_voicemail_sms";
 
+  private static final String IS_SHUTTING_DOWN = "com.android.voicemail.impl.is_shutting_down";
+
   @Override
   public void onCellServiceConnected(
       VisualVoicemailTask task, final PhoneAccountHandle phoneAccountHandle) {
@@ -50,7 +56,7 @@
       return;
     }
 
-    if (!isUserUnlocked()) {
+    if (!isUserUnlocked(this)) {
       VvmLog.i(TAG, "onCellServiceConnected: user locked");
       task.finish();
       return;
@@ -75,7 +81,7 @@
       return;
     }
 
-    if (!isUserUnlocked()) {
+    if (!isUserUnlocked(this)) {
       LegacyModeSmsHandler.handle(this, sms);
       return;
     }
@@ -105,12 +111,18 @@
       return;
     }
 
-    if (!isUserUnlocked()) {
+    if (!isUserUnlocked(this)) {
       VvmLog.i(TAG, "onSimRemoved: user locked");
       task.finish();
       return;
     }
 
+    if (isShuttingDown(this)) {
+      VvmLog.i(TAG, "onSimRemoved: system shutting down, ignoring");
+      task.finish();
+      return;
+    }
+
     Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
     VvmAccountManager.removeAccount(this, phoneAccountHandle);
     task.finish();
@@ -124,7 +136,7 @@
       task.finish();
       return;
     }
-    if (!isUserUnlocked()) {
+    if (!isUserUnlocked(this)) {
       VvmLog.i(TAG, "onStopped: user locked");
       task.finish();
       return;
@@ -132,6 +144,22 @@
     Logger.get(this).logImpression(DialerImpression.Type.VVM_UNBUNDLED_EVENT_RECEIVED);
   }
 
+  @MainThread
+  static void onBoot(@NonNull Context context) {
+    VvmLog.i(TAG, "onBoot");
+    Assert.isTrue(isUserUnlocked(context));
+    Assert.isMainThread();
+    setShuttingDown(context, false);
+  }
+
+  @MainThread
+  static void onShutdown(@NonNull Context context) {
+    VvmLog.i(TAG, "onShutdown");
+    Assert.isTrue(isUserUnlocked(context));
+    Assert.isMainThread();
+    setShuttingDown(context, true);
+  }
+
   private boolean isModuleEnabled() {
     return VoicemailComponent.get(this).getVoicemailClient().isVoicemailModuleEnabled();
   }
@@ -150,8 +178,20 @@
     return true;
   }
 
-  private boolean isUserUnlocked() {
-    UserManager userManager = getSystemService(UserManager.class);
+  private static boolean isUserUnlocked(@NonNull Context context) {
+    UserManager userManager = context.getSystemService(UserManager.class);
     return userManager.isUserUnlocked();
   }
+
+  private static void setShuttingDown(Context context, boolean value) {
+    PreferenceManager.getDefaultSharedPreferences(context)
+        .edit()
+        .putBoolean(IS_SHUTTING_DOWN, value)
+        .apply();
+  }
+
+  private static boolean isShuttingDown(Context context) {
+    return PreferenceManager.getDefaultSharedPreferences(context)
+        .getBoolean(IS_SHUTTING_DOWN, false);
+  }
 }
diff --git a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
index 4a9e433..700e1cb 100644
--- a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
+++ b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
@@ -15,9 +15,11 @@
  */
 package com.android.voicemail.impl;
 
+import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.support.annotation.NonNull;
@@ -30,6 +32,7 @@
 import android.text.TextUtils;
 import android.util.ArraySet;
 import com.android.dialer.common.Assert;
+import com.android.voicemail.impl.configui.ConfigOverrideFragment;
 import com.android.voicemail.impl.protocol.VisualVoicemailProtocol;
 import com.android.voicemail.impl.protocol.VisualVoicemailProtocolFactory;
 import com.android.voicemail.impl.sms.StatusMessage;
@@ -48,27 +51,28 @@
  *
  * <p>The current hidden configs are: {@link #getSslPort()} {@link #getDisabledCapabilities()}
  */
+@TargetApi(VERSION_CODES.O)
 public class OmtpVvmCarrierConfigHelper {
 
   private static final String TAG = "OmtpVvmCarrierCfgHlpr";
 
-  static final String KEY_VVM_TYPE_STRING = CarrierConfigManager.KEY_VVM_TYPE_STRING;
-  static final String KEY_VVM_DESTINATION_NUMBER_STRING =
+  public static final String KEY_VVM_TYPE_STRING = CarrierConfigManager.KEY_VVM_TYPE_STRING;
+  public static final String KEY_VVM_DESTINATION_NUMBER_STRING =
       CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING;
-  static final String KEY_VVM_PORT_NUMBER_INT = CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT;
-  static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING =
+  public static final String KEY_VVM_PORT_NUMBER_INT = CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT;
+  public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING =
       CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING;
-  static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY =
+  public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY =
       "carrier_vvm_package_name_string_array";
-  static final String KEY_VVM_PREFETCH_BOOL = CarrierConfigManager.KEY_VVM_PREFETCH_BOOL;
-  static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL =
+  public static final String KEY_VVM_PREFETCH_BOOL = CarrierConfigManager.KEY_VVM_PREFETCH_BOOL;
+  public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL =
       CarrierConfigManager.KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL;
 
   /** @see #getSslPort() */
-  static final String KEY_VVM_SSL_PORT_NUMBER_INT = "vvm_ssl_port_number_int";
+  public static final String KEY_VVM_SSL_PORT_NUMBER_INT = "vvm_ssl_port_number_int";
 
   /** @see #isLegacyModeEnabled() */
-  static final String KEY_VVM_LEGACY_MODE_ENABLED_BOOL = "vvm_legacy_mode_enabled_bool";
+  public static final String KEY_VVM_LEGACY_MODE_ENABLED_BOOL = "vvm_legacy_mode_enabled_bool";
 
   /**
    * Ban a capability reported by the server from being used. The array of string should be a subset
@@ -76,10 +80,10 @@
    *
    * @see #getDisabledCapabilities()
    */
-  static final String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY =
+  public static final String KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY =
       "vvm_disabled_capabilities_string_array";
 
-  static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
+  public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
 
   private final Context mContext;
   private final PersistableBundle mCarrierConfig;
@@ -87,6 +91,8 @@
   private final VisualVoicemailProtocol mProtocol;
   private final PersistableBundle mTelephonyConfig;
 
+  @Nullable private final PersistableBundle mOverrideConfig;
+
   private PhoneAccountHandle mPhoneAccountHandle;
 
   public OmtpVvmCarrierConfigHelper(Context context, @Nullable PhoneAccountHandle handle) {
@@ -100,6 +106,7 @@
       VvmLog.e(TAG, "PhoneAccountHandle is invalid");
       mCarrierConfig = null;
       mTelephonyConfig = null;
+      mOverrideConfig = null;
       mVvmType = null;
       mProtocol = null;
       return;
@@ -111,6 +118,13 @@
 
     mVvmType = getVvmType();
     mProtocol = VisualVoicemailProtocolFactory.create(mContext.getResources(), mVvmType);
+
+    if (ConfigOverrideFragment.isOverridden(context)) {
+      mOverrideConfig = ConfigOverrideFragment.getConfig(context);
+      VvmLog.w(TAG, "Config override is activated: " + mOverrideConfig);
+    } else {
+      mOverrideConfig = null;
+    }
   }
 
   @VisibleForTesting
@@ -119,10 +133,23 @@
     mContext = context;
     mCarrierConfig = carrierConfig;
     mTelephonyConfig = telephonyConfig;
+    mOverrideConfig = null;
     mVvmType = getVvmType();
     mProtocol = VisualVoicemailProtocolFactory.create(mContext.getResources(), mVvmType);
   }
 
+  public PersistableBundle getConfig() {
+    PersistableBundle result = new PersistableBundle();
+    if (mTelephonyConfig != null) {
+      result.putAll(mTelephonyConfig);
+    }
+    if (mCarrierConfig != null) {
+      result.putAll(mCarrierConfig);
+    }
+
+    return result;
+  }
+
   public Context getContext() {
     return mContext;
   }
@@ -426,6 +453,13 @@
   @Nullable
   private Object getValue(String key, Object defaultValue) {
     Object result;
+    if (mOverrideConfig != null) {
+      result = mOverrideConfig.get(key);
+      if (result != null) {
+        return result;
+      }
+    }
+
     if (mCarrierConfig != null) {
       result = mCarrierConfig.get(key);
       if (result != null) {
diff --git a/java/com/android/voicemail/impl/PackageReplacedReceiver.java b/java/com/android/voicemail/impl/PackageReplacedReceiver.java
new file mode 100644
index 0000000..6a7ca4a
--- /dev/null
+++ b/java/com/android/voicemail/impl/PackageReplacedReceiver.java
@@ -0,0 +1,43 @@
+/*
+ * 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.voicemail.impl;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import com.android.voicemail.VoicemailComponent;
+
+/** Receives MY_PACKAGE_REPLACED to trigger VVM activation. */
+public class PackageReplacedReceiver extends BroadcastReceiver {
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    VvmLog.i("PackageReplacedReceiver.onReceive", "package replaced, starting activation");
+
+    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
+      VvmLog.e("PackageReplacedReceiver.onReceive", "module disabled");
+      return;
+    }
+
+    for (PhoneAccountHandle phoneAccountHandle :
+        context.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts()) {
+      ActivationTask.start(context, phoneAccountHandle, null);
+    }
+  }
+}
diff --git a/java/com/android/voicemail/impl/SubscriptionInfoHelper.java b/java/com/android/voicemail/impl/SubscriptionInfoHelper.java
deleted file mode 100644
index d8a8423..0000000
--- a/java/com/android/voicemail/impl/SubscriptionInfoHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (C) 2014 The Android Open Source Project
- *
- * <p>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
- *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
- *
- * <p>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.voicemail.impl;
-
-import android.app.ActionBar;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.text.TextUtils;
-
-/**
- * Helper for manipulating intents or components with subscription-related information.
- *
- * <p>In settings, subscription ids and labels are passed along to indicate that settings are being
- * changed for particular subscriptions. This helper provides functions for helping extract this
- * info and perform common operations using this info.
- */
-public class SubscriptionInfoHelper {
-  public static final int NO_SUB_ID = -1;
-
-  // Extra on intent containing the id of a subscription.
-  public static final String SUB_ID_EXTRA =
-      "com.android.voicemailomtp.settings.SubscriptionInfoHelper.SubscriptionId";
-  // Extra on intent containing the label of a subscription.
-  private static final String SUB_LABEL_EXTRA =
-      "com.android.voicemailomtp.settings.SubscriptionInfoHelper.SubscriptionLabel";
-
-  private static Context mContext;
-
-  private static int mSubId = NO_SUB_ID;
-  private static String mSubLabel;
-
-  /** Instantiates the helper, by extracting the subscription id and label from the intent. */
-  public SubscriptionInfoHelper(Context context, Intent intent) {
-    mContext = context;
-    mSubId = intent.getIntExtra(SUB_ID_EXTRA, NO_SUB_ID);
-    mSubLabel = intent.getStringExtra(SUB_LABEL_EXTRA);
-  }
-
-  /**
-   * Sets the action bar title to the string specified by the given resource id, formatting it with
-   * the subscription label. This assumes the resource string is formattable with a string-type
-   * specifier.
-   *
-   * <p>If the subscription label does not exists, leave the existing title.
-   */
-  public void setActionBarTitle(ActionBar actionBar, Resources res, int resId) {
-    if (actionBar == null || TextUtils.isEmpty(mSubLabel)) {
-      return;
-    }
-
-    String title = String.format(res.getString(resId), mSubLabel);
-    actionBar.setTitle(title);
-  }
-
-  public int getSubId() {
-    return mSubId;
-  }
-}
diff --git a/java/com/android/voicemail/impl/TelephonyManagerStub.java b/java/com/android/voicemail/impl/TelephonyManagerStub.java
deleted file mode 100644
index 4762e90..0000000
--- a/java/com/android/voicemail/impl/TelephonyManagerStub.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.voicemail.impl;
-
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
-
-/**
- * Temporary stub for public APIs that should be added into telephony manager.
- *
- * <p>TODO(b/32637799) remove this.
- */
-@TargetApi(VERSION_CODES.O)
-public class TelephonyManagerStub {
-
-  public static void showVoicemailNotification(int voicemailCount) {}
-
-  /**
-   * Dismisses the message waiting (voicemail) indicator.
-   *
-   * @param subId the subscription id we should dismiss the notification for.
-   */
-  public static void clearMwiIndicator(int subId) {}
-
-  public static void setShouldCheckVisualVoicemailConfigurationForMwi(int subId, boolean enabled) {}
-}
diff --git a/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java b/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
index b4def2f..046113c 100644
--- a/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
+++ b/java/com/android/voicemail/impl/TelephonyVvmConfigManager.java
@@ -21,7 +21,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.util.ArrayMap;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.impl.utils.XmlUtils;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/java/com/android/voicemail/impl/VoicemailBootReceiver.java b/java/com/android/voicemail/impl/VoicemailBootReceiver.java
deleted file mode 100644
index 0a3e61a..0000000
--- a/java/com/android/voicemail/impl/VoicemailBootReceiver.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (C) 2017 The Android Open Source Project
- *
- * <p>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
- *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
- *
- * <p>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.voicemail.impl;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import com.android.voicemail.VoicemailComponent;
-
-/** Receives {@link Intent#ACTION_BOOT_COMPLETED} for the voicemail module. */
-public class VoicemailBootReceiver extends BroadcastReceiver {
-
-  @Override
-  public void onReceive(Context context, Intent intent) {
-    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
-      return;
-    }
-    StatusCheckJobService.schedule(context);
-  }
-}
diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java
index 83c0523..9bb14f2 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java
@@ -17,21 +17,26 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build.VERSION_CODES;
+import android.os.PersistableBundle;
 import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.impl.configui.VoicemailSecretCodeActivity;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
 import com.android.voicemail.impl.settings.VoicemailChangePinActivity;
 import com.android.voicemail.impl.settings.VoicemailSettingsFragment;
 import com.android.voicemail.impl.sync.VvmAccountManager;
+import com.android.voicemail.impl.transcribe.TranscriptionBackfillService;
 import java.util.List;
 import javax.inject.Inject;
 
@@ -126,6 +131,31 @@
     return VvmAccountManager.isAccountActivated(context, phoneAccountHandle);
   }
 
+  @Override
+  public void showConfigUi(@NonNull Context context) {
+    Intent intent = new Intent(context, VoicemailSecretCodeActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+
+  @Override
+  public PersistableBundle getConfig(Context context, PhoneAccountHandle phoneAccountHandle) {
+    return new OmtpVvmCarrierConfigHelper(context, phoneAccountHandle).getConfig();
+  }
+
+  @Override
+  @MainThread
+  public void onBoot(@NonNull Context context) {
+    OmtpService.onBoot(context);
+    StatusCheckJobService.schedule(context);
+  }
+
+  @Override
+  @MainThread
+  public void onShutdown(@NonNull Context context) {
+    OmtpService.onShutdown(context);
+  }
+
   @TargetApi(VERSION_CODES.O)
   @Override
   public void appendOmtpVoicemailSelectionClause(
@@ -201,4 +231,10 @@
       where.append(")");
     }
   }
+
+  @Override
+  public void onTosAccepted(Context context) {
+    LogUtil.i("VoicemailClientImpl.onTosAccepted", "try backfilling voicemail transcriptions");
+    TranscriptionBackfillService.scheduleTask(context);
+  }
 }
diff --git a/java/com/android/voicemail/impl/VoicemailClientReceiver.java b/java/com/android/voicemail/impl/VoicemailClientReceiver.java
index 49a55a4..688636e 100644
--- a/java/com/android/voicemail/impl/VoicemailClientReceiver.java
+++ b/java/com/android/voicemail/impl/VoicemailClientReceiver.java
@@ -23,6 +23,7 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.sync.UploadTask;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 
@@ -31,6 +32,11 @@
 
   @Override
   public void onReceive(Context context, Intent intent) {
+    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
+      LogUtil.i(
+          "VoicemailClientReceiver.onReceive", "module disabled, ignoring " + intent.getAction());
+      return;
+    }
     switch (intent.getAction()) {
       case VoicemailClient.ACTION_UPLOAD:
         doUpload(context);
diff --git a/java/com/android/voicemail/impl/VoicemailModule.java b/java/com/android/voicemail/impl/VoicemailModule.java
index 5a4e739..e689e47 100644
--- a/java/com/android/voicemail/impl/VoicemailModule.java
+++ b/java/com/android/voicemail/impl/VoicemailModule.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.support.v4.os.BuildCompat;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailPermissionHelper;
 import com.android.voicemail.stub.StubVoicemailClient;
@@ -31,7 +32,7 @@
 
   @Provides
   @Singleton
-  static VoicemailClient provideVoicemailClient(Context context) {
+  static VoicemailClient provideVoicemailClient(@ApplicationContext Context context) {
     if (!BuildCompat.isAtLeastO()) {
       VvmLog.i("VoicemailModule.provideVoicemailClient", "SDK below O");
       return new StubVoicemailClient();
diff --git a/java/com/android/voicemail/impl/VoicemailStatus.java b/java/com/android/voicemail/impl/VoicemailStatus.java
index ec1ab4e..5553cf5 100644
--- a/java/com/android/voicemail/impl/VoicemailStatus.java
+++ b/java/com/android/voicemail/impl/VoicemailStatus.java
@@ -24,6 +24,7 @@
 import android.provider.VoicemailContract.Status;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
+import com.android.dialer.strictmode.DialerStrictMode;
 
 public class VoicemailStatus {
 
@@ -99,7 +100,7 @@
       ContentResolver contentResolver = mContext.getContentResolver();
       Uri statusUri = VoicemailContract.Status.buildSourceUri(mContext.getPackageName());
       try {
-        contentResolver.insert(statusUri, mValues);
+        DialerStrictMode.bypass(() -> contentResolver.insert(statusUri, mValues));
       } catch (IllegalArgumentException iae) {
         VvmLog.e(TAG, "apply :: failed to insert content resolver ", iae);
         mValues.clear();
diff --git a/java/com/android/voicemail/impl/VoicemailTranscriptionServiceGrpc.java b/java/com/android/voicemail/impl/VoicemailTranscriptionServiceGrpc.java
new file mode 100644
index 0000000..8fcbf3b
--- /dev/null
+++ b/java/com/android/voicemail/impl/VoicemailTranscriptionServiceGrpc.java
@@ -0,0 +1,390 @@
+/*
+ * 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.google.internal.communications.voicemailtranscription.v1;
+
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.futureUnaryCall;
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+
+/**
+ * <pre>
+ * RPC service for transcribing voicemails.
+ * </pre>
+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler (version 1.0.3)",
+    comments = "Source: voicemail_transcription.proto")
+public class VoicemailTranscriptionServiceGrpc {
+
+  private VoicemailTranscriptionServiceGrpc() {}
+
+  public static final String SERVICE_NAME = "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService";
+
+  // Static method descriptors that strictly reflect the proto.
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static final io.grpc.MethodDescriptor<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest,
+      com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse> METHOD_TRANSCRIBE_VOICEMAIL =
+      io.grpc.MethodDescriptor.create(
+          io.grpc.MethodDescriptor.MethodType.UNARY,
+          generateFullMethodName(
+              "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService", "TranscribeVoicemail"),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest.getDefaultInstance()),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse.getDefaultInstance()));
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static final io.grpc.MethodDescriptor<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest,
+      com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse> METHOD_TRANSCRIBE_VOICEMAIL_ASYNC =
+      io.grpc.MethodDescriptor.create(
+          io.grpc.MethodDescriptor.MethodType.UNARY,
+          generateFullMethodName(
+              "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService", "TranscribeVoicemailAsync"),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest.getDefaultInstance()),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse.getDefaultInstance()));
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static final io.grpc.MethodDescriptor<com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest,
+      com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse> METHOD_GET_TRANSCRIPT =
+      io.grpc.MethodDescriptor.create(
+          io.grpc.MethodDescriptor.MethodType.UNARY,
+          generateFullMethodName(
+              "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService", "GetTranscript"),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest.getDefaultInstance()),
+          io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse.getDefaultInstance()));
+
+  /**
+   * Creates a new async stub that supports all call types for the service
+   */
+  public static VoicemailTranscriptionServiceStub newStub(io.grpc.Channel channel) {
+    return new VoicemailTranscriptionServiceStub(channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static VoicemailTranscriptionServiceBlockingStub newBlockingStub(
+      io.grpc.Channel channel) {
+    return new VoicemailTranscriptionServiceBlockingStub(channel);
+  }
+
+  /**
+   * Creates a new ListenableFuture-style stub that supports unary and streaming output calls on the service
+   */
+  public static VoicemailTranscriptionServiceFutureStub newFutureStub(
+      io.grpc.Channel channel) {
+    return new VoicemailTranscriptionServiceFutureStub(channel);
+  }
+
+  /**
+   * <pre>
+   * RPC service for transcribing voicemails.
+   * </pre>
+   */
+  public static abstract class VoicemailTranscriptionServiceImplBase implements io.grpc.BindableService {
+
+    /**
+     * <pre>
+     * Returns a transcript of the given voicemail.
+     * </pre>
+     */
+    public void transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(METHOD_TRANSCRIBE_VOICEMAIL, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * Schedules a transcription of the given voicemail. The transcript can be
+     * retrieved using the returned ID.
+     * </pre>
+     */
+    public void transcribeVoicemailAsync(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(METHOD_TRANSCRIBE_VOICEMAIL_ASYNC, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * Returns the transcript corresponding to the given ID, which was returned
+     * by TranscribeVoicemailAsync.
+     * </pre>
+     */
+    public void getTranscript(com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse> responseObserver) {
+      asyncUnimplementedUnaryCall(METHOD_GET_TRANSCRIPT, responseObserver);
+    }
+
+    @java.lang.Override public io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            METHOD_TRANSCRIBE_VOICEMAIL,
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest,
+                com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse>(
+                  this, METHODID_TRANSCRIBE_VOICEMAIL)))
+          .addMethod(
+            METHOD_TRANSCRIBE_VOICEMAIL_ASYNC,
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest,
+                com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse>(
+                  this, METHODID_TRANSCRIBE_VOICEMAIL_ASYNC)))
+          .addMethod(
+            METHOD_GET_TRANSCRIPT,
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest,
+                com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse>(
+                  this, METHODID_GET_TRANSCRIPT)))
+          .build();
+    }
+  }
+
+  /**
+   * <pre>
+   * RPC service for transcribing voicemails.
+   * </pre>
+   */
+  public static final class VoicemailTranscriptionServiceStub extends io.grpc.stub.AbstractStub<VoicemailTranscriptionServiceStub> {
+    private VoicemailTranscriptionServiceStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private VoicemailTranscriptionServiceStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected VoicemailTranscriptionServiceStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new VoicemailTranscriptionServiceStub(channel, callOptions);
+    }
+
+    /**
+     * <pre>
+     * Returns a transcript of the given voicemail.
+     * </pre>
+     */
+    public void transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * Schedules a transcription of the given voicemail. The transcript can be
+     * retrieved using the returned ID.
+     * </pre>
+     */
+    public void transcribeVoicemailAsync(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL_ASYNC, getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * <pre>
+     * Returns the transcript corresponding to the given ID, which was returned
+     * by TranscribeVoicemailAsync.
+     * </pre>
+     */
+    public void getTranscript(com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest request,
+        io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(METHOD_GET_TRANSCRIPT, getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * <pre>
+   * RPC service for transcribing voicemails.
+   * </pre>
+   */
+  public static final class VoicemailTranscriptionServiceBlockingStub extends io.grpc.stub.AbstractStub<VoicemailTranscriptionServiceBlockingStub> {
+    private VoicemailTranscriptionServiceBlockingStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private VoicemailTranscriptionServiceBlockingStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected VoicemailTranscriptionServiceBlockingStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new VoicemailTranscriptionServiceBlockingStub(channel, callOptions);
+    }
+
+    /**
+     * <pre>
+     * Returns a transcript of the given voicemail.
+     * </pre>
+     */
+    public com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request) {
+      return blockingUnaryCall(
+          getChannel(), METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions(), request);
+    }
+
+    /**
+     * <pre>
+     * Schedules a transcription of the given voicemail. The transcript can be
+     * retrieved using the returned ID.
+     * </pre>
+     */
+    public com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse transcribeVoicemailAsync(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest request) {
+      return blockingUnaryCall(
+          getChannel(), METHOD_TRANSCRIBE_VOICEMAIL_ASYNC, getCallOptions(), request);
+    }
+
+    /**
+     * <pre>
+     * Returns the transcript corresponding to the given ID, which was returned
+     * by TranscribeVoicemailAsync.
+     * </pre>
+     */
+    public com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse getTranscript(com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest request) {
+      return blockingUnaryCall(
+          getChannel(), METHOD_GET_TRANSCRIPT, getCallOptions(), request);
+    }
+  }
+
+  /**
+   * <pre>
+   * RPC service for transcribing voicemails.
+   * </pre>
+   */
+  public static final class VoicemailTranscriptionServiceFutureStub extends io.grpc.stub.AbstractStub<VoicemailTranscriptionServiceFutureStub> {
+    private VoicemailTranscriptionServiceFutureStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private VoicemailTranscriptionServiceFutureStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected VoicemailTranscriptionServiceFutureStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new VoicemailTranscriptionServiceFutureStub(channel, callOptions);
+    }
+
+    /**
+     * <pre>
+     * Returns a transcript of the given voicemail.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse> transcribeVoicemail(
+        com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions()), request);
+    }
+
+    /**
+     * <pre>
+     * Schedules a transcription of the given voicemail. The transcript can be
+     * retrieved using the returned ID.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse> transcribeVoicemailAsync(
+        com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL_ASYNC, getCallOptions()), request);
+    }
+
+    /**
+     * <pre>
+     * Returns the transcript corresponding to the given ID, which was returned
+     * by TranscribeVoicemailAsync.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse> getTranscript(
+        com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(METHOD_GET_TRANSCRIPT, getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_TRANSCRIBE_VOICEMAIL = 0;
+  private static final int METHODID_TRANSCRIBE_VOICEMAIL_ASYNC = 1;
+  private static final int METHODID_GET_TRANSCRIPT = 2;
+
+  private static class MethodHandlers<Req, Resp> implements
+      io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
+      io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
+      io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
+      io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
+    private final VoicemailTranscriptionServiceImplBase serviceImpl;
+    private final int methodId;
+
+    public MethodHandlers(VoicemailTranscriptionServiceImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
+      switch (methodId) {
+        case METHODID_TRANSCRIBE_VOICEMAIL:
+          serviceImpl.transcribeVoicemail((com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest) request,
+              (io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse>) responseObserver);
+          break;
+        case METHODID_TRANSCRIBE_VOICEMAIL_ASYNC:
+          serviceImpl.transcribeVoicemailAsync((com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest) request,
+              (io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse>) responseObserver);
+          break;
+        case METHODID_GET_TRANSCRIPT:
+          serviceImpl.getTranscript((com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest) request,
+              (io.grpc.stub.StreamObserver<com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse>) responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver<Req> invoke(
+        io.grpc.stub.StreamObserver<Resp> responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    return new io.grpc.ServiceDescriptor(SERVICE_NAME,
+        METHOD_TRANSCRIBE_VOICEMAIL,
+        METHOD_TRANSCRIBE_VOICEMAIL_ASYNC,
+        METHOD_GET_TRANSCRIPT);
+  }
+
+}
diff --git a/java/com/android/voicemail/impl/VvmPackageInstallReceiver.java b/java/com/android/voicemail/impl/VvmPackageInstallReceiver.java
deleted file mode 100644
index 1e2de60..0000000
--- a/java/com/android/voicemail/impl/VvmPackageInstallReceiver.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2015 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.voicemail.impl;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import com.android.voicemail.VoicemailComponent;
-import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
-
-/**
- * When a new package is installed, check if it matches any of the vvm carrier apps of the currently
- * enabled dialer VVM sources. The dialer VVM client will be disabled upon carrier VVM app
- * installation, unless it was explicitly enabled by the user.
- */
-public class VvmPackageInstallReceiver extends BroadcastReceiver {
-
-  private static final String TAG = "VvmPkgInstallReceiver";
-
-  @Override
-  public void onReceive(Context context, Intent intent) {
-    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
-      return;
-    }
-
-    if (intent.getData() == null) {
-      return;
-    }
-
-    String packageName = intent.getData().getSchemeSpecificPart();
-    if (packageName == null) {
-      return;
-    }
-
-    // This get called every time an app is installed and will be noisy. Don't log until the app
-    // is identified as a carrier VVM app.
-    for (PhoneAccountHandle phoneAccount :
-        context.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts()) {
-      OmtpVvmCarrierConfigHelper carrierConfigHelper =
-          new OmtpVvmCarrierConfigHelper(context, phoneAccount);
-      if (!carrierConfigHelper.isValid()) {
-        continue;
-      }
-      if (carrierConfigHelper.getCarrierVvmPackageNames() == null) {
-        continue;
-      }
-      if (!carrierConfigHelper.getCarrierVvmPackageNames().contains(packageName)) {
-        continue;
-      }
-
-      VvmLog.i(TAG, "Carrier app installed");
-      if (VisualVoicemailSettingsUtil.isEnabledUserSet(context, phoneAccount)) {
-        // Skip the check if this voicemail source's setting is overridden by the user.
-        VvmLog.i(TAG, "VVM enabled by user, not disabling");
-        continue;
-      }
-
-      // Force deactivate the client. The user can re-enable it in the settings.
-      // There is no need to update the settings for deactivation. At this point, if the
-      // default value is used it should be false because a carrier package is present.
-      VvmLog.i(TAG, "Carrier VVM package installed, disabling system VVM client");
-      VisualVoicemailSettingsUtil.setEnabled(context, phoneAccount, false);
-    }
-  }
-}
diff --git a/java/com/android/voicemail/impl/VvmPhoneStateListener.java b/java/com/android/voicemail/impl/VvmPhoneStateListener.java
index 48b7204..00c1358 100644
--- a/java/com/android/voicemail/impl/VvmPhoneStateListener.java
+++ b/java/com/android/voicemail/impl/VvmPhoneStateListener.java
@@ -19,7 +19,6 @@
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
-import com.android.voicemail.impl.sync.OmtpVvmSyncService;
 import com.android.voicemail.impl.sync.SyncTask;
 import com.android.voicemail.impl.sync.VoicemailStatusQueryHelper;
 import com.android.voicemail.impl.sync.VvmAccountManager;
@@ -37,7 +36,7 @@
   private int mPreviousState = -1;
 
   public VvmPhoneStateListener(Context context, PhoneAccountHandle accountHandle) {
-    // TODO: b/32637799 too much trouble to call super constructor through reflection,
+    // TODO(twyen): b/32637799 too much trouble to call super constructor through reflection,
     // just use non-phoneAccountHandle version for now.
     super();
     mContext = context;
@@ -82,7 +81,7 @@
         VvmLog.v(TAG, "Signal returned: requesting resync for " + mPhoneAccount);
         // If the source is already registered, run a full sync in case something was missed
         // while signal was down.
-        SyncTask.start(mContext, mPhoneAccount, OmtpVvmSyncService.SYNC_FULL_SYNC);
+        SyncTask.start(mContext, mPhoneAccount);
       } else {
         VvmLog.v(TAG, "Signal returned: reattempting activation for " + mPhoneAccount);
         // Otherwise initiate an activation because this means that an OMTP source was
diff --git a/java/com/android/voicemail/impl/configui/AndroidManifest.xml b/java/com/android/voicemail/impl/configui/AndroidManifest.xml
new file mode 100644
index 0000000..95796f9
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.voicemail.impl.configui">
+
+  <application>
+    <activity android:name="com.android.voicemail.impl.configui.VoicemailSecretCodeActivity"
+        android:exported="false">
+    </activity>
+  </application>
+</manifest>
diff --git a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java
new file mode 100644
index 0000000..1624ce5
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java
@@ -0,0 +1,178 @@
+/*
+ * 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.voicemail.impl.configui;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.voicemail.VoicemailComponent;
+
+/**
+ * Fragment to edit the override values for the {@link import
+ * com.android.voicemail.impl.OmtpVvmCarrierConfigHelper}
+ */
+public class ConfigOverrideFragment extends PreferenceFragment
+    implements OnPreferenceChangeListener {
+
+  /**
+   * Any preference with key that starts with this prefix will be written to the dialer carrier
+   * config.
+   */
+  @VisibleForTesting static final String CONFIG_OVERRIDE_KEY_PREFIX = "vvm_config_override_key_";
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    PreferenceManager.setDefaultValues(getActivity(), R.xml.vvm_config_override, false);
+    addPreferencesFromResource(R.xml.vvm_config_override);
+
+    // add listener so the value of a EditTextPreference will be updated to the summary.
+    for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+      Preference preference = getPreferenceScreen().getPreference(i);
+      preference.setOnPreferenceChangeListener(this);
+      updatePreference(preference);
+    }
+  }
+
+  @Override
+  public boolean onPreferenceChange(Preference preference, Object newValue) {
+    Assert.isMainThread();
+    ThreadUtil.postOnUiThread(() -> updatePreference(preference));
+    return true;
+  }
+
+  private void updatePreference(Preference preference) {
+    if (preference instanceof EditTextPreference) {
+      EditTextPreference editTextPreference = (EditTextPreference) preference;
+      editTextPreference.setSummary(editTextPreference.getText());
+    }
+  }
+
+  @Override
+  public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+    if (TextUtils.equals(
+        preference.getKey(), getString(R.string.vvm_config_override_load_current_key))) {
+      loadCurrentConfig();
+    }
+    return super.onPreferenceTreeClick(preferenceScreen, preference);
+  }
+
+  /**
+   * Loads the config for the currently carrier into the override values, from the dialer or the
+   * carrier config app. This is a "reset" button to load the defaults.
+   */
+  private void loadCurrentConfig() {
+    Context context = getActivity();
+    PhoneAccountHandle phoneAccountHandle =
+        context
+            .getSystemService(TelecomManager.class)
+            .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_VOICEMAIL);
+
+    PersistableBundle config =
+        VoicemailComponent.get(context).getVoicemailClient().getConfig(context, phoneAccountHandle);
+
+    for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+      Preference preference = getPreferenceScreen().getPreference(i);
+      String key = preference.getKey();
+      if (!key.startsWith(CONFIG_OVERRIDE_KEY_PREFIX)) {
+        continue;
+      }
+
+      String configKey = key.substring(CONFIG_OVERRIDE_KEY_PREFIX.length());
+
+      if (configKey.endsWith("bool")) {
+        ((SwitchPreference) preference).setChecked(config.getBoolean(configKey));
+      } else if (configKey.endsWith("int")) {
+        ((EditTextPreference) preference).setText(String.valueOf(config.getInt(configKey)));
+      } else if (configKey.endsWith("string")) {
+        ((EditTextPreference) preference).setText(config.getString(configKey));
+      } else if (configKey.endsWith("string_array")) {
+        ((EditTextPreference) preference).setText(toCsv(config.getStringArray(configKey)));
+      } else {
+        throw Assert.createAssertionFailException("unknown type for key " + configKey);
+      }
+      updatePreference(preference);
+    }
+  }
+
+  public static boolean isOverridden(Context context) {
+    return DialerStrictMode.bypass(
+        () ->
+            PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.vvm_config_override_enabled_key), false));
+  }
+
+  public static PersistableBundle getConfig(Context context) {
+    Assert.checkState(isOverridden(context));
+    PersistableBundle result = new PersistableBundle();
+
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    for (String key : preferences.getAll().keySet()) {
+      if (!key.startsWith(CONFIG_OVERRIDE_KEY_PREFIX)) {
+        continue;
+      }
+      String configKey = key.substring(CONFIG_OVERRIDE_KEY_PREFIX.length());
+      if (configKey.endsWith("bool")) {
+        result.putBoolean(configKey, preferences.getBoolean(key, false));
+      } else if (configKey.endsWith("int")) {
+        result.putInt(configKey, Integer.valueOf(preferences.getString(key, null)));
+      } else if (configKey.endsWith("string")) {
+        result.putString(configKey, preferences.getString(key, null));
+      } else if (configKey.endsWith("string_array")) {
+        result.putStringArray(configKey, fromCsv(preferences.getString(key, null)));
+      } else {
+        throw Assert.createAssertionFailException("unknown type for key " + configKey);
+      }
+    }
+    return result;
+  }
+
+  private static String toCsv(String[] array) {
+    if (array == null) {
+      return "";
+    }
+    StringBuilder result = new StringBuilder();
+    for (String element : array) {
+      if (result.length() != 0) {
+        result.append(",");
+      }
+      result.append(element);
+    }
+    return result.toString();
+  };
+
+  private static String[] fromCsv(String csv) {
+    return csv.split(",");
+  }
+}
diff --git a/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java b/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java
new file mode 100644
index 0000000..beeb956
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/VoicemailSecretCodeActivity.java
@@ -0,0 +1,58 @@
+/*
+ * 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.voicemail.impl.configui;
+
+import android.content.Intent;
+import android.preference.PreferenceActivity;
+import android.provider.VoicemailContract;
+import java.util.List;
+
+/** Activity launched by simulator->voicemail, provides debug features. */
+@SuppressWarnings("FragmentInjection") // not exported
+public class VoicemailSecretCodeActivity extends PreferenceActivity {
+
+  private Header syncHeader;
+
+  @Override
+  public void onBuildHeaders(List<Header> target) {
+    super.onBuildHeaders(target);
+    syncHeader = new Header();
+    syncHeader.title = "Sync";
+    target.add(syncHeader);
+
+    Header configOverride = new Header();
+    configOverride.fragment = ConfigOverrideFragment.class.getName();
+    configOverride.title = "VVM config override";
+    target.add(configOverride);
+  }
+
+  @Override
+  public void onHeaderClick(Header header, int position) {
+    if (header == syncHeader) {
+      Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL);
+      intent.setPackage(getPackageName());
+      sendBroadcast(intent);
+      return;
+    }
+    super.onHeaderClick(header, position);
+  }
+
+  @Override
+  protected boolean isValidFragment(String fragmentName) {
+    return true;
+  }
+}
diff --git a/java/com/android/voicemail/impl/configui/res/values-af/strings.xml b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-am/strings.xml b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-az/strings.xml b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-be/strings.xml b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-da/strings.xml b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-de/strings.xml b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-el/strings.xml b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-es/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-et/strings.xml b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-in/strings.xml b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-is/strings.xml b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-it/strings.xml b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-km/strings.xml b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-my/strings.xml b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-no/strings.xml b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-si/strings.xml b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-te/strings.xml b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-th/strings.xml b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml
new file mode 100644
index 0000000..826efd3
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values/strings.xml b/java/com/android/voicemail/impl/configui/res/values/strings.xml
new file mode 100644
index 0000000..fea76be
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_config_override_load_current_key" translatable="false">vvm_config_override_load_current</string>
+  <string name="vvm_config_override_enabled_key" translatable="false">vvm_config_override_enabled</string>
+
+</resources>
diff --git a/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml b/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml
new file mode 100644
index 0000000..c4a23c7
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/xml/vvm_config_override.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <Preference
+    android:key="@string/vvm_config_override_load_current_key"
+    android:title="Load current"/>
+
+  <SwitchPreference
+      android:key="@string/vvm_config_override_enabled_key"
+      android:title="Override enabled"
+      android:defaultValue="false"/>
+
+  <!-- Keys should be a key in CarrierConfigManager prefixed with "vvm_config_override_key_" -->
+  <EditTextPreference
+    android:key="vvm_config_override_key_vvm_type_string"
+      android:title="type"
+      android:defaultValue="vvm_type_omtp"
+    />
+
+  <EditTextPreference
+      android:key="vvm_config_override_key_vvm_destination_number_string"
+      android:title="destination number"
+      />
+
+  <EditTextPreference
+      android:key="vvm_config_override_key_vvm_port_number_int"
+      android:title="destination port"
+      />
+  <EditTextPreference
+      android:key="vvm_config_override_key_carrier_vvm_package_name_string_array"
+      android:title="vvm package name (CSV)"
+      />
+
+  <SwitchPreference
+      android:key="vvm_config_override_key_vvm_prefetch_bool"
+      android:title="prefetch"
+      android:defaultValue="true"/>
+
+  <SwitchPreference
+      android:key="vvm_config_override_key_vvm_cellular_data_required_bool"
+      android:title="cellular data required"
+      android:defaultValue="false"/>
+  <EditTextPreference
+      android:key="vvm_config_override_key_vvm_ssl_port_number_int"
+      android:title="SSL port"
+      />
+
+  <SwitchPreference
+      android:key="vvm_config_override_key_vvm_legacy_mode_enabled_bool"
+      android:title="legacy mode"
+      android:defaultValue="false"/>
+
+  <EditTextPreference
+      android:key="vvm_config_override_key_vvm_disabled_capabilities_string_array"
+      android:title="disabled capabilities (CSV)"
+      />
+
+  <EditTextPreference
+      android:key="vvm_config_override_key_vvm_client_prefix_string"
+      android:title="client prefix"
+      />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/java/com/android/voicemail/impl/fetch/VoicemailFetchedCallback.java b/java/com/android/voicemail/impl/fetch/VoicemailFetchedCallback.java
index f386fce..3e82540 100644
--- a/java/com/android/voicemail/impl/fetch/VoicemailFetchedCallback.java
+++ b/java/com/android/voicemail/impl/fetch/VoicemailFetchedCallback.java
@@ -23,9 +23,12 @@
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.voicemail.impl.R;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.imap.VoicemailPayload;
+import com.android.voicemail.impl.transcribe.TranscriptionService;
 import java.io.IOException;
 import java.io.OutputStream;
 import org.apache.commons.io.IOUtils;
@@ -56,6 +59,7 @@
    * @param voicemailPayload The object containing the content data for the voicemail
    */
   public void setVoicemailContent(@Nullable VoicemailPayload voicemailPayload) {
+    Assert.isWorkerThread();
     if (voicemailPayload == null) {
       VvmLog.i(TAG, "Payload not found, message has unsupported format");
       ContentValues values = new ContentValues();
@@ -90,13 +94,23 @@
     ContentValues values = new ContentValues();
     values.put(Voicemails.MIME_TYPE, voicemailPayload.getMimeType());
     values.put(Voicemails.HAS_CONTENT, true);
-    updateVoicemail(values);
+    if (updateVoicemail(values)) {
+      ThreadUtil.postOnUiThread(
+          () -> {
+            if (!TranscriptionService.scheduleNewVoicemailTranscriptionJob(mContext, mUri, true)) {
+              VvmLog.w(TAG, String.format("Failed to schedule transcription for %s", mUri));
+            }
+          });
+    }
   }
 
-  private void updateVoicemail(ContentValues values) {
+  private boolean updateVoicemail(ContentValues values) {
     int updatedCount = mContentResolver.update(mUri, values, null, null);
     if (updatedCount != 1) {
       VvmLog.e(TAG, "Updating voicemail should have updated 1 row, was: " + updatedCount);
+      return false;
+    } else {
+      return true;
     }
   }
 }
diff --git a/java/com/android/voicemail/impl/imap/ImapHelper.java b/java/com/android/voicemail/impl/imap/ImapHelper.java
index f1bc8b2..94abe9b 100644
--- a/java/com/android/voicemail/impl/imap/ImapHelper.java
+++ b/java/com/android/voicemail/impl/imap/ImapHelper.java
@@ -251,13 +251,18 @@
     long time = messageDetails.getSentDate().getTime();
     String number = getNumber(messageDetails.getFrom());
     boolean isRead = Arrays.asList(messageDetails.getFlags()).contains(Flag.SEEN);
-    return Voicemail.createForInsertion(time, number)
-        .setPhoneAccount(mPhoneAccount)
-        .setSourcePackage(mContext.getPackageName())
-        .setSourceData(messageDetails.getUid())
-        .setIsRead(isRead)
-        .setTranscription(listener.getVoicemailTranscription())
-        .build();
+    Long duration = messageDetails.getDuration();
+    Voicemail.Builder builder =
+        Voicemail.createForInsertion(time, number)
+            .setPhoneAccount(mPhoneAccount)
+            .setSourcePackage(mContext.getPackageName())
+            .setSourceData(messageDetails.getUid())
+            .setIsRead(isRead)
+            .setTranscription(listener.getVoicemailTranscription());
+    if (duration != null) {
+      builder.setDuration(duration);
+    }
+    return builder.build();
   }
 
   /**
diff --git a/java/com/android/voicemail/impl/mail/MailTransport.java b/java/com/android/voicemail/impl/mail/MailTransport.java
index 3df36d5..c35e414 100644
--- a/java/com/android/voicemail/impl/mail/MailTransport.java
+++ b/java/com/android/voicemail/impl/mail/MailTransport.java
@@ -17,7 +17,9 @@
 
 import android.content.Context;
 import android.net.Network;
+import android.net.TrafficStats;
 import android.support.annotation.VisibleForTesting;
+import com.android.dialer.constants.TrafficStatsTags;
 import com.android.voicemail.impl.OmtpEvents;
 import com.android.voicemail.impl.imap.ImapHelper;
 import com.android.voicemail.impl.mail.store.ImapStore;
@@ -188,10 +190,13 @@
 
     try {
       LogUtils.v(TAG, "createSocket: network specified");
+      TrafficStats.setThreadStatsTag(TrafficStatsTags.VISUAL_VOICEMAIL_TAG);
       return mNetwork.getSocketFactory().createSocket();
     } catch (IOException ioe) {
       LogUtils.d(TAG, ioe.toString());
       throw new MessagingException(MessagingException.IOERROR, ioe.toString());
+    } finally {
+      TrafficStats.clearThreadStatsTag();
     }
   }
 
diff --git a/java/com/android/voicemail/impl/mail/Message.java b/java/com/android/voicemail/impl/mail/Message.java
index aea5d3e..ca65d3d 100644
--- a/java/com/android/voicemail/impl/mail/Message.java
+++ b/java/com/android/voicemail/impl/mail/Message.java
@@ -15,6 +15,7 @@
  */
 package com.android.voicemail.impl.mail;
 
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import java.util.Date;
 import java.util.HashSet;
@@ -64,6 +65,9 @@
 
   public abstract void setSentDate(Date sentDate) throws MessagingException;
 
+  @Nullable
+  public abstract Long getDuration() throws MessagingException;
+
   public abstract Address[] getRecipients(String type) throws MessagingException;
 
   public abstract void setRecipients(String type, Address[] addresses) throws MessagingException;
diff --git a/java/com/android/voicemail/impl/mail/internet/MimeHeader.java b/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
index d41cdb3..8f08176 100644
--- a/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
+++ b/java/com/android/voicemail/impl/mail/internet/MimeHeader.java
@@ -36,6 +36,7 @@
   public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
   public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
   public static final String HEADER_CONTENT_ID = "Content-ID";
+  public static final String HEADER_CONTENT_DURATION = "Content-Duration";
 
   /** Fields that should be omitted when writing the header using writeTo() */
   private static final String[] WRITE_OMIT_FIELDS = {
diff --git a/java/com/android/voicemail/impl/mail/internet/MimeMessage.java b/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
index 5897206..39378a0 100644
--- a/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
+++ b/java/com/android/voicemail/impl/mail/internet/MimeMessage.java
@@ -15,7 +15,9 @@
  */
 package com.android.voicemail.impl.mail.internet;
 
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.mail.Address;
 import com.android.voicemail.impl.mail.Body;
 import com.android.voicemail.impl.mail.BodyPart;
@@ -197,6 +199,28 @@
   }
 
   @Override
+  @Nullable
+  public Long getDuration() {
+    String durationHeader = null;
+    try {
+      durationHeader = getFirstHeader(MimeHeader.HEADER_CONTENT_DURATION);
+    } catch (MessagingException e) {
+      VvmLog.e("MimeMessage.getDuration", "cannot retrieve header: ", e);
+      return null;
+    }
+    if (durationHeader == null) {
+      VvmLog.w("MimeMessage.getDuration", "message missing Content-Duration header");
+      return null;
+    }
+    try {
+      return Long.valueOf(durationHeader);
+    } catch (NumberFormatException e) {
+      VvmLog.w("MimeMessage.getDuration", "cannot parse duration " + durationHeader);
+      return null;
+    }
+  }
+
+  @Override
   public String getContentType() throws MessagingException {
     final String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
     if (contentType == null) {
diff --git a/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java b/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
index 88ec0ed..fd56952 100644
--- a/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
+++ b/java/com/android/voicemail/impl/mail/store/imap/ImapConstants.java
@@ -27,7 +27,7 @@
   public static final String FETCH_FIELD_BODY_PEEK_SANE =
       String.format(Locale.US, "BODY.PEEK[]<0.%d>", ImapStore.FETCH_BODY_SANE_SUGGESTED_SIZE);
   public static final String FETCH_FIELD_HEADERS =
-      "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc message-id)]";
+      "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc message-id content-duration)]";
 
   public static final String ALERT = "ALERT";
   public static final String APPEND = "APPEND";
diff --git a/java/com/android/voicemail/impl/proguard.flags b/java/com/android/voicemail/impl/proguard.flags
new file mode 100644
index 0000000..9379df3
--- /dev/null
+++ b/java/com/android/voicemail/impl/proguard.flags
@@ -0,0 +1,4 @@
+-assumenosideeffects class com.android.voicemail.impl.VvmLog {
+    public static void v(...);
+    public static void d(...);
+}
diff --git a/java/com/android/voicemail/impl/protocol/OmtpProtocol.java b/java/com/android/voicemail/impl/protocol/OmtpProtocol.java
index 27aab8a..971edcf 100644
--- a/java/com/android/voicemail/impl/protocol/OmtpProtocol.java
+++ b/java/com/android/voicemail/impl/protocol/OmtpProtocol.java
@@ -35,7 +35,7 @@
         phoneAccountHandle,
         applicationPort,
         destinationNumber,
-        OmtpConstants.CLIENT_TYPE_GOOGLE_10,
+        OmtpConstants.getClientType(),
         OmtpConstants.PROTOCOL_VERSION1_1,
         null /*clientPrefix*/);
   }
diff --git a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
index 1cdbbfb..d9a0649 100644
--- a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
+++ b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
@@ -31,7 +31,7 @@
 import android.text.Spanned;
 import android.text.style.URLSpan;
 import android.util.ArrayMap;
-import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.OmtpEvents;
diff --git a/java/com/android/voicemail/impl/res/values-af/strings.xml b/java/com/android/voicemail/impl/res/values-af/strings.xml
index 2e829c9..0ed54fa 100644
--- a/java/com/android/voicemail/impl/res/values-af/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-af/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Verander PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuele stemboodskap moet geaktiveer wees om PIN te verander"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuele stemboodskap is nog nie geaktiveer nie, probeer asseblief later weer"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Ou PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nuwe PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Wag asseblief."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Die nuwe PIN is te kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Die nuwe PIN is te lank."</string>
diff --git a/java/com/android/voicemail/impl/res/values-am/strings.xml b/java/com/android/voicemail/impl/res/values-am/strings.xml
index 183f7b7..39b21b4 100644
--- a/java/com/android/voicemail/impl/res/values-am/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-am/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ፒን ይቀይሩ"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ፒን ለመቀየር የእይታ የድምጽ መልዕክት መንቃት አለበት"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"የእይታ የድምጽ መልዕክት ገና ገቢር አልሆነም፣ እባክዎ ቆይተው እንደገና ይሞክሩ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"የቀድሞ ፒን"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"አዲስ ፒን"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"እባክዎ ይጠብቁ።"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"አዲሱ ፒን በጣም አጭር ነው።"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"አዲሱ ፒን በጣም ረጅም ነው።"</string>
diff --git a/java/com/android/voicemail/impl/res/values-ar/strings.xml b/java/com/android/voicemail/impl/res/values-ar/strings.xml
index 8b75b6e..4cdba4d 100644
--- a/java/com/android/voicemail/impl/res/values-ar/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ar/strings.xml
@@ -25,9 +25,7 @@
     <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"تعيين رقم التعريف الشخصي"</string>
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"تغيير رقم التعريف الشخصي"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ينبغي تشغيل البريد الصوتي المرئي لتغيير رقم التعريف الشخصي"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"لم يتم تنشيط البريد الصوتي المرئي بعد، الرجاء المحاولة مرة أخرى لاحقًا"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"رقم التعريف الشخصي القديم"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"رقم التعريف الشخصي الجديد"</string>
+    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"لم يتم تنشيط البريد الصوتي المرئي بعد، يُرجى المحاولة مرة أخرى لاحقًا"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"يُرجى الانتظار."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"رقم التعريف الشخصي الجديد قصير جدًا."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"رقم التعريف الشخصي الجديد طويل جدًا."</string>
diff --git a/java/com/android/voicemail/impl/res/values-az/strings.xml b/java/com/android/voicemail/impl/res/values-az/strings.xml
index 9783650..f245730 100644
--- a/java/com/android/voicemail/impl/res/values-az/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-az/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-i dəyişin"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-i dəyişmək üçün görünən səsli e-poçt aktiv olmalıdır"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Görünən səsli e-poçt hələ aktiv edilməyib, daha sonra yenidən cəhd edin"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Köhnə PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Yeni PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Gözləyin."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yeni PIN çox qısadır."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yeni PIN çox uzundur."</string>
diff --git a/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
index f7c7a62..7c12c9e 100644
--- a/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promenite PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Morate da omogućite vizuelnu govornu poštu da biste promenili PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuelna govorna pošta još uvek nije aktivirana, probajte ponovo kasnije"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Stari PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novi PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sačekajte."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN je prekratak."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN je predugačak."</string>
diff --git a/java/com/android/voicemail/impl/res/values-be/strings.xml b/java/com/android/voicemail/impl/res/values-be/strings.xml
index 6f4d125..c88f8ab 100644
--- a/java/com/android/voicemail/impl/res/values-be/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-be/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Змяніць PIN-код"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Трэба ўключыць візуальную галасавую пошту, каб змяніць PIN-код"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Візуальная галасавая пошта пакуль не актываваная. Паўтарыце спробу пазней"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Стары PIN-код"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Новы PIN-код"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Пачакайце."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новы PIN-код занадта кароткі."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новы PIN-код занадта доўгі."</string>
diff --git a/java/com/android/voicemail/impl/res/values-bg/strings.xml b/java/com/android/voicemail/impl/res/values-bg/strings.xml
index 553c8f3..380efe2 100644
--- a/java/com/android/voicemail/impl/res/values-bg/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bg/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Промяна на ПИН кода"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"За промяна на ПИН кода трябва да бъде активирана визуалната гласова поща"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалната гласова поща още не е активирана. Моля, опитайте отново по-късно"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Стар ПИН"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Нов ПИН"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Моля, изчакайте."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новият ПИН е твърде къс."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новият ПИН е твърде дълъг."</string>
diff --git a/java/com/android/voicemail/impl/res/values-bn/strings.xml b/java/com/android/voicemail/impl/res/values-bn/strings.xml
index 362240a..011a74e 100644
--- a/java/com/android/voicemail/impl/res/values-bn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bn/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"পিন পরিবর্তন করুন"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"পিন পরিবর্তন করতে ভিজ্যুয়াল ভয়েসমেল অবশ্যই সক্ষম করতে হবে"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ভিজ্যুয়াল ভয়েসমেল এখনও সক্রিয় করা হয়নি, অনুগ্রহ করে পরে আবার চেষ্টা করুন"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"পুরোনো PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"নতুন PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"অনুগ্রহ করে অপেক্ষা করুন৷"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"নতুন PIN খুবই ছোট৷"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"নতুন PIN খুবই বড়৷"</string>
diff --git a/java/com/android/voicemail/impl/res/values-bs/strings.xml b/java/com/android/voicemail/impl/res/values-bs/strings.xml
index f897a61..0a26706 100644
--- a/java/com/android/voicemail/impl/res/values-bs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bs/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promijenite PIN kôd"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Vizuelna govorna pošta mora biti omogućena za promjenu PIN kôda"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuelna govorna pošta još uvijek nije aktivirana, pokušajte ponovo kasnije"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Stari PIN kod"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novi PIN kod"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pričekajte."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN kod je prekratak."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN kod je predug."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ca/strings.xml b/java/com/android/voicemail/impl/res/values-ca/strings.xml
index 51e19fb..5c36ea7 100644
--- a/java/com/android/voicemail/impl/res/values-ca/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ca/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Canvia el PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La bústia de veu visual ha d\'estar activada per poder canviar el PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La bústia de veu visual encara no està activada. Torna-ho a provar més tard."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antic"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN nou"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nou és massa curt."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nou és massa llarg."</string>
diff --git a/java/com/android/voicemail/impl/res/values-cs/strings.xml b/java/com/android/voicemail/impl/res/values-cs/strings.xml
index 38ef3fe..ddef491 100644
--- a/java/com/android/voicemail/impl/res/values-cs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-cs/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Změnit kód PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pokud chcete kód PIN změnit, musíte mít zapnutou vizuální hlasovou schránku"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuální hlasová schránka zatím není aktivovaná, zkuste to prosím znovu později"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Starý kód PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nový kód PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Čekejte prosím."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nový kód PIN je příliš krátký."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nový kód PIN je příliš dlouhý."</string>
diff --git a/java/com/android/voicemail/impl/res/values-da/strings.xml b/java/com/android/voicemail/impl/res/values-da/strings.xml
index 7e47117..64e6588 100644
--- a/java/com/android/voicemail/impl/res/values-da/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-da/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Skift pinkode"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuel telefonsvarer skal være aktiveret, for at du kan skifte pinkode"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuel telefonsvarer er ikke aktiveret endnu. Prøv igen senere"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Nuværende pinkode"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Ny pinkode"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent et øjeblik."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye pinkode er for kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye pinkode er for lang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-de/strings.xml b/java/com/android/voicemail/impl/res/values-de/strings.xml
index 35b86f2..9b16275 100644
--- a/java/com/android/voicemail/impl/res/values-de/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-de/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN ändern"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Die visuelle Mailbox muss aktiviert sein, um die PIN zu ändern"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Die visuelle Mailbox wurde noch nicht aktiviert, bitte versuche es später noch einmal"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Alte PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Neue PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Bitte warten."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Die neue PIN ist zu kurz."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Die neue PIN ist zu lang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-el/strings.xml b/java/com/android/voicemail/impl/res/values-el/strings.xml
index 11711bb..b197b1c 100644
--- a/java/com/android/voicemail/impl/res/values-el/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-el/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Αλλαγή κωδικού PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Για αλλαγή του PIN, ενεργοποιήστε τον οπτικό αυτόματο τηλεφωνητή"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ο οπτικός αυτόματος τηλεφωνητής δεν έχει ενεργοποιηθεί ακόμα. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Παλιός αριθμός PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Νέος αριθμός PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Περιμένετε."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Το νέο PIN είναι πολύ μικρό."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Το νέο PIN είναι πολύ μεγάλo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
index be29e47..f49f9ff 100644
--- a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Old PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"New PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
diff --git a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
index be29e47..f49f9ff 100644
--- a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Old PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"New PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
diff --git a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
index be29e47..f49f9ff 100644
--- a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Old PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"New PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
diff --git a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
index e958ecf..f5aeeb9 100644
--- a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"El buzón de voz visual se debe activar para cambiar el PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"El buzón de voz visual aún no está activado. Vuelve a intentarlo más tarde."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN anterior"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN nuevo"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nuevo es demasiado corto."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nuevo es demasiado largo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-es/strings.xml b/java/com/android/voicemail/impl/res/values-es/strings.xml
index b965ca0..3dc1713 100644
--- a/java/com/android/voicemail/impl/res/values-es/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Para poder cambiar el PIN, el buzón de voz visual debe estar habilitado"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"El buzón de voz visual aún no está activado; inténtalo de nuevo más tarde"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antiguo"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN nuevo"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera..."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nuevo es muy corto."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nuevo es muy largo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-et/strings.xml b/java/com/android/voicemail/impl/res/values-et/strings.xml
index 28042ec..e964dcd 100644
--- a/java/com/android/voicemail/impl/res/values-et/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-et/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-koodi muutmine"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-koodi muutmiseks peab olema lubatud visuaalne kõnepost"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuaalne kõnepost pole veel aktiveeritud, proovige hiljem uuesti"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Vana PIN-kood"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Uus PIN-kood"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Oodake."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Uus PIN-kood on liiga lühike."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Uus PIN-kood on liiga pikk."</string>
diff --git a/java/com/android/voicemail/impl/res/values-eu/strings.xml b/java/com/android/voicemail/impl/res/values-eu/strings.xml
index ff2f34c..398ff23 100644
--- a/java/com/android/voicemail/impl/res/values-eu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-eu/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Aldatu PIN kodea"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ikusizko erantzungailuak gaituta egon behar du PIN kodea aldatu ahal izateko"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Oraindik ez dago aktibatuta ikusizko erantzungailua. Saiatu berriro geroago."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN zaharra"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN berria"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Itxaron, mesedez."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Laburregia da PIN kode berria."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Luzeegia da PIN kode berria."</string>
diff --git a/java/com/android/voicemail/impl/res/values-fa/strings.xml b/java/com/android/voicemail/impl/res/values-fa/strings.xml
index bba6541..c57da26 100644
--- a/java/com/android/voicemail/impl/res/values-fa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fa/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"تغییر پین"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"برای تغییر پین، پست صوتی تصویری باید فعال شود"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"پست صوتی تصویری هنوز فعال نشده است، لطفاً بعداً دوباره امتحان کنید"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"پین قدیمی"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"پین جدید"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"لطفاً منتظر بمانید."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"پین جدید خیلی کوتاه است."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"پین جدید خیلی طولانی است."</string>
diff --git a/java/com/android/voicemail/impl/res/values-fi/strings.xml b/java/com/android/voicemail/impl/res/values-fi/strings.xml
index 6886eff..bb1d2d0 100644
--- a/java/com/android/voicemail/impl/res/values-fi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fi/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Vaihda PIN-koodi"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ota visuaalinen puhelinvastaaja käyttöön, jotta voit vaihtaa PIN-koodin."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuaalista puhelinvastaajaa ei ole vielä aktivoitu. Yritä myöhemmin uudelleen."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Vanha PIN-koodi"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Uusi PIN-koodi"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Odota."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Uusi PIN-koodi on liian lyhyt."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Uusi PIN-koodi on liian pitkä."</string>
diff --git a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
index 3e485e0..92b7df6 100644
--- a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Modifier le NIP"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La messagerie vocale visuelle doit être activée pour que vous puissiez modifier votre NIP"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La messagerie vocale visuelle n\'a pas encore été activée. Veuillez réessayer plus tard"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Ancien NIP"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nouveau NIP"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Veuillez patienter."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Le nouveau NIP est trop court."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Le nouveau NIP est trop long."</string>
diff --git a/java/com/android/voicemail/impl/res/values-fr/strings.xml b/java/com/android/voicemail/impl/res/values-fr/strings.xml
index e540f60..771c324 100644
--- a/java/com/android/voicemail/impl/res/values-fr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Modifier le code secret"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pour que vous puissiez modifier le code secret, la messagerie vocale visuelle doit être activée"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La messagerie vocale visuelle n\'est pas encore activée. Veuillez réessayer plus tard"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Ancien code"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nouveau code"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Veuillez patienter."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Le nouveau code est trop court."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Le nouveau code est trop long."</string>
diff --git a/java/com/android/voicemail/impl/res/values-gl/strings.xml b/java/com/android/voicemail/impl/res/values-gl/strings.xml
index b059879..22f401f 100644
--- a/java/com/android/voicemail/impl/res/values-gl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gl/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Para poder cambiar o PIN, o correo de voz visual ten que estar activado"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correo de voz visual aínda non está activado. Téntao de novo máis tarde"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antigo"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN novo"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Agarda."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é demasiado curto."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é demasiado longo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-gu/strings.xml b/java/com/android/voicemail/impl/res/values-gu/strings.xml
index 3ec3c5d..107fd47 100644
--- a/java/com/android/voicemail/impl/res/values-gu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gu/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN બદલો"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN બદલવા માટે વિઝ્યુઅલ વૉઇસમેઇલ સક્ષમ હોય તે આવશ્યક છે"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"વિઝ્યુઅલ વૉઇસમેઇલ હજુ સુધી સક્રિય નથી, કૃપા કરીને પછીથી ફરી પ્રયાસ કરો"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"જૂનો PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"નવો PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"કૃપા કરીને રાહ જુઓ."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"નવો PIN ખૂબ ટૂંકો છે."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"નવો PIN ખૂબ લાંબો છે."</string>
diff --git a/java/com/android/voicemail/impl/res/values-hi/strings.xml b/java/com/android/voicemail/impl/res/values-hi/strings.xml
index 545fffd..8861370 100644
--- a/java/com/android/voicemail/impl/res/values-hi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hi/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"पिन बदलें"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"पिन बदलने के लिए विज़ुअल वॉइसमेल ज़रूर सक्षम होना चाहिए"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"विज़ुअल वॉइसमेल को अभी तक सक्रिय नहीं किया गया है, कृपया बाद में फिर से कोशिश करें"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"पुराना पिन"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"नया पिन"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा करें."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नया पिन बहुत छोटा है."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नया पिन बहुत बड़ा है."</string>
diff --git a/java/com/android/voicemail/impl/res/values-hr/strings.xml b/java/com/android/voicemail/impl/res/values-hr/strings.xml
index 9d5d606..ee1bf1f 100644
--- a/java/com/android/voicemail/impl/res/values-hr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hr/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promjena PIN-a"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Za promjenu PIN-a potrebno je omogućiti vizualnu govornu poštu"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizualna govorna pošta još nije aktivirana, pokušajte ponovno kasnije"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Stari PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novi PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pričekajte."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN je prekratak."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN je predugačak."</string>
diff --git a/java/com/android/voicemail/impl/res/values-hu/strings.xml b/java/com/android/voicemail/impl/res/values-hu/strings.xml
index 982ba99..d761d40 100644
--- a/java/com/android/voicemail/impl/res/values-hu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hu/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-kód módosítása"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"A PIN-kód módosításához engedélyezni kell a vizuális hangpostát."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"A vizuális hangposta még nincs aktiválva. Engedélyezze később."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Régi PIN-kód"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Új PIN-kód"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Kérjük, várjon."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Az új PIN-kód túl rövid."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Az új PIN-kód túl hosszú."</string>
diff --git a/java/com/android/voicemail/impl/res/values-hy/strings.xml b/java/com/android/voicemail/impl/res/values-hy/strings.xml
index 00a132d..008aeee 100644
--- a/java/com/android/voicemail/impl/res/values-hy/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hy/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Փոխեք PIN կոդը"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN կոդը փոխելու համար տեսողական ձայնային փոստը պետք է միացված լինի"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Տեսողական ձայնային փոստը դեռ ակտիվացված չէ: Փորձեք ավելի ուշ:"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Հին PIN կոդ"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Նոր PIN կոդ"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Սպասեք:"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Նոր PIN կոդը չափազանց կարճ է:"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Նոր PIN կոդը չափազանց երկար է:"</string>
diff --git a/java/com/android/voicemail/impl/res/values-in/strings.xml b/java/com/android/voicemail/impl/res/values-in/strings.xml
index 7523fc9..cda3a1a 100644
--- a/java/com/android/voicemail/impl/res/values-in/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-in/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ubah PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pesan suara visual harus diaktifkan untuk mengubah PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Pesan suara visual belum diaktifkan, coba lagi nanti"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN lama"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN Baru"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Mohon tunggu."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN baru terlalu pendek."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN baru terlalu panjang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-is/strings.xml b/java/com/android/voicemail/impl/res/values-is/strings.xml
index b2e616b..44ef9e0 100644
--- a/java/com/android/voicemail/impl/res/values-is/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-is/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Breyta PIN-númeri"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Kveikt þarf að vera á myndrænu talhólfi til að breyta PIN-númeri"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ekki er búið að virkja myndrænt talhólf. Reyndu aftur síðar"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Gamla PIN-númerið"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nýtt PIN-númer"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Augnablik."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nýja PIN-númerið er of stutt."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nýja PIN-númerið er of langt."</string>
diff --git a/java/com/android/voicemail/impl/res/values-it/strings.xml b/java/com/android/voicemail/impl/res/values-it/strings.xml
index f4fea84..afbbbc2 100644
--- a/java/com/android/voicemail/impl/res/values-it/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-it/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambia PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La lettura delle segreteria deve essere attivata per cambiare il PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Lettura della segreteria non attivata. Riprova più tardi"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN attuale"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nuovo PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Attendi."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Il nuovo PIN è troppo corto."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Il nuovo PIN è troppo lungo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-iw/strings.xml b/java/com/android/voicemail/impl/res/values-iw/strings.xml
index e48e35d..acc2e6c 100644
--- a/java/com/android/voicemail/impl/res/values-iw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-iw/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"שינוי קוד הגישה"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"צריך להפעיל את הדואר הקולי הוויזואלי כדי לשנות את קוד הגישה"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"הדואר הקולי הוויזואלי לא הופעל עדיין. נסה שוב מאוחר יותר"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"קוד הגישה הישן"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"קוד הגישה החדש"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"נא להמתין."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"קוד הגישה החדש קצר מדי."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"קוד הגישה החדש ארוך מדי."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ja/strings.xml b/java/com/android/voicemail/impl/res/values-ja/strings.xml
index cd825d2..f0d6a9b 100644
--- a/java/com/android/voicemail/impl/res/values-ja/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ja/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN の変更"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN を変更するには、ビジュアル ボイスメールを有効にする必要があります"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ビジュアル ボイスメールがまだ有効になっていません。しばらくしてからもう一度お試しください"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"古い PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"新しい PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"お待ちください。"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新しい PIN が短すぎます。"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新しい PIN が長すぎます。"</string>
diff --git a/java/com/android/voicemail/impl/res/values-ka/strings.xml b/java/com/android/voicemail/impl/res/values-ka/strings.xml
index 12a677a..84c13b1 100644
--- a/java/com/android/voicemail/impl/res/values-ka/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ka/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-კოდის შეცვლა"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-კოდის შესაცვლელად ჩართული უნდა იყოს ვიზუალური ხმოვანი ფოსტა"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ვიზუალური ხმოვანი ფოსტა ჯერ გააქტიურებული არ არის. გთხოვთ, სცადოთ ხელახლა."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"ძველი PIN-კოდი"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"ახალი PIN-კოდი"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"გთხოვთ, დაელოდოთ."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ახალი PIN-კოდი ძალიან მოკლეა."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ახალი PIN-კოდი ძალიან გრძელია."</string>
diff --git a/java/com/android/voicemail/impl/res/values-kk/strings.xml b/java/com/android/voicemail/impl/res/values-kk/strings.xml
index 08c7cce..c2afc8e 100644
--- a/java/com/android/voicemail/impl/res/values-kk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kk/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN кодын өзгерту"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN кодын өзгерту үшін визуалды дауыс хабарын қосу қажет"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалды дауыс хабары әлі қосылмаған. Кейінірек қайталап көріңіз"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Ескі PIN коды"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Жаңа PIN коды"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Күте тұрыңыз."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Жаңа PIN коды тым қысқа."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Жаңа PIN коды тым ұзын."</string>
diff --git a/java/com/android/voicemail/impl/res/values-km/strings.xml b/java/com/android/voicemail/impl/res/values-km/strings.xml
index ea3d6ff..55a2253 100644
--- a/java/com/android/voicemail/impl/res/values-km/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-km/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ផ្លាស់ប្ដូរ​កូដ PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​ត្រូវតែ​បើកដំណើរការ ដើម្បី​ផ្លាស់ប្ដូរ PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"សារ​ជាសំឡេង​ដែល​មើល​ឃើញ​មិនទាន់​​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​នៅ​ឡើយ​ទេ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"កូដ PIN ចាស់"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"កូដ PIN ថ្មី"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"សូមរង់ចាំ។"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"កូដ PIN ថ្មី​ ខ្លី​ពេក។"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"កូដ PIN ថ្មី​ វែង​ពេក។"</string>
diff --git a/java/com/android/voicemail/impl/res/values-kn/strings.xml b/java/com/android/voicemail/impl/res/values-kn/strings.xml
index 48e14f5..695c8d4 100644
--- a/java/com/android/voicemail/impl/res/values-kn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kn/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ಪಿನ್ ಬದಲಾಯಿಸಲು ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಇನ್ನೂ ಸಕ್ರಿಯವಾಗಿಲ್ಲ, ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"ಹಳೆಯ ಪಿನ್"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"ಹೊಸ ಪಿನ್‌"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ಹೊಸ ಪಿನ್ ತುಂಬಾ ಚಿಕ್ಕದಾಗಿದೆ."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ಹೊಸ ಪಿನ್ ತುಂಬಾ ಉದ್ದವಾಗಿದೆ."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ko/strings.xml b/java/com/android/voicemail/impl/res/values-ko/strings.xml
index 1138a5b..7f1d8b0 100644
--- a/java/com/android/voicemail/impl/res/values-ko/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ko/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN 변경"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN을 변경하려면 시각적 음성사서함이 사용 설정되어 있어야 합니다."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"시각적 음성사서함이 아직 활성 상태가 아닙니다. 나중에 다시 시도해 주세요."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"이전 PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"새 PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"기다려 주세요."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"새 PIN이 너무 짧습니다."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"새 PIN이 너무 깁니다."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ky/strings.xml b/java/com/android/voicemail/impl/res/values-ky/strings.xml
index b54d2b4..736a56a 100644
--- a/java/com/android/voicemail/impl/res/values-ky/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ky/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN кодду өзгөртүү"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN кодду өзгөртүү үчүн визуладык үн почтасын иштетүү керек"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалдык үн почтаңыз күйгүзүлгөн жок. Кайра аракет кылыңыз."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Эски PIN код"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Жаңы PIN код"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Күтө туруңуз."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Жаңы PIN код өтө эле кыска."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Жаңы PIN код өтө эле узун."</string>
diff --git a/java/com/android/voicemail/impl/res/values-lo/strings.xml b/java/com/android/voicemail/impl/res/values-lo/strings.xml
index 2052059..fb03133 100644
--- a/java/com/android/voicemail/impl/res/values-lo/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lo/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"​ປ່ຽນ​ລະຫັດ PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ຈະຕ້ອງເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເພື່ອປ່ຽນ PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ຍັງບໍໄດ້ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເທື່ອ, ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"ລະຫັດ PIN ເກົ່າ"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"ລະຫັດ PIN ໃໝ່"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ກະລຸນາລໍຖ້າ."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ລະຫັດ PIN ໃໝ່ສັ້ນເກີນໄປ."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ລະຫັດ PIN ໃໝ່ຍາວເກີນໄປ."</string>
diff --git a/java/com/android/voicemail/impl/res/values-lt/strings.xml b/java/com/android/voicemail/impl/res/values-lt/strings.xml
index 4d7d378..c9891ab 100644
--- a/java/com/android/voicemail/impl/res/values-lt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lt/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN kodo keitimas"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Vaizdinis balso paštas turi būti įgalintas, kad būtų galima pakeisti PIN kodą"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vaizdinis balso paštas dar nesuaktyvintas, vėliau bandykite dar kartą"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Senas PIN kodas"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Naujas PIN kodas"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Palaukite."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Naujas PIN kodas per trumpas."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Naujas PIN kodas per ilgas."</string>
diff --git a/java/com/android/voicemail/impl/res/values-lv/strings.xml b/java/com/android/voicemail/impl/res/values-lv/strings.xml
index 776f102..7a26aa0 100644
--- a/java/com/android/voicemail/impl/res/values-lv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lv/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN mainīšana"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Lai varētu mainīt PIN, ir jābūt iespējotam vizuālajam balss pastam."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuālais balss pasts vēl nav aktivizēts. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Iepriekšējais PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Jaunais PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Lūdzu, uzgaidiet!"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Jaunais PIN ir pārāk īss."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Jaunais PIN ir pārāk garš."</string>
diff --git a/java/com/android/voicemail/impl/res/values-mk/strings.xml b/java/com/android/voicemail/impl/res/values-mk/strings.xml
index 52ec73d..2ef8fae 100644
--- a/java/com/android/voicemail/impl/res/values-mk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mk/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Променете PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"За променување на PIN-кодот, мора да се овозможи визуелна говорна пошта"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуелната говорна пошта сѐ уште не е активна. Обидете се повторно подоцна"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Стар PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Нов PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Почекајте."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новиот PIN е премногу кус."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новиот PIN е премногу долг."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ml/strings.xml b/java/com/android/voicemail/impl/res/values-ml/strings.xml
index baece46..ac0ad23 100644
--- a/java/com/android/voicemail/impl/res/values-ml/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ml/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"പിൻ മാറ്റുക"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"പിൻ മാറ്റുന്നതിന് വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഇതുവരെ സജീവമാക്കിയിട്ടില്ല, പിന്നീട് വീണ്ടും ശ്രമിച്ചുനോക്കൂ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"പഴയ പിൻ"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"പുതിയ പിൻ"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"കാത്തിരിക്കുക."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"പുതിയ പിൻ വളരെ ചെറുതാണ്."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"പുതിയ പിൻ വളരെ ദൈർഘ്യമേറിയതാണ്."</string>
diff --git a/java/com/android/voicemail/impl/res/values-mn/strings.xml b/java/com/android/voicemail/impl/res/values-mn/strings.xml
index 58c3134..96e0e42 100644
--- a/java/com/android/voicemail/impl/res/values-mn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mn/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN өөрчлөх"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Харагдах дуут шуудан PIN-г өөрчлөх боломжтой байх ёстой"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Харагдах дуут шуудан хараахан идэвхжээгүй байна, дараа дахин оролдоно уу"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Хуучин PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Шинэ PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Түр хүлээнэ үү."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Шинэ PIN хэт богино байна."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Шинэ PIN хэт урт байна."</string>
diff --git a/java/com/android/voicemail/impl/res/values-mr/strings.xml b/java/com/android/voicemail/impl/res/values-mr/strings.xml
index 17a7f7a..85b5270 100644
--- a/java/com/android/voicemail/impl/res/values-mr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mr/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"पिन बदला"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"पिन बदलण्‍यासाठी व्हिज्युअल व्हॉइसमेल सक्षम करणे आवश्‍यक आहे"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"व्हिज्युअल व्हॉइसमेल अद्याप सक्रिय केले नाही, कृपया नंतर पुन्हा प्रयत्न करा"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"जुना पिन"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"नवीन पिन"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा करा."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नवीन पिन खूप लहान आहे."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नवीन पिन खूप दीर्घ आहे."</string>
@@ -46,6 +44,6 @@
     <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"पिन <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अंकी असणे आवश्‍यक आहे."</string>
     <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"आपल्या पिनची पुष्टी करा"</string>
     <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"पिन जुळत नाहीत"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"व्हॉइसमेल पिन अद्यतनित केला"</string>
+    <string name="change_pin_succeeded" msgid="6869403202124894671">"व्हॉइसमेल पिन अपडेट केला"</string>
     <string name="change_pin_system_error" msgid="5762853042379833829">"पिन सेट करण्यात अक्षम"</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ms/strings.xml b/java/com/android/voicemail/impl/res/values-ms/strings.xml
index b584451..c44ba38 100644
--- a/java/com/android/voicemail/impl/res/values-ms/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ms/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Tukar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Mel suara visual mesti didayakan untuk menukar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Mel suara visual belum diaktifkan. Sila cuba sebentar lagi"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN Lama"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN Baharu"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sila tunggu."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN baharu terlalu pendek."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN baharu terlalu panjang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-my/strings.xml b/java/com/android/voicemail/impl/res/values-my/strings.xml
index b29c852..d9ef363 100644
--- a/java/com/android/voicemail/impl/res/values-my/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-my/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ပင်နံပါတ် ပြောင်းပါ"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ပင်နံပါတ်ပြောင်းရန် စာသားမှတ်တမ်းပါ အသံမေးလ်ကို ဖွင့်ထားရပါမည်"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"စာသားမှတ်တမ်းပါ အသံမေးလ်ကို မဖွင့်ရသေးပါ၊ နောက်မှ ထပ်ဖွင့်ကြည့်ပါ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"ပင်နံပါတ်အဟောင်း"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"ပင်နံပါတ်အသစ်"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ခဏစောင့်ပါ။"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ပင်နံပါတ်အသစ်မှာ တိုလွန်းနေသည်။"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ပင်နံပါတ်အသစ်မှာ ရှည်လွန်းနေသည်။"</string>
diff --git a/java/com/android/voicemail/impl/res/values-nb/strings.xml b/java/com/android/voicemail/impl/res/values-nb/strings.xml
index b6a1e1c..7139887 100644
--- a/java/com/android/voicemail/impl/res/values-nb/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Endre PIN-koden"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Du må slå på visuell talepost for å endre PIN-koden"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell talepost er ikke slått på ennå – prøv igjen senere"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Gammel PIN-kode"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Ny PIN-kode"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent litt."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye PIN-koden er for kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye PIN-koden er for lang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ne/strings.xml b/java/com/android/voicemail/impl/res/values-ne/strings.xml
index f0b4bd8..44c8bb0 100644
--- a/java/com/android/voicemail/impl/res/values-ne/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ne/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN परिवर्तन गर्नुहोस्"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN परिवर्तन गर्न अनिवार्य रूपले भिजुअल भ्वाइस मेललाई सक्षम पारिनुपर्छ"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"भिजुअल भ्वाइस मेललाई अझै सक्रिय पारिएको छैन, कृपया पुन: प्रयास गर्नुहोस्"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"पुरानो PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"नयाँ PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा गर्नुहोस्।"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नयाँ PIN अत्यन्त छोटो छ।"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नयाँ PIN अत्यन्त लामो छ।"</string>
diff --git a/java/com/android/voicemail/impl/res/values-nl/strings.xml b/java/com/android/voicemail/impl/res/values-nl/strings.xml
index f32723b..1e3788d 100644
--- a/java/com/android/voicemail/impl/res/values-nl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nl/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Pincode wijzigen"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuele voicemail moet zijn ingeschakeld om de pincode te wijzigen"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuele voicemail is nog niet geactiveerd. Probeer het later opnieuw."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Oude pincode"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nieuwe pincode"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Even geduld."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"De nieuwe pincode is te kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"De nieuwe pincode is te lang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-no/strings.xml b/java/com/android/voicemail/impl/res/values-no/strings.xml
index b6a1e1c..7139887 100644
--- a/java/com/android/voicemail/impl/res/values-no/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-no/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Endre PIN-koden"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Du må slå på visuell talepost for å endre PIN-koden"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell talepost er ikke slått på ennå – prøv igjen senere"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Gammel PIN-kode"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Ny PIN-kode"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent litt."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye PIN-koden er for kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye PIN-koden er for lang."</string>
diff --git a/java/com/android/voicemail/impl/res/values-pa/strings.xml b/java/com/android/voicemail/impl/res/values-pa/strings.xml
index 6353085..d65588d 100644
--- a/java/com/android/voicemail/impl/res/values-pa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pa/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN ਬਦਲੋ"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ PIN ਬਦਲਣ ਲਈ ਯੋਗ ਬਣਾਇਆ ਜਾਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਹਾਲੇ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤੀ ਗਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"ਪੁਰਾਣਾ PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"ਨਵਾਂ PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ।"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ਨਵਾਂ PIN ਬਹੁਤ ਹੀ ਛੋਟਾ ਹੈ।"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ਨਵਾਂ PIN ਬਹੁਤ ਹੀ ਲੰਬਾ ਹੈ।"</string>
diff --git a/java/com/android/voicemail/impl/res/values-pl/strings.xml b/java/com/android/voicemail/impl/res/values-pl/strings.xml
index 1738214..ae3dcf7 100644
--- a/java/com/android/voicemail/impl/res/values-pl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pl/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Zmień kod PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Aby można było zmienić kod PIN, wizualna poczta głosowa musi być włączona"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Wizualna poczta głosowa nie została jeszcze aktywowana – spróbuj ponownie później"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Stary kod PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nowy kod PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Poczekaj."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nowy kod PIN jest za krótki."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nowy kod PIN jest za długi."</string>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
index 69f285b..f2c2f4e 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"O correio de voz visual precisa ser ativado para alterar o PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correio de voz visual ainda não foi ativado, tente novamente mais tarde"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antigo"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novo PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é curto demais."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é longo demais."</string>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
index ddff14a..b92a54c 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"A mensagem de correio de voz visual tem de estar ativada para poder alterar o PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"A mensagem de correio de voz visual ainda não está ativada. Tente novamente mais tarde"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antigo"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novo PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é demasiado curto."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é demasiado longo."</string>
diff --git a/java/com/android/voicemail/impl/res/values-pt/strings.xml b/java/com/android/voicemail/impl/res/values-pt/strings.xml
index 69f285b..f2c2f4e 100644
--- a/java/com/android/voicemail/impl/res/values-pt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"O correio de voz visual precisa ser ativado para alterar o PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correio de voz visual ainda não foi ativado, tente novamente mais tarde"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN antigo"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Novo PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é curto demais."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é longo demais."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ro/strings.xml b/java/com/android/voicemail/impl/res/values-ro/strings.xml
index 00eee24..165171b 100644
--- a/java/com/android/voicemail/impl/res/values-ro/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ro/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Schimbați codul PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Mesageria vocală vizuală trebuie activată pentru a schimba codul PIN."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Mesageria vocală vizuală nu este activată încă. Încercați din nou mai târziu."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Codul PIN vechi"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Codul PIN nou"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Așteptați."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Codul PIN nou este prea scurt."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Codul PIN nou este prea lung."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ru/strings.xml b/java/com/android/voicemail/impl/res/values-ru/strings.xml
index 8537ac9..99a0b54 100644
--- a/java/com/android/voicemail/impl/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Изменение PIN-кода"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Чтобы изменить PIN-код, включите визуальную голосовую почту"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуальная голосовая почта пока не активирована, повторите попытку позже"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Прежний PIN-код"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Новый PIN-код"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Подождите…"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новый PIN-код слишком короткий."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новый PIN-код слишком длинный."</string>
diff --git a/java/com/android/voicemail/impl/res/values-si/strings.xml b/java/com/android/voicemail/impl/res/values-si/strings.xml
index a72200f..7879678 100644
--- a/java/com/android/voicemail/impl/res/values-si/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-si/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN අංකය වෙනස් කරන්න"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN අංකය වෙනස් කිරීමට දෘශ්‍ය හඬ තැපෑල සබල කළ යුතුය"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"දෘශ්‍ය හඬ තැපෑල තවම සක්‍රිය කර නැත, කරුණාකර පසුව නැවත උත්සාහ කරන්න"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"පැරණි PIN අංකය"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"නව PIN අංකය"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"කරුණාකර රැඳී සිටින්න."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"නව PIN අංකය කෙටි වැඩිය."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"නව PIN අංකය දිග වැඩිය."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sk/strings.xml b/java/com/android/voicemail/impl/res/values-sk/strings.xml
index 8e06b68..a6deaa6 100644
--- a/java/com/android/voicemail/impl/res/values-sk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sk/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Zmena kódu PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN možno zmeniť až po povolení vizuálnej hlasovej schránky"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuálna hlasová schránka ešte nie je aktivovaná, skúste to znova neskôr"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Starý PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nový PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Čakajte."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nový PIN je príliš krátky."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nový PIN je príliš dlhý."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sl/strings.xml b/java/com/android/voicemail/impl/res/values-sl/strings.xml
index a62fa90..bf515c0 100644
--- a/java/com/android/voicemail/impl/res/values-sl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sl/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Sprememba kode PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Če želite spremeniti kodo PIN, morajo biti vizualna sporočila v odzivniku omogočena"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizualna sporočila v odzivniku še niso aktivirana. Poskusite znova pozneje"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Stara koda PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nova koda PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Počakajte."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nova koda PIN je prekratka."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nova koda PIN je predolga."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sq/strings.xml b/java/com/android/voicemail/impl/res/values-sq/strings.xml
index c0f1b12..09104c8 100644
--- a/java/com/android/voicemail/impl/res/values-sq/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sq/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ndrysho kodin PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Duhet të aktivizohet posta zanore vizuale për të ndryshuar kodin PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Posta zanore vizuale nuk është aktivizuar ende. Provo përsëri më vonë"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Kodi PIN i vjetër"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Kodi PIN i ri"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Prit..."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Kodi i ri PIN është shumë i shkurtër."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Kodi i ri PIN është shumë i gjatë."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sr/strings.xml b/java/com/android/voicemail/impl/res/values-sr/strings.xml
index ec6d6a4..ea0ce7b 100644
--- a/java/com/android/voicemail/impl/res/values-sr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sr/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Промените PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Морате да омогућите визуелну говорну пошту да бисте променили PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуелна говорна пошта још увек није активирана, пробајте поново касније"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Стари PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Нови PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Сачекајте."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Нови PIN је прекратак."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Нови PIN је предугачак."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sv/strings.xml b/java/com/android/voicemail/impl/res/values-sv/strings.xml
index a238753..89a1e23 100644
--- a/java/com/android/voicemail/impl/res/values-sv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sv/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ändra pinkod"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuell röstbrevlåda måste vara aktiverat för att ändra pinkoden"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell röstbrevlåda är ännu inte aktiverad, försök igen senare"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Gammal pinkod"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Ny pinkod"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vänta."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nya pinkoden är för kort."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nya pinkoden är för lång."</string>
diff --git a/java/com/android/voicemail/impl/res/values-sw/strings.xml b/java/com/android/voicemail/impl/res/values-sw/strings.xml
index d749ddf..d8c7557 100644
--- a/java/com/android/voicemail/impl/res/values-sw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sw/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Badilisha PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Lazima uruhusu kipengele cha ujumbe wa sauti unaoonekana ili ubadilishe PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Kipengele cha ujumbe wa sauti unaoonekana bado hakijawashwa, tafadhali jaribu tena baadaye"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN ya zamani"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN mpya"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Tafadhali subiri."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN mpya ni fupi mno."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN mpya ni ndefu mno."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ta/strings.xml b/java/com/android/voicemail/impl/res/values-ta/strings.xml
index de0dc4a..1b965aa 100644
--- a/java/com/android/voicemail/impl/res/values-ta/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ta/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"பின்னை மாற்று"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"பின்னை மாற்ற, விஷுவல் குரலஞ்சலை இயக்க வேண்டும்"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"விஷுவல் குரலஞ்சல் இன்னும் இயக்கப்படவில்லை. பிறகு முயலவும்"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"பழைய பின்"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"புதிய பின்"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"காத்திருக்கவும்."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"புதிய பின் மிகவும் சிறியதாக உள்ளது."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"புதிய பின் மிகவும் நீளமாக உள்ளது."</string>
diff --git a/java/com/android/voicemail/impl/res/values-te/strings.xml b/java/com/android/voicemail/impl/res/values-te/strings.xml
index 1459ddc..089a1ba 100644
--- a/java/com/android/voicemail/impl/res/values-te/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-te/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PINను మార్చండి"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PINని మార్చడానికి తప్పనిసరిగా దృశ్యమాన వాయిస్ మెయిల్‌ను ప్రారంభించాలి"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"దృశ్యమాన వాయిస్ మెయిల్‌ ఇంకా సక్రియం కాలేదు, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"పాత PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"కొత్త PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"దయచేసి వేచి ఉండండి."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"కొత్త PIN చాలా చిన్నదిగా ఉంది."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"కొత్త PIN చాలా పొడవుగా ఉంది."</string>
diff --git a/java/com/android/voicemail/impl/res/values-th/strings.xml b/java/com/android/voicemail/impl/res/values-th/strings.xml
index 056800c..130ea26 100644
--- a/java/com/android/voicemail/impl/res/values-th/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-th/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"เปลี่ยน PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ต้องเปิดใช้ข้อความเสียงพร้อมภาพเพื่อเปลี่ยน PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ยังไม่ได้เปิดใช้งานข้อความเสียงพร้อมภาพ โปรดลองอีกครั้งในภายหลัง"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"PIN เก่า"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"PIN ใหม่"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"โปรดรอสักครู่"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN ใหม่สั้นเกินไป"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN ใหม่ยาวเกินไป"</string>
diff --git a/java/com/android/voicemail/impl/res/values-tl/strings.xml b/java/com/android/voicemail/impl/res/values-tl/strings.xml
index c322362..58d1883 100644
--- a/java/com/android/voicemail/impl/res/values-tl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tl/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Palitan ang PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Dapat naka-enable ang visual na voicemail upang palitan ang PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Hindi pa naka-activate ang visual na voicemail, pakisubukang muli sa ibang pagkakataon"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Lumang PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Bagong PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pakihintay."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Masyadong maikli ang bagong PIN."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Masyadong mahaba ang bagong PIN."</string>
diff --git a/java/com/android/voicemail/impl/res/values-tr/strings.xml b/java/com/android/voicemail/impl/res/values-tr/strings.xml
index a80b40b..578cf95 100644
--- a/java/com/android/voicemail/impl/res/values-tr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tr/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN\'i değiştirin"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN\'i değiştirebilmek için görsel sesli mesaj etkinleştirilmelidir"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Görsel sesli mesaj henüz etkinleştirilmedi. Lütfen daha sonra tekrar deneyin."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Eski PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Yeni PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Lütfen bekleyin."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yeni PIN çok kısa."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yeni PIN çok uzun."</string>
diff --git a/java/com/android/voicemail/impl/res/values-uk/strings.xml b/java/com/android/voicemail/impl/res/values-uk/strings.xml
index a0b3d8f..b1d7c10 100644
--- a/java/com/android/voicemail/impl/res/values-uk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uk/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Змінити PIN-код"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Щоб змінити PIN-код, потрібно ввімкнути візуальну голосову пошту"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Візуальну голосову пошту ще не активовано, повторіть спробу пізніше"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Старий PIN-код"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Новий PIN-код"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Зачекайте."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новий PIN-код закороткий."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новий PIN-код задовгий."</string>
diff --git a/java/com/android/voicemail/impl/res/values-ur/strings.xml b/java/com/android/voicemail/impl/res/values-ur/strings.xml
index 81f913f..7b1f8d3 100644
--- a/java/com/android/voicemail/impl/res/values-ur/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ur/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"‏PIN تبدیل کریں"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"‏PIN تبدیل کرنے کیلئے بصری صوتی میل اہل ہونی چاہئیے"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"بصری صوتی میل ابھی فعال نہیں ہے، براہ کرم بعد میں دوبارہ کوشش کریں"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"‏پرانا PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"‏نیا PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"براہ کرم انتظار کریں۔"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"‏نیا PIN بہت مختصر ہے۔"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"‏نیا PIN بہت طویل ہے۔"</string>
diff --git a/java/com/android/voicemail/impl/res/values-uz/strings.xml b/java/com/android/voicemail/impl/res/values-uz/strings.xml
index 8771da7..92a7536 100644
--- a/java/com/android/voicemail/impl/res/values-uz/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uz/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN kodni o‘zgartirish"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN kodni o‘zgartirish uchun vizual ovozli pochtani yoqish lozim."</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizual ovozli pochta yoqilmadi. Keyinroq qayta urinib ko‘ring."</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Eski PIN kod"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Yangi PIN kod"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Iltimos, kuting…"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yangi PIN kod juda qisqa."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yangi PIN kod juda uzun."</string>
diff --git a/java/com/android/voicemail/impl/res/values-vi/strings.xml b/java/com/android/voicemail/impl/res/values-vi/strings.xml
index cdca9bb..972c74c 100644
--- a/java/com/android/voicemail/impl/res/values-vi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-vi/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Thay đổi mã PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Phải bật thư thoại kèm theo hình ảnh để thay đổi mã PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Thư thoại kèm theo hình ảnh chưa được kích hoạt, hãy thử lại sau"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Mã PIN cũ"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Mã PIN mới"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vui lòng đợi."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Mã PIN mới quá ngắn."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Mã PIN mới quá dài."</string>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
index 8b0dde0..21edad6 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"更改 PIN 码"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必须启用可视语音信箱才可更改 PIN 码"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"可视语音信箱尚未激活，请稍后再试"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"旧 PIN 码"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"新 PIN 码"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"请稍候。"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的 PIN 码太短。"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的 PIN 码太长。"</string>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
index 0ee8269..d80cbba 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"變更 PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必須啟用視像留言才能變更 PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"視像留言尚未啟用，請稍後再試"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"舊的 PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"新的 PIN"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"請稍候。"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的 PIN 太短。"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的 PIN 太長。"</string>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
index d33c989..7d23806 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"變更 PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必須啟用視覺化語音信箱才能變更 PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"視覺化語音信箱尚未啟用，請稍後再試"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"舊的語音信箱密碼"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"新的語音信箱密碼"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"請稍候。"</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的語音信箱密碼太短。"</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的語音信箱密碼太長。"</string>
diff --git a/java/com/android/voicemail/impl/res/values-zu/strings.xml b/java/com/android/voicemail/impl/res/values-zu/strings.xml
index b762091..630f288 100644
--- a/java/com/android/voicemail/impl/res/values-zu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zu/strings.xml
@@ -26,8 +26,6 @@
     <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Shintsha i-PIN"</string>
     <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ivoyisimeyili ebonakalayo kumele inikwe amandla ukuze ishintshe i-PIN"</string>
     <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ivoyisimeyili ebonakalayo ayisebenzi okwamanje, sicela uzame futhi emuva kwesikhathi"</string>
-    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"I-PIN endala"</string>
-    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"I-PIN entsha"</string>
     <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sicela ulinde."</string>
     <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"I-PIN entsha imfushane kakhulu."</string>
     <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"I-PIN entsha yinde kakhulu."</string>
diff --git a/java/com/android/voicemail/impl/res/values/strings.xml b/java/com/android/voicemail/impl/res/values/strings.xml
index 375a1e9..66c0e62 100644
--- a/java/com/android/voicemail/impl/res/values/strings.xml
+++ b/java/com/android/voicemail/impl/res/values/strings.xml
@@ -61,11 +61,6 @@
   <string name="voicemail_change_pin_preference_summary_disable">Visual voicemail must be enabled to change PIN</string>
   <string name="voicemail_change_pin_preference_summary_not_activated">Visual voicemail is not activated yet, please try again later</string>
 
-  <!-- Hint for the old PIN field in the change vociemail PIN dialog -->
-  <string name="vm_change_pin_old_pin">Old PIN</string>
-  <!-- Hint for the new PIN field in the change vociemail PIN dialog -->
-  <string name="vm_change_pin_new_pin">New PIN</string>
-
   <!-- Message on the dialog when PIN changing is in progress -->
   <string name="vm_change_pin_progress_message">Please wait.</string>
   <!-- Error message for the voicemail PIN change if the PIN is too short -->
@@ -107,4 +102,8 @@
   <string name="change_pin_succeeded">Voicemail PIN updated</string>
   <!-- The error message to show if the server reported an error while attempting to change the voicemail PIN -->
   <string name="change_pin_system_error">Unable to set PIN</string>
+
+  <string name="vvm_config_override_load_current_key" translatable="false">vvm_config_override_load_current</string>
+  <string name="vvm_config_override_enabled_key" translatable="false">vvm_config_override_enabled</string>
+
 </resources>
diff --git a/java/com/android/voicemail/impl/scheduling/TaskExecutor.java b/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
index e3b718e..afa77c5 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskExecutor.java
@@ -129,7 +129,7 @@
 
   private final MainThreadHandler mainThreadHandler;
 
-  private final Context context;
+  private final Context appContext;
 
   /** Main thread only, access through {@link #getTasks()} */
   private final TaskQueue tasks = new TaskQueue();
@@ -179,7 +179,7 @@
         VvmLog.i("JobFinishedPoller.run", "Job finished");
         if (!getTasks().isEmpty()) {
           TaskSchedulerJobService.scheduleJob(
-              context, serializePendingTasks(), delayMillis, isNewJob);
+              appContext, serializePendingTasks(), delayMillis, isNewJob);
           tasks.clear();
         }
         terminate();
@@ -259,7 +259,7 @@
   }
 
   private TaskExecutor(Context context) {
-    this.context = context;
+    this.appContext = context.getApplicationContext();
     HandlerThread thread = new HandlerThread("VvmTaskExecutor");
     thread.start();
 
@@ -274,7 +274,7 @@
     job = null;
     workerThreadHandler.getLooper().quit();
     instance = null;
-    TaskReceiver.resendDeferredBroadcasts(context);
+    TaskReceiver.resendDeferredBroadcasts(appContext);
   }
 
   @MainThread
@@ -391,7 +391,7 @@
   public void onStartJob(Job job, List<Bundle> pendingTasks) {
     VvmLog.i(TAG, "onStartJob");
     this.job = job;
-    tasks.fromBundles(context, pendingTasks);
+    tasks.fromBundles(appContext, pendingTasks);
     maybeRunNextTask();
   }
 
diff --git a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
index 107234e..baf5804 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
@@ -30,6 +30,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.MainThread;
 import com.android.dialer.constants.ScheduledJobIds;
+import com.android.dialer.strictmode.DialerStrictMode;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.VvmLog;
 import java.util.ArrayList;
@@ -58,7 +59,8 @@
   public boolean onStartJob(JobParameters params) {
     int jobId = params.getTransientExtras().getInt(EXTRA_JOB_ID);
     int expectedJobId =
-        PreferenceManager.getDefaultSharedPreferences(this).getInt(EXPECTED_JOB_ID, 0);
+        DialerStrictMode.bypass(
+            () -> PreferenceManager.getDefaultSharedPreferences(this).getInt(EXPECTED_JOB_ID, 0));
     if (jobId != expectedJobId) {
       VvmLog.e(
           TAG, "Job " + jobId + " is not the last scheduled job " + expectedJobId + ", ignoring");
diff --git a/java/com/android/voicemail/impl/scheduling/TaskSchedulerService.java b/java/com/android/voicemail/impl/scheduling/TaskSchedulerService.java
deleted file mode 100644
index 5ad2447..0000000
--- a/java/com/android/voicemail/impl/scheduling/TaskSchedulerService.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (C) 2016 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.voicemail.impl.scheduling;
-
-import android.annotation.TargetApi;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
-import com.android.voicemail.impl.Assert;
-import com.android.voicemail.impl.NeededForTesting;
-import com.android.voicemail.impl.VvmLog;
-import com.android.voicemail.impl.scheduling.TaskQueue.NextTask;
-import java.util.List;
-
-/**
- * A service to queue and run {@link Task} with the {@link android.app.job.JobScheduler}. A task is
- * queued using {@link Context#startService(Intent)}. The intent should contain enough information
- * in {@link Intent#getExtras()} to construct the task (see {@link Tasks#createIntent(Context,
- * Class)}).
- *
- * <p>All tasks are ran in the background with a wakelock being held by the {@link
- * android.app.job.JobScheduler}, which is between {@link #onStartJob(Job, List)} and {@link
- * #finishJob()}. The {@link TaskSchedulerJobService} also has a {@link TaskQueue}, but the data is
- * stored in the {@link android.app.job.JobScheduler} instead of the process memory, so if the
- * process is killed the queued tasks will be restored. If a new task is added, a new {@link
- * TaskSchedulerJobService} will be scheduled to run the task. If the job is already scheduled, the
- * new task will be pushed into the queue of the scheduled job. If the job is already running, the
- * job will be queued in process memory.
- *
- * <p>Only one task will be ran at a time, and same task cannot exist in the queue at the same time.
- * Refer to {@link TaskQueue} for queuing and execution order.
- *
- * <p>If there are still tasks in the queue but none are executable immediately, the service will
- * enter a "sleep", pushing all remaining task into a new job and end the current job.
- *
- * <p>The service will be started when a intent is received, and stopped when there are no more
- * tasks in the queue.
- *
- * <p>{@link android.app.job.JobScheduler} is not used directly due to:
- *
- * <ul>
- *   <li>The {@link android.telecom.PhoneAccountHandle} used to differentiate task can not be easily
- *       mapped into an integer for job id
- *   <li>A job cannot be mutated to store information such as retry count.
- * </ul>
- */
-@SuppressWarnings("AndroidApiChecker") /* stream() */
-@TargetApi(VERSION_CODES.O)
-public class TaskSchedulerService extends Service {
-
-  interface Job {
-    void finish();
-  }
-
-  private static final String TAG = "VvmTaskScheduler";
-
-  private static final int READY_TOLERANCE_MILLISECONDS = 100;
-
-  /**
-   * Threshold to determine whether to do a short or long sleep when a task is scheduled in the
-   * future.
-   *
-   * <p>A short sleep will continue the job and use {@link Handler#postDelayed(Runnable, long)} to
-   * wait for the next task.
-   *
-   * <p>A long sleep will finish the job and schedule a new one. The exact execution time is
-   * subjected to {@link android.app.job.JobScheduler} battery optimization, and is not exact.
-   */
-  private static final int SHORT_SLEEP_THRESHOLD_MILLISECONDS = 10_000;
-  /**
-   * When there are no more tasks to be run the service should be stopped. But when all tasks has
-   * finished there might still be more tasks in the message queue waiting to be processed,
-   * especially the ones submitted in {@link Task#onCompleted()}. Wait for a while before stopping
-   * the service to make sure there are no pending messages.
-   */
-  private static final int STOP_DELAY_MILLISECONDS = 5_000;
-
-  // The thread to run tasks on
-  private volatile WorkerThreadHandler mWorkerThreadHandler;
-
-  /**
-   * Used by tests to turn task handling into a single threaded process by calling {@link
-   * Handler#handleMessage(Message)} directly
-   */
-  private MessageSender mMessageSender = new MessageSender();
-
-  private MainThreadHandler mMainThreadHandler;
-
-  // Binder given to clients
-  private final IBinder mBinder = new LocalBinder();
-
-  /** Main thread only, access through {@link #getTasks()} */
-  private final TaskQueue mTasks = new TaskQueue();
-
-  private boolean mWorkerThreadIsBusy = false;
-
-  private Job mJob;
-
-  private final Runnable mStopServiceWithDelay =
-      new Runnable() {
-        @MainThread
-        @Override
-        public void run() {
-          VvmLog.i(TAG, "Stopping service");
-          finishJob();
-          stopSelf();
-        }
-      };
-
-  /** Should attempt to run the next task when a task has finished or been added. */
-  private boolean mTaskAutoRunDisabledForTesting = false;
-
-  @VisibleForTesting
-  final class WorkerThreadHandler extends Handler {
-
-    public WorkerThreadHandler(Looper looper) {
-      super(looper);
-    }
-
-    @Override
-    @WorkerThread
-    public void handleMessage(Message msg) {
-      Assert.isNotMainThread();
-      Task task = (Task) msg.obj;
-      try {
-        VvmLog.i(TAG, "executing task " + task);
-        task.onExecuteInBackgroundThread();
-      } catch (Throwable throwable) {
-        VvmLog.e(TAG, "Exception while executing task " + task + ":", throwable);
-      }
-
-      Message schedulerMessage = mMainThreadHandler.obtainMessage();
-      schedulerMessage.obj = task;
-      mMessageSender.send(schedulerMessage);
-    }
-  }
-
-  @VisibleForTesting
-  final class MainThreadHandler extends Handler {
-
-    public MainThreadHandler(Looper looper) {
-      super(looper);
-    }
-
-    @Override
-    @MainThread
-    public void handleMessage(Message msg) {
-      Assert.isMainThread();
-      Task task = (Task) msg.obj;
-      getTasks().remove(task);
-      task.onCompleted();
-      mWorkerThreadIsBusy = false;
-      maybeRunNextTask();
-    }
-  }
-
-  @Override
-  @MainThread
-  public void onCreate() {
-    super.onCreate();
-    HandlerThread thread = new HandlerThread("VvmTaskSchedulerService");
-    thread.start();
-
-    mWorkerThreadHandler = new WorkerThreadHandler(thread.getLooper());
-    mMainThreadHandler = new MainThreadHandler(Looper.getMainLooper());
-  }
-
-  @Override
-  public void onDestroy() {
-    mWorkerThreadHandler.getLooper().quit();
-  }
-
-  @Override
-  @MainThread
-  public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
-    Assert.isMainThread();
-    if (intent == null) {
-      VvmLog.w(TAG, "null intent received");
-      return START_NOT_STICKY;
-    }
-    Task task = Tasks.createTask(this, intent.getExtras());
-    Assert.isTrue(task != null);
-    addTask(task);
-
-    mMainThreadHandler.removeCallbacks(mStopServiceWithDelay);
-    VvmLog.i(TAG, "task added");
-    if (mJob == null) {
-      scheduleJob(0, true);
-    } else {
-      maybeRunNextTask();
-    }
-    // STICKY means the service will be automatically restarted will the last intent if it is
-    // killed.
-    return START_NOT_STICKY;
-  }
-
-  @MainThread
-  @VisibleForTesting
-  void addTask(Task task) {
-    Assert.isMainThread();
-    getTasks().add(task);
-  }
-
-  @MainThread
-  @VisibleForTesting
-  TaskQueue getTasks() {
-    Assert.isMainThread();
-    return mTasks;
-  }
-
-  @MainThread
-  private void maybeRunNextTask() {
-    Assert.isMainThread();
-    if (mWorkerThreadIsBusy) {
-      return;
-    }
-    if (mTaskAutoRunDisabledForTesting) {
-      // If mTaskAutoRunDisabledForTesting is true, runNextTask() must be explicitly called
-      // to run the next task.
-      return;
-    }
-
-    runNextTask();
-  }
-
-  @VisibleForTesting
-  @MainThread
-  void runNextTask() {
-    Assert.isMainThread();
-    if (getTasks().isEmpty()) {
-      prepareStop();
-      return;
-    }
-    NextTask nextTask = getTasks().getNextTask(READY_TOLERANCE_MILLISECONDS);
-
-    if (nextTask.task != null) {
-      nextTask.task.onBeforeExecute();
-      Message message = mWorkerThreadHandler.obtainMessage();
-      message.obj = nextTask.task;
-      mWorkerThreadIsBusy = true;
-      mMessageSender.send(message);
-      return;
-    }
-    VvmLog.i(TAG, "minimal wait time:" + nextTask.minimalWaitTimeMillis);
-    if (!mTaskAutoRunDisabledForTesting && nextTask.minimalWaitTimeMillis != null) {
-      // No tasks are currently ready. Sleep until the next one should be.
-      // If a new task is added during the sleep the service will wake immediately.
-      sleep(nextTask.minimalWaitTimeMillis);
-    }
-  }
-
-  @MainThread
-  private void sleep(long timeMillis) {
-    VvmLog.i(TAG, "sleep for " + timeMillis + " millis");
-    if (timeMillis < SHORT_SLEEP_THRESHOLD_MILLISECONDS) {
-      mMainThreadHandler.postDelayed(
-          new Runnable() {
-            @Override
-            public void run() {
-              maybeRunNextTask();
-            }
-          },
-          timeMillis);
-      return;
-    }
-    finishJob();
-    mMainThreadHandler.post(() -> scheduleJob(timeMillis, false));
-  }
-
-  private List<Bundle> serializePendingTasks() {
-    return getTasks().toBundles();
-  }
-
-  private void prepareStop() {
-    VvmLog.i(
-        TAG,
-        "no more tasks, stopping service if no task are added in "
-            + STOP_DELAY_MILLISECONDS
-            + " millis");
-    mMainThreadHandler.postDelayed(mStopServiceWithDelay, STOP_DELAY_MILLISECONDS);
-  }
-
-  @NeededForTesting
-  static class MessageSender {
-
-    public void send(Message message) {
-      message.sendToTarget();
-    }
-  }
-
-  @NeededForTesting
-  void setTaskAutoRunDisabledForTest(boolean value) {
-    mTaskAutoRunDisabledForTesting = value;
-  }
-
-  @NeededForTesting
-  void setMessageSenderForTest(MessageSender sender) {
-    mMessageSender = sender;
-  }
-
-  /**
-   * The {@link TaskSchedulerJobService} has started and all queued task should be executed in the
-   * worker thread.
-   */
-  @MainThread
-  public void onStartJob(Job job, List<Bundle> pendingTasks) {
-    VvmLog.i(TAG, "onStartJob");
-    mJob = job;
-    mTasks.fromBundles(this, pendingTasks);
-    maybeRunNextTask();
-  }
-
-  /**
-   * The {@link TaskSchedulerJobService} is being terminated by the system (timeout or network
-   * lost). A new job will be queued to resume all pending tasks. The current unfinished job may be
-   * ran again.
-   */
-  @MainThread
-  public void onStopJob() {
-    VvmLog.e(TAG, "onStopJob");
-    if (isJobRunning()) {
-      finishJob();
-      mMainThreadHandler.post(() -> scheduleJob(0, true));
-    }
-  }
-
-  /**
-   * Serializes all pending tasks and schedule a new {@link TaskSchedulerJobService}.
-   *
-   * @param delayMillis the delay before stating the job, see {@link
-   *     android.app.job.JobInfo.Builder#setMinimumLatency(long)}. This must be 0 if {@code
-   *     isNewJob} is true.
-   * @param isNewJob a new job will be requested to run immediately, bypassing all requirements.
-   */
-  @MainThread
-  private void scheduleJob(long delayMillis, boolean isNewJob) {
-    Assert.isMainThread();
-    TaskSchedulerJobService.scheduleJob(this, serializePendingTasks(), delayMillis, isNewJob);
-    mTasks.clear();
-  }
-
-  /**
-   * Signals {@link TaskSchedulerJobService} the current session of tasks has finished, and the wake
-   * lock can be released. Note: this only takes effect after the main thread has been returned. If
-   * a new job need to be scheduled, it should be posted on the main thread handler instead of
-   * calling directly.
-   */
-  @MainThread
-  private void finishJob() {
-    Assert.isMainThread();
-    VvmLog.i(TAG, "finishing Job");
-    mJob.finish();
-    mJob = null;
-  }
-
-  @Override
-  @Nullable
-  public IBinder onBind(Intent intent) {
-    return mBinder;
-  }
-
-  @NeededForTesting
-  class LocalBinder extends Binder {
-
-    @NeededForTesting
-    public TaskSchedulerService getService() {
-      return TaskSchedulerService.this;
-    }
-  }
-
-  private boolean isJobRunning() {
-    return mJob != null;
-  }
-}
diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
index ac5f3ca..4860649 100644
--- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
+++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java
@@ -22,6 +22,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
@@ -29,7 +30,6 @@
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.notification.NotificationChannelManager;
-import com.android.dialer.notification.NotificationChannelManager.Channel;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
@@ -43,8 +43,7 @@
  */
 @TargetApi(VERSION_CODES.O)
 public class VoicemailSettingsFragment extends PreferenceFragment
-    implements Preference.OnPreferenceChangeListener,
-        VvmAccountManager.Listener {
+    implements Preference.OnPreferenceChangeListener, VvmAccountManager.Listener {
 
   private static final String TAG = "VmSettingsActivity";
 
@@ -83,9 +82,8 @@
 
     voicemailNotificationPreference =
         findPreference(getString(R.string.voicemail_notifications_key));
-    voicemailNotificationPreference.setIntent(
-        NotificationChannelManager.getInstance()
-            .getSettingsIntentForChannel(getContext(), Channel.VOICEMAIL, phoneAccountHandle));
+    voicemailNotificationPreference.setIntent(getNotificationSettingsIntent());
+
     voicemailNotificationPreference.setOnPreferenceClickListener(
         new OnPreferenceClickListener() {
           @Override
@@ -233,4 +231,12 @@
       updateChangePin();
     }
   }
+
+  private Intent getNotificationSettingsIntent() {
+    String channelId =
+        NotificationChannelManager.getVoicemailChannelId(getContext(), phoneAccountHandle);
+    return new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+        .putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
+        .putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName());
+  }
 }
diff --git a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
index 5decf63..e902825 100644
--- a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
+++ b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
@@ -79,6 +79,7 @@
     VvmLog.i(TAG, "sending voicemail notification");
     Intent intent = new Intent(VoicemailClient.ACTION_SHOW_LEGACY_VOICEMAIL);
     intent.setPackage(context.getPackageName());
+    intent.putExtra(VoicemailClient.EXTRA_IS_LEGACY_MODE, true);
     intent.putExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
     // Setting voicemail message count to non-zero will show the telephony voicemail
     // notification, and zero will clear it.
diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
index ef0bf10..4383527 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
@@ -35,7 +35,6 @@
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.protocol.VisualVoicemailProtocol;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
-import com.android.voicemail.impl.sync.OmtpVvmSyncService;
 import com.android.voicemail.impl.sync.SyncOneTask;
 import com.android.voicemail.impl.sync.SyncTask;
 import com.android.voicemail.impl.sync.VoicemailsQueryHelper;
@@ -71,6 +70,10 @@
     }
 
     OmtpVvmCarrierConfigHelper helper = new OmtpVvmCarrierConfigHelper(mContext, phone);
+    if (!helper.isValid()) {
+      VvmLog.e(TAG, "vvm config no longer valid");
+      return;
+    }
     if (!VisualVoicemailSettingsUtil.isEnabled(mContext, phone)) {
       if (helper.isLegacyModeEnabled()) {
         LegacyModeSmsHandler.handle(context, sms);
@@ -148,7 +151,7 @@
         }
         break;
       case OmtpConstants.MAILBOX_UPDATE:
-        SyncTask.start(mContext, phone, OmtpVvmSyncService.SYNC_DOWNLOAD_ONLY);
+        SyncTask.start(mContext, phone);
         break;
       case OmtpConstants.GREETINGS_UPDATE:
         // Not implemented in V1
diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
index e9d145c..19661e9 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
@@ -22,6 +22,7 @@
 import android.telephony.SmsManager;
 import com.android.voicemail.impl.OmtpConstants;
 import com.android.voicemail.impl.TelephonyMangerCompat;
+import com.android.voicemail.impl.VvmLog;
 
 /**
  * Send client originated OMTP messages to the OMTP server.
@@ -75,6 +76,11 @@
   public void requestVvmStatus(@Nullable PendingIntent sentIntent) {}
 
   protected void sendSms(String text, PendingIntent sentIntent) {
+
+    VvmLog.v(
+        TAG,
+        String.format("Sending sms '%s' to %s:%d", text, mDestinationNumber, mApplicationPort));
+
     TelephonyMangerCompat.sendVisualVoicemailSms(
         mContext, mPhoneAccountHandle, mDestinationNumber, mApplicationPort, text, sentIntent);
   }
diff --git a/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java b/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
index b2ec49e..1b59ecc 100644
--- a/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
+++ b/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
@@ -52,7 +52,7 @@
           VvmLog.i(TAG, "Unactivated account " + phoneAccount + " found, activating");
           ActivationTask.start(context, phoneAccount, null);
         } else {
-          SyncTask.start(context, phoneAccount, OmtpVvmSyncService.SYNC_FULL_SYNC);
+          SyncTask.start(context, phoneAccount);
         }
       }
     }
diff --git a/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java b/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java
index 7933883..5b5d6b0 100644
--- a/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java
+++ b/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java
@@ -43,6 +43,7 @@
 import com.android.voicemail.impl.sync.VvmNetworkRequest.RequestFailedException;
 import com.android.voicemail.impl.utils.LoggerUtils;
 import com.android.voicemail.impl.utils.VoicemailDatabaseUtil;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -50,22 +51,13 @@
 @TargetApi(VERSION_CODES.O)
 public class OmtpVvmSyncService {
 
-  private static final String TAG = OmtpVvmSyncService.class.getSimpleName();
+  private static final String TAG = "OmtpVvmSyncService";
 
-  /** Signifies a sync with both uploading to the server and downloading from the server. */
-  public static final String SYNC_FULL_SYNC = "full_sync";
-  /** Only upload to the server. */
-  public static final String SYNC_UPLOAD_ONLY = "upload_only";
-  /** Only download from the server. */
-  public static final String SYNC_DOWNLOAD_ONLY = "download_only";
-  /** Only download single voicemail transcription. */
-  public static final String SYNC_DOWNLOAD_ONE_TRANSCRIPTION = "download_one_transcription";
   /** Threshold for whether we should archive and delete voicemails from the remote VM server. */
   private static final float AUTO_DELETE_ARCHIVE_VM_THRESHOLD = 0.75f;
 
   private final Context mContext;
-
-  private VoicemailsQueryHelper mQueryHelper;
+  private final VoicemailsQueryHelper mQueryHelper;
 
   public OmtpVvmSyncService(Context context) {
     mContext = context;
@@ -74,23 +66,21 @@
 
   public void sync(
       BaseTask task,
-      String action,
       PhoneAccountHandle phoneAccount,
       Voicemail voicemail,
       VoicemailStatus.Editor status) {
     Assert.isTrue(phoneAccount != null);
-    VvmLog.v(TAG, "Sync requested: " + action + " - for account: " + phoneAccount);
-    setupAndSendRequest(task, phoneAccount, voicemail, action, status);
+    VvmLog.v(TAG, "Sync requested for account: " + phoneAccount);
+    setupAndSendRequest(task, phoneAccount, voicemail, status);
   }
 
   private void setupAndSendRequest(
       BaseTask task,
       PhoneAccountHandle phoneAccount,
       Voicemail voicemail,
-      String action,
       VoicemailStatus.Editor status) {
     if (!VisualVoicemailSettingsUtil.isEnabled(mContext, phoneAccount)) {
-      VvmLog.v(TAG, "Sync requested for disabled account");
+      VvmLog.e(TAG, "Sync requested for disabled account");
       return;
     }
     if (!VvmAccountManager.isAccountActivated(mContext, phoneAccount)) {
@@ -102,7 +92,7 @@
     LoggerUtils.logImpressionOnMainThread(mContext, DialerImpression.Type.VVM_SYNC_STARTED);
     // DATA_IMAP_OPERATION_STARTED posting should not be deferred. This event clears all data
     // channel errors, which should happen when the task starts, not when it ends. It is the
-    // "Sync in progress..." status.
+    // "Sync in progress..." status, which is currently displayed to the user as no error.
     config.handleEvent(
         VoicemailStatus.edit(mContext, phoneAccount), OmtpEvents.DATA_IMAP_OPERATION_STARTED);
     try (NetworkWrapper network = VvmNetworkRequest.getNetwork(config, phoneAccount, status)) {
@@ -111,7 +101,7 @@
         task.fail();
         return;
       }
-      doSync(task, network.get(), phoneAccount, voicemail, action, status);
+      doSync(task, network.get(), phoneAccount, voicemail, status);
     } catch (RequestFailedException e) {
       config.handleEvent(status, OmtpEvents.DATA_NO_CONNECTION_CELLULAR_REQUIRED);
       task.fail();
@@ -123,14 +113,13 @@
       Network network,
       PhoneAccountHandle phoneAccount,
       Voicemail voicemail,
-      String action,
       VoicemailStatus.Editor status) {
     try (ImapHelper imapHelper = new ImapHelper(mContext, phoneAccount, network, status)) {
       boolean success;
       if (voicemail == null) {
-        success = syncAll(action, imapHelper, phoneAccount);
+        success = syncAll(imapHelper, phoneAccount);
       } else {
-        success = syncOne(imapHelper, voicemail, phoneAccount);
+        success = downloadOneVoicemail(imapHelper, voicemail, phoneAccount);
       }
       if (success) {
         // TODO: b/30569269 failure should interrupt all subsequent task via exceptions
@@ -219,79 +208,33 @@
     }
   }
 
-  private boolean syncAll(String action, ImapHelper imapHelper, PhoneAccountHandle account) {
-    boolean uploadSuccess = true;
-    boolean downloadSuccess = true;
+  private boolean syncAll(ImapHelper imapHelper, PhoneAccountHandle account) {
 
-    if (SYNC_FULL_SYNC.equals(action) || SYNC_UPLOAD_ONLY.equals(action)) {
-      uploadSuccess = upload(account, imapHelper);
-    }
-    if (SYNC_FULL_SYNC.equals(action) || SYNC_DOWNLOAD_ONLY.equals(action)) {
-      downloadSuccess = download(imapHelper, account);
-    }
-
-    VvmLog.v(
-        TAG,
-        "upload succeeded: ["
-            + String.valueOf(uploadSuccess)
-            + "] download succeeded: ["
-            + String.valueOf(downloadSuccess)
-            + "]");
-
-    return uploadSuccess && downloadSuccess;
-  }
-
-  private boolean syncOne(ImapHelper imapHelper, Voicemail voicemail, PhoneAccountHandle account) {
-    if (shouldPerformPrefetch(account, imapHelper)) {
-      VoicemailFetchedCallback callback =
-          new VoicemailFetchedCallback(mContext, voicemail.getUri(), account);
-      imapHelper.fetchVoicemailPayload(callback, voicemail.getSourceData());
-    }
-
-    return imapHelper.fetchTranscription(
-        new TranscriptionFetchedCallback(mContext, voicemail), voicemail.getSourceData());
-  }
-
-  private boolean upload(PhoneAccountHandle phoneAccountHandle, ImapHelper imapHelper) {
-    List<Voicemail> readVoicemails = mQueryHelper.getReadVoicemails(phoneAccountHandle);
-    List<Voicemail> deletedVoicemails = mQueryHelper.getDeletedVoicemails(phoneAccountHandle);
-
-    boolean success = true;
-
-    if (deletedVoicemails.size() > 0) {
-      if (imapHelper.markMessagesAsDeleted(deletedVoicemails)) {
-        // We want to delete selectively instead of all the voicemails for this provider
-        // in case the state changed since the IMAP query was completed.
-        mQueryHelper.deleteFromDatabase(deletedVoicemails);
-      } else {
-        success = false;
-      }
-    }
-
-    if (readVoicemails.size() > 0) {
-      VvmLog.i(TAG, "Marking voicemails as read");
-      if (imapHelper.markMessagesAsRead(readVoicemails)) {
-        VvmLog.i(TAG, "Marking voicemails as clean");
-        mQueryHelper.markCleanInDatabase(readVoicemails);
-      } else {
-        success = false;
-      }
-    }
-
-    return success;
-  }
-
-  private boolean download(ImapHelper imapHelper, PhoneAccountHandle account) {
     List<Voicemail> serverVoicemails = imapHelper.fetchAllVoicemails();
     List<Voicemail> localVoicemails = mQueryHelper.getAllVoicemails(account);
+    List<Voicemail> deletedVoicemails = mQueryHelper.getDeletedVoicemails(account);
+    boolean succeeded = true;
 
     if (localVoicemails == null || serverVoicemails == null) {
       // Null value means the query failed.
+      VvmLog.e(TAG, "syncAll: query failed");
       return false;
     }
 
+    if (deletedVoicemails.size() > 0) {
+      if (imapHelper.markMessagesAsDeleted(deletedVoicemails)) {
+        // Delete only the voicemails that was deleted on the server, in case more are deleted
+        // since the IMAP query was completed.
+        mQueryHelper.deleteFromDatabase(deletedVoicemails);
+      } else {
+        succeeded = false;
+      }
+    }
+
     Map<String, Voicemail> remoteMap = buildMap(serverVoicemails);
 
+    List<Voicemail> localReadVoicemails = new ArrayList<>();
+
     // Go through all the local voicemails and check if they are on the server.
     // They may be read or deleted on the server but not locally. Perform the
     // appropriate local operation if the status differs from the server. Remove
@@ -310,6 +253,8 @@
       } else {
         if (remoteVoicemail.isRead() && !localVoicemail.isRead()) {
           mQueryHelper.markReadInDatabase(localVoicemail);
+        } else if (localVoicemail.isRead() && !remoteVoicemail.isRead()) {
+          localReadVoicemails.add(localVoicemail);
         }
 
         if (!TextUtils.isEmpty(remoteVoicemail.getTranscription())
@@ -321,6 +266,16 @@
       }
     }
 
+    if (localReadVoicemails.size() > 0) {
+      VvmLog.i(TAG, "Marking voicemails as read");
+      if (imapHelper.markMessagesAsRead(localReadVoicemails)) {
+        VvmLog.i(TAG, "Marking voicemails as clean");
+        mQueryHelper.markCleanInDatabase(localReadVoicemails);
+      } else {
+        return false;
+      }
+    }
+
     // The leftover messages are messages that exist on the server but not locally.
     boolean prefetchEnabled = shouldPerformPrefetch(account, imapHelper);
     for (Voicemail remoteVoicemail : remoteMap.values()) {
@@ -336,7 +291,19 @@
       }
     }
 
-    return true;
+    return succeeded;
+  }
+
+  private boolean downloadOneVoicemail(
+      ImapHelper imapHelper, Voicemail voicemail, PhoneAccountHandle account) {
+    if (shouldPerformPrefetch(account, imapHelper)) {
+      VoicemailFetchedCallback callback =
+          new VoicemailFetchedCallback(mContext, voicemail.getUri(), account);
+      imapHelper.fetchVoicemailPayload(callback, voicemail.getSourceData());
+    }
+
+    return imapHelper.fetchTranscription(
+        new TranscriptionFetchedCallback(mContext, voicemail), voicemail.getSourceData());
   }
 
   private boolean shouldPerformPrefetch(PhoneAccountHandle account, ImapHelper imapHelper) {
diff --git a/java/com/android/voicemail/impl/sync/SyncOneTask.java b/java/com/android/voicemail/impl/sync/SyncOneTask.java
index cd2782a..70c6bd8 100644
--- a/java/com/android/voicemail/impl/sync/SyncOneTask.java
+++ b/java/com/android/voicemail/impl/sync/SyncOneTask.java
@@ -39,17 +39,14 @@
   private static final int RETRY_INTERVAL_MILLIS = 5_000;
 
   private static final String EXTRA_PHONE_ACCOUNT_HANDLE = "extra_phone_account_handle";
-  private static final String EXTRA_SYNC_TYPE = "extra_sync_type";
   private static final String EXTRA_VOICEMAIL = "extra_voicemail";
 
   private PhoneAccountHandle mPhone;
-  private String mSyncType;
   private Voicemail mVoicemail;
 
   public static void start(Context context, PhoneAccountHandle phone, Voicemail voicemail) {
     Intent intent = BaseTask.createIntent(context, SyncOneTask.class, phone);
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, phone);
-    intent.putExtra(EXTRA_SYNC_TYPE, OmtpVvmSyncService.SYNC_DOWNLOAD_ONE_TRANSCRIPTION);
     intent.putExtra(EXTRA_VOICEMAIL, voicemail);
     context.sendBroadcast(intent);
   }
@@ -63,14 +60,13 @@
   public void onCreate(Context context, Bundle extras) {
     super.onCreate(context, extras);
     mPhone = extras.getParcelable(EXTRA_PHONE_ACCOUNT_HANDLE);
-    mSyncType = extras.getString(EXTRA_SYNC_TYPE);
     mVoicemail = extras.getParcelable(EXTRA_VOICEMAIL);
   }
 
   @Override
   public void onExecuteInBackgroundThread() {
     OmtpVvmSyncService service = new OmtpVvmSyncService(getContext());
-    service.sync(this, mSyncType, mPhone, mVoicemail, VoicemailStatus.edit(getContext(), mPhone));
+    service.sync(this, mPhone, mVoicemail, VoicemailStatus.edit(getContext(), mPhone));
   }
 
   @Override
@@ -78,7 +74,6 @@
     LoggerUtils.logImpressionOnMainThread(getContext(), DialerImpression.Type.VVM_AUTO_RETRY_SYNC);
     Intent intent = super.createRestartIntent();
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, mPhone);
-    intent.putExtra(EXTRA_SYNC_TYPE, mSyncType);
     intent.putExtra(EXTRA_VOICEMAIL, mVoicemail);
     return intent;
   }
diff --git a/java/com/android/voicemail/impl/sync/SyncTask.java b/java/com/android/voicemail/impl/sync/SyncTask.java
index 0b3e090..68ce012 100644
--- a/java/com/android/voicemail/impl/sync/SyncTask.java
+++ b/java/com/android/voicemail/impl/sync/SyncTask.java
@@ -37,17 +37,14 @@
   private static final int MINIMAL_INTERVAL_MILLIS = 60_000;
 
   private static final String EXTRA_PHONE_ACCOUNT_HANDLE = "extra_phone_account_handle";
-  private static final String EXTRA_SYNC_TYPE = "extra_sync_type";
 
   private final RetryPolicy mRetryPolicy;
 
   private PhoneAccountHandle mPhone;
-  private String mSyncType;
 
-  public static void start(Context context, PhoneAccountHandle phone, String syncType) {
+  public static void start(Context context, PhoneAccountHandle phone) {
     Intent intent = BaseTask.createIntent(context, SyncTask.class, phone);
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, phone);
-    intent.putExtra(EXTRA_SYNC_TYPE, syncType);
     context.sendBroadcast(intent);
   }
 
@@ -62,13 +59,12 @@
   public void onCreate(Context context, Bundle extras) {
     super.onCreate(context, extras);
     mPhone = extras.getParcelable(EXTRA_PHONE_ACCOUNT_HANDLE);
-    mSyncType = extras.getString(EXTRA_SYNC_TYPE);
   }
 
   @Override
   public void onExecuteInBackgroundThread() {
     OmtpVvmSyncService service = new OmtpVvmSyncService(getContext());
-    service.sync(this, mSyncType, mPhone, null, mRetryPolicy.getVoicemailStatusEditor());
+    service.sync(this, mPhone, null, mRetryPolicy.getVoicemailStatusEditor());
   }
 
   @Override
@@ -76,7 +72,6 @@
     LoggerUtils.logImpressionOnMainThread(getContext(), DialerImpression.Type.VVM_AUTO_RETRY_SYNC);
     Intent intent = super.createRestartIntent();
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, mPhone);
-    intent.putExtra(EXTRA_SYNC_TYPE, mSyncType);
     return intent;
   }
 }
diff --git a/java/com/android/voicemail/impl/sync/UploadTask.java b/java/com/android/voicemail/impl/sync/UploadTask.java
index f2b2036..d8f06db 100644
--- a/java/com/android/voicemail/impl/sync/UploadTask.java
+++ b/java/com/android/voicemail/impl/sync/UploadTask.java
@@ -63,10 +63,6 @@
       return;
     }
     service.sync(
-        this,
-        OmtpVvmSyncService.SYNC_UPLOAD_ONLY,
-        phoneAccountHandle,
-        null,
-        VoicemailStatus.edit(getContext(), phoneAccountHandle));
+        this, phoneAccountHandle, null, VoicemailStatus.edit(getContext(), phoneAccountHandle));
   }
 }
diff --git a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
index 9b295db..316e1ca 100644
--- a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
+++ b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
@@ -49,8 +49,6 @@
   public static final int DELETED = 3;
   public static final int TRANSCRIPTION = 4;
 
-  static final String READ_SELECTION =
-      Voicemails.DIRTY + "=1 AND " + Voicemails.DELETED + "!=1 AND " + Voicemails.IS_READ + "=1";
   static final String DELETED_SELECTION = Voicemails.DELETED + "=1";
   static final String ARCHIVED_SELECTION = Voicemails.ARCHIVED + "=0";
 
@@ -65,15 +63,6 @@
   }
 
   /**
-   * Get all the local read voicemails that have not been synced to the server.
-   *
-   * @return A list of read voicemails.
-   */
-  public List<Voicemail> getReadVoicemails(@NonNull PhoneAccountHandle phoneAccountHandle) {
-    return getLocalVoicemails(phoneAccountHandle, READ_SELECTION);
-  }
-
-  /**
    * Get all the locally deleted voicemails that have not been synced to the server.
    *
    * @return A list of deleted voicemails.
diff --git a/java/com/android/voicemail/impl/sync/VvmAccountManager.java b/java/com/android/voicemail/impl/sync/VvmAccountManager.java
index cc4e31f..2625fba 100644
--- a/java/com/android/voicemail/impl/sync/VvmAccountManager.java
+++ b/java/com/android/voicemail/impl/sync/VvmAccountManager.java
@@ -15,14 +15,20 @@
  */
 package com.android.voicemail.impl.sync;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import android.os.UserManager;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.util.ArraySet;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.PerAccountSharedPreferences;
 import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.util.DialerUtils;
 import com.android.voicemail.impl.OmtpConstants;
 import com.android.voicemail.impl.VisualVoicemailPreferences;
 import com.android.voicemail.impl.VoicemailStatus;
@@ -40,6 +46,7 @@
  * #removeAccount(Context, PhoneAccountHandle)} should be called to clear the connection information
  * and allow reactivation.
  */
+@TargetApi(VERSION_CODES.O)
 public class VvmAccountManager {
   public static final String TAG = "VvmAccountManager";
 
@@ -49,7 +56,7 @@
     void onActivationStateChanged(PhoneAccountHandle phoneAccountHandle, boolean isActivated);
   }
 
-  private static final String IS_ACCOUNT_ACTIVATED = "is_account_activated";
+  @VisibleForTesting static final String IS_ACCOUNT_ACTIVATED = "is_account_activated";
 
   private static Set<Listener> listeners = new ArraySet<>();
 
@@ -57,7 +64,8 @@
       Context context, PhoneAccountHandle phoneAccountHandle, StatusMessage statusMessage) {
     VisualVoicemailPreferences preferences =
         new VisualVoicemailPreferences(context, phoneAccountHandle);
-    statusMessage.putStatus(preferences.edit()).putBoolean(IS_ACCOUNT_ACTIVATED, true).apply();
+    statusMessage.putStatus(preferences.edit()).apply();
+    setAccountActivated(context, phoneAccountHandle, true);
 
     ThreadUtil.postOnUiThread(
         () -> {
@@ -69,10 +77,10 @@
 
   public static void removeAccount(Context context, PhoneAccountHandle phoneAccount) {
     VoicemailStatus.disable(context, phoneAccount);
+    setAccountActivated(context, phoneAccount, false);
     VisualVoicemailPreferences preferences = new VisualVoicemailPreferences(context, phoneAccount);
     preferences
         .edit()
-        .putBoolean(IS_ACCOUNT_ACTIVATED, false)
         .putString(OmtpConstants.IMAP_USER_NAME, null)
         .putString(OmtpConstants.IMAP_PASSWORD, null)
         .apply();
@@ -86,7 +94,9 @@
 
   public static boolean isAccountActivated(Context context, PhoneAccountHandle phoneAccount) {
     Assert.isNotNull(phoneAccount);
-    VisualVoicemailPreferences preferences = new VisualVoicemailPreferences(context, phoneAccount);
+    PerAccountSharedPreferences preferences =
+        getPreferenceForActivationState(context, phoneAccount);
+    migrateActivationState(context, preferences, phoneAccount);
     return preferences.getBoolean(IS_ACCOUNT_ACTIVATED, false);
   }
 
@@ -113,4 +123,47 @@
     Assert.isMainThread();
     listeners.remove(listener);
   }
+
+  /**
+   * The activation state is moved from credential protected storage to device protected storage
+   * after v10, so it can be checked under FBE. The state should be migrated to avoid reactivation.
+   */
+  private static void migrateActivationState(
+      Context context,
+      PerAccountSharedPreferences deviceProtectedPreference,
+      PhoneAccountHandle phoneAccountHandle) {
+    if (!context.getSystemService(UserManager.class).isUserUnlocked()) {
+      return;
+    }
+    if (deviceProtectedPreference.contains(IS_ACCOUNT_ACTIVATED)) {
+      return;
+    }
+
+    PerAccountSharedPreferences credentialProtectedPreference =
+        new VisualVoicemailPreferences(context, phoneAccountHandle);
+
+    deviceProtectedPreference
+        .edit()
+        .putBoolean(
+            IS_ACCOUNT_ACTIVATED,
+            credentialProtectedPreference.getBoolean(IS_ACCOUNT_ACTIVATED, false))
+        .apply();
+  }
+
+  private static void setAccountActivated(
+      Context context, PhoneAccountHandle phoneAccountHandle, boolean activated) {
+    Assert.isNotNull(phoneAccountHandle);
+    getPreferenceForActivationState(context, phoneAccountHandle)
+        .edit()
+        .putBoolean(IS_ACCOUNT_ACTIVATED, activated)
+        .apply();
+  }
+
+  private static PerAccountSharedPreferences getPreferenceForActivationState(
+      Context context, PhoneAccountHandle phoneAccountHandle) {
+    return new PerAccountSharedPreferences(
+        context,
+        phoneAccountHandle,
+        DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context));
+  }
 }
diff --git a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java
index 067eff8..068b19b 100644
--- a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java
+++ b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java
@@ -128,7 +128,7 @@
 
   @CallSuper
   public void onUnavailable() {
-    // TODO: b/32637799 this is hidden, do we really need this?
+    // TODO(twyen): b/32637799 this is hidden, do we really need this?
     mResultReceived = true;
     onFailed(NETWORK_REQUEST_FAILED_TIMEOUT);
   }
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
new file mode 100644
index 0000000..f3c6e64
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
@@ -0,0 +1,85 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.app.job.JobWorkItem;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.WorkerThread;
+import android.support.v4.app.JobIntentService;
+import android.support.v4.os.BuildCompat;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.constants.ScheduledJobIds;
+import java.util.List;
+
+/**
+ * JobScheduler service for transcribing old voicemails. This service does a database scan for
+ * un-transcribed voicemails and schedules transcription tasks for them, once we have an un-metered
+ * network connection.
+ */
+public class TranscriptionBackfillService extends JobIntentService {
+
+  /** Schedule a task to scan the database for untranscribed voicemails */
+  public static boolean scheduleTask(Context context) {
+    if (BuildCompat.isAtLeastO()) {
+      LogUtil.enterBlock("TranscriptionBackfillService.transcribeOldVoicemails");
+      ComponentName componentName = new ComponentName(context, TranscriptionBackfillService.class);
+      JobInfo.Builder builder =
+          new JobInfo.Builder(ScheduledJobIds.VVM_TRANSCRIPTION_BACKFILL_JOB, componentName)
+              .setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED);
+      JobScheduler scheduler = context.getSystemService(JobScheduler.class);
+      return scheduler.enqueue(builder.build(), makeWorkItem()) == JobScheduler.RESULT_SUCCESS;
+    } else {
+      LogUtil.i("TranscriptionBackfillService.transcribeOldVoicemails", "not supported");
+      return false;
+    }
+  }
+
+  private static JobWorkItem makeWorkItem() {
+    Intent intent = new Intent();
+    return new JobWorkItem(intent);
+  }
+
+  @Override
+  @WorkerThread
+  protected void onHandleWork(Intent intent) {
+    LogUtil.enterBlock("TranscriptionBackfillService.onHandleWork");
+
+    TranscriptionDbHelper dbHelper = new TranscriptionDbHelper(this);
+    List<Uri> untranscribed = dbHelper.getUntranscribedVoicemails();
+    LogUtil.i(
+        "TranscriptionBackfillService.onHandleWork",
+        "found " + untranscribed.size() + " untranscribed voicemails");
+    // TODO(mdooley): Consider doing the actual transcriptions here instead of scheduling jobs.
+    for (Uri uri : untranscribed) {
+      ThreadUtil.postOnUiThread(
+          () -> {
+            TranscriptionService.scheduleNewVoicemailTranscriptionJob(this, uri, false);
+          });
+    }
+  }
+
+  @Override
+  public void onDestroy() {
+    LogUtil.enterBlock("TranscriptionBackfillService.onDestroy");
+    super.onDestroy();
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
new file mode 100644
index 0000000..83f04da
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
@@ -0,0 +1,90 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.content.Context;
+import com.android.dialer.configprovider.ConfigProviderBindings;
+
+/** Provides configuration values needed to connect to the transcription server. */
+public class TranscriptionConfigProvider {
+  private final Context context;
+
+  public TranscriptionConfigProvider(Context context) {
+    this.context = context;
+  }
+
+  public boolean isVoicemailTranscriptionEnabled() {
+    return ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false);
+  }
+
+  public String getServerAddress() {
+    // Private voicemail transcription service
+    return ConfigProviderBindings.get(context)
+        .getString(
+            "voicemail_transcription_server_address", "voicemailtranscription-pa.googleapis.com");
+  }
+
+  public String getApiKey() {
+    // Android API key restricted to com.google.android.dialer
+    return ConfigProviderBindings.get(context)
+        .getString(
+            "voicemail_transcription_client_api_key", "AIzaSyAXdDnif6B7sBYxU8hzw9qAp3pRPVHs060");
+  }
+
+  public String getAuthToken() {
+    return null;
+  }
+
+  public boolean shouldUsePlaintext() {
+    return ConfigProviderBindings.get(context)
+        .getBoolean("voicemail_transcription_server_use_plaintext", false);
+  }
+
+  public boolean shouldUseSyncApi() {
+    return ConfigProviderBindings.get(context)
+        .getBoolean("voicemail_transcription_server_use_sync_api", false);
+  }
+
+  public long getMaxTranscriptionRetries() {
+    return ConfigProviderBindings.get(context)
+        .getLong("voicemail_transcription_max_transcription_retries", 2L);
+  }
+
+  public long getMaxGetTranscriptPolls() {
+    return ConfigProviderBindings.get(context)
+        .getLong("voicemail_transcription_max_get_transcript_polls", 20L);
+  }
+
+  public long getGetTranscriptPollIntervalMillis() {
+    return ConfigProviderBindings.get(context)
+        .getLong("voicemail_transcription_get_transcript_poll_interval_millis", 1000L);
+  }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "{ address: %s, api key: %s, auth token: %s, plaintext: %b, sync: %b, retries: %d, polls:"
+            + " %d, poll ms: %d }",
+        getServerAddress(),
+        getApiKey(),
+        getAuthToken(),
+        shouldUsePlaintext(),
+        shouldUseSyncApi(),
+        getMaxTranscriptionRetries(),
+        getMaxGetTranscriptPolls(),
+        getGetTranscriptPollIntervalMillis());
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java b/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java
new file mode 100644
index 0000000..9d3c2e4
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java
@@ -0,0 +1,137 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.annotation.TargetApi;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build.VERSION_CODES;
+import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
+import android.support.v4.os.BuildCompat;
+import android.util.Pair;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Helper class for reading and writing transcription data in the database */
+@TargetApi(VERSION_CODES.O)
+public class TranscriptionDbHelper {
+  @VisibleForTesting
+  static final String[] PROJECTION =
+      new String[] {
+        Voicemails._ID, // 0
+        Voicemails.TRANSCRIPTION, // 1
+        VoicemailCompat.TRANSCRIPTION_STATE // 2
+      };
+
+  static final int ID = 0;
+  static final int TRANSCRIPTION = 1;
+  static final int TRANSCRIPTION_STATE = 2;
+
+  private final ContentResolver contentResolver;
+  private final Uri uri;
+
+  TranscriptionDbHelper(Context context, Uri uri) {
+    Assert.isNotNull(uri);
+    this.contentResolver = context.getContentResolver();
+    this.uri = uri;
+  }
+
+  TranscriptionDbHelper(Context context) {
+    this(context, Voicemails.buildSourceUri(context.getPackageName()));
+  }
+
+  @WorkerThread
+  @TargetApi(VERSION_CODES.M) // used for try with resources
+  Pair<String, Integer> getTranscriptionAndState() {
+    Assert.checkState(BuildCompat.isAtLeastO());
+    Assert.isWorkerThread();
+    try (Cursor cursor = contentResolver.query(uri, PROJECTION, null, null, null)) {
+      if (cursor == null) {
+        LogUtil.e("TranscriptionDbHelper.getTranscriptionAndState", "query failed.");
+        return null;
+      }
+
+      if (cursor.moveToFirst()) {
+        String transcription = cursor.getString(TRANSCRIPTION);
+        int transcriptionState = cursor.getInt(TRANSCRIPTION_STATE);
+        return new Pair<>(transcription, transcriptionState);
+      }
+    }
+    LogUtil.i("TranscriptionDbHelper.getTranscriptionAndState", "query returned no results");
+    return null;
+  }
+
+  @WorkerThread
+  @TargetApi(VERSION_CODES.M) // used for try with resources
+  List<Uri> getUntranscribedVoicemails() {
+    Assert.checkArgument(BuildCompat.isAtLeastO());
+    Assert.isWorkerThread();
+    List<Uri> untranscribed = new ArrayList<>();
+    String whereClause =
+        Voicemails.TRANSCRIPTION + " is NULL AND " + VoicemailCompat.TRANSCRIPTION_STATE + "=?";
+    String[] whereArgs = {String.valueOf(VoicemailCompat.TRANSCRIPTION_NOT_STARTED)};
+    try (Cursor cursor = contentResolver.query(uri, PROJECTION, whereClause, whereArgs, null)) {
+      if (cursor == null) {
+        LogUtil.e("TranscriptionDbHelper.getUntranscribedVoicemails", "query failed.");
+      } else {
+        while (cursor.moveToNext()) {
+          untranscribed.add(ContentUris.withAppendedId(uri, cursor.getLong(ID)));
+        }
+      }
+    }
+    return untranscribed;
+  }
+
+  @WorkerThread
+  void setTranscriptionState(int transcriptionState) {
+    Assert.isWorkerThread();
+    LogUtil.i(
+        "TranscriptionDbHelper.setTranscriptionState",
+        "uri: " + uri + ", state: " + transcriptionState);
+    ContentValues values = new ContentValues();
+    values.put(VoicemailCompat.TRANSCRIPTION_STATE, transcriptionState);
+    updateDatabase(values);
+  }
+
+  @WorkerThread
+  void setTranscriptionAndState(String transcription, int transcriptionState) {
+    Assert.isWorkerThread();
+    LogUtil.i(
+        "TranscriptionDbHelper.setTranscriptionAndState",
+        "uri: " + uri + ", state: " + transcriptionState);
+    ContentValues values = new ContentValues();
+    values.put(Voicemails.TRANSCRIPTION, transcription);
+    values.put(VoicemailCompat.TRANSCRIPTION_STATE, transcriptionState);
+    updateDatabase(values);
+  }
+
+  private void updateDatabase(ContentValues values) {
+    int updatedCount = contentResolver.update(uri, values, null, null);
+    if (updatedCount != 1) {
+      LogUtil.e(
+          "TranscriptionDbHelper.updateDatabase",
+          "Wrong row count, should have updated 1 row, was: " + updatedCount);
+    }
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
new file mode 100644
index 0000000..2ca16fb
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
@@ -0,0 +1,223 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.app.job.JobService;
+import android.app.job.JobWorkItem;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.MainThread;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.BuildCompat;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.constants.ScheduledJobIds;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionClientFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Job scheduler callback for launching voicemail transcription tasks. The transcription tasks will
+ * run in the background and will typically last for approximately the length of the voicemail audio
+ * (since thats how long the backend transcription service takes to do the transcription).
+ */
+public class TranscriptionService extends JobService {
+  @VisibleForTesting static final String EXTRA_VOICEMAIL_URI = "extra_voicemail_uri";
+
+  private ExecutorService executorService;
+  private JobParameters jobParameters;
+  private TranscriptionClientFactory clientFactory;
+  private TranscriptionConfigProvider configProvider;
+
+  /** Callback used by a task to indicate it has finished processing its work item */
+  interface JobCallback {
+    void onWorkCompleted(JobWorkItem completedWorkItem);
+  }
+
+  // Schedule a task to transcribe the indicated voicemail, return true if transcription task was
+  // scheduled.
+  @MainThread
+  public static boolean scheduleNewVoicemailTranscriptionJob(
+      Context context, Uri voicemailUri, boolean highPriority) {
+    Assert.isMainThread();
+    if (BuildCompat.isAtLeastO()) {
+      LogUtil.i(
+          "TranscriptionService.scheduleNewVoicemailTranscriptionJob", "scheduling transcription");
+      Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_VOICEMAIL_RECEIVED);
+
+      ComponentName componentName = new ComponentName(context, TranscriptionService.class);
+      JobInfo.Builder builder =
+          new JobInfo.Builder(ScheduledJobIds.VVM_TRANSCRIPTION_JOB, componentName);
+      if (highPriority) {
+        builder
+            .setMinimumLatency(0)
+            .setOverrideDeadline(0)
+            .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
+      } else {
+        builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED);
+      }
+      JobScheduler scheduler = context.getSystemService(JobScheduler.class);
+      JobWorkItem workItem = makeWorkItem(voicemailUri);
+      return scheduler.enqueue(builder.build(), workItem) == JobScheduler.RESULT_SUCCESS;
+    } else {
+      LogUtil.i("TranscriptionService.scheduleNewVoicemailTranscriptionJob", "not supported");
+      return false;
+    }
+  }
+
+  // Cancel all transcription tasks
+  @MainThread
+  public static void cancelTranscriptions(Context context) {
+    Assert.isMainThread();
+    LogUtil.enterBlock("TranscriptionService.cancelTranscriptions");
+    JobScheduler scheduler = context.getSystemService(JobScheduler.class);
+    scheduler.cancel(ScheduledJobIds.VVM_TRANSCRIPTION_JOB);
+  }
+
+  @MainThread
+  public TranscriptionService() {
+    Assert.isMainThread();
+  }
+
+  @VisibleForTesting
+  TranscriptionService(
+      ExecutorService executorService,
+      TranscriptionClientFactory clientFactory,
+      TranscriptionConfigProvider configProvider) {
+    this.executorService = executorService;
+    this.clientFactory = clientFactory;
+    this.configProvider = configProvider;
+  }
+
+  @Override
+  @MainThread
+  public boolean onStartJob(JobParameters params) {
+    Assert.isMainThread();
+    LogUtil.enterBlock("TranscriptionService.onStartJob");
+    if (!getConfigProvider().isVoicemailTranscriptionEnabled()) {
+      LogUtil.i("TranscriptionService.onStartJob", "transcription not enabled, exiting.");
+      return false;
+    } else if (TextUtils.isEmpty(getConfigProvider().getServerAddress())) {
+      LogUtil.i("TranscriptionService.onStartJob", "transcription server not configured, exiting.");
+      return false;
+    } else {
+      LogUtil.i(
+          "TranscriptionService.onStartJob",
+          "transcription server address: " + configProvider.getServerAddress());
+      jobParameters = params;
+      return checkForWork();
+    }
+  }
+
+  @Override
+  @MainThread
+  public boolean onStopJob(JobParameters params) {
+    Assert.isMainThread();
+    LogUtil.enterBlock("TranscriptionService.onStopJob");
+    cleanup();
+    return true;
+  }
+
+  @Override
+  @MainThread
+  public void onDestroy() {
+    Assert.isMainThread();
+    LogUtil.enterBlock("TranscriptionService.onDestroy");
+    cleanup();
+  }
+
+  private void cleanup() {
+    if (clientFactory != null) {
+      clientFactory.shutdown();
+      clientFactory = null;
+    }
+    if (executorService != null) {
+      executorService.shutdownNow();
+      executorService = null;
+    }
+  }
+
+  @MainThread
+  private boolean checkForWork() {
+    Assert.isMainThread();
+    JobWorkItem workItem = jobParameters.dequeueWork();
+    if (workItem != null) {
+      TranscriptionTask task =
+          configProvider.shouldUseSyncApi()
+              ? new TranscriptionTaskSync(
+                  this, new Callback(), workItem, getClientFactory(), configProvider)
+              : new TranscriptionTaskAsync(
+                  this, new Callback(), workItem, getClientFactory(), configProvider);
+      getExecutorService().execute(task);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  static Uri getVoicemailUri(JobWorkItem workItem) {
+    return workItem.getIntent().getParcelableExtra(EXTRA_VOICEMAIL_URI);
+  }
+
+  private ExecutorService getExecutorService() {
+    if (executorService == null) {
+      // The common use case is transcribing a single voicemail so just use a single thread executor
+      // The reason we're not using DialerExecutor here is because the transcription task can be
+      // very long running (ie. multiple minutes).
+      executorService = Executors.newSingleThreadExecutor();
+    }
+    return executorService;
+  }
+
+  private class Callback implements JobCallback {
+    @Override
+    @MainThread
+    public void onWorkCompleted(JobWorkItem completedWorkItem) {
+      Assert.isMainThread();
+      LogUtil.i("TranscriptionService.Callback.onWorkCompleted", completedWorkItem.toString());
+      jobParameters.completeWork(completedWorkItem);
+      checkForWork();
+    }
+  }
+
+  private static JobWorkItem makeWorkItem(Uri voicemailUri) {
+    Intent intent = new Intent();
+    intent.putExtra(EXTRA_VOICEMAIL_URI, voicemailUri);
+    return new JobWorkItem(intent);
+  }
+
+  private TranscriptionConfigProvider getConfigProvider() {
+    if (configProvider == null) {
+      configProvider = new TranscriptionConfigProvider(this);
+    }
+    return configProvider;
+  }
+
+  private TranscriptionClientFactory getClientFactory() {
+    if (clientFactory == null) {
+      clientFactory = new TranscriptionClientFactory(this, getConfigProvider());
+    }
+    return clientFactory;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java b/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java
new file mode 100644
index 0000000..b5f29da
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionTask.java
@@ -0,0 +1,225 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.annotation.TargetApi;
+import android.app.job.JobWorkItem;
+import android.content.Context;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Pair;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.voicemail.impl.VvmLog;
+import com.android.voicemail.impl.transcribe.TranscriptionService.JobCallback;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionClient;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionClientFactory;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionResponse;
+import com.google.internal.communications.voicemailtranscription.v1.AudioFormat;
+import com.google.internal.communications.voicemailtranscription.v1.TranscriptionStatus;
+import com.google.protobuf.ByteString;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Background task to get a voicemail transcription and update the database.
+ *
+ * <pre>
+ * This task performs the following steps:
+ *   1. Update the transcription-state in the database to 'in-progress'
+ *   2. Create grpc client and transcription request
+ *   3. Make synchronous or asynchronous grpc transcription request to backend server
+ *     3a. On response
+ *       Update the database with transcription (if successful) and new transcription-state
+ *     3b. On network error
+ *       If retry-count < max then increment retry-count and retry the request
+ *       Otherwise update the transcription-state in the database to 'transcription-failed'
+ *   4. Notify the callback that the work item is complete
+ * </pre>
+ */
+public abstract class TranscriptionTask implements Runnable {
+  private static final String TAG = "TranscriptionTask";
+
+  private final Context context;
+  private final JobCallback callback;
+  private final JobWorkItem workItem;
+  private final TranscriptionClientFactory clientFactory;
+  private final Uri voicemailUri;
+  private final TranscriptionDbHelper databaseHelper;
+  protected final TranscriptionConfigProvider configProvider;
+  protected ByteString audioData;
+  protected AudioFormat encoding;
+
+  static final String AMR_PREFIX = "#!AMR\n";
+
+  /** Functional interface for sending requests to the transcription server */
+  public interface Request {
+    TranscriptionResponse getResponse(TranscriptionClient client);
+  }
+
+  TranscriptionTask(
+      Context context,
+      JobCallback callback,
+      JobWorkItem workItem,
+      TranscriptionClientFactory clientFactory,
+      TranscriptionConfigProvider configProvider) {
+    this.context = context;
+    this.callback = callback;
+    this.workItem = workItem;
+    this.clientFactory = clientFactory;
+    this.voicemailUri = TranscriptionService.getVoicemailUri(workItem);
+    this.configProvider = configProvider;
+    databaseHelper = new TranscriptionDbHelper(context, voicemailUri);
+  }
+
+  @Override
+  public void run() {
+    VvmLog.i(TAG, "run");
+    if (readAndValidateAudioFile()) {
+      updateTranscriptionState(VoicemailCompat.TRANSCRIPTION_IN_PROGRESS);
+      transcribeVoicemail();
+    } else {
+      if (AudioFormat.AUDIO_FORMAT_UNSPECIFIED.equals(encoding)) {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_VOICEMAIL_FORMAT_NOT_SUPPORTED);
+      } else {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_VOICEMAIL_INVALID_DATA);
+      }
+      updateTranscriptionState(VoicemailCompat.TRANSCRIPTION_FAILED);
+    }
+    ThreadUtil.postOnUiThread(
+        () -> {
+          callback.onWorkCompleted(workItem);
+        });
+  }
+
+  protected abstract Pair<String, TranscriptionStatus> getTranscription();
+
+  protected abstract DialerImpression.Type getRequestSentImpression();
+
+  private void transcribeVoicemail() {
+    VvmLog.i(TAG, "transcribeVoicemail");
+    Pair<String, TranscriptionStatus> pair = getTranscription();
+    String transcript = pair.first;
+    TranscriptionStatus status = pair.second;
+    if (!TextUtils.isEmpty(transcript)) {
+      updateTranscriptionAndState(transcript, VoicemailCompat.TRANSCRIPTION_AVAILABLE);
+      VvmLog.i(TAG, "transcribeVoicemail, got response");
+      Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_SUCCESS);
+    } else {
+      VvmLog.i(TAG, "transcribeVoicemail, transcription unsuccessful, " + status);
+      switch (status) {
+        case FAILED_LANGUAGE_NOT_SUPPORTED:
+          Logger.get(context)
+              .logImpression(
+                  DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_LANGUAGE_NOT_SUPPORTED);
+          break;
+        case FAILED_NO_SPEECH_DETECTED:
+          Logger.get(context)
+              .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_NO_SPEECH_DETECTED);
+          break;
+        case EXPIRED:
+          Logger.get(context)
+              .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_EXPIRED);
+          break;
+        default:
+          Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_EMPTY);
+          break;
+      }
+      updateTranscriptionAndState(transcript, VoicemailCompat.TRANSCRIPTION_FAILED);
+    }
+  }
+
+  protected TranscriptionResponse sendRequest(Request request) {
+    VvmLog.i(TAG, "sendRequest");
+    TranscriptionClient client = clientFactory.getClient();
+    for (int i = 0; i < configProvider.getMaxTranscriptionRetries(); i++) {
+      VvmLog.i(TAG, "sendRequest, try: " + (i + 1));
+      if (i == 0) {
+        Logger.get(context).logImpression(getRequestSentImpression());
+      } else {
+        Logger.get(context).logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_REQUEST_RETRY);
+      }
+
+      TranscriptionResponse response = request.getResponse(client);
+      if (response.hasRecoverableError()) {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_RECOVERABLE_ERROR);
+        backoff(i);
+      } else {
+        return response;
+      }
+    }
+
+    Logger.get(context)
+        .logImpression(DialerImpression.Type.VVM_TRANSCRIPTION_RESPONSE_TOO_MANY_ERRORS);
+    return null;
+  }
+
+  private static void backoff(int retryCount) {
+    VvmLog.i(TAG, "backoff, count: " + retryCount);
+    long millis = (1L << retryCount) * 1000;
+    sleep(millis);
+  }
+
+  protected static void sleep(long millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException e) {
+      VvmLog.w(TAG, "interrupted");
+      Thread.currentThread().interrupt();
+    }
+  }
+
+  private void updateTranscriptionAndState(String transcript, int newState) {
+    databaseHelper.setTranscriptionAndState(transcript, newState);
+  }
+
+  private void updateTranscriptionState(int newState) {
+    databaseHelper.setTranscriptionState(newState);
+  }
+
+  // Uses try-with-resource
+  @TargetApi(android.os.Build.VERSION_CODES.M)
+  private boolean readAndValidateAudioFile() {
+    if (voicemailUri == null) {
+      VvmLog.i(TAG, "Transcriber.readAndValidateAudioFile, file not found.");
+      return false;
+    } else {
+      VvmLog.i(TAG, "Transcriber.readAndValidateAudioFile, reading: " + voicemailUri);
+    }
+
+    try (InputStream in = context.getContentResolver().openInputStream(voicemailUri)) {
+      audioData = ByteString.readFrom(in);
+      VvmLog.i(TAG, "Transcriber.readAndValidateAudioFile, read " + audioData.size() + " bytes");
+    } catch (IOException e) {
+      VvmLog.e(TAG, "Transcriber.readAndValidateAudioFile", e);
+      return false;
+    }
+
+    if (audioData.startsWith(ByteString.copyFromUtf8(AMR_PREFIX))) {
+      encoding = AudioFormat.AMR_NB_8KHZ;
+    } else {
+      VvmLog.i(TAG, "Transcriber.readAndValidateAudioFile, unknown encoding");
+      encoding = AudioFormat.AUDIO_FORMAT_UNSPECIFIED;
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java
new file mode 100644
index 0000000..3c41aef
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java
@@ -0,0 +1,123 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.app.job.JobWorkItem;
+import android.content.Context;
+import android.util.Pair;
+import com.android.dialer.common.Assert;
+import com.android.dialer.logging.DialerImpression;
+import com.android.voicemail.impl.VvmLog;
+import com.android.voicemail.impl.transcribe.TranscriptionService.JobCallback;
+import com.android.voicemail.impl.transcribe.grpc.GetTranscriptResponseAsync;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionClientFactory;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionResponseAsync;
+import com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest;
+import com.google.internal.communications.voicemailtranscription.v1.TranscriptionStatus;
+
+/**
+ * Background task to get a voicemail transcription using the asynchronous API. The async API works
+ * as follows:
+ *
+ * <ol>
+ *   <li>client uploads voicemail data to the server
+ *   <li>server responds with a transcription-id and an estimated transcription wait time
+ *   <li>client waits appropriate amount of time then begins polling for the result
+ * </ol>
+ *
+ * This implementation blocks until the response or an error is received, even though it is using
+ * the asynchronous server API.
+ */
+public class TranscriptionTaskAsync extends TranscriptionTask {
+  private static final String TAG = "TranscriptionTaskAsync";
+
+  public TranscriptionTaskAsync(
+      Context context,
+      JobCallback callback,
+      JobWorkItem workItem,
+      TranscriptionClientFactory clientFactory,
+      TranscriptionConfigProvider configProvider) {
+    super(context, callback, workItem, clientFactory, configProvider);
+  }
+
+  @Override
+  protected Pair<String, TranscriptionStatus> getTranscription() {
+    VvmLog.i(TAG, "getTranscription");
+
+    TranscriptionResponseAsync uploadResponse =
+        (TranscriptionResponseAsync)
+            sendRequest((client) -> client.sendUploadRequest(getUploadRequest()));
+
+    if (uploadResponse == null) {
+      VvmLog.i(TAG, "getTranscription, failed to upload voicemail.");
+      return new Pair<>(null, TranscriptionStatus.FAILED_NO_RETRY);
+    } else {
+      waitForTranscription(uploadResponse);
+      return pollForTranscription(uploadResponse);
+    }
+  }
+
+  @Override
+  protected DialerImpression.Type getRequestSentImpression() {
+    return DialerImpression.Type.VVM_TRANSCRIPTION_REQUEST_SENT_ASYNC;
+  }
+
+  private static void waitForTranscription(TranscriptionResponseAsync uploadResponse) {
+    long millis = uploadResponse.getEstimatedWaitMillis();
+    VvmLog.i(TAG, "waitForTranscription, " + millis + " millis");
+    sleep(millis);
+  }
+
+  private Pair<String, TranscriptionStatus> pollForTranscription(
+      TranscriptionResponseAsync uploadResponse) {
+    VvmLog.i(TAG, "pollForTranscription");
+    GetTranscriptRequest request = getGetTranscriptRequest(uploadResponse);
+    for (int i = 0; i < configProvider.getMaxGetTranscriptPolls(); i++) {
+      GetTranscriptResponseAsync response =
+          (GetTranscriptResponseAsync)
+              sendRequest((client) -> client.sendGetTranscriptRequest(request));
+      if (response == null) {
+        VvmLog.i(TAG, "pollForTranscription, no transcription result.");
+      } else if (response.isTranscribing()) {
+        VvmLog.i(TAG, "pollForTranscription, poll count: " + (i + 1));
+      } else if (response.hasFatalError()) {
+        VvmLog.i(TAG, "pollForTranscription, fail. " + response.getErrorDescription());
+        return new Pair<>(null, response.getTranscriptionStatus());
+      } else {
+        VvmLog.i(TAG, "pollForTranscription, got transcription");
+        return new Pair<>(response.getTranscript(), TranscriptionStatus.SUCCESS);
+      }
+      sleep(configProvider.getGetTranscriptPollIntervalMillis());
+    }
+    VvmLog.i(TAG, "pollForTranscription, timed out.");
+    return new Pair<>(null, TranscriptionStatus.FAILED_NO_RETRY);
+  }
+
+  private TranscribeVoicemailAsyncRequest getUploadRequest() {
+    return TranscribeVoicemailAsyncRequest.newBuilder()
+        .setVoicemailData(audioData)
+        .setAudioFormat(encoding)
+        .build();
+  }
+
+  private GetTranscriptRequest getGetTranscriptRequest(TranscriptionResponseAsync uploadResponse) {
+    Assert.checkArgument(uploadResponse.getTranscriptionId() != null);
+    return GetTranscriptRequest.newBuilder()
+        .setTranscriptionId(uploadResponse.getTranscriptionId())
+        .build();
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionTaskSync.java b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskSync.java
new file mode 100644
index 0000000..bee6859
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskSync.java
@@ -0,0 +1,69 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+import android.app.job.JobWorkItem;
+import android.content.Context;
+import android.util.Pair;
+import com.android.dialer.logging.DialerImpression;
+import com.android.voicemail.impl.VvmLog;
+import com.android.voicemail.impl.transcribe.TranscriptionService.JobCallback;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionClientFactory;
+import com.android.voicemail.impl.transcribe.grpc.TranscriptionResponseSync;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest;
+import com.google.internal.communications.voicemailtranscription.v1.TranscriptionStatus;
+
+/** Background task to get a voicemail transcription using the synchronous API */
+public class TranscriptionTaskSync extends TranscriptionTask {
+  private static final String TAG = "TranscriptionTaskSync";
+
+  public TranscriptionTaskSync(
+      Context context,
+      JobCallback callback,
+      JobWorkItem workItem,
+      TranscriptionClientFactory clientFactory,
+      TranscriptionConfigProvider configProvider) {
+    super(context, callback, workItem, clientFactory, configProvider);
+  }
+
+  @Override
+  protected Pair<String, TranscriptionStatus> getTranscription() {
+    VvmLog.i(TAG, "getTranscription");
+
+    TranscriptionResponseSync response =
+        (TranscriptionResponseSync)
+            sendRequest((client) -> client.sendSyncRequest(getSyncRequest()));
+    if (response == null) {
+      VvmLog.i(TAG, "getTranscription, failed to transcribe voicemail.");
+      return new Pair<>(null, TranscriptionStatus.FAILED_NO_RETRY);
+    } else {
+      VvmLog.i(TAG, "getTranscription, got transcription");
+      return new Pair<>(response.getTranscript(), TranscriptionStatus.SUCCESS);
+    }
+  }
+
+  @Override
+  protected DialerImpression.Type getRequestSentImpression() {
+    return DialerImpression.Type.VVM_TRANSCRIPTION_REQUEST_SENT;
+  }
+
+  private TranscribeVoicemailRequest getSyncRequest() {
+    return TranscribeVoicemailRequest.newBuilder()
+        .setVoicemailData(audioData)
+        .setAudioFormat(encoding)
+        .build();
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/VoicemailCompat.java b/java/com/android/voicemail/impl/transcribe/VoicemailCompat.java
new file mode 100644
index 0000000..c6e30c6
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/VoicemailCompat.java
@@ -0,0 +1,59 @@
+/*
+ * 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.voicemail.impl.transcribe;
+
+/**
+ * Provide access to new API constants before they're publicly available
+ *
+ * <p>Copied from android.provider.VoicemailContract.Voicemails. These should become public in O-MR1
+ * and these constants can be removed then.
+ */
+public class VoicemailCompat {
+
+  /**
+   * The state of the voicemail transcription.
+   *
+   * <p>Possible values: {@link #TRANSCRIPTION_NOT_STARTED}, {@link #TRANSCRIPTION_IN_PROGRESS},
+   * {@link #TRANSCRIPTION_FAILED}, {@link #TRANSCRIPTION_AVAILABLE}.
+   *
+   * <p>Type: INTEGER
+   */
+  public static final String TRANSCRIPTION_STATE = "transcription_state";
+
+  /**
+   * Value of {@link #TRANSCRIPTION_STATE} when the voicemail transcription has not yet been
+   * attempted.
+   */
+  public static final int TRANSCRIPTION_NOT_STARTED = 0;
+
+  /**
+   * Value of {@link #TRANSCRIPTION_STATE} when the voicemail transcription has begun but is not yet
+   * complete.
+   */
+  public static final int TRANSCRIPTION_IN_PROGRESS = 1;
+
+  /**
+   * Value of {@link #TRANSCRIPTION_STATE} when the voicemail transcription has been attempted and
+   * failed.
+   */
+  public static final int TRANSCRIPTION_FAILED = 2;
+
+  /**
+   * Value of {@link #TRANSCRIPTION_STATE} when the voicemail transcription has completed and the
+   * result has been stored in the {@link #TRANSCRIPTION} column.
+   */
+  public static final int TRANSCRIPTION_AVAILABLE = 3;
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/GetTranscriptResponseAsync.java b/java/com/android/voicemail/impl/transcribe/grpc/GetTranscriptResponseAsync.java
new file mode 100644
index 0000000..f979d69
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/GetTranscriptResponseAsync.java
@@ -0,0 +1,102 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.google.internal.communications.voicemailtranscription.v1.GetTranscriptResponse;
+import com.google.internal.communications.voicemailtranscription.v1.TranscriptionStatus;
+import io.grpc.Status;
+
+/** Container for response and status objects for an asynchronous get-transcript request */
+public class GetTranscriptResponseAsync extends TranscriptionResponse {
+  @Nullable private final GetTranscriptResponse response;
+
+  @VisibleForTesting
+  public GetTranscriptResponseAsync(GetTranscriptResponse response) {
+    Assert.checkArgument(response != null);
+    this.response = response;
+  }
+
+  @VisibleForTesting
+  public GetTranscriptResponseAsync(Status status) {
+    super(status);
+    this.response = null;
+  }
+
+  public @Nullable String getTranscript() {
+    if (response != null) {
+      return response.getTranscript();
+    }
+    return null;
+  }
+
+  public @Nullable String getErrorDescription() {
+    if (!hasRecoverableError() && !hasFatalError()) {
+      return null;
+    }
+    if (status != null) {
+      return "Grpc error: " + status;
+    }
+    if (response != null) {
+      return "Transcription error: " + response.getStatus();
+    }
+    Assert.fail("Impossible state");
+    return null;
+  }
+
+  public TranscriptionStatus getTranscriptionStatus() {
+    if (response == null) {
+      return TranscriptionStatus.TRANSCRIPTION_STATUS_UNSPECIFIED;
+    } else {
+      return response.getStatus();
+    }
+  }
+
+  public boolean isTranscribing() {
+    return response != null && response.getStatus() == TranscriptionStatus.PENDING;
+  }
+
+  @Override
+  public boolean hasRecoverableError() {
+    if (super.hasRecoverableError()) {
+      return true;
+    }
+
+    if (response != null) {
+      return response.getStatus() == TranscriptionStatus.EXPIRED
+          || response.getStatus() == TranscriptionStatus.FAILED_RETRY;
+    }
+
+    return false;
+  }
+
+  @Override
+  public boolean hasFatalError() {
+    if (super.hasFatalError()) {
+      return true;
+    }
+
+    if (response != null) {
+      return response.getStatus() == TranscriptionStatus.FAILED_NO_RETRY
+          || response.getStatus() == TranscriptionStatus.FAILED_LANGUAGE_NOT_SUPPORTED
+          || response.getStatus() == TranscriptionStatus.FAILED_NO_SPEECH_DETECTED;
+    }
+
+    return false;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClient.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClient.java
new file mode 100644
index 0000000..b18d956
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClient.java
@@ -0,0 +1,61 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.support.annotation.WorkerThread;
+import com.google.internal.communications.voicemailtranscription.v1.GetTranscriptRequest;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncRequest;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest;
+import com.google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionServiceGrpc;
+import io.grpc.StatusRuntimeException;
+
+/** Wrapper around Grpc transcription server stub */
+public class TranscriptionClient {
+
+  private final VoicemailTranscriptionServiceGrpc.VoicemailTranscriptionServiceBlockingStub stub;
+
+  TranscriptionClient(
+      VoicemailTranscriptionServiceGrpc.VoicemailTranscriptionServiceBlockingStub stub) {
+    this.stub = stub;
+  }
+
+  @WorkerThread
+  public TranscriptionResponseSync sendSyncRequest(TranscribeVoicemailRequest request) {
+    try {
+      return new TranscriptionResponseSync(stub.transcribeVoicemail(request));
+    } catch (StatusRuntimeException e) {
+      return new TranscriptionResponseSync(e.getStatus());
+    }
+  }
+
+  @WorkerThread
+  public TranscriptionResponseAsync sendUploadRequest(TranscribeVoicemailAsyncRequest request) {
+    try {
+      return new TranscriptionResponseAsync(stub.transcribeVoicemailAsync(request));
+    } catch (StatusRuntimeException e) {
+      return new TranscriptionResponseAsync(e.getStatus());
+    }
+  }
+
+  @WorkerThread
+  public GetTranscriptResponseAsync sendGetTranscriptRequest(GetTranscriptRequest request) {
+    try {
+      return new GetTranscriptResponseAsync(stub.getTranscript(request));
+    } catch (StatusRuntimeException e) {
+      return new GetTranscriptResponseAsync(e.getStatus());
+    }
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClientFactory.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClientFactory.java
new file mode 100644
index 0000000..c57b01f
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionClientFactory.java
@@ -0,0 +1,196 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.voicemail.impl.transcribe.TranscriptionConfigProvider;
+import com.google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionServiceGrpc;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ClientInterceptors;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.okhttp.OkHttpChannelBuilder;
+import java.security.MessageDigest;
+
+/**
+ * Factory for creating grpc clients that talk to the transcription server. This allows all clients
+ * to share the same channel, which is relatively expensive to create.
+ */
+public class TranscriptionClientFactory {
+  private static final String DIGEST_ALGORITHM_SHA1 = "SHA1";
+  private static final char[] HEX_UPPERCASE = {
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+  };
+
+  private final TranscriptionConfigProvider configProvider;
+  private final ManagedChannel originalChannel;
+  private final String packageName;
+  private final String cert;
+
+  public TranscriptionClientFactory(Context context, TranscriptionConfigProvider configProvider) {
+    this(context, configProvider, getManagedChannel(configProvider));
+  }
+
+  public TranscriptionClientFactory(
+      Context context, TranscriptionConfigProvider configProvider, ManagedChannel managedChannel) {
+    this.configProvider = configProvider;
+    this.packageName = context.getPackageName();
+    this.cert = getCertificateFingerprint(context);
+    originalChannel = managedChannel;
+  }
+
+  public TranscriptionClient getClient() {
+    LogUtil.enterBlock("TranscriptionClientFactory.getClient");
+    Assert.checkState(!originalChannel.isShutdown());
+    Channel channel =
+        ClientInterceptors.intercept(
+            originalChannel,
+            new Interceptor(
+                packageName, cert, configProvider.getApiKey(), configProvider.getAuthToken()));
+    return new TranscriptionClient(VoicemailTranscriptionServiceGrpc.newBlockingStub(channel));
+  }
+
+  public void shutdown() {
+    LogUtil.enterBlock("TranscriptionClientFactory.shutdown");
+    if (!originalChannel.isShutdown()) {
+      originalChannel.shutdown();
+    }
+  }
+
+  private static ManagedChannel getManagedChannel(TranscriptionConfigProvider configProvider) {
+    ManagedChannelBuilder<OkHttpChannelBuilder> builder =
+        OkHttpChannelBuilder.forTarget(configProvider.getServerAddress());
+    // Only use plaintext for debugging
+    if (configProvider.shouldUsePlaintext()) {
+      // Just passing 'false' doesnt have the same effect as not setting this field
+      builder.usePlaintext(true);
+    }
+    return builder.build();
+  }
+
+  private static String getCertificateFingerprint(Context context) {
+    try {
+      PackageInfo packageInfo =
+          context
+              .getPackageManager()
+              .getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES);
+      if (packageInfo != null
+          && packageInfo.signatures != null
+          && packageInfo.signatures.length > 0) {
+        MessageDigest messageDigest = MessageDigest.getInstance(DIGEST_ALGORITHM_SHA1);
+        if (messageDigest == null) {
+          LogUtil.w(
+              "TranscriptionClientFactory.getCertificateFingerprint", "error getting digest.");
+          return null;
+        }
+        byte[] bytes = messageDigest.digest(packageInfo.signatures[0].toByteArray());
+        if (bytes == null) {
+          LogUtil.w(
+              "TranscriptionClientFactory.getCertificateFingerprint", "empty message digest.");
+          return null;
+        }
+
+        int length = bytes.length;
+        StringBuilder out = new StringBuilder(length * 2);
+        for (int i = 0; i < length; i++) {
+          out.append(HEX_UPPERCASE[(bytes[i] & 0xf0) >>> 4]);
+          out.append(HEX_UPPERCASE[bytes[i] & 0x0f]);
+        }
+        return out.toString();
+      } else {
+        LogUtil.w(
+            "TranscriptionClientFactory.getCertificateFingerprint",
+            "failed to get package signature.");
+      }
+    } catch (Exception e) {
+      LogUtil.e(
+          "TranscriptionClientFactory.getCertificateFingerprint",
+          "error getting certificate fingerprint.",
+          e);
+    }
+
+    return null;
+  }
+
+  private static final class Interceptor implements ClientInterceptor {
+    private final String packageName;
+    private final String cert;
+    private final String apiKey;
+    private final String authToken;
+
+    private static final Metadata.Key<String> API_KEY_HEADER =
+        Metadata.Key.of("X-Goog-Api-Key", Metadata.ASCII_STRING_MARSHALLER);
+    private static final Metadata.Key<String> ANDROID_PACKAGE_HEADER =
+        Metadata.Key.of("X-Android-Package", Metadata.ASCII_STRING_MARSHALLER);
+    private static final Metadata.Key<String> ANDROID_CERT_HEADER =
+        Metadata.Key.of("X-Android-Cert", Metadata.ASCII_STRING_MARSHALLER);
+    private static final Metadata.Key<String> AUTHORIZATION_HEADER =
+        Metadata.Key.of("authorization", Metadata.ASCII_STRING_MARSHALLER);
+
+    public Interceptor(String packageName, String cert, String apiKey, String authToken) {
+      this.packageName = packageName;
+      this.cert = cert;
+      this.apiKey = apiKey;
+      this.authToken = authToken;
+    }
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+        MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
+      LogUtil.enterBlock(
+          "TranscriptionClientFactory.interceptCall, intercepted " + method.getFullMethodName());
+      ClientCall<ReqT, RespT> call = next.newCall(method, callOptions);
+
+      call =
+          new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(call) {
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+              if (!TextUtils.isEmpty(packageName)) {
+                LogUtil.i(
+                    "TranscriptionClientFactory.interceptCall",
+                    "attaching package name: " + packageName);
+                headers.put(ANDROID_PACKAGE_HEADER, packageName);
+              }
+              if (!TextUtils.isEmpty(cert)) {
+                LogUtil.i("TranscriptionClientFactory.interceptCall", "attaching android cert");
+                headers.put(ANDROID_CERT_HEADER, cert);
+              }
+              if (!TextUtils.isEmpty(apiKey)) {
+                LogUtil.i("TranscriptionClientFactory.interceptCall", "attaching API Key");
+                headers.put(API_KEY_HEADER, apiKey);
+              }
+              if (!TextUtils.isEmpty(authToken)) {
+                LogUtil.i("TranscriptionClientFactory.interceptCall", "attaching auth token");
+                headers.put(AUTHORIZATION_HEADER, "Bearer " + authToken);
+              }
+              super.start(responseListener, headers);
+            }
+          };
+      return call;
+    }
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java
new file mode 100644
index 0000000..f0823de
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java
@@ -0,0 +1,53 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.support.annotation.Nullable;
+import com.android.dialer.common.Assert;
+import io.grpc.Status;
+
+/**
+ * Base class for encapulating a voicemail transcription server response. This handles the Grpc
+ * status response, subclasses will handle request specific responses.
+ */
+public abstract class TranscriptionResponse {
+  @Nullable public final Status status;
+
+  TranscriptionResponse() {
+    this.status = null;
+  }
+
+  TranscriptionResponse(Status status) {
+    Assert.checkArgument(status != null);
+    this.status = status;
+  }
+
+  public boolean hasRecoverableError() {
+    if (status != null) {
+      return status.getCode() == Status.Code.UNAVAILABLE;
+    }
+
+    return false;
+  }
+
+  public boolean hasFatalError() {
+    if (status != null) {
+      return status.getCode() != Status.Code.OK && status.getCode() != Status.Code.UNAVAILABLE;
+    }
+
+    return false;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseAsync.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseAsync.java
new file mode 100644
index 0000000..38b4630
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseAsync.java
@@ -0,0 +1,53 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailAsyncResponse;
+import io.grpc.Status;
+
+/** Container for response and status objects for an asynchronous transcription upload request */
+public class TranscriptionResponseAsync extends TranscriptionResponse {
+  @Nullable private final TranscribeVoicemailAsyncResponse response;
+
+  @VisibleForTesting
+  public TranscriptionResponseAsync(TranscribeVoicemailAsyncResponse response) {
+    Assert.checkArgument(response != null);
+    this.response = response;
+  }
+
+  @VisibleForTesting
+  public TranscriptionResponseAsync(Status status) {
+    super(status);
+    this.response = null;
+  }
+
+  public @Nullable String getTranscriptionId() {
+    if (response != null) {
+      return response.getTranscriptionId();
+    }
+    return null;
+  }
+
+  public long getEstimatedWaitMillis() {
+    if (response != null) {
+      return response.getEstimatedWaitSecs() * 1_000L;
+    }
+    return 0;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseSync.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseSync.java
new file mode 100644
index 0000000..d2e2e21
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponseSync.java
@@ -0,0 +1,43 @@
+/*
+ * 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.voicemail.impl.transcribe.grpc;
+
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse;
+import io.grpc.Status;
+
+/** Container for response and status objects for a synchronous transcription request */
+public class TranscriptionResponseSync extends TranscriptionResponse {
+  @Nullable private final TranscribeVoicemailResponse response;
+
+  @VisibleForTesting
+  public TranscriptionResponseSync(Status status) {
+    super(status);
+    this.response = null;
+  }
+
+  @VisibleForTesting
+  public TranscriptionResponseSync(TranscribeVoicemailResponse response) {
+    Assert.checkArgument(response != null);
+    this.response = response;
+  }
+
+  public @Nullable String getTranscript() {
+    return (response != null) ? response.getTranscript() : null;
+  }
+}
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto
new file mode 100644
index 0000000..a2064d1
--- /dev/null
+++ b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto
@@ -0,0 +1,133 @@
+// LINT.IfChange
+
+syntax = "proto2";
+
+package google.internal.communications.voicemailtranscription.v1;
+
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+option java_package = "com.google.internal.communications.voicemailtranscription.v1";
+
+// Enum that specifies supported audio formats.
+enum AudioFormat {
+  // Default but invalid value.
+  AUDIO_FORMAT_UNSPECIFIED = 0;
+
+  // Adaptive Multi-Rate Narrowband, 8kHz sampling frequency.
+  // https://en.wikipedia.org/wiki/Adaptive_Multi-Rate_audio_codec
+  AMR_NB_8KHZ = 1;
+}
+
+// Enum that describes the status of the transcription process.
+enum TranscriptionStatus {
+  // Default but invalid value.
+  TRANSCRIPTION_STATUS_UNSPECIFIED = 0;
+
+  // Transcription was successful and the transcript is present.
+  SUCCESS = 1;
+
+  // Transcription is progress. Check again later.
+  PENDING = 2;
+
+  // Transcription was successful, but the expiration period has passed, which
+  // means that the sensative data (including the transcript) has been deleted.
+  // Resend the voicemail through TranscribeVoicemailAsync to retry.
+  EXPIRED = 3;
+
+  // Internal error encountered during the transcription.
+  // Resend the voicemail through TranscribeVoicemailAsync to retry.
+  // This is a catch-all status for all retriable errors that aren't captured by
+  // a more specfic status.
+  FAILED_RETRY = 4;
+
+  // Internal error encountered during the transcription.
+  // Do not resend the voicemail.
+  // This is a catch-all status for all non-retriable errors that aren't
+  // captured by a more specfic status.
+  FAILED_NO_RETRY = 5;
+
+  // The language detected is not yet supported by this service.
+  // Do not resend the voicemail.
+  FAILED_LANGUAGE_NOT_SUPPORTED = 6;
+
+  // No speech was detected in the voicemail.
+  // Do not resend the voicemail.
+  FAILED_NO_SPEECH_DETECTED = 7;
+}
+
+// Request for synchronous voicemail transcription.
+message TranscribeVoicemailRequest {
+  // Voicemail audio file containing the raw bytes we receive from the carrier.
+  optional bytes voicemail_data = 1;
+
+  // Audio format of the voicemail file.
+  optional AudioFormat audio_format = 2;
+}
+
+// Response for synchronous voicemail transcription.
+message TranscribeVoicemailResponse {
+  // The transcribed text of the voicemail.
+  optional string transcript = 1;
+}
+
+// Request for asynchronous voicemail transcription.
+message TranscribeVoicemailAsyncRequest {
+  // Voicemail audio data encoded in the format specified by audio_format.
+  optional bytes voicemail_data = 1;
+
+  // Audio format of the voicemail file.
+  optional AudioFormat audio_format = 2;
+}
+
+// Response for asynchronous voicemail transcription containing information
+// needed to fetch the transcription results through the GetTranscript method.
+message TranscribeVoicemailAsyncResponse {
+  // Unique ID for the transcription. This ID is used for retrieving the
+  // voicemail transcript later.
+  optional string transcription_id = 1;
+
+  // The estimated amount of time in seconds before the transcription will be
+  // available.
+  // The client should not call GetTranscript until this time has elapsed, but
+  // the transcript is not guaranteed to be ready by this time.
+  optional int64 estimated_wait_secs = 2;
+}
+
+// Request for retrieving an asynchronously generated transcript.
+message GetTranscriptRequest {
+  // Unique ID for the transcription. This ID was returned by
+  // TranscribeVoicemailAsync.
+  optional string transcription_id = 1;
+}
+
+// Response for retrieving an asynchronously generated transcript.
+message GetTranscriptResponse {
+  // Status of the trascription process.
+  optional TranscriptionStatus status = 1;
+
+  // The transcribed text of the voicemail. This is only present if the status
+  // is SUCCESS.
+  optional string transcript = 2;
+}
+
+// RPC service for transcribing voicemails.
+service VoicemailTranscriptionService {
+  // Returns a transcript of the given voicemail.
+  rpc TranscribeVoicemail(TranscribeVoicemailRequest)
+      returns (TranscribeVoicemailResponse) {}
+
+  // Schedules a transcription of the given voicemail. The transcript can be
+  // retrieved using the returned ID.
+  rpc TranscribeVoicemailAsync(TranscribeVoicemailAsyncRequest)
+      returns (TranscribeVoicemailAsyncResponse) {
+  }
+
+  // Returns the transcript corresponding to the given ID, which was returned
+  // by TranscribeVoicemailAsync.
+  rpc GetTranscript(GetTranscriptRequest) returns (GetTranscriptResponse) {
+  }
+}
+
+// LINT.ThenChange(//depot/google3/google/internal/communications/voicemailtranscription/v1/\
+//         voicemail_transcription.proto)
diff --git a/java/com/android/voicemail/permissions.xml b/java/com/android/voicemail/permissions.xml
deleted file mode 100644
index bedf068..0000000
--- a/java/com/android/voicemail/permissions.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.voicemailomtp">
-
-  <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="26"/>
-
-  <!-- Applications using this module should merge these permissions using android_manifest_merge -->
-
-  <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
-  <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
-  <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-  <uses-permission android:name="android.permission.SEND_SMS"/>
-  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-  <application/>
-</manifest>
diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java
index e2b4707..9929503 100644
--- a/java/com/android/voicemail/stub/StubVoicemailClient.java
+++ b/java/com/android/voicemail/stub/StubVoicemailClient.java
@@ -18,6 +18,9 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.PersistableBundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.voicemail.VoicemailClient;
@@ -81,4 +84,22 @@
   public boolean isActivated(Context context, PhoneAccountHandle phoneAccountHandle) {
     return false;
   }
+
+  @Override
+  public void showConfigUi(@NonNull Context context) {}
+
+  @Override
+  public PersistableBundle getConfig(
+      @NonNull Context context, @Nullable PhoneAccountHandle phoneAccountHandle) {
+    return new PersistableBundle();
+  }
+
+  @Override
+  public void onBoot(@NonNull Context context) {}
+
+  @Override
+  public void onShutdown(@NonNull Context context) {}
+
+  @Override
+  public void onTosAccepted(Context context) {}
 }